Merge branch 'master' into master

TheThingsNetwork · Sep 9, 2024 · 645dd54 · 645dd54
2 parents 1b1a869 + 8e7376f
commit 645dd54
Show file tree

Hide file tree

Showing 97 changed files with 5,469 additions and 506 deletions.
diff --git a/vendor/acrios/acr-cv-101l-m-d.png b/vendor/acrios/acr-cv-101l-m-d.png
diff --git a/vendor/acrios/acr-cv-101l-m-d.yaml b/vendor/acrios/acr-cv-101l-m-d.yaml
@@ -1,38 +1,99 @@
-name: M-Bus IoT converter
-description: The Acrios M-Bus IoT converter is an M-Bus to LoRaWAN® converter that can be used for reading electricity meters and calorimeters. The M-Bus converter supports connections of up to 5 UL (Unit Loads) and communication is based on the EN 137 57-3 protocol.
+name: M-Bus to LoRaWAN converter
+description: M-Bus to LoRaWAN converter is used to retrofit ANY M-Bus meter with LoRaWAN communication
+
 hardwareVersions:
   - version: 'v3.7'
     numeric: 1
+  - version: 'ACR-CV-101L-M-DEAC_v1.1'
+    numeric: 2
+
 firmwareVersions:
-  - # Firmware version
-    version: 'e8d17c15795f'
+  - version: 'e8d17c15795f'
     numeric: 1
     hardwareVersions:
       - 'v3.7'
     profiles:
       EU863-870:
         lorawanCertified: true
         id: acr-cv-101l-m-d-profile
+  - version: '2.13.18'
+    numeric: 2
+    hardwareVersions:
+      - 'ACR-CV-101L-M-DEAC_v1.1'
+    features:
+      - remote rejoin
+      - transmission interval
+    profiles:
+      EU863-870:
+        vendorID: acrios
+        id: acr-cv-otaa-profile
+        lorawanCertified: true
+        codec: acr-cv-101l-m-x-codec
+
+deviceType: cots
+
 bridgeInterfaces:
   - m-bus
+
 dimensions:
   width: 145
   length: 90
   height: 55
-weight: 250
+
+weight: 336
+
 battery:
   replaceable: true
+  type: D-Cell with JST-XH 2pin connector
+
 operatingConditions:
   temperature:
     min: -30
     max: 60
-ipCode: IP65
+  relativeHumidity:
+    min: 0
+    max: 0.85
+
+ipCode: IP67
+
 keyProvisioning:
   - custom
+
 keyProgramming:
   - serial
+  - firmware
+
 keySecurity: read protected
-productURL: https://acrios.com/m-bus-iot-prevodnik/?lang=en#
-dataSheetURL: https://acrios.com/wp-content/uploads/2023/02/ACR-CV-101L-M-D.pdf
+
+firmwareProgramming:
+  - serial
+  - fuota lorawan
+
+productURL: https://www.acrios.com/converters/m-bus-lorawan
+dataSheetURL: https://cdn.prod.website-files.com/66967900e67b9bbd56c4b73c/66d08c240b2ddf57a76697c6_ACR-CV-101L-M-D.pdf
+# dataSheetURL: https://wiking.acrios.com/datasheets/ACR-CV-101L-M-D.pdf
+# onboardingGuideURL: https://wiking.acrios.com/manuals/category/acr-cv-101l-m-x/
+
+resellerURLs:
+  - name: 'ZENNERSHOP'
+    region:
+      - European Union
+      - Saudi Arabia
+    url: https://iot.zenner.shop/en/M-Bus-LoRa-Bridge-ACR-CV-101L-M-D/188113
+
+msrp:
+  EUR: 192
+
 photos:
