Merge pull request #819 from dasdigidings/master

Fixed validation errors and got us pulled into the lorawan-devices repo

src/lorawan-devices-repo/vendor/opensource/esp32-paxcounter-codec.yaml

@@ -1,27 +1,28 @@
 # Uplink decoder decodes binary data uplink into a JSON object (optional)
 # For documentation on writing encoders and decoders, see: https://thethingsstack.io/integrations/payload-formatters/javascript/
 uplinkDecoder:
-  fileName: esp32-paxcounter-packed_decodeUplink.js
+  fileName: esp32-paxcounter-packed.js
   examples:
     - description: Paxcount data
       input:
         fPort: 1
-        bytes: [0x00, 0x07, 0x00, 0x03]
+        bytes: [0x07, 0x00, 0x03, 0x00]
       output:
         data:
-          bytes: [0x00, 0x07, 0x00, 0x03]
+          bytes: [0x07, 0x00, 0x03, 0x00]
           port: 1
           wifi: 7
           ble: 3
+          pax: 10
         errors: []
         warnings: []
     - description: Device status query result
       input:
         fPort: 2
-        bytes: [0x01, 0x2F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x4B, 0xC0, 0x2D, 0x00, 0x03, 0x4B, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00]
+        bytes: [0x2F, 0x01, 0x00, 0x00, 0x00, 0x00, 0xC0, 0x4B, 0x03, 0x00, 0x2D, 0xC0, 0x4B, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00]
       output:
         data:
-          bytes: [0x01, 0x2F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x4B, 0xC0, 0x2D, 0x00, 0x03, 0x4B, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00]
+          bytes: [0x2F, 0x01, 0x00, 0x00, 0x00, 0x00, 0xC0, 0x4B, 0x03, 0x00, 0x2D, 0xC0, 0x4B, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00]
           port: 2
           voltage: 303
           uptime: 216000
@@ -46,24 +47,39 @@ uplinkDecoder:
           wifichancycle: 50
           blescantime: 10
           rgblum: 30
-          flags: 0
-          payloadmask: 0
-          version: 0
+          flags:
+            adr: 0
+            antenna: 0
+            blescan: 0
+            countermode: 0
+            reserved: 0
+            screen: 0
+            screensaver: 0
+          payloadmask:
+            battery: 0
+            bme: 0
+            counter: 0
+            gps: 0
+            reserved: 0
+            sensor1: 0
+            sensor2: 0
+            sensor3: 0
+          version: ''
         errors: []
         warnings: []
     - description: GPS data
       input:
         fPort: 4
-        bytes: [0x6E, 0x1C, 0x07, 0x03, 0x0A, 0x63, 0x6F, 0x0B, 0x51, 0x00, 0xCD, 0x00]
+        bytes: [0x65, 0xCA, 0x06, 0x03, 0x05, 0x19, 0x6F, 0x00, 0x05, 0xC6, 0x00, 0x42, 0x00]
       output:
         data:
-          bytes: [0x6E, 0x1C, 0x07, 0x03, 0x0A, 0x63, 0x6F, 0x0B, 0x51, 0x00, 0xCD, 0x00]
+          bytes: [0x65, 0xCA, 0x06, 0x03, 0x05, 0x19, 0x6F, 0x00, 0x05, 0xC6, 0x00, 0x42, 0x00]
           port: 4
-          latitude: 50.797678
-          longitude: 7.29985
-          sats: 11
-          hdop: 0.81
-          altitude: 205
+          latitude: 50.776677
+          longitude: 7.280901
+          sats: 5
+          hdop: 1.98
+          altitude: 66
         errors: []
         warnings: []
     - description: Button data
@@ -72,7 +88,7 @@ uplinkDecoder:
         bytes: [0x01]
       output:
         data:
-          bytes: [0x00]
+          bytes: [0x01]
           port: 5
           button: 1
         errors: []
@@ -80,10 +96,10 @@ uplinkDecoder:
     - description: Environmental sensor data
       input:
         fPort: 7
-        bytes: [0x08, 0x34, 0x27, 0x10, 0x1F, 0x40, 0x27, 0x10]
+        bytes: [0x08, 0x34, 0x10, 0x27, 0x40, 0x1F, 0x10, 0x27]
       output:
         data:
-          bytes: [0x08, 0x34, 0x27, 0x10, 0x1F, 0x40, 0x27, 0x10]
+          bytes: [0x08, 0x34, 0x10, 0x27, 0x40, 0x1F, 0x10, 0x27]
           port: 7
           temperature: 21.00
           pressure: 1000.0
@@ -94,10 +110,10 @@ uplinkDecoder:
     - description: Battery voltage data
       input:
         fPort: 8
-        bytes: [0x01, 0x2F]
+        bytes: [0x2F, 0x01]
       output:
         data:
-          bytes: [0x01, 0x2F]
+          bytes: [0x2F, 0x01]
           port: 8
           voltage: 303
         errors: []
@@ -105,10 +121,10 @@ uplinkDecoder:
     - description: Time/Date
       input:
         fPort: 9
-        bytes: [0x60, 0xC8, 0x86, 0x90, 0x00]
+        bytes: [0x90, 0x86, 0xC8, 0x60, 0x00]
       output:
         data:
-          bytes: [0x60, 0xC8, 0x86, 0x90, 0x00]
+          bytes: [0x90, 0x86, 0xC8, 0x60, 0x00]
           port: 9
           time: 1623754384
           timestatus: 0
@@ -117,10 +133,10 @@ uplinkDecoder:
     - description: User sensor data
       input:
         fPort: 10
-        bytes: [0x00]
+        bytes: [0x00, 0x00]
       output:
         data:
-          bytes: [0x00]
+          bytes: [0x00, 0x00]
           port: 10
           ens: 0
         errors: []

src/lorawan-devices-repo/vendor/opensource/esp32-paxcounter.yaml

@@ -43,21 +43,27 @@ firmwareVersions:
 # vibration, voltage, water potential, water, weight, wifi ssid, wind direction, wind speed.
 sensors:
   - battery
-  - ble
-  - wifi
-  - pax
+  #  - ble
+  #  - wifi
+  #  - pax
   - gps
   - altitude
-  - latitude
-  - longitude
-  - hdop
-  - sats
+  #  - latitude
+  #  - longitude
+  #  - hdop
+  #  - sats
   - temperature
   - humidity
   - barometer
   - pm2.5
   - pm10
 
+# Additional radios that this device has (optional)
+# Valid values are: ble, nfc, wifi, cellular.
+additionalRadios:
+  - ble
+  - wifi
+
 # Dimensions in mm (optional)
 # Use width, height, length and/or diameter
 #dimensions: