Skip to content

Split wind speed into avg & gust, added water measurements. #568

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

Open
dajtxx wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Split wind speed into avg & gust, added water measurements. #568

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a8b8550
Split wind speed into avg & gust, added water measurements.
dajtxx Dec 9, 2022
686ed51
Changed avg to average, removed water ec while determining what the u…
dajtxx Dec 29, 2022
9cc83e4
Merge pull request #1 from TheThingsNetwork/master
dajtxx Jun 13, 2023
aad613e
Removed averageSpeed in the wind section.
dajtxx Jun 13, 2023
d70955a
Merge pull request #2 from TheThingsNetwork/master
dajtxx Jan 30, 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
44 changes: 39 additions & 5 deletions lib/payload.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,12 @@
"minimum": 0,
"maximum": 100
},
"ec": {
"type": "number",
"description": "Electrical conductivity (dS/m)",
"minimum": 0,
"maximum": 621
},
Copy link
Member

@johanstokking johanstokking Jan 18, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is now unused in water so it can be reverted

"measurement": {
"type": "object",
"properties": {
Expand All @@ -73,9 +79,7 @@
},
"ec": {
"description": "Soil electrical conductivity (dS/m)",
"type": "number",
"minimum": 0,
"maximum": 621
"$ref": "#/definitions/ec"
},
"pH": {
"description": "Soil pH level",
Expand Down Expand Up @@ -127,8 +131,12 @@
"wind": {
"type": "object",
"properties": {
"speed": {
"description": "Wind speed (m/s)",
"avgSpeed": {
"description": "Average wind speed (m/s)",
"$ref": "#/definitions/speed"
},
"gustSpeed": {
"description": "Gust wind speed (m/s)",
"$ref": "#/definitions/speed"
},
"direction": {
Comment on lines 133 to 138
Copy link
Member

@johanstokking johanstokking Dec 23, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this is a good change. I think it is indeed useful domain knowledge to differentiate between average and gust wind speeds.

Can you turn it into averageSpeed though?

Copy link
Author

@dajtxx dajtxx Dec 29, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK, this is done.

Expand All @@ -137,6 +145,32 @@
}
},
"additionalProperties": false
},
"water": {
"type": "object",
"properties": {
"depth": {
"description": "Depth of water measurement (cm)",
"$ref": "#/definitions/depth"
},
"temperature": {
"description": "Water temperature (°C)",
"$ref": "#/definitions/temperature"
},
"ec": {
"description": "Water electrical conductivity (dS/m)",
"$ref": "#/definitions/ec"
},
"pH": {
"description": "Water pH level",
"$ref": "#/definitions/pH"
},
"salinity": {
"description": "Salt (mg) per litre (ppm)",
Copy link
Member

@johanstokking johanstokking Jun 15, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We're following en-US

Suggested change
"description": "Salt (mg) per litre (ppm)",
"description": "Salt (mg) per liter (ppm)",

"$ref": "#/definitions/concentration"
}
},
"additionalProperties": false
}
},
"additionalProperties": false
Expand Down