iobroker.lorawan 0.6.3 → 0.6.4

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**
 -->
+### 0.6.4 (2024-03-07)
+* (BenAhrdt) Change writing of deviceinformations at Ttn
+
 ### 0.6.3 (2024-03-05)
 * (BenAhrdt) def of deviceinformations changed
 

package/io-package.json

@@ -1,8 +1,21 @@
 {
   "common": {
     "name": "lorawan",
-    "version": "0.6.3",
+    "version": "0.6.4",
     "news": {
+      "0.6.4": {
+        "en": "Change writing of deviceinformations at Ttn",
+        "de": "Schreiben von Geräteinformationen bei Ttn ändern",
+        "ru": "Изменение записи устройств в Ttn",
+        "pt": "Alterar a escrita de informações de dispositivos no Ttn",
+        "nl": "Het schrijven van apparaatinformatie bij Ttn wijzigen",
+        "fr": "Modifier l'écriture des informations de l'appareil à Ttn",
+        "it": "Cambia la scrittura di informazioni sui dispositivi a Ttn",
+        "es": "Cambiar la escritura de las informaciones de dispositivo en Ttn",
+        "pl": "Zmień pisanie informacji na temat treści w Ttn",
+        "uk": "Зміна письмової інформації про пристрій",
+        "zh-cn": "在 Ttn 更改设备信息的写入"
+      },
       "0.6.3": {
         "en": "def of deviceinformations changed",
         "de": "def von geräteinformationen geändert",
@@ -80,19 +93,6 @@
         "pl": "wdrożyć zatwierdzoną Folder conzept dla pisarek z wiadomości",
         "uk": "реалізація затвердженого р. Складаний конверт для написаннякоманд з повідомлення",
         "zh-cn": "执行批准的程序 从信件中写入命令的文件夹召集"
-      },
-      "0.5.3": {
-        "en": "change folder for writetriggers",
-        "de": "ordner für schreiber ändern",
-        "ru": "изменить папку для дикторов",
-        "pt": "mudar a pasta para writetriggers",
-        "nl": "map voor schrijftriggers wijzigen",
-        "fr": "modifier le dossier pour writetriggers",
-        "it": "modificare la cartella per writetriggers",
-        "es": "cambiar la carpeta para los escritores",
-        "pl": "zmień folder dla pisarzy",
-        "uk": "змінити папку для запису",
-        "zh-cn": "更改写入文件夹"
       }
     },
     "title": "LoRaWAN",

package/lib/modules/directorieshandler.js

@@ -49,7 +49,8 @@ class directorieshandlerClass {
 			time: this.timestringToDate,
 			gwTime: this.timestringToDate,
 			nsTime: this.timestringToDate,
-			timestamp: this.timestringToDate
+			timestamp: this.timestringToDate,
+			received_at: this.timestringToDate
 		};
 
 		/*********************************************************************
@@ -228,34 +229,36 @@ class directorieshandlerClass {
 							if(!myObject.native){
 								myObject.native = {};
 							}
+							// Generate native
 							if(obj[elementName].objectNative){
 								const objectNative = obj[elementName].objectNative(topic,message);
 								for(const attribute in objectNative){
 									myObject.native[attribute] = objectNative[attribute];
 								}
+							}
 
-								// Assigne to common, if there are values specified
-								if(obj[elementName].objectCommonFromNative){
-									for(const attribute in obj[elementName].objectCommonFromNative){
-										// Check, whether the actual native is present
-										if(myObject.native[obj[elementName].objectCommonFromNative[attribute]]){
-											// check for old common => existing object
-											if(myObjectBefore.common){
-												//check for content
-												if(myObjectBefore.common[attribute] === myObjectBefore.native[obj[elementName].objectCommonFromNative[attribute]] ||
-												myObjectBefore.common[attribute] === ""){
-													this.adapter.log.silly(`set common attribut ${attribute} to ${myObject.native[obj[elementName].objectCommonFromNative[attribute]]}`);
-													myObject.common[attribute] = myObject.native[obj[elementName].objectCommonFromNative[attribute]];
-												}
-											}
-											else{
+							// Assigne to common, if there are values specified
+							if(obj[elementName].objectCommonFromNative){
+								for(const attribute in obj[elementName].objectCommonFromNative){
+									// Check, whether the actual native is present
+									if(myObject.native[obj[elementName].objectCommonFromNative[attribute]]){
+										// check for old common => existing object
+										if(myObjectBefore.common){
+											//check for content
+											if(myObjectBefore.common[attribute] === myObjectBefore.native[obj[elementName].objectCommonFromNative[attribute]] ||
+											myObjectBefore.common[attribute] === ""){
 												this.adapter.log.silly(`set common attribut ${attribute} to ${myObject.native[obj[elementName].objectCommonFromNative[attribute]]}`);
 												myObject.common[attribute] = myObject.native[obj[elementName].objectCommonFromNative[attribute]];
 											}
 										}
+										else{
+											this.adapter.log.silly(`set common attribut ${attribute} to ${myObject.native[obj[elementName].objectCommonFromNative[attribute]]}`);
+											myObject.common[attribute] = myObject.native[obj[elementName].objectCommonFromNative[attribute]];
+										}
 									}
 								}
 							}
+
 							// Check for name
 							if(!myObject.common.name){
 								myObject.common.name = "";

package/lib/modules/messagehandler.js

@@ -103,9 +103,9 @@ class messagehandlerClass {
 			// Check origin
 			switch(this.adapter.config.origin){
 				case this.adapter.origin.ttn:
-					if(message.uplink_message && message.uplink_message.decoded_payload){
+					if(message.uplink_message && message.uplink_message){
 						this.deviceinformations[changeInfo.deviceEUI].uplink.decoded = message.uplink_message.decoded_payload;
-						this.deviceinformations[changeInfo.deviceEUI].uplink.time = message.rx_metadata.time;
+						this.deviceinformations[changeInfo.deviceEUI].uplink.time = message.uplink_message.rx_metadata.time;
 					}
 					break;
 				case this.adapter.origin.chirpstack:

package/package.json

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