Fix missing sensors and add device types (#772)

* add device_type * add devicetype to csv * add type converter * add coveragetester * update more devices & add some sensors * update some more devices * photos mandatory * update valid sensor values * update netvox * update radio-bridge * update tektelic * remove digital output * remove some devicetypes & add missing bridgeInterfaces * change to devkit, module, cots * lowerCamelCase * change to deviceType --------- Co-authored-by: Jaime Trinidad <81958808+Jaime-Trinidad@users.noreply.github.com>
TheThingsNetwork · May 2, 2024 · 3aa4c61 · 3aa4c61
1 parent 14190b7
commit 3aa4c61
Show file tree

Hide file tree

Showing 290 changed files with 863 additions and 722 deletions.
diff --git a/bin/csv.js b/bin/csv.js
@@ -37,6 +37,7 @@ const extractData = (filePath, vendor) => {
       const name = data.name;
       const vendorname = vendorNamesMap.get(vendor) || vendor; // Fallback to the vendor ID if no name is found
       const description = data.description.replace(/"/g, "'");
+      const deviceType = data.deviceType || '';
       const sensors = Array.isArray(data.sensors) ? `"${data.sensors.join(', ')}"` : '';
       const imageUrl = data.photos?.main ? `"${baseUrl}/${vendor}/${data.photos.main}"` : '';
       const additionalRadios = Array.isArray(data.additionalRadios) ? `"${data.additionalRadios.join(', ')}"` : '';
@@ -76,7 +77,7 @@ const extractData = (filePath, vendor) => {
         });
       });
 
-      return `"${id}","${name}","${vendorname}","${description}",${imageUrl},${sensors},${additionalRadios},${height},${width},${length},${weight},"${ipCode}","${battery_replace}","${battery_type}","${productURL}","${dataSheetURL}","${highestMacVersion}",${regionalParametersVersion},${supportsClassB},${supportsClassC}\n`;
+      return `"${id}","${name}","${vendorname}","${description}",${imageUrl},${sensors},${deviceType},${additionalRadios},${height},${width},${length},${weight},"${ipCode}","${battery_replace}","${battery_type}","${productURL}","${dataSheetURL}","${highestMacVersion}",${regionalParametersVersion},${supportsClassB},${supportsClassC}\n`;
     }
   } catch (e) {
     console.error(`Failed to process ${filePath}: ${e}`);
@@ -103,7 +104,7 @@ const walkSync = (dir, vendor = '', csvContent = '') => {
 
 // Initialize CSV data
 let csvHeader =
-  'ID,Name,Vendor,Description,Image,Sensor,Radios,Height,Width,Length,Weight,IP Rating,Battery Replaceable?,Battery Type,Product URL,Datasheet URL,MAC Version,Regional Parameter Version,Supports Class B?, Supports Class C?\n';
+  'ID,Name,Vendor,Description,Image,Sensor,Device Type,Radios,Height,Width,Length,Weight,IP Rating,Battery Replaceable?,Battery Type,Product URL,Datasheet URL,MAC Version,Regional Parameter Version,Supports Class B?, Supports Class C?\n';
 let csvData = walkSync(startPath);
 
 // Save to CSV file

diff --git a/bin/validate.js b/bin/validate.js
@@ -422,6 +422,9 @@ vendors.vendors.forEach((v) => {
               });
           });
         }
+      } else {
+        console.error(`${key}: image is missing.`);
+        process.exit(1);
       }
     });
   });

diff --git a/schema.json b/schema.json
@@ -951,6 +951,9 @@
           "description": "Instructions for finding firmware version",
           "examples": ["In the WebFig configuration panel, the firmware version is stated in the top left (e.g RouterOS v6.47.9)"]
         },
