iobroker.lorawan 0.1.5 → 0.1.6

package/README.md

@@ -14,11 +14,17 @@ The adapter communicates bidirectionally with LoraWan devices via LoRaWAN Networ
 “The Thinks Network” and “Chirpstack” are supported now, more could follow later. 
 Adapter was created in collaboration with Joerg Froehner LoraWan@hafenmeister.com
 
+For Documentation use the doc folder.
+For now there is documentation in English here: http://www.hafenmeister.com/LoraWan/Iobroker-Adapter.pdf
+
 ## Changelog
 <!--
 	Placeholder for the next version (at the beginning of the line):
 	### **WORK IN PROGRESS**
 -->
+### 0.1.6 (2024-02-05)
+* (BenAhrdt) implments byte swap
+
 ### 0.1.5 (2024-02-02)
 * (BenAhrdt) remove units and insert roles
 

package/admin/i18n/de/translations.json

@@ -55,5 +55,7 @@
     "decimalPlaces": "Nachkommastellen",
     "decimalPlacesTooltip": "Wählen Sie die gewünschte Anzahl an Nachkommastellen aus, die als Downlink gesendet werden",
     "downlinkConfigMainHeader": "Haupt Downlink Konfiguration",
-    "downlinkConfigSubHeader": "Individuelle Downlink Konfiguration"
+    "downlinkConfigSubHeader": "Individuelle Downlink Konfiguration",
+    "swap": "Little Endian (Bytereihenfolge tauschen)",
+    "swapTooltip": "Tauschen Sie den Bytereihenfolged der Eingabe"
 }

package/admin/i18n/en/translations.json

@@ -55,5 +55,7 @@
 	"decimalPlaces": "decimal places",
 	"decimalPlacesTooltip": "select the desired numberof decimal places",
 	"downlinkConfigMainHeader": "main downlink config",
-	"downlinkConfigSubHeader": "individual downlink config"
+	"downlinkConfigSubHeader": "individual downlink config",
+	"swap": "little endian (sawp byteorder)",
+	"swapTooltip": "swap the byteoder of the input"
 }

package/admin/i18n/es/translations.json

@@ -55,5 +55,7 @@
     "decimalPlaces": "lugares decimales",
     "decimalPlacesTooltip": "seleccione el número deseado de decimales",
     "downlinkConfigMainHeader": "configuración principal del enlace descendente",
-    "downlinkConfigSubHeader": "configuración de enlace descendente individual"
+    "downlinkConfigSubHeader": "configuración de enlace descendente individual",
+    "swap": "little endian (orden de bytes visto)",
+    "swapTooltip": "intercambiar el byteoder de la entrada"
 }

package/admin/i18n/fr/translations.json

@@ -55,5 +55,7 @@
     "decimalPlaces": "décimales",
     "decimalPlacesTooltip": "sélectionnez le nombre de décimales souhaité",
     "downlinkConfigMainHeader": "configuration principale de la liaison descendante",
-    "downlinkConfigSubHeader": "configuration de liaison descendante individuelle"
+    "downlinkConfigSubHeader": "configuration de liaison descendante individuelle",
+    "swap": "Little Endian (ordre des octets Sawp)",
+    "swapTooltip": "échanger le byteoder de l'entrée"
 }

package/admin/i18n/it/translations.json

@@ -55,5 +55,7 @@
     "decimalPlaces": "decimali",
     "decimalPlacesTooltip": "selezionare il numero desiderato di cifre decimali",
     "downlinkConfigMainHeader": "configurazione downlink principale",
-    "downlinkConfigSubHeader": "configurazione downlink individuale"
+    "downlinkConfigSubHeader": "configurazione downlink individuale",
+    "swap": "little endian (ordine byte sawp)",
+    "swapTooltip": "scambia il byteoder dell'input"
 }

package/admin/i18n/nl/translations.json

@@ -55,5 +55,7 @@
     "decimalPlaces": "decimalen",
     "decimalPlacesTooltip": "selecteer het gewenste aantal decimalen",
     "downlinkConfigMainHeader": "belangrijkste downlink-configuratie",
