Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge QA into Main #173

Merged
merged 58 commits into from
Dec 31, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
58 commits
Select commit Hold shift + click to select a range
14077f9
Revert "Added 4 LNS integrations for EM400-MUD"
artem-barysh-dev Dec 11, 2024
0bcc4b8
Added 4 LNS integrations for EM400-TLD
artem-barysh-dev Dec 11, 2024
c7638a7
Added 4 LNS integrations for EM400-UDL
artem-barysh-dev Dec 11, 2024
920d49a
Resolved conflict
artem-barysh-dev Dec 11, 2024
3cb73b6
Resolved conflict
artem-barysh-dev Dec 11, 2024
da90abf
Deleted unused result_1.json
artem-barysh-dev Dec 12, 2024
3b064ef
Deleted unused result_1.json
artem-barysh-dev Dec 12, 2024
2902069
Added 4 LNS integrations for EM500-CO2
artem-barysh-dev Dec 13, 2024
35032e5
Fix Decentlab DL-SHT35-001 type
decentlab Dec 17, 2024
48f2aa9
Add Decentlab DL-SHT35-002
decentlab Dec 17, 2024
08a4927
Updated company logos
artem-barysh-dev Dec 17, 2024
1df7d2f
Added 4 LNS integrations for Clover
artem-barysh-dev Dec 19, 2024
460af4e
Added 4 LNS integrations for Kiwi
artem-barysh-dev Dec 19, 2024
2d40d65
Merge pull request #157 from artem-barysh-dev/em400-tld
ViacheslavKlimov Dec 19, 2024
69046d5
Merge pull request #162 from artem-barysh-dev/em500-co2
ViacheslavKlimov Dec 19, 2024
5722aa5
Merge pull request #158 from artem-barysh-dev/em400-udl
ViacheslavKlimov Dec 19, 2024
b1569a3
Merge branch 'main' of github.com:thingsboard/data-converters into qa
ViacheslavKlimov Dec 19, 2024
399caa2
Merge pull request #168 from decentlab/main
ViacheslavKlimov Dec 19, 2024
5cfd5ec
Merge pull request #170 from artem-barysh-dev/updated-company-logos
ViacheslavKlimov Dec 19, 2024
97106bf
Merge pull request #171 from artem-barysh-dev/clover
ViacheslavKlimov Dec 19, 2024
8a9eeb8
Merge pull request #172 from artem-barysh-dev/kiwi
ViacheslavKlimov Dec 19, 2024
230ed70
Added 4 LNS integrations for Aura
artem-barysh-dev Dec 19, 2024
c7b8a70
Added 4 LNS integrations for Flux
artem-barysh-dev Dec 19, 2024
1fede74
Updated the validation script by adding checks for vendors' photo and…
artem-barysh-dev Dec 23, 2024
4c32451
Merge pull request #176 from thingsboard/fix-validation-script
ViacheslavKlimov Dec 23, 2024
cf37fa2
Added 4 LNS integrations for Comfort
artem-barysh-dev Dec 23, 2024
76ab9f3
Added 4 LNS integrations for Vivid
artem-barysh-dev Dec 24, 2024
1db5067
Added an additional test case for integrating Loriot (Bosch device)
artem-barysh-dev Dec 24, 2024
4a192eb
Fixed mismatch of expected result in Loriot integration
artem-barysh-dev Dec 24, 2024
1eea580
Updated converter
artem-barysh-dev Dec 24, 2024
fe258d1
Added an additional test case for integrating Loriot (SensiEDGE device)
artem-barysh-dev Dec 24, 2024
762462f
Added an additional test case for integrating Loriot (Nwave device)
artem-barysh-dev Dec 24, 2024
ab2932d
Fixed mismatch of expected result files for Bosch device
artem-barysh-dev Dec 24, 2024
9530be3
Added an additional test cases for loriot integration(elsys devices)
artem-barysh-dev Dec 24, 2024
eaefa9e
Added an additional test cases for loriot integration(Netvox devices)
artem-barysh-dev Dec 24, 2024
400178a
Merge pull request #179 from artem-barysh-dev/vivid
ViacheslavKlimov Dec 24, 2024
e239167
Merge pull request #178 from thingsboard/comfort
ViacheslavKlimov Dec 24, 2024
f16f3a3
Merge pull request #175 from thingsboard/flux
ViacheslavKlimov Dec 24, 2024
963218e
Merge pull request #174 from thingsboard/aura
ViacheslavKlimov Dec 24, 2024
3defd9e
Added an additional test cases for loriot integration(Tektelic devices)
artem-barysh-dev Dec 24, 2024
82d191e
Added an additional test case for integrating Loriot (Yobiiq device)
artem-barysh-dev Dec 26, 2024
7bfce90
Added an additional test case for integrating Loriot (Milesight device)
artem-barysh-dev Dec 26, 2024
45802c2
Merge pull request #180 from artem-barysh-dev/fix-bosch-loriot
ViacheslavKlimov Dec 26, 2024
feb3bd0
Merge pull request #181 from artem-barysh-dev/fix-sensiedge-loriot
ViacheslavKlimov Dec 26, 2024
e8fb503
Merge pull request #182 from artem-barysh-dev/fix-nwave-loriot
ViacheslavKlimov Dec 26, 2024
2370050
Merge pull request #183 from artem-barysh-dev/fix-elsys-loriot
ViacheslavKlimov Dec 26, 2024
e4633b4
Merge pull request #184 from artem-barysh-dev/fix-netvox-loriot
ViacheslavKlimov Dec 26, 2024
c2d7aed
Merge pull request #185 from thingsboard/fix-tektelic-loriot
ViacheslavKlimov Dec 26, 2024
5c25324
Merge pull request #186 from thingsboard/fix-yobiiq-loriot
ViacheslavKlimov Dec 26, 2024
c234551
Merge pull request #187 from thingsboard/fix-milesight-loriot
ViacheslavKlimov Dec 26, 2024
6778af2
Added an additional test case for integrating Loriot (Decentlab device)
artem-barysh-dev Dec 26, 2024
9e56357
Fixed result output for dl-dlr2-005
artem-barysh-dev Dec 26, 2024
d0931c9
Fixed result output for dl-dlr2-003
artem-barysh-dev Dec 26, 2024
a36059a
Merge pull request #188 from thingsboard/fix-decentlab-loriot
ViacheslavKlimov Dec 30, 2024
bd48b9a
Added HTTP integration for Milesight devices
ArtemAbrams Dec 30, 2024
7fb584e
Fixed mismatch between payload and result for AM102L
ArtemAbrams Dec 30, 2024
a43034d
Added missing result for AM102 Loriot integration
ArtemAbrams Dec 30, 2024
6a1d39f
Merge pull request #189 from thingsboard/http-integration
ViacheslavKlimov Dec 30, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
9 changes: 7 additions & 2 deletions VENDORS/Bosch/Parking_Lot_Sensor/LORIOT/uplink/converter.json