-  main: acr-cv-101l-m-d.png
+  main: acr-cv-101l-x-d.png
+  other:
+    - acr-cv-101l-x-d-top.png
+
+videos:
+  main: https://youtu.be/fiuiulh-8BY
+
+compliances:
+  safety:
+    - body: M-Bus
+      norm: EN
+      standard: 13757-3
diff --git a/vendor/acrios/acr-cv-101l-m-eac-inside.png b/vendor/acrios/acr-cv-101l-m-eac-inside.png
diff --git a/vendor/acrios/acr-cv-101l-m-eac.yaml b/vendor/acrios/acr-cv-101l-m-eac.yaml
@@ -1,130 +1,102 @@
-name: Externally powered M-BUS to LoRaWAN®
-description: 230V AC externally-powered ACRIOS Systems IoT converter is working as M-Bus to LoRaWAN® bridge with implemented LUA scripting interface. The LUA scripting interface allows for VIF DIF filtering, message buffering, message splitting, LoRaWAN communication class changes, and other operations on the hardware level. Part of the company portfolio is dedicated to enablement such as the M-Bus backend solution allowing for remote scanning and setting up the VIF DIF filters.
+name: M-Bus to LoRaWAN converter, externally powered
+description: M-Bus to LoRaWAN converter is used to retrofit ANY M-Bus meter with LoRaWAN communication
 
-# Hardware versions (optional, use when you have revisions)
 hardwareVersions:
   - version: 'ACR-CV-101L-RM-D2EAC_v2.0'
+    numeric: 2
+  - version: 'ACR-CV-101L-RM-D2EAC_v2.2'
     numeric: 1
 
-# Firmware versions (at least one is mandatory)
 firmwareVersions:
-  - # Firmware version
-    version: '2.5'
+  - version: '2.5'
     numeric: 1
-    # Corresponding hardware versions (optional)
     hardwareVersions:
       - 'ACR-CV-101L-RM-D2EAC_v2.0'
-
-    # Firmware features (optional)
-    # Valid values are: remote rejoin (trigger a join from the application layer), transmission interval (configure how
-    # often he device sends a message).
     features:
       - remote rejoin
       - transmission interval
-
-    # LoRaWAN Device Profiles per region
-    # Supported regions are EU863-870, US902-928, AU915-928, AS923, CN779-787, EU433, CN470-510, KR920-923, IN865-867,
-    # RU864-870
     profiles:
-      # Optional identifier of the vendor of the profile. When you specify the vendorID, the profile is loaded from
-      # the vendorID's folder. This allows you to reuse profiles from module or LoRaWAN end device stack vendors.
-      # If vendorID is empty, the current vendor ID is used. In this example, the vendorID is the current vendor ID,
-      # which is verbose.
-      #vendorID:
       EU863-870:
-        # Identifier of the profile (lowercase, alphanumeric with dashes, max 36 characters)
         id: acr-cv-otaa-profile
         lorawanCertified: true
+  - version: '2.13.18'
+    numeric: 2
+    hardwareVersions:
+      - 'ACR-CV-101L-RM-D2EAC_v2.2'
+    features:
+      - remote rejoin
+      - transmission interval
+    profiles:
+      EU863-870:
+        vendorID: acrios
+        id: acr-cv-otaa-profile
+        lorawanCertified: true
+        codec: acr-cv-101l-m-x-codec
+
+deviceType: cots
 
-# Bridge interfaces (optional)
-# Valid values are: modbus, m-bus, can bus, rs-485, sdi-12, analog.
 bridgeInterfaces:
   - m-bus
 
-# Dimensions in mm (optional)
-# Use width, height, length and/or diameter
 dimensions:
   width: 145
   length: 90
   height: 55
 
-# Weight in grams (optional)
-weight: 250
+weight: 166
 
-# Battery information (optional)
 battery:
   replaceable: false
   type: Externally powered unit 85 - 305V AC
 
-# Operating conditions (optional)
 operatingConditions:
-  # Temperature (Celsius)
   temperature:
     min: -30
     max: 60
+  relativeHumidity:
+    min: 0
+    max: 0.85
 
-# IP rating (optional)
-ipCode: IP65
+ipCode: IP67
 
-# Key provisioning (optional)
-# Valid values are: custom (user can configure keys), join server and manifest.
 keyProvisioning:
   - custom
 
-# Key programming (optional)
-# Valid values are: bluetooth, nfc, wifi, serial (when the user has a serial interface to set the keys)
-# and firmware (when the user should change the firmware to set the keys).
 keyProgramming:
   - serial
   - firmware
 
-# Key security (optional)
-# Valid values are: none, read protected and secure element.
 keySecurity: read protected
 
-# Firmware programming (optional)
-# Valid values are: serial (when the user has a serial interface to update the firmware), fuota lorawan (when the device
-# supports LoRaWAN FUOTA via standard interfaces) and fuota other (other wireless update mechanism).
 firmwareProgramming:
   - serial
   - fuota lorawan
 
-# Product and data sheet URLs (optional)
-productURL: https://acrios.com/m-bus-iot-prevodnik/?lang=en
-dataSheetURL: https://acrios.com/wp-content/uploads/2023/02/ACR-CV-101L-M-EAC.pdf
+productURL: https://www.acrios.com/converters/m-bus-lorawan
+# dataSheetURL: https://wiking.acrios.com/datasheets/ACR-CV-101L-M-EAC.pdf
+# onboardingGuideURL: https://wiking.acrios.com/manuals/category/acr-cv-101l-m-x/
 
-# Commercial information
 resellerURLs:
-  - name: 'ACRIOS Systems'
+  - name: 'ZENNERSHOP'
     region:
       - European Union
-    url: https://acrios.com/?lang=en
+      - Saudi Arabia
+    url: https://iot.zenner.shop/en/M-Bus-LoRa-Bridge-ACR-CV-101L-M-D/188113
 
 msrp:
-  EUR: 137
+  EUR: 179
 
-# Photos
 photos:
-  main: zeus-2pg-rsma.png
+  main: acr-cv-101l-x-eac.png
   other:
-    - acr-cv-aec-angle.jpg
-    - acr-cv-eac-top.jpg
+    - acr-cv-101l-x-eac-top.png
+    - acr-cv-101l-m-eac-inside.png
+
+videos:
+  main: https://youtu.be/fiuiulh-8BY
 
-# Regulatory compliances (optional)
 compliances:
   safety:
-    - body: IEC
-      norm: EN
-      standard: 62368-1
-    # - body: IEC
-    # norm: EN
-    # standard: 137 57-3
-  radioEquipment:
-    - body: ETSI
-      norm: EN
-      standard: 301 489-1
-      version: 2.2.0
-    - body: ETSI
+    - body: M-Bus
       norm: EN
-      standard: 301 489-3
-      version: 2.1.0
+      standard: 13757-3
diff --git a/vendor/acrios/acr-cv-101l-m-x-codec.yaml b/vendor/acrios/acr-cv-101l-m-x-codec.yaml
@@ -0,0 +1,37 @@
+uplinkDecoder:
+  fileName: acr-cv-101l-m-x.js
+  examples:
+    - description: M-Bus payload
+      input:
+        fPort: 1
+        # HEX payload: 01 01 68 13 13 68 08 05 73 78 56 34 12 0a 00 e9 7e 01 00 00 00 35 01 00 00 3c 16
+        bytes: [1, 1, 104, 19, 19, 104, 8, 5, 115, 120, 86, 52, 18, 10, 0, 233, 126, 1, 0, 0, 0, 53, 1, 0, 0, 60, 22]
+      output:
+        data:
+          a: 5
+          accessN: 10
+          c: 8
+          cStored: Actual
+          ci: 115
+          data:
+            - func: Instantaneous
+              id: 0
+              storage: 0
+              unit: l
+              value: 1
+            - func: Instantaneous
+              id: 1
+              storage: 1
+              unit: l
+              value: 135
+          deviceCode: 7
+          deviceType: Water meter
+          errors: []
+          fixed: true
+          id: 12345678
+          l: 19
+          len: 25
+          status: 0
+          type: Data
+        errors: []
+        warnings: []