-    "downlinkConfigSubHeader": "individuele downlinkconfiguratie"
+    "downlinkConfigSubHeader": "individuele downlinkconfiguratie",
+    "swap": "kleine endian (sawp-bytevolgorde)",
+    "swapTooltip": "verwissel de byteoder van de invoer"
 }

package/admin/i18n/pl/translations.json

@@ -55,5 +55,7 @@
     "decimalPlaces": "miejsca dziesiętne",
     "decimalPlacesTooltip": "wybierz żądaną liczbę miejsc po przecinku",
     "downlinkConfigMainHeader": "główna konfiguracja łącza w dół",
-    "downlinkConfigSubHeader": "indywidualna konfiguracja łącza w dół"
+    "downlinkConfigSubHeader": "indywidualna konfiguracja łącza w dół",
+    "swap": "Little Endian (kolejność bajtów sawp)",
+    "swapTooltip": "zamień bajt wejścia"
 }

package/admin/i18n/pt/translations.json

@@ -55,5 +55,7 @@
     "decimalPlaces": "casas decimais",
     "decimalPlacesTooltip": "selecione o número desejado de casas decimais",
     "downlinkConfigMainHeader": "configuração de downlink principal",
-    "downlinkConfigSubHeader": "configuração de downlink individual"
+    "downlinkConfigSubHeader": "configuração de downlink individual",
+    "swap": "little endian (ordem de bytes serrada)",
+    "swapTooltip": "trocar o byteoder da entrada"
 }

package/admin/i18n/ru/translations.json

@@ -55,5 +55,7 @@
     "decimalPlaces": "десятичные знаки",
     "decimalPlacesTooltip": "выберите желаемое количество десятичных знаков",
     "downlinkConfigMainHeader": "основная конфигурация нисходящей линии связи",
-    "downlinkConfigSubHeader": "индивидуальная конфигурация нисходящей линии связи"
+    "downlinkConfigSubHeader": "индивидуальная конфигурация нисходящей линии связи",
+    "swap": "с прямым порядком байтов (порядок байтов Sawp)",
+    "swapTooltip": "поменять местами байтодер ввода"
 }

package/admin/i18n/uk/translations.json

@@ -55,5 +55,7 @@
     "decimalPlaces": "знаки після коми",
     "decimalPlacesTooltip": "виберіть потрібну кількість знаків після коми",
     "downlinkConfigMainHeader": "основна конфігурація низхідного каналу",
-    "downlinkConfigSubHeader": "індивідуальна конфігурація низхідного каналу"
+    "downlinkConfigSubHeader": "індивідуальна конфігурація низхідного каналу",
+    "swap": "маленький порядок байтів (sawp byteorder)",
+    "swapTooltip": "поміняти байтовий порядок введення"
 }

package/admin/i18n/zh-cn/translations.json

@@ -55,5 +55,7 @@
     "decimalPlaces": "小数位",
     "decimalPlacesTooltip": "选择所需的小数位数",
     "downlinkConfigMainHeader": "主要下行配置",
-    "downlinkConfigSubHeader": "单独的下行链路配置"
+    "downlinkConfigSubHeader": "单独的下行链路配置",
+    "swap": "小尾数（sawp 字节顺序）",
+    "swapTooltip": "交换输入的字节码"
 }

package/admin/jsonConfig.json

@@ -61,9 +61,8 @@
 					"type": "password",
 					"label": "password",
 					"tooltip": "passwordTooltip",
-					"repeat": true,
 					"default": "",
-					"sm": 6
+					"sm": 3
 				},
 				"OriginHeader": {
 					"newLine": true,
@@ -214,6 +213,21 @@
 									"default": "boolean",
 									"sm":2
 								},
+								{
+									"type": "checkbox",
+									"attr": "swap",
+									"label": "swap",
+									"tooltip": "swapTooltip",
+									"hidden": "data.type !== 'number'",
+									"default": false,
+									"sm":2
+								},
+								{
+									"type": "staticText",
+									"label": "",
+									"hidden": "data.type === 'number'",
+									"sm":2
+								},
 								{
 									"type": "checkbox",
 									"attr": "confirmed",

package/io-package.json

@@ -1,8 +1,21 @@
 {
   "common": {
     "name": "lorawan",
-    "version": "0.1.5",
+    "version": "0.1.6",
     "news": {
+      "0.1.6": {
+        "en": "implments byte swap",
+        "de": "implikationen byte swap",
+        "ru": "свопа",
+        "pt": "impelimentos por swap",
+        "nl": "implments byte swap",
+        "fr": "swap par octets",
+        "it": "importazioni di swap",
+        "es": "swap byte",
+        "pl": "implikacje swap bajtów",
+        "uk": "напляскване",
+        "zh-cn": "杂质字节互换"
+      },
       "0.1.5": {
         "en": "remove units and insert roles",
         "de": "einheiten entfernen und rollen einfügen",
@@ -80,19 +93,6 @@
         "pl": "usuwanie ścieżki downlink / configuration oraz pierwsze testy wysyłania łącza downlink za pomocą programu uplink",
         "uk": "видалити шлях посилання / налаштування та перші тести відправки з посиланням",
         "zh-cn": "删除下行链路/ 配置路径, 并首次测试下行链路的发送"
-      },
-      "0.0.18": {
-        "en": "remove wrong warn logging",
-        "de": "falsche warnen protokollierung entfernen",
-        "ru": "удалить неправильные предупреждения",
-        "pt": "remover registro de aviso errado",
-        "nl": "foutmelding verwijderen",
-        "fr": "supprimer les avertissements erronés",
-        "it": "rimuovere l'avvertenza sbagliata",
-        "es": "eliminar el registro incorrecto",
-        "pl": "usunąć nieprawidłowe logowanie ostrzeżeń",
-        "uk": "видалити неправильний попереджати залоги",
-        "zh-cn": "删除错误的警告记录"
       }
     },
     "title": "LoRaWAN",
@@ -152,7 +152,7 @@
     ],
     "globalDependencies": [
       {
-        "admin": ">=5.1.13"
+        "admin": ">=6.13.15"
       }
     ]
   },

package/lib/modules/directorieshandler.js

@@ -185,7 +185,7 @@ class directorieshandlerClass {
 									type: stateCommonType !== undefined? stateCommonType!== "object"? stateCommonType: "mixed": "mixed",
 									name: stateCommonName,
 									role: stateCommonRole,
-									read: true,
+									read: stateCommonRole !== "button",
 									unit: obj[elementName]? obj[elementName].CommonStateUnit? obj[elementName].CommonStateUnit : "" : "",
 									def: obj[elementName]? obj[elementName].stateCommonDef? obj[elementName].stateCommonDef: stateCommonType === "boolean"? false : stateCommonType === "number"? 0: "": stateCommonType === "number"? 0: "",
 									write: stateCommonWrite

package/lib/modules/downlinkConfighandler.js

@@ -81,7 +81,7 @@ class downlinkConfighandlerClass {
 			config[downlinkConfig.deviceType] = downlinkConfig;
 			config[downlinkConfig.deviceType].downlinkState = {};
 			for(const downlinkParameter of Object.values(downlinkConfig.downlinkParameter)){
-				config[downlinkConfig.deviceType].downlinkState[downlinkParameter.name] = downlinkParameter;
+				config[downlinkConfig.deviceType].downlinkState[downlinkParameter.name.replace(this.adapter.FORBIDDEN_CHARS,"_")] = downlinkParameter;
 			}
 		}
 		catch(error){
@@ -115,7 +115,9 @@ class downlinkConfighandlerClass {
 			let foundLength = 0;
 			for(const deviceType in this.activeDownlinkConfigs){
 				if((deviceType === "all" || deviceType === this.internalDevices.baseDevice || changeInfo.deviceType.indexOf(deviceType) === 0) && deviceType.length > foundLength){
-					foundMatch = deviceType;
+					if(foundLength === 0){
+						foundMatch = deviceType;
+					}
 					if(deviceType !== "all" && deviceType !== this.internalDevices.baseDevice){
 						foundLength = deviceType.length;
 					}
@@ -269,6 +271,9 @@ class downlinkConfighandlerClass {
 						zeroDiggits += "0";
 					}
 					payloadInHex = (zeroDiggits + payloadInHex).slice(-numberOfDiggits);
+					if(downlinkParameter.swap){
+						payloadInHex = Buffer.from(payloadInHex,"hex").reverse().toString("hex");
+					}
 					payloadInHex = downlinkParameter.front + payloadInHex + downlinkParameter.end;
 					break;
 

package/lib/modules/messagehandler.js

@@ -98,13 +98,13 @@ class messagehandlerClass {
 							else if(stateCommonType === "ascii"){
 								stateCommonType = "string";
 							}
-							await this.adapter.setObjectAsync(`${deviceStartdirectory}.downlink.control.${downlinkConfig.name}`,{
+							await this.adapter.extendObject(`${deviceStartdirectory}.downlink.control.${downlinkConfig.name}`,{
 								type: "state",
 								common: {
 									name: "",
 									type: stateCommonType,
 									role: stateCommonRole,
-									read: true,
+									read: stateCommonRole !== "button",
 									write: true,
 									unit: downlinkConfig.unit? downlinkConfig.unit:"",
 									def: stateCommonType === "boolean"? false : stateCommonType === "number"? 0: "",

package/main.js

@@ -56,11 +56,9 @@ class Lorawan extends utils.Adapter {
 			await this.messagehandler.generateDownlinksAndRemoveStatesAtStatup();
 
 			//Subscribe all configuration and control states
-			this.subscribeStatesAsync("*.configuration.*");
-			this.subscribeStatesAsync("*downlink.control.*");
-			this.subscribeStatesAsync("*.logAvailableConfignames");
-			this.log.debug(`the adapter start with the config: ${JSON.stringify(this.config)}.`);
-			this.log.silly(`the whole reacable downlinkconfigs are: ${JSON.stringify(this.downlinkConfighandler.activeDownlinkConfigs)}`);
+			this.subscribeStatesAsync("*");
+			this.log.debug(`the adapter starts with downlinkconfigs: ${JSON.stringify(this.config.downlinkConfig)}.`);
+			this.log.silly(`the active downlinkconfigs are: ${JSON.stringify(this.downlinkConfighandler.activeDownlinkConfigs)}`);
 
 			/*setTimeout(async () => {
 				await this.startSimulation();
@@ -139,7 +137,7 @@ class Lorawan extends utils.Adapter {
 				// The state was changed => only states with ack = false will be processed, others will be ignored
 				if(!state.ack){
 					// Check for downlink in id
-					if(id.indexOf("downlink") !== -1){
+					if(id.indexOf(".downlink.contro.") !== -1){
 						this.log.silly(`the state ${id} has changed to ${state.val}.`);
 						// get information of the changing state
 						const changeInfo = await this.getChangeInfo(id,{withBestMatch:true});
@@ -166,7 +164,7 @@ class Lorawan extends utils.Adapter {
 						}
 					}
 					// State is from configuration path
-					else if(id.indexOf("configuration") !== -1){
+					else if(id.indexOf(".configuration.") !== -1){
 						const changeInfo = await this.getChangeInfo(id,{withBestMatch:true});
 						this.messagehandler?.fillWithDownlinkConfig(changeInfo?.objectStartDirectory);
 
@@ -184,7 +182,7 @@ class Lorawan extends utils.Adapter {
 						this.setStateAsync(id,state.val,true);
 					}
 					// logging of the actual available configs
-					else if(id.indexOf("logAvailableConfignames") !== -1){
+					else if(id.indexOf(".logAvailableConfignames") !== -1){
 						this.log.info(`The following devicenames has an existing downlink-config`);
 						let index = 0;
 						for(const devicename in this.downlinkConfighandler?.activeDownlinkConfigs){

package/package.json

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