iobroker.lorawan 1.5.5 → 1.5.6

package/README.md

@@ -23,6 +23,9 @@ For now there is documentation in English here: https://wiki.hafenmeister.de
 	Placeholder for the next version (at the beginning of the line):
 	### **WORK IN PROGRESS**
 -->
+### 1.5.6 (2024-11-26)
+* (BenAhrdt) add folder "uplink.remaining.version_ids" to writecommands
+
 ### 1.5.5 (2024-11-23)
 * (BenAhrdt) add CRC-8
 

package/io-package.json

@@ -1,8 +1,21 @@
 {
   "common": {
     "name": "lorawan",
-    "version": "1.5.5",
+    "version": "1.5.6",
     "news": {
+      "1.5.6": {
+        "en": "add folder \"uplink.remaining.version_ids\" to writecommands",
+        "de": "ordner \"uplink.remaining.version_ids\" zu schreibenbefehlen hinzufügen",
+        "ru": "добавить папку \"uplink.remaining.version_ids\" в написание",
+        "pt": "adicionar pasta \"uplink.remaining.version_ids\" para writecommands",
+        "nl": "map \"uplink.resting.version_ids\" toevoegen aan schrijfopdrachten",
+        "fr": "ajouter le dossier \"uplink.remaining.version_ids\" aux commandes d'écriture",
+        "it": "aggiungere la cartella \"uplink.remaining.version_ids\" per scriverecomandi",
+        "es": "añadir carpeta \"uplink.remaining.version_ids\" para escribircommands",
+        "pl": "dodaj folder \"uplink.revening.version _ ids\" do writecommands",
+        "uk": "додати папку \"uplink.remaining.version_ids\" для записукоманд",
+        "zh-cn": "添加文件夹“ uplink. remaining.version_ ids” 以写入命令"
+      },
       "1.5.5": {
         "en": "add CRC-8",
         "de": "cRC-8 hinzufügen",
@@ -80,19 +93,6 @@
         "pl": "dodaj kilka powiadomień dla urządzeń online",
         "uk": "додати деякі повідомлення для пристроїв назад онлайн",
         "zh-cn": "在线添加设备的一些通知"
-      },
-      "1.4.2": {
-        "en": "add informations about delete an custom entry in config",
-        "de": "fügen sie informationen zum löschen eines benutzerdefinierten eintrags in config hinzu",
-        "ru": "добавить информацию об удалении пользовательской записи в настройке",
-        "pt": "adicionar informações sobre excluir uma entrada personalizada em config",
-        "nl": "toe te voegen informatie over verwijderen van een aangepaste ingang in configuratie",
-        "fr": "ajouter des informations sur supprimer une entrée personnalisée dans config",
-        "it": "aggiungere informazioni su cancellare una voce personalizzata in configurazione",
-        "es": "añadir información sobre eliminar una entrada personalizada en config",
-        "pl": "dodaj informacje o usunięciu niestandardowego wpisu w konfiguratorze",
-        "uk": "додати інформацію про видалення користувацького входу в налаштування",
-        "zh-cn": "在配置中添加关于删除自定义项的信息"
       }
     },
     "titleLang": {

package/lib/modules/deviceProfiles/16ASPM.json

@@ -18,7 +18,7 @@
         "end": "11",
         "lengthInByte": 2,
         "on": "C101B1",
-        "off": "C101B1",
+        "off": "C100B1",
         "onClick": "030111",
         "multiplyfaktor": 1,
         "decimalPlaces": 0,

package/lib/modules/directorieshandler.js

@@ -98,7 +98,7 @@ class directorieshandlerClass {
 			const activeFunction = "writeCommandDeviceType";
 			this.adapter.log.debug(`Function ${activeFunction} started.`);
 			try{
-				const writecommand = {destination:"configuration.devicetype",releaseValue:"",approvedFolders:{"uplink.decoded":true}};
+				const writecommand = {destination:"configuration.devicetype",releaseValue:"",approvedFolders:{"uplink.decoded":true, "uplink.remaining.version_ids": true}};
 				return await this.executeWritecommand(writecommand,elementName,sourceId,value);
 			}
 			catch(error){
@@ -112,7 +112,8 @@ class directorieshandlerClass {
 			Device: this.writeCommandDeviceType,
 			device: this.writeCommandDeviceType,
 			Hardware_mode: this.writeCommandDeviceType,
-			Hardware_Mode: this.writeCommandDeviceType
+			Hardware_Mode: this.writeCommandDeviceType,
+			model_id : this.writeCommandDeviceType
 		};
 
 		// declare the directory structre

package/main.js

@@ -90,6 +90,10 @@ class Lorawan extends utils.Adapter {
 		//const topic ="v3/hafi-ttn-lorawan@ttn/devices/Meins/up";
 		//const message = {"end_device_ids":{"device_id":"eui-lobaro-modbus","application_ids":{"application_id":"hafi-ttn-lorawan"},"dev_eui":"70B3D5E050013950","join_eui":"D55B58C0DDC074DE","dev_addr":"260B5972"},"correlation_ids":["gs:uplink:01HMQZVSCX4D7JRDNFA7GJ9D4W"],"received_at":"2024-01-22T07:06:25.260676101Z","uplink_message":{"session_key_id":"AY0v/ZirzRkpNW0Cgjdhig==","f_port":20,"f_cnt":2,"frm_payload":"AA5BAf0AxwIAAQ==","decoded_payload":{"airhumidity":50.9,"airtemperature":19.9,"port":20,"relais1":0,"relais2":1,"relais3":null,"relais5":null,"volt":3.649,"zisternenpegel":2},"rx_metadata":[{"gateway_ids":{"gateway_id":"hafenmeister-port2ttn-ng","eui":"50313953530A4750"},"time":"2024-01-22T07:06:25.013878Z","timestamp":995696116,"rssi":-37,"channel_rssi":-37,"snr":8.5,"location":{"latitude":53.5548443059465,"longitude":9.92155426743724,"altitude":10,"source":"SOURCE_REGISTRY"},"uplink_token":"CiYKJAoYaGFmZW5tZWlzdGVyLXBvcnQydHRuLW5nEghQMTlTUwpHUBD0u+TaAxoLCPGnuK0GEM3uvhkgoIL0oP24Sg==","channel_index":5,"received_at":"2024-01-22T07:06:25.032492359Z"}],"settings":{"data_rate":{"lora":{"bandwidth":125000,"spreading_factor":9,"coding_rate":"4/5"}},"frequency":"867500000","timestamp":995696116,"time":"2024-01-22T07:06:25.013878Z"},"received_at":"2024-01-22T07:06:25.054442349Z","consumed_airtime":"0.205824s","network_ids":{"net_id":"000013","ns_id":"EC656E0000000181","tenant_id":"ttn","cluster_id":"eu1","cluster_address":"eu1.cloud.thethings.network"}}};
 
+		const topic = "v3/hafi-ttn-lorawan@ttn/devices/eui-00137A1000044DF5/up";
+		const message = {"end_device_ids":{"device_id":"shlm-luxsensor-001","application_ids":{"application_id":"shlm-clima"},"dev_eui":"00137A1000044DF5","join_eui":"00137A1000000002","dev_addr":"260B60D9"},"correlation_ids":["gs:uplink:01JDM7QFYGPF09F2NK2YW5GW78"],"received_at":"2024-11-26T12:39:20.993583474Z","uplink_message":{"session_key_id":"AZNi5dvTa96t7M6UDHLcnw==","f_port":6,"f_cnt":107,"frm_payload":"AR4BJAAAAQIAAAA=","decoded_payload":{"BatV":3.6,"Illuminance":258},"rx_metadata":[{"gateway_ids":{"gateway_id":"shlmgw03","eui":"A84041FDFE291238"},"time":"2024-11-26T12:39:20.769507Z","timestamp":184317371,"rssi":-29,"channel_rssi":-29,"snr":14,"frequency_offset":"9922","location":{"latitude":54.51076410677215,"longitude":9.540317058563234,"source":"SOURCE_REGISTRY"},"uplink_token":"ChYKFAoIc2hsbWd3MDMSCKhAQf3+KRI4ELvr8VcaDAj4gpe6BhCWuPL1AiD4xK/RrrNE","channel_index":1,"received_at":"2024-11-26T12:39:20.784112662Z"},{"gateway_ids":{"gateway_id":"shlmgw01","eui":"A84041FDFE276220"},"time":"2024-11-26T12:39:20.764831Z","timestamp":304678548,"rssi":-105,"channel_rssi":-105,"snr":-1.8,"frequency_offset":"10121","location":{"latitude":54.5128326197047,"longitude":9.54245877441114,"source":"SOURCE_REGISTRY"},"uplink_token":"ChYKFAoIc2hsbWd3MDESCKhAQf3+J2IgEJSNpJEBGgwI+IKXugYQ9bnS+QIgoOSGgu/qhgE=","channel_index":1,"received_at":"2024-11-26T12:39:20.791977205Z"},{"gateway_ids":{"gateway_id":"eui-7076ff0056070bc0","eui":"7076FF0056070BC0"},"time":"2024-11-26T12:39:20.756Z","timestamp":2848353700,"rssi":-120,"channel_rssi":-120,"snr":-8.2,"uplink_token":"CiIKIAoUZXVpLTcwNzZmZjAwNTYwNzBiYzASCHB2/wBWBwvAEKTbmc4KGgwI+IKXugYQiY/egwMgoJHx+PLsngEqDAj4gpe6BhCAyr7oAg==","channel_index":6,"gps_time":"2024-11-26T12:39:20.756Z","received_at":"2024-11-26T12:39:20.813139849Z"}],"settings":{"data_rate":{"lora":{"bandwidth":125000,"spreading_factor":7,"coding_rate":"4/5"}},"frequency":"868300000","timestamp":184317371,"time":"2024-11-26T12:39:20.769507Z"},"received_at":"2024-11-26T12:39:20.785204683Z","consumed_airtime":"0.061696s","version_ids":{"brand_id":"netvox","model_id":"r718g","hardware_version":"2","firmware_version":"10","band_id":"EU_863_870"},"network_ids":{"net_id":"000013","ns_id":"EC656E0000000181","tenant_id":"ttn","cluster_id":"eu1","cluster_address":"eu1.cloud.thethings.network"}}};
+
+
 		// ACK
 		//const topic = "v3/hafi-ttn-lorawan@ttn/devices/eui-a84041162183f8fb/down/ack";
 		//const message = {"end_device_ids":{"device_id":"eui-a84041162183f8fb","application_ids":{"application_id":"hafi-ttn-lorawan"},"dev_eui":"A84041162183F8FB","join_eui":"A840410000000101","dev_addr":"260B141A"},"correlation_ids":["as:downlink:01HP6D18MQXJN90J5B07DC11HY","gs:uplink:01HP6D1A9X4WAA3SFMXH4ESSMV"],"received_at":"2024-02-09T07:41:41.776887672Z","downlink_ack":{"session_key_id":"AY2MUrmnuovS8DCZAfYmsA==","f_port":1,"f_cnt":21,"frm_payload":"AQAAeA==","confirmed":true,"priority":"NORMAL","correlation_ids":["as:downlink:01HP6D18MQXJN90J5B07DC11HY"],"confirmed_retry":{"attempt":1}}};
@@ -119,8 +123,8 @@ class Lorawan extends utils.Adapter {
 		//const message = {"deduplicationId":"4a91b00d-b5e1-4955-b085-ba21b9318213","time":"2024-01-26T20:18:45.299871+00:00","deviceInfo":{"tenantId":"52f14cd4-c6f1-4fbd-8f87-4025e1d49242","tenantName":"ChirpStack","applicationId":"59bcc5a7-59e2-4481-9615-fc4e58791915","applicationName":"Mclimate_Vicki","deviceProfileId":"3a9bc28f-3664-4bdf-b3be-a20d1eb32dc8","deviceProfileName":"Mclimate_Vicki","deviceName":"MClimate_Vicki_Heizkoerperventil_001","devEui":"70b3d52dd300ed31","deviceClassEnabled":"CLASS_A","tags":{}},"margin":7,"externalPowerSource":false,"batteryLevelUnavailable":false,"batteryLevel":85.826775};
 
 		// UP
-		const topic = "application/e91e66ba-1aa7-4bdf-af88-f1246e0b8d75/device/a84041263188b787/event/up";
-		const message = {"deduplicationId":"ce1ca35d-35c7-4f60-844c-c2b2810fd74b","time":"2024-08-25T07:10:47.758298+00:00","deviceInfo":{"tenantId":"52f14cd4-c6f1-4fbd-8f87-4025e1d49242","tenantName":"ChirpStack","applicationId":"e91e66ba-1aa7-4bdf-af88-f1246e0b8d75","applicationName":"Türen","deviceProfileId":"431c5895-68e2-478d-945f-f0e9a6f5f9f5","deviceProfileName":"Dragino Türsensoren / Fenstersensoren","deviceName":"Flurtüre","devEui":"a84041263188b787","deviceClassEnabled":"CLASS_A","tags":{}},"devAddr":"0061ebd4","adr":true,"dr":5,"fCnt":8264,"fPort":10,"confirmed":false,"data":"DAYBAA+IAAAAAA==","object":{"ALARM":0.0,"BAT_V":3.078,"CONTACT":true,"OPEN_TIMES":3976.0,"MOD":1.0,"LAST_OPEN_DURATION":0.0,"OPEN":false,"devicetype":"Dragino"},"rxInfo":[{"gatewayId":"503035416e314750","uplinkId":64001,"gwTime":"2024-08-25T07:10:47.758298+00:00","nsTime":"2024-08-25T07:11:29.787667701+00:00","rssi":-68,"snr":9.25,"channel":6,"location":{"latitude":50.69350130173554,"longitude":8.476821184158327},"context":"fp1WbA==","metadata":{"region_common_name":"EU868","region_config_id":"eu868"},"crcStatus":"CRC_OK"}],"txInfo":{"frequency":867700000,"modulation":{"lora":{"bandwidth":125000,"spreadingFactor":7,"codeRate":"CR_4_5"}}}};
+		//const topic = "application/e91e66ba-1aa7-4bdf-af88-f1246e0b8d75/device/a84041263188b787/event/up";
+		//const message = {"deduplicationId":"ce1ca35d-35c7-4f60-844c-c2b2810fd74b","time":"2024-08-25T07:10:47.758298+00:00","deviceInfo":{"tenantId":"52f14cd4-c6f1-4fbd-8f87-4025e1d49242","tenantName":"ChirpStack","applicationId":"e91e66ba-1aa7-4bdf-af88-f1246e0b8d75","applicationName":"Türen","deviceProfileId":"431c5895-68e2-478d-945f-f0e9a6f5f9f5","deviceProfileName":"Dragino Türsensoren / Fenstersensoren","deviceName":"Flurtüre","devEui":"a84041263188b787","deviceClassEnabled":"CLASS_A","tags":{}},"devAddr":"0061ebd4","adr":true,"dr":5,"fCnt":8264,"fPort":10,"confirmed":false,"data":"DAYBAA+IAAAAAA==","object":{"ALARM":0.0,"BAT_V":3.078,"CONTACT":true,"OPEN_TIMES":3976.0,"MOD":1.0,"LAST_OPEN_DURATION":0.0,"OPEN":false,"devicetype":"Dragino"},"rxInfo":[{"gatewayId":"503035416e314750","uplinkId":64001,"gwTime":"2024-08-25T07:10:47.758298+00:00","nsTime":"2024-08-25T07:11:29.787667701+00:00","rssi":-68,"snr":9.25,"channel":6,"location":{"latitude":50.69350130173554,"longitude":8.476821184158327},"context":"fp1WbA==","metadata":{"region_common_name":"EU868","region_config_id":"eu868"},"crcStatus":"CRC_OK"}],"txInfo":{"frequency":867700000,"modulation":{"lora":{"bandwidth":125000,"spreadingFactor":7,"codeRate":"CR_4_5"}}}};
 
 		// LOG
 		//const topic = "application/59bcc5a7-59e2-4481-9615-fc4e58791915/device/70b3d52dd300ed31/event/up";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.lorawan",
-  "version": "1.5.5",
+  "version": "1.5.6",
   "description": "converts the desired lora gateway data to a ioBroker structure",
   "author": {
     "name": "BenAhrdt",