Enless_Transmitter_Unit corrections and Profile updates (#760)

* Added Enless Transmitter * Changed the Regulatory compliances * Added description and type in the yaml file * validate fmt * Modified the vender profile id as unique for both EU868 ans US915 profile * Images added , Removed unused Transmitters , Description changes * validate fmt * 1. Added the temperature unit 2.Added Descriptions 3.Added partnet website link 4.F/W version updated --------- Co-authored-by: MINDTECK\reghu.nd <[email protected]> Co-authored-by: Jaime Trinidad <[email protected]> Co-authored-by: Jaime Trinidad <[email protected]>
TheThingsNetwork · Mar 12, 2024 · 8277387 · 8277387
1 parent 5848c88
commit 8277387
Show file tree

Hide file tree

Showing 19 changed files with 31 additions and 114 deletions.
diff --git a/vendor/enless-wireless/enlessdecoder.js b/vendor/enless-wireless/enlessdecoder.js
@@ -48,7 +48,7 @@ function bin_decode(deviceType, payload) {
             case EN302: /* TX T&H AMB  600-021*/
                 addValueField(template, {
                     temperature: {
-                        unit: "oc",
+                        unit: "°C",
                         value: hexToInt(payload.substring(12, 16), 10),
                     },
                     humidity: {
@@ -74,7 +74,7 @@ function bin_decode(deviceType, payload) {
             case EN303: /* TX T&H AMB  600-022*/
                 addValueField(template, {
                     temperature: {
-                        unit: "oc",
+                        unit: "°C",
                         value: hexToInt(payload.substring(12, 16), 10),
                     },
                     humidity: {
@@ -103,7 +103,7 @@ function bin_decode(deviceType, payload) {
             case EN304: /* TX T&H AMB  600-023*/
                 addValueField(template, {
                     temperature: {
-                        unit: "oc",
+                        unit: "°C",
                         value: hexToInt(payload.substring(12, 16), 10),
                     },
                     Humidity: {
@@ -156,11 +156,11 @@ function bin_decode(deviceType, payload) {
             case EN314: /* TX TEMP CONT2 MP 600-233 */
                 addValueField(template, {
                     temperature_1: {
-                        unit: "oC",
+                        unit: "°C",
                         value: hexToInt(payload.substring(12, 16), 10),
                     },
                     temperature_2: {
-                        unit: "oC",
+                        unit: "°C",
                         value: hexToUInt(payload.substring(16, 20), 10),
                     },
                 });
@@ -214,7 +214,7 @@ function bin_decode(deviceType, payload) {
 
                 addValueField(template, {
                     temperature_1: {
-                        unit: "oc",
+                        unit: "°C",
                         value: hexToInt(payload.substring(12, 16), 10),
                     },
                 });
@@ -240,27 +240,7 @@ function bin_decode(deviceType, payload) {
                 };
                 break;
 
-            case EN307: /*TX 4/20 mA 600-035 */
-                addValueField(template, {
-                    current: {
-                        unit: "mA",
-                        value: hexToInt(payload.substring(12, 16), 10),
-                    },
-                });
-
-                this.addAlarmStateField(template,
-                    this.alarmParser(payload.substring(16, 20), deviceType));
-
-                addStateField(template, {
-                    battery: hexToBatteryLvl(payload.substring(20, 24)),
-                    msg_type: hexToMsgType(payload.substring(20, 24))
-                });
-
-
-                return {
-                    data: template
-                };
-                break;
+
             case EN308: /*TX PULSE 600-036*/
             case EN309: /*TX PULSE ATEX 600-037*/
             case EN310: /*TX PULSE LED 600-038*/
@@ -316,7 +296,7 @@ function bin_decode(deviceType, payload) {
             case EN311: /*TX T&H 600-034 */
                 addValueField(template, {
                     temperature: {
-                        unit: "oc",
+                        unit: "°C",
                         value: hexToInt(payload.substring(12, 16), 10),
                     },
                     humidity: {
@@ -510,7 +490,7 @@ function binToUInt(bin) {
 
 function hexToFwVerison(hex) {
     const binNum = hexToBin(hex);
-    return binToUInt(binNum.substring(binNum.length - 4, binNum.length))
+    return binToUInt(binNum.substring(binNum.length - 6, binNum.length))
 }
 
 function hexToStatus(hex, defs) {

diff --git a/vendor/enless-wireless/tx-amb-600-023-codec.yaml b/vendor/enless-wireless/tx-amb-600-023-codec.yaml
@@ -23,7 +23,7 @@ uplinkDecoder:
             voc:
               high: false
               low: false
-          fw_version: 1
+          fw_version: 17
           id: 129
           seq_counter: 14
           states:
@@ -38,7 +38,7 @@ uplinkDecoder:
               unit: ppm
               value: 60.9
             temperature:
-              unit: oc
+              unit: °C
               value: 21.1
             voc:
               unit: ppb

diff --git a/vendor/enless-wireless/tx-amb-600-023.yaml b/vendor/enless-wireless/tx-amb-600-023.yaml
@@ -26,12 +26,6 @@ firmwareVersions:
         lorawanCertified: true
         codec: tx-amb-600-023-codec
 
-      US902-928:
-        # Unique identifier of the profile (lowercase, alphanumeric with dashes, max 36 characters)
-        id: enless-profile-915
-        lorawanCertified: true
-        codec: tx-amb-600-023-codec
-
 # Sensors that this device features (optional)
 # Valid values are:
 # 4-20 ma, accelerometer, altitude, analog input, auxiliary, barometer, battery, button, bvoc, co, co2, conductivity,
@@ -49,9 +43,9 @@ sensors:
 # Dimensions in mm (optional)
 # Use width, height, length and/or diameter
 dimensions:
-  width: 43
-  length: 118
-  height: 79
+  width: 38
+  length: 105
+  height: 95
 
 # Battery information (optional)
 battery:
@@ -79,7 +73,7 @@ keyProvisioning:
   - join server
 
 # Product and data sheet URLs (optional)
-productURL: https://enless-wireless.com/en/products/pulse-meter-transmitter-lora/
+productURL: https://enless-wireless.com/en/products/ambient-voc-co2-temperature-humidity-sensor-lora/
 dataSheetURL: https://enless-wireless.com/wp-content/uploads/2022/06/EN-600-023.pdf
 
 # Photos

diff --git a/vendor/enless-wireless/tx-analog-600-035.yaml b/vendor/enless-wireless/tx-analog-600-035.yaml
@@ -26,12 +26,6 @@ firmwareVersions:
         lorawanCertified: true
         codec: tx-analog-600-035-codec
 
-      US902-928:
-        # Unique identifier of the profile (lowercase, alphanumeric with dashes, max 36 characters)
-        id: enless-profile-915
-        lorawanCertified: true
-        codec: tx-analog-600-035-codec
-
 # Sensors that this device features (optional)
 # Valid values are:
 # 4-20 ma, accelerometer, altitude, analog input, auxiliary, barometer, battery, button, bvoc, co, co2, conductivity,

diff --git a/vendor/enless-wireless/tx-contact-600-039.yaml b/vendor/enless-wireless/tx-contact-600-039.yaml
@@ -26,12 +26,6 @@ firmwareVersions:
         lorawanCertified: true
         codec: tx-contact-600-039-codec
 
-      US902-928:
-        # Unique identifier of the profile (lowercase, alphanumeric with dashes, max 36 characters)
-        id: enless-profile-915
-        lorawanCertified: true
-        codec: tx-contact-600-039-codec
-
 # Sensors that this device features (optional)
 # Valid values are:
 # 4-20 ma, accelerometer, altitude, analog input, auxiliary, barometer, battery, button, bvoc, co, co2, conductivity,
@@ -76,6 +70,8 @@ keyProvisioning:
   - join server
 
 # Product and data sheet URLs (optional)
+productURL: https://enless-wireless.com/en/products/leak-detection-sensor-lora/
+dataSheetURL: https://enless-wireless.com/wp-content/uploads/2024/01/EN-600-039-LEAK-CABLE.pdf
 
 # Photos
 photos:

diff --git a/vendor/enless-wireless/tx-pulse-600-codec.yaml b/vendor/enless-wireless/tx-pulse-600-codec.yaml
@@ -23,7 +23,7 @@ uplinkDecoder:
               high: false
               low: false
             pulse_oc_leak: false
-          fw_version: 1
+          fw_version: 17
           id: 149
           seq_counter: 49
           states:

diff --git a/vendor/enless-wireless/tx-pulse-600.yaml b/vendor/enless-wireless/tx-pulse-600.yaml
@@ -26,12 +26,6 @@ firmwareVersions:
         lorawanCertified: true
         codec: tx-pulse-600-codec
 
-      US902-928:
-        # Unique identifier of the profile (lowercase, alphanumeric with dashes, max 36 characters)
-        id: enless-profile-915
-        lorawanCertified: true
-        codec: tx-pulse-600-codec
-
 # Sensors that this device features (optional)
 # Valid values are:
 # 4-20 ma, accelerometer, altitude, analog input, auxiliary, barometer, battery, button, bvoc, co, co2, conductivity,

diff --git a/vendor/enless-wireless/tx-pulse-atex-600-037.yaml b/vendor/enless-wireless/tx-pulse-atex-600-037.yaml
@@ -26,12 +26,6 @@ firmwareVersions:
         lorawanCertified: true
         codec: tx-pulse-atex-600-037-codec
 
-      US902-928:
-        # Unique identifier of the profile (lowercase, alphanumeric with dashes, max 36 characters)
-        id: enless-profile-915
-        lorawanCertified: true
-        codec: tx-pulse-atex-600-037-codec
-
 # Sensors that this device features (optional)
 # Valid values are:
 # 4-20 ma, accelerometer, altitude, analog input, auxiliary, barometer, battery, button, bvoc, co, co2, conductivity,
@@ -41,7 +35,7 @@ firmwareVersions:
 # 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:
-  - temperature
+  - pulse count
 
 # Dimensions in mm (optional)
 # Use width, height, length and/or diameter

diff --git a/vendor/enless-wireless/tx-pulse-led-600-038.yaml b/vendor/enless-wireless/tx-pulse-led-600-038.yaml
@@ -26,12 +26,6 @@ firmwareVersions:
         lorawanCertified: true
         codec: tx-pulse-led-600-038-codec
 
-      US902-928:
-        # Unique identifier of the profile (lowercase, alphanumeric with dashes, max 36 characters)
-        id: enless-profile-915
-        lorawanCertified: true
-        codec: tx-pulse-led-600-038-codec
-
 # Sensors that this device features (optional)
 # Valid values are:
 # 4-20 ma, accelerometer, altitude, analog input, auxiliary, barometer, battery, button, bvoc, co, co2, conductivity,

diff --git a/vendor/enless-wireless/tx-temp-600-031-codec.yaml b/vendor/enless-wireless/tx-temp-600-031-codec.yaml
@@ -23,5 +23,5 @@ uplinkDecoder:
           type: 7
           values:
             temperature_1:
-              unit: oc
+              unit: °C
               value: 20.5
diff --git a/vendor/enless-wireless/tx-temp-600-031.yaml b/vendor/enless-wireless/tx-temp-600-031.yaml
@@ -26,12 +26,6 @@ firmwareVersions:
         lorawanCertified: true
         codec: tx-temp-600-031-codec
 
-      US902-928:
-        # Unique identifier of the profile (lowercase, alphanumeric with dashes, max 36 characters)
-        id: enless-profile-915
-        lorawanCertified: true
-        codec: tx-temp-600-031-codec
-
 # Sensors that this device features (optional)
 # Valid values are:
 # 4-20 ma, accelerometer, altitude, analog input, auxiliary, barometer, battery, button, bvoc, co, co2, conductivity,

diff --git a/vendor/enless-wireless/tx-temp-cont1-600-032-codec.yaml b/vendor/enless-wireless/tx-temp-cont1-600-032-codec.yaml
@@ -23,5 +23,5 @@ uplinkDecoder:
           type: 15
           values:
             temperature_1:
-              unit: oc
+              unit: °C
               value: 20.8
diff --git a/vendor/enless-wireless/tx-temp-cont1-600-032.yaml b/vendor/enless-wireless/tx-temp-cont1-600-032.yaml
@@ -26,12 +26,6 @@ firmwareVersions:
         lorawanCertified: true
         codec: tx-temp-cont1-600-032-codec
 
-      US902-928:
-        # Unique identifier of the profile (lowercase, alphanumeric with dashes, max 36 characters)
-        id: enless-profile-915
-        lorawanCertified: true
-        codec: tx-temp-cont1-600-032-codec
-
 # Sensors that this device features (optional)
 # Valid values are:
 # 4-20 ma, accelerometer, altitude, analog input, auxiliary, barometer, battery, button, bvoc, co, co2, conductivity,

diff --git a/vendor/enless-wireless/tx-temp-cont2-600-034-codec.yaml b/vendor/enless-wireless/tx-temp-cont2-600-034-codec.yaml
@@ -29,5 +29,5 @@ uplinkDecoder:
               unit: '%'
               value: 38.6
             temperature:
-              unit: oc
+              unit: °C
               value: 20.2
diff --git a/vendor/enless-wireless/tx-temp-cont2-600-034.yaml b/vendor/enless-wireless/tx-temp-cont2-600-034.yaml
@@ -1,5 +1,5 @@
 name: 600-034 - Temperature and Humidity sensor - External probe
-description: This Enless Wireless LoRaWAN IP65 transmitter with external temperature and humidity probe allows you to measure temperatures and humidity (°C & %rH data) in a remote manner.The robustness of our transmitter – IP 65 housing – and its high environmental tolerance (probe temperature range - 40°C / +125°C) allow it to withstand any type of “outdoor” vironment, sometimes under extreme conditions.
+description: This Enless Wireless LoRaWAN IP65 transmitter with external temperature and humidity probe allows you to measure temperatures and humidity (°C & %rH data) in a remote manner.The robustness of our transmitter - IP 65 housing - and its high environmental tolerance (probe temperature range - 40°C / +125°C) allow it to withstand any type of “outdoor” environment, sometimes under extreme conditions.
 # Hardware versions (optional, use when you have revisions)
 hardwareVersions:
   - version: '1.0'
@@ -25,12 +25,6 @@ firmwareVersions:
         lorawanCertified: true
         codec: tx-temp-cont2-600-034-codec
 
-      US902-928:
-        # Unique identifier of the profile (lowercase, alphanumeric with dashes, max 36 characters)
-        id: enless-profile-915
-        lorawanCertified: true
-        codec: tx-temp-cont2-600-034-codec
-
 # Sensors that this device features (optional)
 # Valid values are:
 # 4-20 ma, accelerometer, altitude, analog input, auxiliary, barometer, battery, button, bvoc, co, co2, conductivity,
@@ -41,6 +35,7 @@ firmwareVersions:
 # vibration, voltage, water potential, water, weight, wifi ssid, wind direction, wind speed.
 sensors:
   - temperature
+  - humidity
 
 # Dimensions in mm (optional)
 # Use width, height, length and/or diameter

diff --git a/vendor/enless-wireless/tx-temp-cont2-600-232-codec.yaml b/vendor/enless-wireless/tx-temp-cont2-600-232-codec.yaml
@@ -26,8 +26,8 @@ uplinkDecoder:
           type: 12
           values:
             temperature_1:
-              unit: oC
+              unit: °C
               value: 20.2
             temperature_2:
-              unit: oC
+              unit: °C
               value: 38.6
diff --git a/vendor/enless-wireless/tx-temp-cont2-600-232.yaml b/vendor/enless-wireless/tx-temp-cont2-600-232.yaml
@@ -26,12 +26,6 @@ firmwareVersions:
         lorawanCertified: true
         codec: tx-temp-cont2-600-232-codec
 
-      US902-928:
-        # Unique identifier of the profile (lowercase, alphanumeric with dashes, max 36 characters)
-        id: enless-profile-915
-        lorawanCertified: true
-        codec: tx-temp-cont2-600-232-codec
-
 # Sensors that this device features (optional)
 # Valid values are:
 # 4-20 ma, accelerometer, altitude, analog input, auxiliary, barometer, battery, button, bvoc, co, co2, conductivity,

diff --git a/vendor/enless-wireless/tx-trh-amb-600-021-codec.yaml b/vendor/enless-wireless/tx-trh-amb-600-021-codec.yaml
@@ -29,5 +29,5 @@ uplinkDecoder:
               unit: '%'
               value: 28.8
             temperature:
-              unit: oc
+              unit: °C
               value: 6550.9
diff --git a/vendor/enless-wireless/tx-trh-amb-600-021.yaml b/vendor/enless-wireless/tx-trh-amb-600-021.yaml
@@ -1,5 +1,5 @@
 name: 600-021 - Ambient Temperature and Humidity sensor
-description: Specifically designed for indoor applications in an ambient environment, the Enless Wireless LoRaWAN humidity and temperature transmitter allows you to monitor occupant comfort levels, thanks to its integrated sensors of temperature and humidity (data °C – %rah) and save energy by monitoring HVAC systems – Heating Ventilation Air Conditioning – in situ.
+description: Specifically designed for indoor applications in an ambient environment, the Enless Wireless LoRaWAN humidity and temperature transmitter allows you to monitor occupant comfort levels, thanks to its integrated sensors of temperature and humidity (data °C - %rH)) and save energy by monitoring HVAC systems - Heating Ventilation Air Conditioning - in situ.
 
 # Hardware versions (optional, use when you have revisions)
 hardwareVersions:
@@ -26,12 +26,6 @@ firmwareVersions:
         lorawanCertified: true
         codec: tx-trh-amb-600-021-codec
 
-      US902-928:
-        # Unique identifier of the profile (lowercase, alphanumeric with dashes, max 36 characters)
-        id: enless-profile-915
-        lorawanCertified: true
-        codec: tx-trh-amb-600-021-codec
-
 # Sensors that this device features (optional)
 # Valid values are:
 # 4-20 ma, accelerometer, altitude, analog input, auxiliary, barometer, battery, button, bvoc, co, co2, conductivity,
@@ -47,9 +41,9 @@ sensors:
 # Dimensions in mm (optional)
 # Use width, height, length and/or diameter
 dimensions:
-  width: 43
-  length: 118
-  height: 79
+  width: 32
+  length: 99
+  height: 85
 
 # Battery information (optional)
 battery: