From a8b855024d761669a300d92a0705e5c0d17f6241 Mon Sep 17 00:00:00 2001
From: David Taylor <david.a.taylor@dpi.nsw.gov.au>
Date: Fri, 9 Dec 2022 15:54:01 +1100
Subject: [PATCH 1/3] Split wind speed into avg & gust, added water
 measurements.

---
 lib/payload.json | 44 +++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 39 insertions(+), 5 deletions(-)

diff --git a/lib/payload.json b/lib/payload.json
index 428f4c3d61..a4a55fb990 100644
--- a/lib/payload.json
+++ b/lib/payload.json
@@ -48,6 +48,12 @@
       "minimum": 0,
       "maximum": 100
     },
+    "ec": {
+      "type": "number",
+      "description": "Electrical conductivity (dS/m)",
+      "minimum": 0,
+      "maximum": 621
+    },
     "measurement": {
       "type": "object",
       "properties": {
@@ -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",
@@ -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": {
@@ -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)",
+              "$ref": "#/definitions/concentration"
+            }
+          },
+          "additionalProperties": false
         }
       },
       "additionalProperties": false

From 686ed518b144db1cd097be4427040e1804323fc5 Mon Sep 17 00:00:00 2001
From: David Taylor <david.a.taylor@dpi.nsw.gov.au>
Date: Fri, 30 Dec 2022 08:55:09 +1100
Subject: [PATCH 2/3] Changed avg to average, removed water ec while
 determining what the unit should be.

---
 lib/payload.json | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/lib/payload.json b/lib/payload.json
index a4a55fb990..f0428dcfcc 100644
--- a/lib/payload.json
+++ b/lib/payload.json
@@ -131,7 +131,7 @@
         "wind": {
           "type": "object",
           "properties": {
-            "avgSpeed": {
+            "averageSpeed": {
               "description": "Average wind speed (m/s)",
               "$ref": "#/definitions/speed"
             },
@@ -157,10 +157,6 @@
               "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"

From aad613e7c8f07afcde8671ca926dd96d46e75a08 Mon Sep 17 00:00:00 2001
From: David Taylor <david.a.taylor@dpi.nsw.gov.au>
Date: Wed, 14 Jun 2023 08:58:23 +1000
Subject: [PATCH 3/3] Removed averageSpeed in the wind section.

---
 lib/payload.json | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/lib/payload.json b/lib/payload.json
index f0428dcfcc..ca3a958036 100644
--- a/lib/payload.json
+++ b/lib/payload.json
@@ -48,12 +48,6 @@
       "minimum": 0,
       "maximum": 100
     },
-    "ec": {
-      "type": "number",
-      "description": "Electrical conductivity (dS/m)",
-      "minimum": 0,
-      "maximum": 621
-    },
     "measurement": {
       "type": "object",
       "properties": {
@@ -79,7 +73,9 @@
             },
             "ec": {
               "description": "Soil electrical conductivity (dS/m)",
-              "$ref": "#/definitions/ec"
+              "type": "number",
+              "minimum": 0,
+              "maximum": 621
             },
             "pH": {
               "description": "Soil pH level",
@@ -131,12 +127,12 @@
         "wind": {
           "type": "object",
           "properties": {
-            "averageSpeed": {
-              "description": "Average wind speed (m/s)",
+            "speed": {
+              "description": "Instantaneous or average wind speed (m/s)",
               "$ref": "#/definitions/speed"
             },
             "gustSpeed": {
-              "description": "Gust wind speed (m/s)",
+              "description": "Maximum wind speed during the measurement interval (m/s)",
               "$ref": "#/definitions/speed"
             },
             "direction": {