iobroker.lorawan 1.0.0 → 1.0.1

package/README.md

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

package/io-package.json

@@ -1,8 +1,21 @@
 {
   "common": {
     "name": "lorawan",
-    "version": "1.0.0",
+    "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",
@@ -80,19 +93,6 @@
         "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": "更好的写值和更改集的概念 要扩展的对象不包含 对象"
       }
     },
     "titleLang": {

package/lib/modules/directorieshandler.js

@@ -372,7 +372,7 @@ class directorieshandlerClass {
 	 * ******************************************************************/
 
 	getIconPath(topic,message,icontype){
-		const activeFunction = "getIcon";
+		const activeFunction = "getIconPath";
 		try{
 			// Select search in case of origin
 			switch(this.adapter.config.origin){
@@ -501,13 +501,13 @@ class directorieshandlerClass {
 	 * ******************************************************************/
 
 	getTtnIconPath(topic,message,icontype){
-		const activeFunction = "getTtnIcon";
+		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){
+					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 "";
@@ -594,13 +594,13 @@ class directorieshandlerClass {
 	 * ******************************************************************/
 
 	getChirpstackIconPath(topic,message,icontype){
-		const activeFunction = "getTtnIcon";
+		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){
+					if(message.txInfo?.modulation.lora.spreadingFactor &&
+						message.rxInfo[0]?.rssi){
 						return this.analyseConnection(message.txInfo.modulation.lora.spreadingFactor,message.rxInfo[0].rssi);
 					}
 					else{

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/package.json

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