Merge branch 'master' into update-rp02-formatter

vendor/dragino/index.yaml

@@ -37,3 +37,4 @@ endDevices:
   - wsc1-l
   - sw3l
   - lht52
+  - trackerd

vendor/dragino/trackerd-codec.yaml

@@ -6,12 +6,4 @@ uplinkDecoder:
         fPort: 2
         bytes: [0x01, 0x5A, 0x70, 0x66, 0x06, 0xCF, 0x3C, 0xF8, 0x0F, 0xA2, 0x30, 0x01, 0xAE, 0x00, 0xDA]
       output:
-        data: { 'BatV': 3.062, 'Bat_status': 3, 'Ext_sensor': 'Temperature Sensor', 'Hum_SHT': 88.6, 'TempC_DS': 27.81, 'TempC_SHT': 28.29 }
-
-    - description: Unknown FPort
-      input:
-        fPort: 42
-        bytes: [0x01, 0x5A, 0x70, 0x66, 0x06, 0xCF, 0x3C, 0xF8, 0x0F, 0xA2, 0x30, 0x01, 0xAE, 0x00, 0xDA]
-      output:
-        errors:
-          - unknown FPort
+        data: { 'ALARM_status': 'FALSE', 'Hum': 43, 'LON': 'ON', 'Latitude': 22.70423, 'Location': '22.70423,114.244856', 'Longitud': 114.244856, 'MD': 0, 'Tem': 21.8, 'Transport': 'MOVE' }

vendor/dragino/trackerd.yaml

@@ -109,4 +109,4 @@ sellerURLs:
 
 # Photos
 photos:
-  main: trackerd.jpg
+  main: trackerd.png

vendor/index.yaml

@@ -1090,6 +1090,9 @@ vendors:
   - id: yosensi
     name: Yosensi Sp. z o.o.
     vendorID: 659
+    website: https://yosensi.io/
+    social:
+      linkedin: https://www.linkedin.com/company/yosensi/
 
   - id: netze
     name: Netze BW GmbH

vendor/nexelec/sign-codec.js

@@ -258,11 +258,6 @@ function decodeUplink(input)
             else if(octetCalibrationActivate===1){return "Automatic calibration activated"};
         }
 
-        function co2Threshold(octetCO2Threshold)
-        {
-            return {"value":octetCO2Threshold, "unit":"ppm"};
-        }
-
         function active(octetActive)
         {
             if(octetActive===0){return "Non-active"}
@@ -436,21 +431,20 @@ function decodeUplink(input)
             "redundancyOfRecord":data_repetition,
             "co2":{"value":mesure,"unit":"ppm"},
             }
-            
+
             return data
         }
 
         function historicalTemperatureDataOutput(stringHex)
         {
             var mesure = [];
             var i = 0;
-            var offset_octet = 0;
 
             var data_nombre_mesures = (parseInt(stringHex.substring(4,6),16)>>2)&0x3F;
             var data_time_between_measurement_sec = ((parseInt(stringHex.substring(4,8),16)>>2)&0xFF);
             var data_repetition = (parseInt(stringHex.substring(7,9),16))&0x3F;
             var binary=hexToBinary(stringHex)
-
+            
             for(i=0;i<data_nombre_mesures;i++){
 
                 offset_binaire = 36 + (10*i);
@@ -468,8 +462,9 @@ function decodeUplink(input)
             "periodBetweenRecord":{"value":data_time_between_measurement_sec,"unit":"minutes"},
             "redundancyOfRecord":data_repetition,
             "temperature":{"value":mesure,"unit":"°C"},
-            }
-
+             }
+
+            return data;
         }
 
         function productStatusDataOutput(stringHex)

vendor/yosensi/index.yaml

@@ -15,3 +15,4 @@ endDevices:
   - yo-pulse
   - yo-refrigerant-monitor
   - yo-h2o
+  - yo-people-counter

vendor/yosensi/yo-360.yaml

@@ -69,4 +69,4 @@ dataSheetURL: https://yosensi.io/support/datasheets/YO_360_datasheet.pdf
 
 # Photos
 photos:
-  main: yo-360.png
+  main: yo-360-2.png

vendor/yosensi/yo-agribox.yaml

@@ -70,4 +70,4 @@ dataSheetURL: https://yosensi.io/support/datasheets/YO_AgriBox_datasheet.pdf
 
 # Photos
 photos:
-  main: yo-agribox.png
+  main: yo-agribox-2.png

vendor/yosensi/yo-airflow-pro.yaml

@@ -75,4 +75,4 @@ dataSheetURL: https://yosensi.io/support/datasheets/YO_Airflow_Pro_datasheet.pdf
 
 # Photos
 photos:
-  main: yo-airflow-pro.png
+  main: yo-airflow-pro-2.png