+        "deviceType": {
+          "enum": ["devkit", "module", "cots"]
+        },
         "sensors": {
           "type": "array",
           "items": {
@@ -978,8 +981,10 @@
               "gps",
               "gyroscope",
               "h2s",
+              "hall effect",
               "humidity",
               "iaq",
+              "infrared",
               "leaf wetness",
               "level",
               "light",
@@ -988,9 +993,11 @@
               "magnetometer",
               "moisture",
               "motion",
+              "nfc",
               "no",
               "no2",
               "o3",
+              "occupancy",
               "optical meter",
               "particulate matter",
               "ph",
@@ -1006,16 +1013,19 @@
               "pulse frequency",
               "radar",
               "rainfall",
+              "reed switch",
               "rssi",
               "sap flow",
               "salinity",
               "smart valve",
+              "smoke",
               "snr",
               "so2",
               "solar radiation",
               "sound",
               "strain",
               "surface temperature",
+              "switch",
               "temperature",
               "tilt",
               "time",

diff --git a/vendor/abeeway/abeeway-geolocation-module.yaml b/vendor/abeeway/abeeway-geolocation-module.yaml
@@ -40,6 +40,8 @@ firmwareVersions:
         id: abeeway-geolocation-module-profile
         lorawanCertified: true
 
+deviceType: module
+
 # Sensors that this device features (optional)
 # Valid values are:
 # accelerometer, altitude, analog input, auxiliary, barometer, battery, button, bvoc, co2, current, digital input,

diff --git a/vendor/adeunis/ftd-network-tester.yaml b/vendor/adeunis/ftd-network-tester.yaml
@@ -23,6 +23,8 @@ firmwareVersions:
         id: ftd-profile-eu868
         lorawanCertified: true
 
+deviceType: cots
+
 # 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/adeunis/modbus.yaml b/vendor/adeunis/modbus.yaml
@@ -68,7 +68,9 @@ firmwareVersions:
 # vibration, voltage, water potential, water, weight, wifi ssid, wind direction, wind speed.
 sensors:
   - pulse count
-    # modbus
+
+bridgeInterfaces:
+  - modbus
 
 # Dimensions in mm (optional)
 # Use width, height, length and/or diameter

diff --git a/vendor/arduino/mkr-wan-1310.yaml b/vendor/arduino/mkr-wan-1310.yaml
@@ -50,6 +50,8 @@ firmwareVersions:
         lorawanCertified: false
         codec: mkrwan1310-codec
 
+deviceType: devkit
+
 # Dimensions in mm (optional)
 # Use width, height, length and/or diameter
 dimensions:

diff --git a/vendor/arduino/portenta-max-carrier.yaml b/vendor/arduino/portenta-max-carrier.yaml
@@ -50,6 +50,8 @@ firmwareVersions:
         lorawanCertified: false
         codec: portentamaxcarrier-codec
 
+deviceType: devkit
+
 # Dimensions in mm (optional)
 # Use width, height, length and/or diameter
 dimensions:

diff --git a/vendor/atim/acw-tst.yaml b/vendor/atim/acw-tst.yaml
@@ -37,6 +37,8 @@ firmwareVersions:
         lorawanCertified: true
         codec: codec2
 
+deviceType: cots
+
 # 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/browan/l0010.yaml b/vendor/browan/l0010.yaml
@@ -22,8 +22,8 @@ firmwareVersions:
         lorawanCertified: true
         codec: l0010-codec
 
-#sensors:
-# - gasmatic sensor
+sensors:
+  - iaq
 
 dimensions:
   width: 180

diff --git a/vendor/cotx/cotxpetfon.yaml b/vendor/cotx/cotxpetfon.yaml
@@ -47,6 +47,8 @@ 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:
+  - gps
 
 # Additional radios that this device has (optional)
 # Valid values are: ble, nfc, wifi, cellular.

diff --git a/vendor/dragino/lt22222-l.yaml b/vendor/dragino/lt22222-l.yaml
@@ -138,6 +138,7 @@ firmwareVersions:
         id: ru864-c-abp-profile
         lorawanCertified: true
         codec: lt22222-l-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,
@@ -146,9 +147,9 @@ firmwareVersions:
 # power, precipitation, pressure, proximity, pulse count, pulse frequency, radar, rainfall, rssi, snr, 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:
-#  - wind direction
-#  - wind speed
+sensors:
+  - digital input
+  - analog input
 
 # Battery information (optional)
 #battery:

diff --git a/vendor/dragino/lt33222-l.yaml b/vendor/dragino/lt33222-l.yaml
@@ -97,6 +97,7 @@ firmwareVersions:
         id: ru864-c-abp-profile
         lorawanCertified: true
         codec: lt33222-l-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,
@@ -105,9 +106,9 @@ firmwareVersions:
 # power, precipitation, pressure, proximity, pulse count, pulse frequency, radar, rainfall, rssi, snr, 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:
-#  - wind direction
-#  - wind speed
+sensors:
+  - digital input
+  - analog input
 
 # Battery information (optional)
 #battery:

diff --git a/vendor/dragino/rs485-bl.yaml b/vendor/dragino/rs485-bl.yaml
@@ -52,17 +52,8 @@ firmwareVersions:
       RU864-870:
         id: ru864-a-abp-profile
 
-# Sensors that this device features (optional)
-# Valid values are:
-# 4-20 ma, accelerometer, altitude, analog input, auxiliary, barometer, battery, button, bvoc, co, co2, conductivity,
-# current, digital input, dissolved oxygen, distance, dust, energy, gps, gyroscope, h2s, humidity, iaq, level, light,
-# lightning, link, magnetometer, moisture, motion, no, no2, o3, particulate matter, ph, pir, pm2.5, pm10, potentiometer,
-# power, precipitation, pressure, proximity, pulse count, pulse frequency, radar, rainfall, rssi, snr, 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:
-#  - wind direction
-#  - wind speed
+bridgeInterfaces:
+  - rs-485
 
 # Dimensions in mm (optional)
 # Use width, height, length and/or diameter

diff --git a/vendor/dragino/rs485-ln.yaml b/vendor/dragino/rs485-ln.yaml
@@ -61,17 +61,9 @@ firmwareVersions:
         id: kr920-c-abp-profile
       RU864-870:
         id: ru864-c-abp-profile
-# Sensors that this device features (optional)
-# Valid values are:
-# 4-20 ma, accelerometer, altitude, analog input, auxiliary, barometer, battery, button, bvoc, co, co2, conductivity,
-# current, digital input, dissolved oxygen, distance, dust, energy, gps, gyroscope, h2s, humidity, iaq, level, light,
-# lightning, link, magnetometer, moisture, motion, no, no2, o3, particulate matter, ph, pir, pm2.5, pm10, potentiometer,
-# power, precipitation, pressure, proximity, pulse count, pulse frequency, radar, rainfall, rssi, snr, 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:
-#  - wind direction
-#  - wind speed
+
+bridgeInterfaces:
+  - rs-485
 
 # Dimensions in mm (optional)
 # Use width, height, length and/or diameter

diff --git a/vendor/dragino/sdi-12.yaml b/vendor/dragino/sdi-12.yaml
@@ -87,6 +87,7 @@ firmwareVersions:
         id: ru864-a-abp-profile
         lorawanCertified: true
         codec: sdi-12-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,
@@ -98,6 +99,9 @@ firmwareVersions:
 sensors:
   - water
 
+bridgeInterfaces:
+  - sdi-12
+
 # Product and data sheet URLs (optional)
 productURL: https://www.dragino.com/products/agriculture-weather-station/item/252-sdi-12-lb.html
 dataSheetURL: https://www.dropbox.com/sh/g99v0fxcltn9r1y/AAAE_8hHxu8y2Ests4OlLB0ja/SDI-12-LB?dl=0&subfolder_nav_tracking=1

diff --git a/vendor/elster/merlin-868.yaml b/vendor/elster/merlin-868.yaml
@@ -30,8 +30,8 @@ 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:
-# - optical
+sensors:
+  - magnetometer
 
 # Battery information (optional)
 battery:

diff --git a/vendor/elsys/elt-lite.yaml b/vendor/elsys/elt-lite.yaml
@@ -49,6 +49,11 @@ firmwareVersions:
         lorawanCertified: true
         codec: elt-2-codec
 
+sensors:
+  - digital input
+  - analog input
+  - pulse count
+
 # Additional radios that this device has (optional)
 # Valid values are: ble, nfc, wifi, cellular.
 additionalRadios:

diff --git a/vendor/elsys/ems-desk.yaml b/vendor/elsys/ems-desk.yaml
@@ -61,7 +61,7 @@ sensors:
   - temperature
   - humidity
   - accelerometer
-  #- occupancy
+  - occupancy
 
 # Additional radios that this device has (optional)
 # Valid values are: ble, nfc, wifi, cellular.

diff --git a/vendor/elsys/ers-co2.yaml b/vendor/elsys/ers-co2.yaml
@@ -57,6 +57,7 @@ sensors:
   - light
   - motion
   - co2
+  - pir
 
 # Additional radios that this device has (optional)
 # Valid values are: ble, nfc, wifi, cellular.

diff --git a/vendor/elsys/ers-eye.yaml b/vendor/elsys/ers-eye.yaml
@@ -62,7 +62,7 @@ sensors:
   - humidity
   - light
   - motion
-  #- occupancy
+  - occupancy
 
 # Additional radios that this device has (optional)
 # Valid values are: ble, nfc, wifi, cellular.

diff --git a/vendor/elv/elv-lw-int1.yaml b/vendor/elv/elv-lw-int1.yaml
@@ -37,15 +37,7 @@ firmwareVersions:
         lorawanCertified: true
         codec: elv-lw-int1-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,
-# current, digital input, dissolved oxygen, distance, dust, energy, gps, gyroscope, h2s, humidity, iaq, level, light,
-# lightning, link, magnetometer, moisture, motion, no, no2, o3, particulate matter, ph, pir, pm2.5, pm10, potentiometer,
-# 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:
+deviceType: devkit
 
 # Dimensions in mm (optional)
 # Use width, height, length and/or diameter

diff --git a/vendor/elvaco/cmi4110.yaml b/vendor/elvaco/cmi4110.yaml
@@ -33,3 +33,8 @@ firmwareVersions:
       #   lorawanCertified: true
       #   # This is the file name of the codec defintion and must have the .yaml extension.
       #   codec: device-a-codec
+
+deviceType: module
+
+photos:
+  main: cmi4110.jpeg
diff --git a/vendor/elvaco/cmi4111.yaml b/vendor/elvaco/cmi4111.yaml
@@ -33,3 +33,8 @@ firmwareVersions:
       #   lorawanCertified: true
       #   # This is the file name of the codec defintion and must have the .yaml extension.
       #   codec: device-a-codec
+
+deviceType: module
+
+photos:
+  main: cmi4111.jpeg
diff --git a/vendor/elvaco/cmi4130.yaml b/vendor/elvaco/cmi4130.yaml
@@ -33,3 +33,8 @@ firmwareVersions:
       #   lorawanCertified: true
       #   # This is the file name of the codec defintion and must have the .yaml extension.
       #   codec: device-a-codec
+
+deviceType: module
+
+photos:
+  main: cmi4130.jpeg
diff --git a/vendor/elvaco/cmi4140.yaml b/vendor/elvaco/cmi4140.yaml
@@ -33,3 +33,8 @@ firmwareVersions:
       #   lorawanCertified: true
       #   # This is the file name of the codec defintion and must have the .yaml extension.
       #   codec: device-a-codec
+
+deviceType: module
+
+photos:
+  main: cmi4140.jpeg
diff --git a/vendor/elvaco/cmi4160.yaml b/vendor/elvaco/cmi4160.yaml
@@ -33,3 +33,8 @@ firmwareVersions:
       #   lorawanCertified: true
       #   # This is the file name of the codec defintion and must have the .yaml extension.
       #   codec: device-a-codec
+
+deviceType: module
+
+photos:
+  main: cmi4160.jpeg
diff --git a/vendor/embit/emb-lr1280-mpci-4x.yaml b/vendor/embit/emb-lr1280-mpci-4x.yaml
@@ -13,6 +13,8 @@ firmwareVersions:
         # Unique identifier of the profile (lowercase, alphanumeric with dashes, max 36 characters)
         id: emb-lrwl55-profile-eu868
 
+deviceType: module
+
 # Dimensions in mm (optional)
 # Use width, height, length and/or diameter
 dimensions:

diff --git a/vendor/embit/emb-lr1280s.yaml b/vendor/embit/emb-lr1280s.yaml
@@ -13,6 +13,8 @@ firmwareVersions:
         # Unique identifier of the profile (lowercase, alphanumeric with dashes, max 36 characters)
         id: emb-lr1280s-profile
 
+deviceType: module
+
 # Dimensions in mm (optional)
 # Use width, height, length and/or diameter
 dimensions: