iobroker.lorawan 0.6.0 → 0.6.1

package/README.md

@@ -22,6 +22,9 @@ For now there is documentation in English here: http://www.hafenmeister.com/Lora
 	Placeholder for the next version (at the beginning of the line):
 	### **WORK IN PROGRESS**
 -->
+### 0.6.1 (2024-03-02)
+* (BenAhrdt) better concept to write values and change setObjectNotExists to extendObject
+
 ### 0.6.0 (2024-03-02)
 * (BenAhrdt) change concept of assigning roles, values and writecommands
 

package/io-package.json

@@ -1,8 +1,21 @@
 {
   "common": {
     "name": "lorawan",
-    "version": "0.6.0",
+    "version": "0.6.1",
     "news": {
+      "0.6.1": {
+        "en": "better concept to write values and change setObjectNotExists to extendObject",
+        "de": "besseres Konzept zum Schreiben von Werten und Änderungsset ObjectNotExists to erweitern Gegenstand",
+        "ru": "лучшее понятие для написания ценностей и изменения набора ObjectNotExists Объект",
+        "pt": "melhor conceito para escrever valores e alterar o conjunto ObjectNotExists para estender Objeto",
+        "nl": "beter concept om waarden en verandering set te schrijven ObjectNotBestaat om uit te breiden Doel",
+        "fr": "meilleur concept pour écrire des valeurs et changer ensemble ObjectNotExiste à étendre Objet",
+        "it": "migliore concetto per scrivere valori e cambiare set ObjectNotEsiste per estendere Oggetto",
+        "es": "mejor concepto para escribir valores y cambiar conjunto ObjectNotExists to extend Objeto",
+        "pl": "lepsza koncepcja zapisu wartości i zestaw zmian ObjectNotExists rozszerzyć Obiekt",
+        "uk": "краща концепція для написання значень та змін Об'єктNotExists для розширення Об'єкт",
+        "zh-cn": "更好的写值和更改集的概念 要扩展的对象不包含 对象"
+      },
       "0.6.0": {
         "en": "change concept of assigning roles, values and writecommands",
         "de": "änderungskonzept der zuordnung von rollen, werten und schreibbefehlen",
@@ -80,19 +93,6 @@
         "pl": "wykrywanie zmienionych tryggerwords",
         "uk": "виявлення змінених фраз",
         "zh-cn": "检测触发词已更改"
-      },
-      "0.5.0": {
-        "en": "trigger for devicetype implemented",
-        "de": "trigger für implementierte gerätetypen",
-        "ru": "триггер для реализованного устройства",
-        "pt": "gatilho para o tipo de dispositivo implementado",
-        "nl": "trigger voor apparaattype geïmplementeerd",
-        "fr": "déclencheur pour le type d'appareil implémenté",
-        "it": "trigger per il tipo di dispositivo implementato",
-        "es": "disparador para el tipo de dispositivo implementado",
-        "pl": "wyzwalacz dla wdrożonego typu devicetype",
-        "uk": "тригер для установки",
-        "zh-cn": "已执行设备类型的触发器"
       }
     },
     "title": "LoRaWAN",

package/lib/modules/directorieshandler.js

@@ -56,24 +56,28 @@ class directorieshandlerClass {
 		 * ************************** writecommands  *************************
 		 * ******************************************************************/
 
-		this.executeWritecommand = async (elementName,sourceId,value) =>{
+		//general function for writecommands
+		this.executeWritecommand = async (writecommand,elementName,sourceId,value) =>{
 			// Check, if there is a writetrigger and the stateval is not euqal its releaseVal(still present)
-			const writecommand = this.writeCommand[elementName];
-			if(writecommand && writecommand.releaseValue !== value){
+			if(writecommand.releaseValue !== value){
 				const baseInfo = this.adapter.getBaseDeviceInfo(sourceId);
 				const subfolder = sourceId.slice(baseInfo.objectStartDirectory.length + 1,sourceId.length - baseInfo.changedState.length - 1);
 				if(!writecommand.approvedFolders || writecommand.approvedFolders[subfolder]){
 					const destinationId = `${baseInfo.objectStartDirectory}.${writecommand.destination}`;
 					const destinationState = await this.adapter.getStateAsync(destinationId);
 					if(destinationState?.val === writecommand.releaseValue){
-						this.adapter.log.debug(`writetrigger ${elementName} recogniced. value ${value} will be written into ${this.writeCommand[elementName].destination}`);
+						this.adapter.log.debug(`writecommand ${elementName} recogniced. value ${value} will be written into ${writecommand.destination}`);
 						await this.adapter.setStateAsync(destinationId,value);
 					}
 				}
 			}
 		};
 
-		this.writeCommandDeviceType = {destination:"configuration.devicetype",releaseValue:"",approvedFolders:{"uplink.decoded":true}};
+		// Define settings for writecommand devicetype
+		this.writeCommandDeviceType = async (elementName,sourceId,value) =>{
+			const writecommand = {destination:"configuration.devicetype",releaseValue:"",approvedFolders:{"uplink.decoded":true}};
+			return await this.executeWritecommand(writecommand,elementName,sourceId,value);
+		};
 
 		this.writeCommand = {
 			Devicetype: this.writeCommandDeviceType,
@@ -271,10 +275,6 @@ class directorieshandlerClass {
 								unit: obj[elementName]? obj[elementName].CommonStateUnit? obj[elementName].CommonStateUnit : "" : "",
 								write: false
 							};
-							/*let stateCommonType = typeof obj[elementName];
-							let stateCommonName = "";
-							let stateCommonWrite = false;
-							let stateCommonRole = "value";*/
 							let stateVal = obj[elementName];
 							let objectId = `${startDirectory}.${elementName}`;
 							let internalObjectId = elementName;
@@ -301,7 +301,7 @@ class directorieshandlerClass {
 							}
 							common.read = common.role !== "button";
 							common.def = obj[elementName] || typeof obj[elementName] === "boolean" ? obj[elementName].stateCommonDef? obj[elementName].stateCommonDef: common.type === "boolean"? false : common.type === "number"? 0: "": common.type === "number"? 0: "";
-							await this.adapter.setObjectNotExistsAsync(objectId,{
+							await this.adapter.extendObjectAsync(objectId,{
 								type: "state",
 								common: common,
 								native: {},
@@ -312,7 +312,10 @@ class directorieshandlerClass {
 							if(stateVal !== undefined){
 								// Set State from Objectpath
 								await this.adapter.setStateAsync(`${objectId}`,stateVal,true);
-								await this.executeWritecommand(elementName,objectId,stateVal);
+								//Check for writecommand
+								if(this.writeCommand[elementName]){
+									await this.writeCommand[elementName](elementName,objectId,stateVal);
+								}
 							}
 						}
 					}

package/lib/modules/messagehandler.js

@@ -90,55 +90,51 @@ class messagehandlerClass {
 						}
 						// check found length
 						if(downlinkDevice.length > foundLength[downlinkParameter.name]){
-							let stateCommonRole = "level";
-							let stateCommonType = downlinkParameter.type;
+							const common = {
+								role: "level",
+								type: downlinkParameter.type
+							};
 							// Assign role (if present)
-							if(this.downlinkRoles[stateCommonType]){
-								stateCommonRole = this.downlinkRoles[stateCommonType];
+							if(this.downlinkRoles[common.type]){
+								common.role = this.downlinkRoles[common.type];
 							}
 							// Reassign type
-							if(stateCommonType === "button"){
-								stateCommonType = "boolean";
+							if(common.type === "button"){
+								common.type = "boolean";
 							}
-							else if(stateCommonType === "ascii"){
-								stateCommonType = "string";
+							else if(common.type === "ascii"){
+								common.type = "string";
 							}
 							// declare def / min / max
-							let stateCommonMin = undefined;
-							let stateCommonDef = 0; //just numbers
-							let stateCommonMax = undefined;
-							if(stateCommonType === "number"){
+							common.min = undefined;
+							common.def = 0; //just numbers
+							common.max = undefined;
+							if(common.type === "number"){
 								if(downlinkParameter.limitMin){
-									stateCommonMin = downlinkParameter.limitMinValue;
-									if(stateCommonMin > stateCommonDef){
-										stateCommonDef = stateCommonMin;
+									common.min = downlinkParameter.limitMinValue;
+									if(common.min > common.def){
+										common.def = common.min;
 									}
 								}
-								else if(stateCommonType === "number"){
-									stateCommonMin = -1000000;
+								else if(common.type === "number"){
+									common.min = -1000000;
 								}
 								if(downlinkParameter.limitMax){
-									stateCommonMax = downlinkParameter.limitMaxValue;
-									if(stateCommonMax < stateCommonDef){
-										stateCommonDef = stateCommonMax;
+									common.max = downlinkParameter.limitMaxValue;
+									if(common.max < common.def){
+										common.def = common.max;
 									}
 								}
-								else if(stateCommonType === "number"){
-									stateCommonMax = 1000000;
+								else if(common.type === "number"){
+									common.max = 1000000;
 								}
 							}
+							common.name = "";
+							common.read = common.role !== "button";
+							common.write = true;
+							common.unit = downlinkParameter.unit? downlinkParameter.unit:"";
+							common.def = common.type === "boolean"? false : common.type === "number"? common.def: "";
 							// common set into variable to read later (for options)
-							const common = {
-								name: "",
-								type: stateCommonType,
-								role: stateCommonRole,
-								read: stateCommonRole !== "button",
-								write: true,
-								unit: downlinkParameter.unit? downlinkParameter.unit:"",
-								min: stateCommonMin,
-								max: stateCommonMax,
-								def: stateCommonType === "boolean"? false : stateCommonType === "number"? stateCommonDef: "",
-							};
 							const stateId = `${deviceStartdirectory}.${this.directoryhandler.reachableSubfolders.downlinkControl}.${downlinkParameter.name}`;
 							await this.adapter.extendObjectAsync(stateId,{
 								type: "state",

package/package.json

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