vendor/yosensi/yo-analog.yaml

@@ -43,6 +43,7 @@ firmwareVersions:
 # vibration, voltage, water potential, water, weight, wifi ssid, wind direction, wind speed.
 sensors:
   - analog input
+  - 4-20 ma
 
 # Additional radios that this device has (optional)
 # Valid values are: ble, nfc, wifi, cellular.
@@ -68,4 +69,4 @@ dataSheetURL: https://yosensi.io/support/datasheets/YO_Analog_datasheet.pdf
 
 # Photos
 photos:
-  main: yo-analog.png
+  main: yo-analog-2.png

vendor/yosensi/yo-distance.yaml

@@ -74,4 +74,4 @@ dataSheetURL: https://yosensi.io/support/datasheets/YO_Distance_datasheet.pdf
 
 # Photos
 photos:
-  main: yo-distance.png
+  main: yo-distance-2.png

vendor/yosensi/yo-meter-pulse.yaml

@@ -75,4 +75,4 @@ dataSheetURL: https://yosensi.io/support/datasheets/YO_Temp_datasheet.pdf
 
 # Photos
 photos:
-  main: yo-meter-pulse.png
+  main: yo-meter-pulse-2.png

vendor/yosensi/yo-modbus.yaml

@@ -1,5 +1,5 @@
 name: YO Modbus
-description: Modbus
+description: YO Modbus is the bridge between the Modbus network and LoRaWAN. It allows to read data via Modbus RTU from Slave devices and send it via LoRaWAN.With one YO Modbus device, it is possible to create up to 150 Modbus queries and send via LoRaWAN collected in up to 30 different LoRa frames. The device is designed for mounting on standard 35 mm DIN rails in electrical switchboards.
 # Hardware versions (optional, use when you have revisions)
 hardwareVersions:
   - version: '1.0'
@@ -41,8 +41,10 @@ firmwareVersions:
 # power, precipitation, pressure, proximity, pulse count, pulse frequency, radar, rainfall, rssi, smart valve, snr, so2,
 # solar radiation, sound, strain, surface temperature, temperature, tilt, time, tvoc, uv, vapor pressure, velocity,
 # vibration, voltage, water potential, water, weight, wifi ssid, wind direction, wind speed.
-#sensors:
-# - modbus
+sensors:
+  - current
+  - power
+  - voltage
 
 # Additional radios that this device has (optional)
 # Valid values are: ble, nfc, wifi, cellular.

vendor/yosensi/yo-people-counter-au.yaml

@@ -0,0 +1,52 @@
+# Vendor profile ID, can be freely issued by the vendor
+# This vendor profile ID is also used on the QR code for LoRaWAN devices, see
+# https://lora-alliance.org/sites/default/files/2020-10/LoRa_Alliance_Vendor_ID_for_QR_Code.pdf
+vendorProfileID: 659
+
+# LoRaWAN MAC version: 1.0, 1.0.1, 1.0.2, 1.0.3, 1.0.4 or 1.1
+macVersion: '1.0.2'
+# LoRaWAN Regional Parameters version. Values depend on the LoRaWAN version:
+#   1.0:   TS001-1.0
+#   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.1:   RP001-1.1-RevA or RP001-1.1-RevB
+regionalParametersVersion: 'RP001-1.0.2-RevB'
+
+# Whether the end device supports join (OTAA) or not (ABP)
+supportsJoin: true
+# If your device is an ABP device (supportsJoin is false), uncomment the following fields:
+# RX1 delay
+#rx1Delay: 5
+# RX1 data rate offset
+#rx1DataRateOffset: 0
+# RX2 data rate index
+#rx2DataRateIndex: 0
+# RX2 frequency (MHz)
+#rx2Frequency: 869.525
+# Factory preset frequencies (MHz)
+#factoryPresetFrequencies: [868.1, 868.3, 868.5, 867.1, 867.3, 867.5, 867.7, 867.9]
+
+# Maximum EIRP
+maxEIRP: 27
+# Whether the end device supports 32-bit frame counters
+supports32bitFCnt: true
+
+# Whether the end device supports class B
+supportsClassB: false
+# If your device supports class B, uncomment the following fields:
+# Maximum delay for the end device to answer a MAC request or confirmed downlink frame (seconds)
+#classBTimeout: 60
+# Ping slot period (seconds)
+#pingSlotPeriod: 128
+# Ping slot data rate index
+#pingSlotDataRateIndex: 0
+# Ping slot frequency (MHz). Set to 0 if the band supports ping slot frequency hopping.
+#pingSlotFrequency: 869.525
+
+# Whether the end device supports class C
+supportsClassC: false
+# If your device supports class C, uncomment the following fields:
+# Maximum delay for the end device to answer a MAC request or confirmed downlink frame (seconds)
+#classCTimeout: 60