Skip to content

Commit 5db7ca4

Browse files
wtc-pegJaime-Trinidad
wtc-peg
and
Jaime-Trinidad
authored
Delivery for new vendor watteco (former nke-watteco) (#870)
* Refactor: Global build for new Vendor watteco. Deployment of last evolutions (v1.1.1) for Watteco, Actility, TTN, and NPM repositories Key objectives for this build: - Added new TTN Watteco vendor (former nke_watteco retained for compatibility) - TS013 compliance: ES5 output, decoder size < 64KB, output format, API conformance - Added new sensors, removed/renamed others - Enhanced utilities for easier build and repository synchronization (watteco repositorsy) - Passed Watteco and TTN test procedures - Addressed compatibility with platforms requiring strict (older) ES5 support * validate fmt * issue review --------- Co-authored-by: Jaime Trinidad <81958808+Jaime-Trinidad@users.noreply.github.com> Co-authored-by: Jaime Trinidad <jaimetv4@gmail.com>
1 parent 7c19818 commit 5db7ca4

File tree

138 files changed

+10007
-312
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

138 files changed

+10007
-312
lines changed

vendor/watteco/th-sensor-profile.yaml renamed to vendor/watteco/1-generic-eu-1-0-2-class-a-profile.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,3 +45,4 @@ supportsClassC: false
4545
# If your device supports class C, uncomment the following fields:
4646
# Maximum delay for the end device to answer a MAC request or confirmed downlink frame (seconds)
4747
#classCTimeout: 60
48+

‎vendor/watteco/1-generic-eu-1-0-2-class-c-profile.yaml‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
# LoRaWAN MAC version: 1.0, 1.0.1, 1.0.2, 1.0.3, 1.0.4 or 1.1
2+
macVersion: 1.0.2
3+
# LoRaWAN Regional Parameters version. Values depend on the LoRaWAN version:
4+
# 1.0: TS001-1.0
5+
# 1.0.1: TS001-1.0.1
6+
# 1.0.2: RP001-1.0.2 or RP001-1.0.2-RevB
7+
# 1.0.3: RP001-1.0.3-RevA
8+
# 1.0.4: RP002-1.0.0 or RP002-1.0.1
9+
# 1.1: RP001-1.1-RevA or RP001-1.1-RevB
10+
regionalParametersVersion: RP001-1.0.2-RevB
11+
12+
# Whether the end device supports join (OTAA) or not (ABP)
13+
supportsJoin: true
14+
# If your device is an ABP device (supportsJoin is false), uncomment the following fields:
15+
# RX1 delay
16+
#rx1Delay: 5
17+
# RX1 data rate offset
18+
#rx1DataRateOffset: 0
19+
# RX2 data rate index
20+
#rx2DataRateIndex: 0
21+
# RX2 frequency (MHz)
22+
#rx2Frequency: 869.525
23+
# Factory preset frequencies (MHz)
24+
#factoryPresetFrequencies: [868.1, 868.3, 868.5, 867.1, 867.3, 867.5, 867.7, 867.9]
25+
26+
# Maximum EIRP
27+
maxEIRP: 16
28+
# Whether the end device supports 32-bit frame counters
29+
supports32bitFCnt: true
30+
31+
# Whether the end device supports class B
32+
supportsClassB: false
33+
# If your device supports class B, uncomment the following fields:
34+
# Maximum delay for the end device to answer a MAC request or confirmed downlink frame (seconds)
35+
#classBTimeout: 60
36+
# Ping slot period (seconds)
37+
#pingSlotPeriod: 128
38+
# Ping slot data rate index
39+
#pingSlotDataRateIndex: 0
40+
# Ping slot frequency (MHz). Set to 0 if the band supports ping slot frequency hopping.
41+
#pingSlotFrequency: 869.525
42+
43+
# Whether the end device supports class C
44+
supportsClassC: true
45+
# If your device supports class C, uncomment the following fields:
46+
# Maximum delay for the end device to answer a MAC request or confirmed downlink frame (seconds)
47+
classCTimeout: 60

‎vendor/watteco/atmo-codec.yaml‎

Lines changed: 139 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,139 @@
1+
uplinkDecoder:
2+
fileName: atmo.js
3+
examples:
4+
- description: 'uplink standard report containing temperature value | payload:110A04020000290B89'
5+
input:
6+
bytes: [0x11, 0x0a, 0x04, 0x02, 0x00, 0x00, 0x29, 0x0b, 0x89]
7+
fPort: 125
8+
recvTime: '2023-07-19T07:51:31.598957793Z'
9+
output:
10+
data:
11+
samples:
12+
- variable: temperature
13+
value: 29.53
14+
date: '2023-07-19T07:51:31.598957793Z'
15+
temperature: 29.53
16+
warnings: []
17+
- description: 'uplink standard report containing humidity value | payload:110A04050000210E89'
18+
input:
19+
bytes: [0x11, 0x0a, 0x04, 0x05, 0x00, 0x00, 0x21, 0x0e, 0x89]
20+
fPort: 125
21+
recvTime: '2023-07-19T07:51:25.508306410Z'
22+
output:
23+
data:
24+
samples:
25+
- variable: humidity
26+
value: 37.21
27+
date: '2023-07-19T07:51:25.508306410Z'
28+
humidity: 37.21
29+
warnings: []
30+
- description: 'uplink standard report containing pressure value | payload:110A04030000290045'
31+
input:
32+
bytes: [0x11, 0x0a, 0x04, 0x03, 0x00, 0x00, 0x29, 0x00, 0x45]
33+
fPort: 125
34+
recvTime: '2023-07-19T07:51:25.508306410Z'
35+
output:
36+
data:
37+
samples:
38+
- variable: pressure
39+
value: 69
40+
date: '2023-07-19T07:51:25.508306410Z'
41+
pressure: 69
42+
warnings: []
43+
- description: 'uplink standard report containing state of pin 1 | payload:110A000F00551001'
44+
input:
45+
bytes: [0x11, 0x0a, 0x00, 0x0f, 0x00, 0x55, 0x10, 0x01]
46+
fPort: 125
47+
recvTime: '2023-07-19T07:51:25.508306410Z'
48+
output:
49+
data:
50+
samples:
51+
- variable: pin_state_1
52+
value: true
53+
date: '2023-07-19T07:51:25.508306410Z'
54+
pin_state_1: true
55+
warnings: []
56+
- description: 'uplink standard report containing number of pulse detection on input 1 | payload:110A000F04022300000000'
57+
input:
58+
bytes: [0x11, 0x0a, 0x00, 0x0f, 0x04, 0x02, 0x23, 0x00, 0x00, 0x00, 0x00]
59+
fPort: 125
60+
recvTime: '2023-07-19T07:51:25.508306410Z'
61+
output:
62+
data:
63+
samples:
64+
- variable: index_1
65+
value: 0
66+
date: '2023-07-19T07:51:25.508306410Z'
67+
index_1: 0
68+
warnings: []
69+
- description: 'uplink standard report containing firmware version | payload:110100000002000D0305020015E2'
70+
input:
71+
bytes: [0x11, 0x01, 0x00, 0x00, 0x00, 0x02, 0x00, 0x0d, 0x03, 0x05, 0x02, 0x00, 0x15, 0xe2]
72+
fPort: 125
73+
recvTime: '2023-07-19T07:51:25.508306410Z'
74+
output:
75+
data:
76+
samples:
77+
- variable: firmware
78+
value: 3.5.2.5602
79+
date: '2023-07-19T07:51:25.508306410Z'
80+
firmware: 3.5.2.5602
81+
warnings: []
82+
- description: 'uplink standard report containing battery charge | payload:110A00500006410503040E6804'
83+
input:
84+
bytes: [0x11, 0x0a, 0x00, 0x50, 0x00, 0x06, 0x41, 0x05, 0x03, 0x04, 0x0e, 0x68, 0x04]
85+
fPort: 125
86+
recvTime: '2023-07-19T07:51:25.508306410Z'
87+
output:
88+
data:
89+
samples:
90+
- variable: disposable_battery_voltage
91+
value: 3.688
92+
date: '2023-07-19T07:51:25.508306410Z'
93+
disposable_battery_voltage: 3.688
94+
warnings: []
95+
- description: 'uplink standard report containing dataup info | payload:110180040000000800'
96+
input:
97+
bytes: [0x11, 0x01, 0x80, 0x04, 0x00, 0x00, 0x00, 0x08, 0x00]
98+
fPort: 125
99+
recvTime: '2023-07-19T07:51:25.508306410Z'
100+
output:
101+
data:
102+
samples:
103+
- variable: message_type
104+
value: unconfirmed
105+
date: '2023-07-19T07:51:25.508306410Z'
106+
message_type: unconfirmed
107+
warnings: []
108+
- description: 'uplink batch report contenaing several pressures and battery level | payload:20220080039281F268D3212D54A0C3E170380AB000'
109+
input:
110+
bytes: [0x20, 0x22, 0x00, 0x80, 0x03, 0x92, 0x81, 0xf2, 0x68, 0xd3, 0x21, 0x2d, 0x54, 0xa0, 0xc3, 0xe1, 0x70, 0x38, 0x0a, 0xb0, 0x00]
111+
fPort: 125
112+
recvTime: '2023-07-19T07:51:25.508306410Z'
113+
output:
114+
data:
115+
samples:
116+
- variable: pressure
117+
value: 997
118+
date: '2023-07-19T07:50:34.508Z'
119+
- variable: pressure
120+
value: 997
121+
date: '2023-07-19T07:50:44.508Z'
122+
- variable: pressure
123+
value: 997
124+
date: '2023-07-19T07:50:54.508Z'
125+
- variable: pressure
126+
value: 997
127+
date: '2023-07-19T07:51:04.508Z'
128+
- variable: pressure
129+
value: 997
130+
date: '2023-07-19T07:51:14.508Z'
131+
- variable: pressure
132+
value: 997
133+
date: '2023-07-19T07:51:24.508Z'
134+
- variable: battery_voltage
135+
value: 3.689
136+
date: '2023-07-19T07:51:24.508Z'
137+
battery_voltage: 3.689
138+
pressure: 997
139+
warnings: []

‎vendor/watteco/atmo.js‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/watteco/atmo.png‎

63.3 KB
Loading

‎vendor/watteco/atmo.yaml‎

Lines changed: 137 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,137 @@
1+
name: Atm'O - Temperature/Humidity/Atmospheric Pressure
2+
description: The WATTECO Atm’O has sensors for measuring temperature, relative humidity, and atmospheric pressure in outdoors and industrial environments, and transmits the data over a public or private LoRaWAN® radio network.
3+
4+
# Hardware versions (optional, use when you have revisions)
5+
hardwareVersions:
6+
- version: '50-70-099'
7+
numeric: 99
8+
9+
# Firmware versions (at least one is mandatory)
10+
firmwareVersions:
11+
- # Firmware version
12+
version: '3.5.2'
13+
numeric: 352
14+
# Corresponding hardware versions (optional)
15+
hardwareVersions:
16+
- '50-70-099'
17+
18+
# # Firmware features (optional)
19+
# # Valid values are: remote rejoin (trigger a join from the application layer), transmission interval (configure how
20+
# # often he device sends a message).
21+
# features:
22+
# - remote rejoin
23+
# - transmission interval
24+
25+
# LoRaWAN Device Profiles per region
26+
# Supported regions are EU863-870, US902-928, AU915-928, AS923, CN779-787, EU433, CN470-510, KR920-923, IN865-867,
27+
# RU864-870
28+
profiles:
29+
EU863-870:
30+
id: 1-generic-eu-1-0-2-class-a-profile
31+
lorawanCertified: true
32+
codec: atmo-codec
33+
34+
# Sensors that this device features (optional)
35+
# Valid values are:
36+
# 4-20 ma, accelerometer, altitude, analog input, auxiliary, barometer, battery, button, bvoc, co, co2, conductivity,
37+
# current, digital input, dissolved oxygen, distance, dust, energy, gps, gyroscope, h2s, humidity, iaq, level, light,
38+
# lightning, link, magnetometer, moisture, motion, no, no2, o3, particulate matter, ph, pir, pm2.5, pm10, potentiometer,
39+
# power, precipitation, pressure, proximity, pulse count, pulse frequency, radar, rainfall, rssi, smart valve, snr, so2,
40+
# solar radiation, sound, strain, surface temperature, temperature, tilt, time, tvoc, uv, vapor pressure, velocity,
41+
# vibration, voltage, water potential, water, weight, wifi ssid, wind direction, wind speed.
42+
sensors:
43+
- temperature
44+
- humidity
45+
- barometer
46+
47+
# Additional radios that this device has (optional)
48+
# Valid values are: ble, nfc, wifi, cellular.
49+
# additionalRadios:
50+
# -
51+
52+
# Bridge interfaces (optional)
53+
# Valid values are: modbus, m-bus, can bus, rs-485, sdi-12, analog.
54+
# bridgeInterfaces: none
55+
56+
# Dimensions in mm (optional)
57+
# Use width, height, length and/or diameter
58+
dimensions:
59+
diameter: 150
60+
height: 250
61+
62+
# Weight in grams (optional)
63+
# weight: 95
64+
65+
# Battery information (optional)
66+
battery:
67+
replaceable: true
68+
type: C
69+
70+
# Operating conditions (optional)
71+
operatingConditions:
72+
# Temperature (Celsius)
73+
temperature:
74+
min: -20
75+
max: 55
76+
77+
# IP rating (optional)
78+
ipCode: IP68
79+
80+
# Key provisioning (optional)
81+
# Valid values are: custom (user can configure keys), join server and manifest.
82+
keyProvisioning:
83+
- custom
84+
85+
# Key programming (optional)
86+
# Valid values are: bluetooth, nfc, wifi, serial (when the user has a serial interface to set the keys)
87+
# and firmware (when the user should change the firmware to set the keys).
88+
keyProgramming:
89+
- firmware
90+
91+
# Key security (optional)
92+
# Valid values are: none, read protected and secure element.
93+
keySecurity: none
94+
95+
# Firmware programming (optional)
96+
# Valid values are: serial (when the user has a serial interface to update the firmware), fuota lorawan (when the device
97+
# supports LoRaWAN FUOTA via standard interfaces) and fuota other (other wireless update mechanism).
98+
# firmwareProgramming: none
99+
100+
# Product and data sheet URLs (optional)
101+
102+
productURL: https://www.watteco.fr/product/atmo-sensor-lorawan/
103+
dataSheetURL: https://www.watteco.fr/download/atmo-sensor-data-sheet-lorawan/?wpdmdl=6433
104+
onboardingGuideURL: https://support.watteco.com/atmo/
105+
106+
# Commercial information
107+
resellerURLs:
108+
- name: 'Watteco'
109+
region:
110+
- European Union
111+
url: http://www.watteco.fr
112+
# msrp:
113+
# EUR:
114+
115+
# Photos
116+
photos:
117+
main: atmo.png
118+
119+
# Youtube or Vimeo Video (optional)
120+
# videos:
121+
# main:
122+
123+
# Regulatory compliances (optional)
124+
compliances:
125+
safety:
126+
- body: IEC
127+
norm: EN
128+
standard: 61000-4-2
129+
radioEquipment:
130+
- body: ETSI
131+
norm: EN
132+
standard: 300 220-1
133+
version: 2.4.1
134+
- body: ETSI
135+
norm: EN
136+
standard: 301 489
137+
version: 1.6.1

0 commit comments

Comments
 (0)