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.

Sign up for GitHub

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

Jump to bottom

Extend normalized payload #800

Merged
merged 36 commits into from
Sep 17, 2024
Merged

Extend normalized payload #800

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
1f79afa
GN & tbms100
LDannijs Jun 20, 2024
47e5ac1
add status
LDannijs Jun 20, 2024
087aa23
add em300-th
LDannijs Jun 25, 2024
8a34b01
Merge branch 'TheThingsNetwork:master' into normalized-pl
LDannijs Jun 25, 2024
ed44952
add lht65
LDannijs Jun 25, 2024
fa99c5e
add lsn50-v2
LDannijs Jun 25, 2024
1cadec3
add ws301
LDannijs Jun 25, 2024
864120a
add ers
LDannijs Jun 26, 2024
b6dfc58
add tbdw100
LDannijs Jun 26, 2024
88a173e
Merge branch 'TheThingsNetwork:master' into normalized-pl
LDannijs Jul 1, 2024
8a6aa64
change battVolt & add elsys, dragino
LDannijs Jul 1, 2024
32cea85
add vicki
LDannijs Jul 2, 2024
ca3be23
add lw001-bgpro beginning
LDannijs Jul 2, 2024
293c775
add to lw001-bgpro
LDannijs Jul 2, 2024
9f7d89d
add laird
LDannijs Jul 3, 2024
0417b50
add strips
LDannijs Jul 4, 2024
ff8275b
add tektelic
LDannijs Jul 4, 2024
e91b303
add lwl03a & change status
LDannijs Jul 4, 2024
5108db3
align all devices same format
LDannijs Jul 5, 2024
00bd1a8
update decodeUplink
LDannijs Jul 5, 2024
524b29c
rename doorStatus & add ers-co2
LDannijs Jul 8, 2024
a15feaa
update lwl03a
LDannijs Jul 8, 2024
2cc330b
add feedback
LDannijs Jul 10, 2024
adb031d
change motion to object
LDannijs Jul 11, 2024
8fa550b
Merge branch 'master' into normalized-pl
LDannijs Jul 11, 2024
634e72b
motion fixes
LDannijs Jul 17, 2024
6d1a4e4
Merge branch 'master' into normalized-pl
LDannijs Jul 18, 2024
f82cdcd
Merge branch 'master' into normalized-pl
LDannijs Aug 12, 2024
bfe92e3
air location
LDannijs Aug 19, 2024
17be71c
change to contactState
LDannijs Aug 22, 2024
8080bfb
Close to closed
LDannijs Aug 23, 2024
543bc1a
add ternary operator
LDannijs Aug 26, 2024
1fb6a05
Update door state once more
LDannijs Aug 30, 2024
af5ac51
revert air to object
LDannijs Sep 2, 2024
9d34711
Merge branch 'TheThingsNetwork:master' into normalized-pl
LDannijs Sep 10, 2024
f1283a0
Merge branch 'master' into normalized-pl
johanstokking Sep 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/payload.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,9 +178,9 @@
},
"additionalProperties": false
},
"doorState": {
"contactState": {
"type": "string",
"description": "State of door or window",
"description": "State of a contact sensor",
"enum": ["OPEN", "CLOSE"]
LDannijs marked this conversation as resolved.
Show resolved Hide resolved
}
},
Expand Down
2 changes: 1 addition & 1 deletion vendor/dragino/lsn50-v2-codec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ uplinkDecoder:
- temperature: 25.2
relativeHumidity: 51.7
action:
doorState: 'OPEN'
contactState: 'OPEN'
battery: 2.9

- description: Unknown FPort
Expand Down
2 changes: 1 addition & 1 deletion vendor/dragino/lsn50-v2.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ function normalizeUplink(input) {
},
],
action: {
doorState: input.data.Door_status
contactState: input.data.Door_status
johanstokking marked this conversation as resolved.
Show resolved Hide resolved
},
battery: input.data.BatV,
}
Expand Down
2 changes: 1 addition & 1 deletion vendor/dragino/lsn50v2-s31-codec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ uplinkDecoder:
- temperature: 25.2
relativeHumidity: 51.7
action:
doorState: 'OPEN'
contactState: 'OPEN'
battery: 2.9
- description: Unknown FPort
input:
Expand Down
2 changes: 1 addition & 1 deletion vendor/dragino/lsn50v2-s31.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ function normalizeUplink(input) {
},
],
action: {
doorState: input.data.Door_status
contactState: input.data.Door_status
},
battery: input.data.BatV,
}
Expand Down
2 changes: 1 addition & 1 deletion vendor/milesight-iot/ws301-codec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ uplinkDecoder:
normalizedOutput:
data:
- action:
doorState: 'OPEN'
contactState: 'OPEN'
battery: 75
- description: Magnetic Contact Switch (example 2) - Milesight IoT
input:
Expand Down
2 changes: 1 addition & 1 deletion vendor/milesight-iot/ws301.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ function normalizeUplink(input) {
return {
data: {
action: {
doorState: input.data.door.toUpperCase()
contactState: input.data.door.toUpperCase()
},
battery: input.data.battery,
}
Expand Down
2 changes: 1 addition & 1 deletion vendor/tektelic/decoder_smart_room_sensor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2894,7 +2894,7 @@ function decodeUplink(input) {
}

if (input.data.reed_state) {
action.doorState = input.data.reed_state;
action.contactState = input.data.reed_state;
}

if (Object.keys(air).length > 0) {
Expand Down
2 changes: 1 addition & 1 deletion vendor/tektelic/decoder_smart_room_sensor_pir_base.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -813,7 +813,7 @@ function normalizeUplink(input) {
}

if (input.data.reed_state) {
action.doorState = input.data.reed_state;
action.contactState = input.data.reed_state;
}

if (Object.keys(air).length > 0) {
Expand Down
Loading