iobroker.lorawan 0.6.6 → 1.0.1

package/README.md

@@ -22,6 +22,12 @@ 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.0.1 (2024-03-25)
+* (BenAhrdt) support 2's complement
+
+### 1.0.0 (2024-03-21)
+* (BenAhrdt) implement wifi icons
+
 ### 0.6.6 (2024-03-11)
 * (BenAhrdt) update Vicki device-config
 

package/io-package.json

@@ -1,8 +1,34 @@
 {
   "common": {
     "name": "lorawan",
-    "version": "0.6.6",
+    "version": "1.0.1",
     "news": {
+      "1.0.1": {
+        "en": "support 2's complement",
+        "de": "support 2's ergänzung",
+        "ru": "поддержка 2",
+        "pt": "complemento do suporte 2",
+        "nl": "ondersteuning 2's complement",
+        "fr": "soutenir le complément 2",
+        "it": "supporto 2's complemento",
+        "es": "complemento de soporte 2",
+        "pl": "wsparcie dopełnienia 2",
+        "uk": "підтримка 2 доповнення",
+        "zh-cn": "支助2的补充"
+      },
+      "1.0.0": {
+        "en": "implement wifi icons",
+        "de": "wifi-symbole implementieren",
+        "ru": "реализовать wifi иконки",
+        "pt": "implementar ícones de wifi",
+        "nl": "wifi-pictogrammen implementeren",
+        "fr": "implémenter des icônes wifi",
+        "it": "implementare le icone wifi",
+        "es": "implementar iconos wifi",
+        "pl": "implementuj ikony wifi",
+        "uk": "впроваджувати іконки wifi",
+        "zh-cn": "执行wifi图标"
+      },
       "0.6.6": {
         "en": "update Vicki device-config",
         "de": "vicki Gerät-config aktualisieren",
@@ -67,35 +93,8 @@
         "pl": "seperate dp for deviceinformations",
         "uk": "seperate dp для пристроюінформаційних систем",
         "zh-cn": "设备信息的 seperate dp"
-      },
-      "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",
-        "ru": "изменение концепции присвоения ролей, ценностей и комманд",
-        "pt": "mudar o conceito de atribuir papéis, valores e redigircomando",
-        "nl": "verandering concept van het toewijzen van rollen, waarden en schrijfcommando's",
-        "fr": "changer le concept d'attribution des rôles, des valeurs et des commandes écrites",
-        "it": "cambiare il concetto di assegnare ruoli, valori e comandi di scrittura",
-        "es": "cambio de concepto de asignación de roles, valores y",
-        "pl": "zmiana koncepcji przypisywania ról, wartości i pisarek",
-        "uk": "зміни концепції присвоєння ролей, значень та написаннякоманд",
-        "zh-cn": "更改指定角色、值和写入命令的概念"
       }
     },
-    "title": "LoRaWAN",
     "titleLang": {
       "en": "LoRaWAN",
       "de": "LoRaWAN",

package/lib/modules/directorieshandler.js

@@ -28,6 +28,10 @@ class directorieshandlerClass {
 			joinRaw: "join.raw"
 		};
 
+		this.icons = {
+			wifi: "wifi"
+		};
+
 		/*********************************************************************
 		 * ********************* Definition of Assigns  **********************
 		 * ******************************************************************/
@@ -113,6 +117,9 @@ class directorieshandlerClass {
 								deviceId : this.getAttributValue(topic,message,this.searchableAttributeNames.deviceId)
 							};
 						},
+						objectIconPath: (topic,message)=>{
+							return this.getIconPath(topic,message,this.icons.wifi);
+						},
 						objectType: "device",
 						configuration:{
 							devicetype:{
@@ -165,7 +172,8 @@ class directorieshandlerClass {
 			objectCommonName: "objectCommonName",
 			objectCommonFromNative: "objectCommonFromNative",
 			objectType: "objectType",
-			objectNative : "objectNative"
+			objectNative: "objectNative",
+			objectIconPath: "objectIconPath"
 		};
 	}
 
@@ -215,6 +223,14 @@ class directorieshandlerClass {
 								myObject.common = {};
 							}
 
+							// Check for icon assignment
+							if(obj[elementName].objectIconPath){
+								const iconPath = obj[elementName].objectIconPath(topic,message);
+								if(iconPath !== ""){
+									myObject.common.icon = iconPath;
+								}
+							}
+
 							// check whether a common name was specified
 							if(obj[elementName].objectCommonName){
 								if(typeof obj[elementName].objectCommonName === "function"){
@@ -351,6 +367,63 @@ class directorieshandlerClass {
 		}
 	}
 
+	/*********************************************************************
+	 * *************************** iconPath ******************************
+	 * ******************************************************************/
+
+	getIconPath(topic,message,icontype){
+		const activeFunction = "getIconPath";
+		try{
+			// Select search in case of origin
+			switch(this.adapter.config.origin){
+				case this.adapter.origin.ttn:
+					return this.getTtnIconPath(topic,message,icontype);
+				case this.adapter.origin.chirpstack:
+					return this.getChirpstackIconPath(topic,message,icontype);
+			}
+		}
+		catch(error){
+			this.adapter.log.error(`error at ${activeFunction}:  ${error} - - - Message: ${JSON.stringify(message)}`);
+		}
+	}
+
+	analyseConnection(sf,rssi){
+		const activeFunction = "getIcon";
+		try{
+			this.adapter.log.silly(`icon for device with sf: ${sf} and rssi: ${rssi} requested`);
+			let iconPath = `icons/wifiSf`;
+			if(sf === 7 || sf === 9 || sf === 12){
+				iconPath += `${sf}`;
+			}
+			else{
+				iconPath += `X`;
+			}
+			if(rssi >= -70){
+				rssi = 5;
+			}
+			else if(rssi >= -80){
+				rssi = 4;
+			}
+			else if(rssi >= -90){
+				rssi = 3;
+			}
+			else if(rssi >= -100){
+				rssi = 2;
+			}
+			else if(rssi >= -110){
+				rssi = 1;
+			}
+			else{
+				rssi = 0;
+			}
+			iconPath += `_${rssi}.png`;
+
+			return iconPath;
+		}
+		catch(error){
+			this.adapter.log.error(`error at ${activeFunction}:  ${error}`);
+		}
+	}
 	/*********************************************************************
 	 * ******************** Object Start Directory ***********************
 	 * ******************************************************************/
@@ -423,6 +496,32 @@ class directorieshandlerClass {
 		}
 	}
 
+	/*********************************************************************
+	 * *************************** iconPath ******************************
+	 * ******************************************************************/
+
+	getTtnIconPath(topic,message,icontype){
+		const activeFunction = "getTtnIconPath";
+		try{
+			this.adapter.log.silly(`icontype ${icontype} is requested for ttn`);
+			switch(icontype){
+				case this.icons.wifi:
+					if(message.uplink_message?.settings.data_rate.lora.spreading_factor &&
+						message.uplink_message?.rx_metadata[0].rssi){
+						return this.analyseConnection(message.uplink_message.settings.data_rate.lora.spreading_factor,message.uplink_message.rx_metadata[0].rssi);
+					}
+					return "";
+
+				default:
+					this.adapter.log.warn(`No icontype with the name ${icontype} found.`);
+					return "";
+			}
+		}
+		catch(error){
+			this.adapter.log.error(`error at ${activeFunction}:  ${error} - - - Topic: ${JSON.stringify(topic)}`);
+		}
+	}
+
 	/*********************************************************************
 	 * ************************ Object Directory *************************
 	 * ******************************************************************/
@@ -490,6 +589,34 @@ class directorieshandlerClass {
 		}
 	}
 
+	/*********************************************************************
+	 * *************************** iconPath ******************************
+	 * ******************************************************************/
+
+	getChirpstackIconPath(topic,message,icontype){
+		const activeFunction = "getChirpstackIconPath";
+		try{
+			this.adapter.log.silly(`icontype ${icontype} is requested for ttn`);
+			switch(icontype){
+				case this.icons.wifi:
+					if(message.txInfo?.modulation.lora.spreadingFactor &&
+						message.rxInfo[0]?.rssi){
+						return this.analyseConnection(message.txInfo.modulation.lora.spreadingFactor,message.rxInfo[0].rssi);
+					}
+					else{
+						return "";
+					}
+
+				default:
+					this.adapter.log.warn(`No icontype with the name ${icontype} found.`);
+					return "";
+			}
+		}
+		catch(error){
+			this.adapter.log.error(`error at ${activeFunction}:  ${error} - - - Topic: ${JSON.stringify(topic)}`);
+		}
+	}
+
 	/*********************************************************************
 	 * ************************ Resolved Topic ***************************
 	 * ******************************************************************/

package/lib/modules/downlinkConfighandler.js

@@ -293,14 +293,17 @@ class downlinkConfighandlerClass {
 				case "number":
 					if(downlinkParameter.decimalPlaces){
 						const expotentialFactor = Math.pow(10,downlinkParameter.decimalPlaces);
-						const StateWithExotetialFactor = Math.trunc(state.val * expotentialFactor);
+						const StateWithExotetialFactor = Math.round(state.val * expotentialFactor);
+						this.adapter.log.warn(StateWithExotetialFactor);
 						resultAfterdecimalPlaces = StateWithExotetialFactor / expotentialFactor;
 					}
 					else{
 						resultAfterdecimalPlaces = Math.trunc(state.val);
 					}
 					multipliedVal = resultAfterdecimalPlaces * downlinkParameter.multiplyfaktor;
-					payloadInHex = multipliedVal.toString(16);
+					// Assign absolute value
+					payloadInHex = Math.abs(multipliedVal).toString(16);
+					// create the zero diggits
 					numberOfDiggits = downlinkParameter.lengthInByte * 2;
 					for(let index = 1; index <= numberOfDiggits; index++){
 						zeroDiggits += "0";
@@ -309,6 +312,14 @@ class downlinkConfighandlerClass {
 					if(downlinkParameter.swap){
 						payloadInHex = Buffer.from(payloadInHex,"hex").reverse().toString("hex");
 					}
+
+					// Create negative 2´s complement
+					if(multipliedVal < 0){
+						const compareFactor = Math.pow(2,(downlinkParameter.lengthInByte * 8))-1;
+						payloadInHex = (~parseInt(payloadInHex,16)+1 & compareFactor).toString(16);
+					}
+
+					// Assign the front and end
 					payloadInHex = downlinkParameter.front + payloadInHex + downlinkParameter.end;
 					break;
 

package/main.js

@@ -31,6 +31,9 @@ class Lorawan extends utils.Adapter {
 			ttn: "ttn",
 			chirpstack: "chirpstack"
 		};
+
+		// Simulation variables
+		this.simulation = {};
 	}
 
 	/**
@@ -66,7 +69,7 @@ class Lorawan extends utils.Adapter {
 			/*setTimeout(async () => {
 				await this.startSimulation();
 			}, 5000);*/
-			/*setTimeout(async () => {
+			/*this.simulation.timeout = setTimeout(async () => {
 				const topic = "application/d63c10b6-9263-4ab3-9299-4308fa19a2ad/device/f1c0ae0e-b4a2-4547-b360-7cfa15e85734/command/down";
 				const message = {devEui:"f1c0ae0e-b4a2-4547-b360-7cfa15e85734",confirmed:false,fPort:1,data:"AAA"};
 				await this.mqttClient?.publish(topic,JSON.stringify(message));
@@ -136,6 +139,11 @@ class Lorawan extends utils.Adapter {
 	 */
 	onUnload(callback) {
 		try {
+			// clear timeout (for simulation)
+			if(this.simulation.timeout){
+				this.clearTimeout(this.simulation.timeout);
+				delete this.simulation.timeout;
+			}
 			this.mqttClient?.destroy();
 			callback();
 		} catch (e) {

package/package.json

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