Large diffs are not rendered by default.

32 changes: 32 additions & 0 deletions VENDORS/Bosch/Parking_Lot_Sensor/LORIOT/uplink/payload_3.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{
"cmd": "gw",
"seqno": 4,
"EUI": "0102030405060708",
"ts": 1690901260493,
"fcnt": 3,
"port": 2,
"freq": 868300000,
"toa": 1319,
"dr": "SF12 BW125 4/5",
"ack": false,
"gws": [
{
"rssi": -38,
"snr": 8.5,
"ts": 1690901260493,
"time": "2023-08-01T14:47:40.493Z",
"gweui": "1020304080706050",
"ant": 0
},
{
"rssi": -42,
"snr": 8.8,
"ts": 1690901260495,
"time": "2023-08-01T14:47:40.495Z",
"gweui": "1020304081716151",
"ant": 0
}
],
"bat": 143,
"data": "0112"
}
2 changes: 1 addition & 1 deletion VENDORS/Bosch/Parking_Lot_Sensor/LORIOT/uplink/result.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[{
"deviceName": "Bosch parking lot sensor1000000000000001",
"deviceName": "Bosch parking lot sensor 1000000000000001",
"deviceType": "Parking sensor",
"attributes": {
"eui": "1000000000000001",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[{
"deviceName": "Bosch parking lot sensor1000000000000001",
"deviceName": "Bosch parking lot sensor 1000000000000001",
"deviceType": "Parking sensor",
"attributes": {
"eui": "1000000000000001",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[{
"deviceName": "Bosch parking lot sensor1000000000000001",
"deviceName": "Bosch parking lot sensor 1000000000000001",
"deviceType": "Parking sensor",
"attributes": {
"eui": "1000000000000001",
Expand Down
43 changes: 43 additions & 0 deletions VENDORS/Bosch/Parking_Lot_Sensor/LORIOT/uplink/result_3.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
[{
"deviceName": "Bosch parking lot sensor 0102030405060708",
"deviceType": "Parking sensor",
"attributes": {
"eui": "0102030405060708",
"fPort": 2,
"frequency": 868300000
},
"telemetry": [{
"ts": 1690901260493,
"values": {
"type": "heartbeat",
"occupied": true,
"temperature": 18
}
}]
}, {
"deviceName": "Gateway 1020304080706050",
"deviceType": "Lora gateway",
"telemetry": [{
"ts": 1690901260493,
"values": {
"rssi": -38,
"snr": 8.5
}
}],
"attributes": {
"eui": "1020304080706050"
}
}, {
"deviceName": "Gateway 1020304081716151",
"deviceType": "Lora gateway",
"telemetry": [{
"ts": 1690901260495,
"values": {
"rssi": -42,
"snr": 8.8
}
}],
"attributes": {
"eui": "1020304081716151"
}
}]
10 changes: 5 additions & 5 deletions VENDORS/Bosch/logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
32 changes: 32 additions & 0 deletions VENDORS/Decentlab/DL-5TM/LORIOT/uplink/payload_2.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{
"cmd": "gw",
"seqno": 4,
"EUI": "0102030405060708",
"ts": 1690901260493,
"fcnt": 3,
"port": 1,
"freq": 868300000,
"toa": 1319,
"dr": "SF12 BW125 4/5",
"ack": false,
"gws": [
{
"rssi": -38,
"snr": 8.5,
"ts": 1690901260493,
"time": "2023-08-01T14:47:40.493Z",
"gweui": "1020304080706050",
"ant": 0
},
{
"rssi": -42,
"snr": 8.8,
"ts": 1690901260495,
"time": "2023-08-01T14:47:40.495Z",
"gweui": "1020304081716151",
"ant": 0
}
],
"bat": 143,
"data": "02023b0003003702710c60"
}
21 changes: 21 additions & 0 deletions VENDORS/Decentlab/DL-5TM/LORIOT/uplink/result_2.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"deviceName": "571",
"deviceType": "DL-5TM",
"attributes": {
"lora_dev_eui": "0102030405060708",
"protocol_version": 2
},
"telemetry": [{
"ts": 1690901260493,
"values": {
"dielectric_permittivity": 1.1,
"volumetric_water_content": -0.0215397767,
"soil_temperature": 22.5,
"battery_voltage": 3.168,
"lora_frame_counter": 3,
"lora_frame_port": 1,
"lora_frequency": 868300000,
"lora_spreading_factor": 12
}
}]
}
32 changes: 32 additions & 0 deletions VENDORS/Decentlab/DL-ALB/LORIOT/uplink/payload_2.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{
"cmd": "gw",
"seqno": 4,
"EUI": "0102030405060708",
"ts": 1690901260493,
"fcnt": 3,
"port": 1,
"freq": 868300000,
"toa": 1319,
"dr": "SF12 BW125 4/5",
"ack": false,
"gws": [
{
"rssi": -38,
"snr": 8.5,
"ts": 1690901260493,
"time": "2023-08-01T14:47:40.493Z",
"gweui": "1020304080706050",
"ant": 0
},
{
"rssi": -42,
"snr": 8.8,
"ts": 1690901260495,
"time": "2023-08-01T14:47:40.495Z",
"gweui": "1020304081716151",
"ant": 0
}
],
"bat": 143,
"data": "02023b0003003702710c60"
}
21 changes: 21 additions & 0 deletions VENDORS/Decentlab/DL-ALB/LORIOT/uplink/result_2.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"deviceName": "571",
"deviceType": "DL-ALB",
"attributes": {
"lora_dev_eui": "0102030405060708",
"protocol_version": 2
},
"telemetry": [{
"ts": 1690901260493,
"values": {
"incoming_radiation": -3271.3,
"reflected_radiation": -3214.3,
"albedo": 0,
"battery_voltage": 3.168,
"lora_frame_counter": 3,
"lora_frame_port": 1,
"lora_frequency": 868300000,
"lora_spreading_factor": 12
}
}]
}
32 changes: 32 additions & 0 deletions VENDORS/Decentlab/DL-ATM22/LORIOT/uplink/payload_2.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{
"cmd": "gw",
"seqno": 4,
"EUI": "0102030405060708",
"ts": 1690901260493,
"fcnt": 3,
"port": 1,
"freq": 868300000,
"toa": 1319,
"dr": "SF12 BW125 4/5",
"ack": false,
"gws": [
{
"rssi": -38,
"snr": 8.5,
"ts": 1690901260493,
"time": "2023-08-01T14:47:40.493Z",
"gweui": "1020304080706050",
"ant": 0
},
{
"rssi": -42,
"snr": 8.8,
"ts": 1690901260495,
"time": "2023-08-01T14:47:40.495Z",
"gweui": "1020304081716151",
"ant": 0
}
],
"bat": 143,
"data": "0208c900020bf5"
}
18 changes: 18 additions & 0 deletions VENDORS/Decentlab/DL-ATM22/LORIOT/uplink/result_2.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"deviceName": "2249",
"deviceType": "DL-ATM22",
"attributes": {
"lora_dev_eui": "0102030405060708",
"protocol_version": 2
},
"telemetry": [{
"ts": 1690901260493,
"values": {
"battery_voltage": 3.061,
"lora_frame_counter": 3,
"lora_frame_port": 1,
"lora_frequency": 868300000,
"lora_spreading_factor": 12
}
}]
}
32 changes: 32 additions & 0 deletions VENDORS/Decentlab/DL-ATM41/LORIOT/uplink/payload_2.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{
"cmd": "gw",
"seqno": 4,
"EUI": "0102030405060708",
"ts": 1690901260493,
"fcnt": 3,
"port": 1,
"freq": 868300000,
"toa": 1319,
"dr": "SF12 BW125 4/5",
"ack": false,
"gws": [
{
"rssi": -38,
"snr": 8.5,
"ts": 1690901260493,
"time": "2023-08-01T14:47:40.493Z",
"gweui": "1020304080706050",
"ant": 0
},
{
"rssi": -42,
"snr": 8.8,
"ts": 1690901260495,
"time": "2023-08-01T14:47:40.495Z",
"gweui": "1020304081716151",
"ant": 0
}
],
"bat": 143,
"data": "02035a0003800a8000800080008009812b8014810880b4a57c820c810980027fe88056800880040bf5"
}
35 changes: 35 additions & 0 deletions VENDORS/Decentlab/DL-ATM41/LORIOT/uplink/result_2.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
{
"deviceName": "858",
"deviceType": "DL-ATM41",
"attributes": {
"lora_dev_eui": "0102030405060708",
"protocol_version": 2
},
"telemetry": [{
"ts": 1690901260493,
"values": {
"solar_radiation": 10,
"precipitation": 0,
"lightning_strike_count": 0,
"lightning_average_distance": 0,
"wind_speed": 0.09,
"wind_direction": 29.9,
"maximum_wind_speed": 0.2,
"air_temperature": 26.4,
"vapor_pressure": 1.8,
"atmospheric_pressure": 95.96,
"relative_humidity": 52.4,
"sensor_temperature_internal": 26.5,
"x_orientation_angle": 0.2,
"y_orientation_angle": -2.4,
"compass_heading": 86,
"north_wind_speed": 0.08,
"east_wind_speed": 0.04,
"battery_voltage": 3.061,
"lora_frame_counter": 3,
"lora_frame_port": 1,
"lora_frequency": 868300000,
"lora_spreading_factor": 12
}
}]
}
32 changes: 32 additions & 0 deletions VENDORS/Decentlab/DL-BLG/LORIOT/uplink/payload_2.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{
"cmd": "gw",
"seqno": 4,
"EUI": "0102030405060708",
"ts": 1690901260493,
"fcnt": 3,
"port": 1,
"freq": 868300000,
"toa": 1319,
"dr": "SF12 BW125 4/5",
"ack": false,
"gws": [
{
"rssi": -38,
"snr": 8.5,
"ts": 1690901260493,
"time": "2023-08-01T14:47:40.493Z",
"gweui": "1020304080706050",
"ant": 0
},
{
"rssi": -42,
"snr": 8.8,
"ts": 1690901260495,
"time": "2023-08-01T14:47:40.495Z",
"gweui": "1020304081716151",
"ant": 0
}
],
"bat": 143,
"data": "0230c50003a40c00810c60"
}
21 changes: 21 additions & 0 deletions VENDORS/Decentlab/DL-BLG/LORIOT/uplink/result_2.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"deviceName": "12485",
"deviceType": "DL-BLG",
"attributes": {
"lora_dev_eui": "0102030405060708",
"protocol_version": 2
},
"telemetry": [{
"ts": 1690901260493,
"values": {
"voltage_ratio": 0.006409406661987305,
"thermistor_resistance": 115020.68221552655,
"temperature": 22.028848392450755,
"battery_voltage": 3.168,
"lora_frame_counter": 3,
"lora_frame_port": 1,
"lora_frequency": 868300000,
"lora_spreading_factor": 12
}
}]
}
Loading