Merge branch 'master' into feature/laird-normalized-payload

.github/workflows/issue-triage.yml

@@ -9,11 +9,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Add "needs/triage" label
-        uses: actions/github-script@v3
+        uses: actions/github-script@v6
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           script: |
-            github.issues.addLabels({
+            github.rest.issues.addLabels({
               owner: context.repo.owner,
               repo: context.repo.repo,
               issue_number: context.issue.number,

.github/workflows/release.yml

@@ -11,13 +11,13 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - name: Check out code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Set up Go
-        uses: actions/setup-go@v2
+        uses: actions/setup-go@v3
         with:
           go-version: '~1.18'
       - name: Set up Node
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v3
         with:
           node-version: '16'
       - name: Setup Hugo

.github/workflows/validate.yml

@@ -6,12 +6,12 @@ jobs:
     name: Validate
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Install Go
-        uses: actions/setup-go@v2
+        uses: actions/setup-go@v3
         with:
           go-version: '~1.18'
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v3
         with:
           node-version: '16'
       - name: Install Dependencies

README.md

@@ -1,8 +1,12 @@
-# Device Repository for LoRaWAN
+# Device Repository for LoRaWAN®
 
 The Device Repository contains information about LoRaWAN end devices. The Device Repository acts as key data source for device catalogs and onboarding devices on LoRaWAN networks.
 
-This repository is a collaborative effort, driven by The Things Network community. We welcome device makers to contribute information about their end devices to help users find and onboard their devices.
+We welcome device makers to contribute information to help users find and onboard end devices in products and services developed and offered by The Things Industries, including [The Things Stack](https://www.thethingsindustries.com/docs/).
+
+## Database Protection Right
+
+The contents of this Device Repository is obtained, verified and structured by The Things Industries B.V. and The Things Network Foundation. As such, the Device Repository is a database protected by copyright and sui generis right as defined by the Database Directive ([Directive 96/9/EC of the European Parliament and of the Council](https://eur-lex.europa.eu/legal-content/EN/TXT/?uri=celex%3A31996L0009)). You may not extract and/or reuse the Device Repository as a whole or a substantial part of its content. You are, however, permitted to reuse or extract information about an individual end device.
 
 ## Example
 
@@ -54,6 +58,8 @@ Pull requests are validated automatically. If there are any validation or format
 $ make validate fmt
 ```
 
+Contributors are required to sign the [Contributor License Agreement](https://gist.github.com/johanstokking/58081d646d6dd4f93b3d85cd5c62377c).
+
 ## Validation
 
 The Device Repository contains tooling to validate all data against a schema. This is necessary for all data to be loaded automatically in The Things Stack and other services.
@@ -215,7 +221,7 @@ macVersion: '1.0.3'
 #   1.0.1: TS001-1.0.1
 #   1.0.2: RP001-1.0.2 or RP001-1.0.2-RevB
 #   1.0.3: RP001-1.0.3-RevA
-#   1.0.4: RP002-1.0.0 or RP002-1.0.1
+#   1.0.4: RP002-1.0.0, RP002-1.0.1, RP002-1.0.2, RP002-1.0.3 or RP002-1.0.4
 #   1.1:   RP001-1.1-RevA or RP001-1.1-RevB
 regionalParametersVersion: 'RP001-1.0.3-RevA'
 
@@ -326,6 +332,6 @@ See [The Things Stack documentation](https://www.thethingsindustries.com/docs/in
 
 ## Legal
 
-The API is distributed under [Apache License, Version 2.0](https://www.apache.org/licenses/LICENSE-2.0). See `LICENSE` for more information.
+Copyright © 2020-2022 The Things Industries B.V.
 
 All product names, logos, and brands are property of their respective owners. All company, product and service names used in the Device Repository are for identification purposes only. Use of these names, logos, and brands does not imply endorsement.

lib/payload.json

@@ -20,6 +20,28 @@
       "description": "Speed (m/s)",
       "minimum": 0
     },
+    "depth": {
+      "type": "number",
+      "description": "Depth from the surface (cm)",
+      "minimum": 0
+    },
+    "pH": {
+      "type": "number",
+      "description": "pH level",
+      "minimum": 0,
+      "maximum": 14
+    },
+    "concentration": {
+      "type": "number",
+      "description": "Concentration (ppm)",
+      "minimum": 0,
+      "maximum": 1000000
+    },
+    "illuminance": {
+      "type": "number",
+      "description": "Illuminance (lux)",
+      "minimum": 0
+    },
     "percentage": {
       "type": "number",
       "description": "Percentage (%)",
@@ -34,6 +56,46 @@
           "format": "date-time",
           "description": "Date and time of the measurement (RFC3339)"
         },
+        "soil": {
+          "type": "object",
+          "properties": {
+            "depth": {
+              "description": "Depth of the soil measurement (cm)",
+              "$ref": "#/definitions/depth"
+            },
+            "moisture": {
+              "description": "Soil moisture (%)",
+              "$ref": "#/definitions/percentage"
+            },
+            "temperature": {
+              "description": "Soil temperature (°C)",
+              "$ref": "#/definitions/temperature"
+            },
+            "ec": {
+              "description": "Soil electrical conductivity (dS/m)",
+              "type": "number",
+              "minimum": 0,
+              "maximum": 621
+            },
+            "pH": {
+              "description": "Soil pH level",
+              "$ref": "#/definitions/pH"
+            },
+            "n": {
+              "description": "Concentration of Nitrogen in the soil (ppm)",
+              "$ref": "#/definitions/concentration"
+            },
+            "p": {
+              "description": "Concentration of Phosphorus in the soil (ppm)",
+              "$ref": "#/definitions/concentration"
+            },
+            "k": {
+              "description": "Concentration of Potassium in the soil (ppm)",
+              "$ref": "#/definitions/concentration"
+            }
+          },
+          "additionalProperties": false
+        },
         "air": {
           "type": "object",
           "properties": {
@@ -50,6 +112,14 @@
               "description": "Atmospheric pressure (hPa)",
               "minimum": 900,
               "maximum": 1100
+            },
+            "co2": {
+              "description": "Concentration of CO2 in the air (ppm)",
+              "$ref": "#/definitions/concentration"
+            },
+            "lightIntensity": {
+              "description": "Light intensity (lux)",
+              "$ref": "#/definitions/illuminance"
             }
           },
           "additionalProperties": false