iobroker.lorawan 0.1.2 → 0.1.4

package/README.md

@@ -19,6 +19,12 @@ Adapter was created in collaboration with Joerg Froehner LoraWan@hafenmeister.co
 	Placeholder for the next version (at the beginning of the line):
 	### **WORK IN PROGRESS**
 -->
+### 0.1.4 (2024-02-01)
+* (BenAhrdt) change input of length and validate hex inputs
+
+### 0.1.3 (2024-02-01)
+* (BenAhrdt) change internal Base devices
+
 ### 0.1.2 (2024-01-31)
 * (BenAhrdt) concept of config changed
 

package/admin/i18n/de/translations.json

@@ -34,8 +34,8 @@
     "frontTooltip": "Geben Sie den Frontwert im Hex-Format ein, der heruntergeladen werden soll",
     "end": "Folgend (hex)",
     "endTooltip": "Geben Sie den Endwert im Hex-Format ein, der heruntergeladen werden soll",
-    "length": "Gesamtlänge",
-    "lengthTooltip": "Geben Sie den Wert der gesamten Downlink-Nutzlast ein",
+    "lengthInByte": "Statelänge (Byte)",
+    "lengthInByteTooltip": "Geben Sie die Länge des States in Bytes an",
     "on": "An",
     "onTooltip": "Geben Sie den Wert ein, den Sie senden möchten, wenn Sie den Status auf „true“ setzen",
     "off": "aus",

package/admin/i18n/en/translations.json

@@ -34,8 +34,8 @@
 	"frontTooltip": "insert the front-value in hex format, wich will be downloaded",
 	"end": "end value (hex)",
 	"endTooltip": "insert the end-value in hex format, wich will be downloaded",
-	"length": "overall length",
-	"lengthTooltip": "insert the value of the whole downlink payload",
+	"lengthInByte": "length of state (byte)",
+	"lengthInByteTooltip": "insert the length of the state in bytes",
 	"on": "on",
 	"onTooltip": "insert the value you want to send if you set the state to true",
 	"off": "off",

package/admin/i18n/es/translations.json

@@ -34,8 +34,8 @@
     "frontTooltip": "inserte el valor frontal en formato hexadecimal, que se descargará",
     "end": "valor final (hexadecimal)",
     "endTooltip": "inserte el valor final en formato hexadecimal, que se descargará",
-    "length": "longitud total",
-    "lengthTooltip": "inserte el valor de toda la carga útil del enlace descendente",
+    "lengthInByte": "longitud del estado (byte)",
+    "lengthInByteTooltip": "insertar la longitud del estado en bytes",
     "on": "en",
     "onTooltip": "inserte el valor que desea enviar si establece el estado en verdadero",
     "off": "apagado",

package/admin/i18n/fr/translations.json

@@ -34,8 +34,8 @@
     "frontTooltip": "insérez la valeur frontale au format hexadécimal, qui sera téléchargée",
     "end": "valeur finale (hex)",
     "endTooltip": "insérez la valeur finale au format hexadécimal, qui sera téléchargée",
-    "length": "longueur totale",
-    "lengthTooltip": "insérer la valeur de toute la charge utile de la liaison descendante",
+    "lengthInByte": "longueur de l'état (octet)",
+    "lengthInByteTooltip": "insérer la longueur de l'état en octets",
     "on": "sur",
     "onTooltip": "insérez la valeur que vous souhaitez envoyer si vous définissez l'état sur true",
     "off": "désactivé",

package/admin/i18n/it/translations.json

@@ -34,8 +34,8 @@
     "frontTooltip": "inserire il valore frontale in formato esadecimale, che verrà scaricato",
     "end": "valore finale (esadecimale)",
     "endTooltip": "inserire il valore finale in formato esadecimale, che verrà scaricato",
-    "length": "lunghezza complessiva",
-    "lengthTooltip": "inserire il valore dell'intero payload del downlink",
+    "lengthInByte": "lunghezza dello stato (byte)",
+    "lengthInByteTooltip": "inserire la lunghezza dello stato in byte",
     "on": "SU",
     "onTooltip": "inserisci il valore che vuoi inviare se imposti lo stato su true",
     "off": "spento",

package/admin/i18n/nl/translations.json

@@ -34,8 +34,8 @@
     "frontTooltip": "voeg de voorwaarde in hexadecimaal formaat in, die zal worden gedownload",
     "end": "eindwaarde (hexadecimaal)",
     "endTooltip": "voer de eindwaarde in hexadecimaal formaat in, die zal worden gedownload",
-    "length": "totale lengte",
-    "lengthTooltip": "voer de waarde van de gehele downlink-payload in",
+    "lengthInByte": "lengte van staat (byte)",
+    "lengthInByteTooltip": "voer de lengte van de status in bytes in",
     "on": "op",
     "onTooltip": "voer de waarde in die u wilt verzenden als u de status op true instelt",
     "off": "uit",

package/admin/i18n/pl/translations.json

@@ -34,8 +34,8 @@
     "frontTooltip": "wstaw wartość przednią w formacie szesnastkowym, która zostanie pobrana",
     "end": "wartość końcowa (szesnastkowo)",
     "endTooltip": "wstaw wartość końcową w formacie szesnastkowym, która zostanie pobrana",
-    "length": "całkowita długość",
-    "lengthTooltip": "wstaw wartość całego ładunku łącza pobierającego",
+    "lengthInByte": "długość stanu (bajt)",
+    "lengthInByteTooltip": "wstaw długość stanu w bajtach",
     "on": "NA",
     "onTooltip": "wstaw wartość, którą chcesz wysłać, jeśli ustawisz stan na true",
     "off": "wyłączony",

package/admin/i18n/pt/translations.json

@@ -34,8 +34,8 @@
     "frontTooltip": "insira o valor frontal em formato hexadecimal, que será baixado",
     "end": "valor final (hex)",
     "endTooltip": "insira o valor final em formato hexadecimal, que será baixado",
-    "length": "comprimento total",
-    "lengthTooltip": "insira o valor de toda a carga útil do downlink",
+    "lengthInByte": "comprimento do estado (byte)",
+    "lengthInByteTooltip": "insira o comprimento do estado em bytes",
     "on": "sobre",
     "onTooltip": "insira o valor que deseja enviar se definir o estado como verdadeiro",
     "off": "desligado",

package/admin/i18n/ru/translations.json

@@ -34,8 +34,8 @@
     "frontTooltip": "вставьте переднее значение в шестнадцатеричном формате, которое будет загружено",
     "end": "конечное значение (шестнадцатеричное)",
     "endTooltip": "вставьте конечное значение в шестнадцатеричном формате, которое будет загружено",
-    "length": "полная длина",
-    "lengthTooltip": "вставьте значение всей полезной нагрузки нисходящей линии связи",
+    "lengthInByte": "длина состояния (байт)",
+    "lengthInByteTooltip": "вставьте длину состояния в байтах",
     "on": "на",
     "onTooltip": "вставьте значение, которое вы хотите отправить, если вы установили состояние true",
     "off": "выключенный",
@@ -48,7 +48,7 @@
     "unitTooltip": "вставьте единицу измерения вашего значения",
     "deviceType": "тип устройства",
     "expertSettings": "Эксперт-Настройки",
-    "enabled & collect": "включить и собирать",
+    "enabled & collect": "включить и собрать",
     "deviceTypeTooltip": "вставьте название типа устройства, этот конфиг действителен. (например, Dragino XY также соответствует Dragino)",
     "sendWithUplink": "отправить по восходящей линии связи",
     "sendWithUplinkTooltip": "выберите режим отправки для конфигов с нужным типом устройства",

package/admin/i18n/uk/translations.json

@@ -34,8 +34,8 @@
     "frontTooltip": "вставте переднє значення в шістнадцятковому форматі, яке буде завантажено",
     "end": "кінцеве значення (шістнадцяткове)",
     "endTooltip": "вставте кінцеве значення в шістнадцятковому форматі, яке буде завантажено",
-    "length": "Загальна довжина",
-    "lengthTooltip": "вставте значення всього корисного навантаження низхідного каналу",
+    "lengthInByte": "довжина стану (байт)",
+    "lengthInByteTooltip": "вставити довжину стану в байтах",
     "on": "на",
     "onTooltip": "вставте значення, яке ви хочете надіслати, якщо ви встановили стан як true",
     "off": "вимкнено",

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

@@ -34,15 +34,15 @@
     "frontTooltip": "以十六进制格式插入前面的值，它将被下载",
     "end": "最终值（十六进制）",
     "endTooltip": "插入十六进制格式的最终​​值，它将被下载",
-    "length": "总体长度",
-    "lengthTooltip": "插入整个下行链路有效负载的值",
+    "lengthInByte": "状态长度（字节）",
+    "lengthInByteTooltip": "插入状态的长度（以字节为单位）",
     "on": "在",
     "onTooltip": "如果将状态设置为 true，则插入要发送的值",
     "off": "离开",
     "offTooltip": "如果将状态设置为 false，则插入要发送的值",
     "onClick": "点击时",
     "onClickTooltip": "如果将状态设置为 true（单击按钮），则插入要发送的值",
-    "multiplyfaktor": "多重因素",
+    "multiplyfaktor": "多重因子",
     "multiplyfaktorTooltip": "插入您想要与数据相乘的因子（例如，输入 1(min) => 60s 为 60）",
     "unit": "单元",
     "unitTooltip": "插入您的值的单位",

package/admin/jsonConfig.json

@@ -102,7 +102,6 @@
 					"items":[
 						{
 							"newLine": true,
-							"attr": "downlinkConfigMain",
 							"type": "header",
 							"text": "downlinkConfigMainHeader",
 							"size": 3
@@ -115,6 +114,8 @@
 							"options": [
 								{"label":"all","value":"all"}
 							],
+							"validator": "if(data.deviceType === '' || data.deviceType === null){return false;}else{return true;}",
+							"validatorNoSaveOnError": true,
 							"default": "all",
 							"freeSolo": true,
 							"sm":2
@@ -179,8 +180,7 @@
 									"label": "name",
 									"tooltip": "nameTooltip",
 									"default": "",
-									"validator": "if(data.name === '' || data.name === null) return false; return true",
-									"validatorNoSaveOnError": true,
+									"validator": "if(data.name === '' || data.name === null){return false;}else{return true;}",
 									"sm":2
 								},
 								{
@@ -229,6 +229,7 @@
 									"label": "front",
 									"tooltip": "frontTooltip",
 									"default": "03",
+									"validator": "const myRegEx = /^([0-9a-f]{2})*$/i; return myRegEx.test(data.front);",
 									"hidden": "data.type === 'boolean' || data.type === 'button'",
 									"sm":2
 								},
@@ -237,17 +238,17 @@
 									"attr": "end",
 									"label": "end",
 									"tooltip": "endTooltip",
-									"default": "11",
+									"default": "11","validator": "const myRegEx = /^([0-9a-f]{2})*$/i; return myRegEx.test(data.end);",
 									"hidden": "data.type === 'boolean' || data.type === 'button'",
 									"sm":2
 								},
 								{
 									"type": "number",
-									"attr": "length",
-									"label": "length",
-									"tooltip": "lengthTooltip",
-									"default": 8,
-									"min":2,
+									"attr": "lengthInByte",
+									"label": "lengthInByte",
+									"tooltip": "lengthInByteTooltip",
+									"default": 2,
+									"min":1,
 									"max": 20,
 									"hidden": "data.type === 'boolean' || data.type === 'button' || data.type === 'string'",
 									"sm":2
@@ -259,6 +260,7 @@
 									"label": "on",
 									"tooltip": "onTooltip",
 									"default": "01",
+									"validator": "const myRegEx = /^([0-9a-f]{2})*$/i; return myRegEx.test(data.on);",
 									"hidden": "data.type !== 'boolean'",
 									"sm":2
 								},
@@ -268,6 +270,7 @@
 									"label": "off",
 									"tooltip": "offTooltip",
 									"default": "11",
+									"validator": "const myRegEx = /^([0-9a-f]{2})*$/i; return myRegEx.test(data.off);",
 									"hidden": "data.type !== 'boolean'",
 									"sm":2
 								},
@@ -278,6 +281,7 @@
 									"label": "onClick",
 									"tooltip": "onClickTooltip",
 									"default": "030111",
+									"validator": "const myRegEx = /^([0-9a-f]{2})*$/i; return myRegEx.test(data.onClick);",
 									"hidden": "data.type !== 'button'",
 									"sm":2
 								},

package/io-package.json

@@ -1,8 +1,34 @@
 {
   "common": {
     "name": "lorawan",
-    "version": "0.1.2",
+    "version": "0.1.4",
     "news": {
+      "0.1.4": {
+        "en": "change input of length and validate hex inputs",
+        "de": "längeneingabe ändern und hexeneingänge validieren",
+        "ru": "изменение вводимых значений длины и валидированных",
+        "pt": "alterar a entrada de comprimento e validar entradas de hex",
+        "nl": "de input van lengte wijzigen en hex-inputs valideren",
+        "fr": "modifier l'entrée de longueur et valider les entrées de hexagone",
+        "it": "modificare l'ingresso della lunghezza e convalidare gli input esadecimali",
+        "es": "cambio de entrada de longitud y validar entradas de hex",
+        "pl": "zmiana wejścia długości i walidacja wejść heksu",
+        "uk": "зміна введення довжини і валідації шестигранних входів",
+        "zh-cn": "修改长度输入并验证十六进制输入"
+      },
+      "0.1.3": {
+        "en": "change internal Base devices",
+        "de": "änderung intern Basisgeräte",
+        "ru": "изменения Базовые устройства",
+        "pt": "mudança interna Dispositivos base",
+        "nl": "intern wijzigen Basisvoorzieningen",
+        "fr": "changement interne Dispositifs de base",
+        "it": "cambiamento interno Dispositivi di base",
+        "es": "cambio interno Dispositivos de base",
+        "pl": "zmiana wewnętrzna Urządzenia bazowe",
+        "uk": "змінити внутрішню Пристрої бази",
+        "zh-cn": "内部变化 基本设备"
+      },
       "0.1.2": {
         "en": "concept of config changed",
         "de": "konzept von config geändert",
@@ -67,32 +93,6 @@
         "pl": "zmiana obsługi konfiguracji standardowych",
         "uk": "змінено Обробка стандартних конфігурацій",
         "zh-cn": "更改标准配置的处理"
-      },
-      "0.0.16": {
-        "en": "romeve reacheble object directory / improoved object === NULL",
-        "de": "romeve toucheble Objektverzeichnis / improoviertes Objekt == NULL",
-        "ru": "romeve reacheble object Directory / improoved object === NULL",
-        "pt": "romeve reacheble object diretório / objeto improoved - Sim",
-        "nl": "roeve bereikbare object directory / improoved object === NULL",
-        "fr": "romeve attele object directory / objet improvisé === NULL",
-        "it": "romeve catcheble object directory / oggetto improvato Traduzione:",
-        "es": "romeve reacheble objeto directorio / objeto improvisado === NULL",
-        "pl": "romeve Reacheble katalog obiektów / obiekt nieprofaworyzowany = = = NULL",
-        "uk": "romeve досягає каталогу об'єктів / об'єкт об'єкта ==== NULL",
-        "zh-cn": "romeve 达到对象目录/ 无法对象 QQ NULL 语言"
-      },
-      "0.0.15": {
-        "en": "bugfix chirpstack directory at downlink queued",
-        "de": "bugfix chirpstack verzeichnis bei downlink queued",
-        "ru": "bugfix chirpstack directory в очертаниях",
-        "pt": "bugfix chirpstack diretório no downlink queued",
-        "nl": "bugfix chirpstack directory bij downlink wachtrij",
-        "fr": "bugfix répertoire chirpstack au lien descendant en file d'attente",
-        "it": "bugfix chirpstack directory in downlink in coda",
-        "es": "bugfix chirpstack directorio en downlink queued",
-        "pl": "katalog chirpstock bugfix na downlink w kolejce",
-        "uk": "javascript licenses api веб-сайт go1.13.8",
-        "zh-cn": "下行链路队列时的 bugfix kirpstack 目录"
       }
     },
     "title": "LoRaWAN",

package/lib/modules/directorieshandler.js

@@ -212,9 +212,9 @@ class directorieshandlerClass {
 		try{
 			// Select search in case of origin
 			switch(this.adapter.config.origin){
-				case "ttn":
+				case this.adapter.origin.ttn:
 					return await this.getTtnAttributValue(topic,message,resolvetype);
-				case "chirpstack":
+				case this.adapter.origin.chirpstack:
 					return await this.getChirpstackAttributValue(topic,message,resolvetype);
 			}
 		}
@@ -232,9 +232,9 @@ class directorieshandlerClass {
 		try{
 			// Select search in case of origin
 			switch(this.adapter.config.origin){
-				case "ttn":
+				case this.adapter.origin.ttn:
 					return await this.getTtnObjectDirectory(topic,message,resolvetype);
-				case "chirpstack":
+				case this.adapter.origin.chirpstack:
 					return await this.getChirpstackObjectDirectory(topic,message,resolvetype);
 			}
 		}
@@ -252,9 +252,9 @@ class directorieshandlerClass {
 			this.adapter.log.silly(`topic ${topic} is requested for resolveing`);
 			// Select in case of origin
 			switch(this.adapter.config.origin){
-				case "ttn":
+				case this.adapter.origin.ttn:
 					return this.getTtnTopicResolved(topic);
-				case "chirpstack":
+				case this.adapter.origin.chirpstack:
 					return this.getChirpstackTopicResolved(topic);
 			}
 		}

package/lib/modules/downlinkConfighandler.js

@@ -4,7 +4,10 @@ const { isDeepStrictEqual } = require("util");
 class downlinkConfighandlerClass {
 	constructor(adapter) {
 		this.adapter = adapter;
-		this.activeDownlinkDeviceConfigs = {};
+		this.activeDownlinkConfigs = {};
+		this.internalDevices = {
+			baseDevice: "internalBaseDevice"
+		};
 	}
 
 	/*********************************************************************
@@ -18,13 +21,13 @@ class downlinkConfighandlerClass {
 			// Add standard downlink config
 			const internalDownlinks = this.getJsonArrayFromDirectoryfiles(`${this.adapter.adapterDir}/lib/modules/downlinks`);
 			if(Array.isArray(internalDownlinks)){
-				for(const downlinkDeviceConfig of Object.values(internalDownlinks)){
-					this.addDownlinkConfigByType(downlinkDeviceConfig,this.activeDownlinkDeviceConfigs);
+				for(const downlinkConfig of Object.values(internalDownlinks)){
+					this.addDownlinkConfigByType(downlinkConfig,this.activeDownlinkConfigs);
 				}
 			}
 			// Add user downlink config
-			for(const downlinkDeviceConfig of Object.values(this.adapter.config.downlinkConfig)){
-				this.addDownlinkConfigByType(downlinkDeviceConfig,this.activeDownlinkDeviceConfigs);
+			for(const downlinkConfig of Object.values(this.adapter.config.downlinkConfig)){
+				this.addDownlinkConfigByType(downlinkConfig,this.activeDownlinkConfigs);
 			}
 
 			// Check active userconfig
@@ -32,10 +35,29 @@ class downlinkConfighandlerClass {
 			const obj = await this.adapter.getForeignObjectAsync(adapterId);
 			// generate the Config without own objects
 			const ownConfig = [];
-			for(const downlinkDeviceConfig of Object.values(this.activeDownlinkDeviceConfigs)){
-				ownConfig.push(JSON.parse(JSON.stringify(downlinkDeviceConfig)));
+			for(const downlinkConfig of Object.values(this.activeDownlinkConfigs)){
+				ownConfig.push(JSON.parse(JSON.stringify(downlinkConfig)));
 				delete ownConfig[ownConfig.length - 1].downlinkState;
+				/*for(const downlinkParameter of Object.values(ownConfig[ownConfig.length - 1].downlinkParameter)){
+					//delete elements out of downlinkParameter Array
+					let parameterIndex = 0;
+					while(parameterIndex !== -1){
+						parameterIndex = downlinkParameter.findIndex((parameter) => {return parameter.notInConfig;});
+						if(parameterIndex !== -1){
+							downlinkParameter.splice(parameterIndex,1);
+						}
+					}
+				}*/
+			}
+
+			// Add internal base downlinks
+			const internalBaseDownlinks = this.getJsonArrayFromDirectoryfiles(`${this.adapter.adapterDir}/lib/modules/downlinks/baseDevices`);
+			if(Array.isArray(internalBaseDownlinks)){
+				for(const downlinkConfig of Object.values(internalBaseDownlinks)){
+					this.addDownlinkConfigByType(downlinkConfig,this.activeDownlinkConfigs);
+				}
 			}
+
 			// Sort Array by Alphabet
 			ownConfig.sort((a, b) => a.deviceType.toLowerCase() > b.deviceType.toLowerCase()?1:-1);
 			if(!isDeepStrictEqual(obj.native.downlinkConfig,ownConfig)){
@@ -50,14 +72,14 @@ class downlinkConfighandlerClass {
 		}
 	}
 
-	addDownlinkConfigByType(downlinkDeviceConfig,config){
+	addDownlinkConfigByType(downlinkConfig,config){
 		const activeFunction = "addDownlinkConfigByType";
 		try{
 			// override standard with userconfig
-			config[downlinkDeviceConfig.deviceType] = downlinkDeviceConfig;
-			config[downlinkDeviceConfig.deviceType].downlinkState = {};
-			for(const downlinkParameter of Object.values(downlinkDeviceConfig.downlinkParameter)){
-				config[downlinkDeviceConfig.deviceType].downlinkState[downlinkParameter.name] = downlinkParameter;
+			config[downlinkConfig.deviceType] = downlinkConfig;
+			config[downlinkConfig.deviceType].downlinkState = {};
+			for(const downlinkParameter of Object.values(downlinkConfig.downlinkParameter)){
+				config[downlinkConfig.deviceType].downlinkState[downlinkParameter.name] = downlinkParameter;
 			}
 		}
 		catch(error){
@@ -89,15 +111,14 @@ class downlinkConfighandlerClass {
 		try{
 			let foundMatch = "";
 			let foundLength = 0;
-			for(const deviceType in this.activeDownlinkDeviceConfigs){
-				if((deviceType === "all" || changeInfo.deviceType.indexOf(deviceType) === 0) && deviceType.length > foundLength){
+			for(const deviceType in this.activeDownlinkConfigs){
+				if((deviceType === "all" || deviceType === this.internalDevices.baseDevice || changeInfo.deviceType.indexOf(deviceType) === 0) && deviceType.length > foundLength){
 					foundMatch = deviceType;
-					if(deviceType !== "all"){
+					if(deviceType !== "all" && deviceType !== this.internalDevices.baseDevice){
 						foundLength = deviceType.length;
 					}
 				}
 			}
-
 			if(foundMatch !== ""){
 				return foundMatch;
 			}
@@ -110,17 +131,17 @@ class downlinkConfighandlerClass {
 		}
 	}
 
-	getDownlinkConfig(changeInfo,options){
-		const activeFunction = "getDownlinkConfig";
+	getDownlinkParameter(changeInfo,options){
+		const activeFunction = "getDownlinkParameter";
 		this.adapter.log.silly(`the downlinkconfig is requested for the following changeinfo: ${JSON.stringify(changeInfo)}`);
 		try{
 			let downlinkConfig = undefined;
 			let foundLength = 0;
-			for(const deviceType in this.activeDownlinkDeviceConfigs){
-				if((deviceType === "all" || changeInfo.deviceType.indexOf(deviceType) === 0) && deviceType.length > foundLength){
-					if(this.activeDownlinkDeviceConfigs[deviceType].downlinkState[changeInfo.changedState]){
-						downlinkConfig = this.activeDownlinkDeviceConfigs[deviceType].downlinkState[changeInfo.changedState];
-						if(deviceType !== "all"){
+			for(const deviceType in this.activeDownlinkConfigs){
+				if((deviceType === "all" || deviceType === this.internalDevices.baseDevice || changeInfo.deviceType.indexOf(deviceType) === 0) && deviceType.length > foundLength){
+					if(this.activeDownlinkConfigs[deviceType].downlinkState[changeInfo.changedState]){
+						downlinkConfig = this.activeDownlinkConfigs[deviceType].downlinkState[changeInfo.changedState];
+						if(deviceType !== "all" && deviceType !== this.internalDevices.baseDevice){
 							foundLength = deviceType.length;
 						}
 					}
@@ -140,7 +161,7 @@ class downlinkConfighandlerClass {
 					}
 				}
 				else{
-					this.adapter.log.warn(`${activeFunction}: no downlinkConfig found: deviceType: ${changeInfo.deviceType} - changed state: ${changeInfo.changedState}`);
+					this.adapter.log.warn(`${activeFunction}: no downlinkParameter found: deviceType: ${changeInfo.deviceType} - changed state: ${changeInfo.changedState}`);
 				}
 			}
 		}
@@ -156,13 +177,39 @@ class downlinkConfighandlerClass {
 	getDownlinkTopic(changeInfo,suffix){
 		// Select downlinktopic in case of origin
 		switch(this.adapter.config.origin){
-			case "ttn":
+			case this.adapter.origin.ttn:
 				return this.getTtnDownlinkTopicFromDirektory(changeInfo,suffix);
-			case "chirpstack":
+			case this.adapter.origin.chirpstack:
 				return this.getChirpstackDownlinkTopicFromDirektory(changeInfo,suffix);
 		}
 	}
 
+	/*********************************************************************
+	 * *********************** Topicsuffix *****************************
+	 * ******************************************************************/
+
+	getDownlinkTopicSuffix(state){
+		const activeFunction = "getDownlinkTopicSuffix";
+		try{
+			const replace = "replace";
+			switch(this.adapter.config.origin){
+				case this.adapter.origin.ttn:
+					switch(state){
+						case replace:
+							return "/down/replace";
+
+						default:
+							return "/down/push";
+					}
+				case this.adapter.origin.chirpstack:
+					return "/down";
+			}
+		}
+		catch(error){
+			this.adapter.log.error(`error at ${activeFunction}: ` + error);
+		}
+	}
+
 	/*********************************************************************
 	 * ************************** Downlink *******************************
 	 * ******************************************************************/
@@ -171,9 +218,9 @@ class downlinkConfighandlerClass {
 		// Select downlink in case of origin
 		this.adapter.log.silly(`the downlink for the changeinfo ${JSON.stringify(changeInfo)} is requested`);
 		switch(this.adapter.config.origin){
-			case "ttn":
+			case this.adapter.origin.ttn:
 				return this.getTtnDownlink(downlinkConfig,payloadInHex);
-			case "chirpstack":
+			case this.adapter.origin.chirpstack:
 				return this.getChirpstackDownlink(downlinkConfig,payloadInHex,changeInfo);
 		}
 	}
@@ -182,59 +229,59 @@ class downlinkConfighandlerClass {
 	 * ******************* Calculation of payload ************************
 	 * ******************************************************************/
 
-	calculatePayloadInHex(downlinkConfig,state){
+	calculatePayloadInHex(downlinkParameter,state){
 		// declare pyaload variable
 		this.adapter.log.silly(`the payload will be calculated`);
 		let payloadInHex = "";
 		let multipliedVal = 0;
 		//Check type
-		if(downlinkConfig.type === "button"){
-			payloadInHex = downlinkConfig.onClick;
+		if(downlinkParameter.type === "button"){
+			payloadInHex = downlinkParameter.onClick;
 		}
-		else if(downlinkConfig.type === "boolean"){
+		else if(downlinkParameter.type === "boolean"){
 			if(state.val){
-				payloadInHex = downlinkConfig.on;
+				payloadInHex = downlinkParameter.on;
 			}
 			else{
-				payloadInHex = downlinkConfig.off;
+				payloadInHex = downlinkParameter.off;
 			}
 		}
 		else{
 			let numberOfDiggits = 0;
 			let zeroDiggits = "";
 			let resultAfterdecimalPlaces = 0;
-			switch(downlinkConfig.type){
+			switch(downlinkParameter.type){
 				case "number":
-					if(downlinkConfig.decimalPlaces){
-						const expotentialFactor = Math.pow(10,downlinkConfig.decimalPlaces);
+					if(downlinkParameter.decimalPlaces){
+						const expotentialFactor = Math.pow(10,downlinkParameter.decimalPlaces);
 						const StateWithExotetialFactor = Math.trunc(state.val * expotentialFactor);
 						resultAfterdecimalPlaces = StateWithExotetialFactor / expotentialFactor;
 					}
 					else{
 						resultAfterdecimalPlaces = Math.trunc(state.val);
 					}
-					multipliedVal = resultAfterdecimalPlaces * downlinkConfig.multiplyfaktor;
+					multipliedVal = resultAfterdecimalPlaces * downlinkParameter.multiplyfaktor;
 					payloadInHex = multipliedVal.toString(16).toUpperCase();
-					numberOfDiggits = downlinkConfig.length - downlinkConfig.front.length - downlinkConfig.end.length;
+					numberOfDiggits = downlinkParameter.lengthInByte * 2;
 					for(let index = 1; index <= numberOfDiggits; index++){
 						zeroDiggits += "0";
 					}
 					payloadInHex = (zeroDiggits + payloadInHex).slice(-numberOfDiggits);
-					payloadInHex = downlinkConfig.front + payloadInHex + downlinkConfig.end;
+					payloadInHex = downlinkParameter.front + payloadInHex + downlinkParameter.end;
 					break;
 
 				case "ascii":
 					payloadInHex = Buffer.from(state.val).toString("hex").toUpperCase();
-					numberOfDiggits = downlinkConfig.length - downlinkConfig.front.length - downlinkConfig.end.length;
+					numberOfDiggits = downlinkParameter.lengthInByte * 2;
 					for(let index = 1; index <= numberOfDiggits; index++){
 						zeroDiggits += "0";
 					}
 					payloadInHex = (zeroDiggits + payloadInHex).slice(-numberOfDiggits);
-					payloadInHex = downlinkConfig.front + payloadInHex + downlinkConfig.end;
+					payloadInHex = downlinkParameter.front + payloadInHex + downlinkParameter.end;
 					break;
 
 				case "string":
-					payloadInHex = downlinkConfig.front + state.val + downlinkConfig.end;
+					payloadInHex = downlinkParameter.front + state.val + downlinkParameter.end;
 					payloadInHex = Buffer.from(payloadInHex).toString("hex").toUpperCase();
 					break;
 			}

package/lib/modules/downlinks/Dragino LT22222.json

@@ -14,7 +14,7 @@
                 "confirmed": true,
                 "front": "030111",
                 "end": "11",
-                "length": 8,
+                "lengthInByte": 1,
                 "on": "030111",
                 "off": "030011",
                 "multiplyfaktor": "1",
@@ -29,7 +29,7 @@
                 "confirmed": false,
                 "front": "01",
                 "end": "",
-                "length": 8,
+                "lengthInByte": 3,
                 "on": "11",
                 "off": "11",
                 "multiplyfaktor": 60,
@@ -44,7 +44,7 @@
                 "confirmed": true,
                 "front": "03",
                 "end": "11",
-                "length": 2,
+                "lengthInByte": 1,
                 "on": "031101",
                 "off": "031100",
                 "multiplyfaktor": "1",
@@ -59,7 +59,7 @@
                 "confirmed": false,
                 "front": "03",
                 "end": "11",
-                "length": 2,
+                "lengthInByte": 1,
                 "on": "2104",
                 "off": "2100",
                 "multiplyfaktor": "1",
@@ -74,7 +74,7 @@
                 "confirmed": true,
                 "front": "03",
                 "end": "11",
-                "length": 2,
+                "lengthInByte": 1,
                 "on": "02011111",
                 "off": "02001111",
                 "multiplyfaktor": "1",
@@ -89,7 +89,7 @@
                 "confirmed": true,
                 "front": "03",
                 "end": "11",
-                "length": 2,
+                "lengthInByte": 1,
                 "on": "02110111",
                 "off": "02110011",
                 "multiplyfaktor": "1",
@@ -104,7 +104,7 @@
                 "confirmed": false,
                 "front": "03",
                 "end": "11",
-                "length": 2,
+                "lengthInByte": 1,
                 "on": "A90001111107D0",
                 "off": "",
                 "multiplyfaktor": "1",
@@ -119,7 +119,7 @@
                 "confirmed": true,
                 "front": "03",
                 "end": "11",
-                "length": 2,
+                "lengthInByte": 1,
                 "on": "050021EA60",
                 "off": "",
                 "multiplyfaktor": "1",

package/lib/modules/downlinks/Dragino.json

@@ -14,7 +14,7 @@
                 "confirmed": false,
                 "front": "01",
                 "end": "",
-                "length": 8,
+                "lengthInByte": 3,
                 "on": "",
                 "off": "",
                 "multiplyfaktor": 60,
@@ -28,7 +28,7 @@
                 "confirmed": false,
                 "front": "",
                 "end": "",
-                "length": 4,
+                "lengthInByte": 2,
                 "on": "",
                 "off": "",
                 "onClick": "04FF",

package/lib/modules/downlinks/LBR-BSM-0404.json

@@ -0,0 +1,117 @@
+[
+    {
+        "deviceType":"LBR-BSM-0404",
+        "sendWithUplink":"disabled",
+        "port":2,
+        "priority":"NORMAL",
+        "confirmed":false,
+        "downlinkParameter":[
+            {
+                "name": "Cron",
+                "port": 128,
+                "priority": "NORMAL",
+                "type": "string",
+                "confirmed": true,
+                "front": "SMeasureCron=",
+                "end": "",
+                "lengthInByte": 2,
+                "on": "01",
+                "off": "11",
+                "onClick": "030111",
+                "multiplyfaktor": "1",
+                "unit": ""
+              },
+              {
+                "name": "Get config parameter",
+                "port": 128,
+                "priority": "NORMAL",
+                "type": "string",
+                "confirmed": false,
+                "front": "g",
+                "end": "",
+                "lengthInByte": 2,
+                "on": "01",
+                "off": "11",
+                "onClick": "g",
+                "multiplyfaktor": "1",
+                "unit": ""
+              },
+              {
+                "name": "Request firmware and version",
+                "port": 128,
+                "priority": "NORMAL",
+                "type": "button",
+                "confirmed": true,
+                "front": "03",
+                "end": "11",
+                "lengthInByte": 2,
+                "on": "01",
+                "off": "11",
+                "onClick": "3F",
+                "multiplyfaktor": "1",
+                "unit": ""
+              },
+              {
+                "name": "BSM_Relais1",
+                "port": 4,
+                "priority": "NORMAL",
+                "type": "boolean",
+                "confirmed": true,
+                "front": "03",
+                "end": "11",
+                "lengthInByte": 2,
+                "on": "0601050000FF00",
+                "off": "06010500000000",
+                "onClick": "030111",
+                "multiplyfaktor": "1",
+                "unit": ""
+              },
+              {
+                "name": "BSM_Relais2",
+                "port": 4,
+                "priority": "NORMAL",
+                "type": "boolean",
+                "confirmed": true,
+                "front": "03",
+                "end": "11",
+                "lengthInByte": 2,
+                "on": "0601050001FF00",
+                "off": "06010500010000",
+                "onClick": "030111",
+                "multiplyfaktor": "1",
+                "unit": ""
+              },
+              {
+                "name": "BSM_Relais3",
+                "port": 4,
+                "priority": "NORMAL",
+                "type": "boolean",
+                "confirmed": true,
+                "front": "03",
+                "end": "11",
+                "lengthInByte": 2,
+                "on": "0601050002FF00",
+                "off": "06010500020000",
+                "onClick": "030111",
+                "multiplyfaktor": "1",
+                "unit": ""
+              },
+              {
+                "name": "BSM_Relais4",
+                "port": 4,
+                "priority": "NORMAL",
+                "type": "boolean",
+                "confirmed": true,
+                "front": "03",
+                "end": "11",
+                "lengthInByte": 2,
+                "on": "0601050003FF00",
+                "off": "06010500030000",
+                "onClick": "030111",
+                "multiplyfaktor": "1",
+                "unit": "",
+                "decimalPlaces": "1"
+              }
+        ]
+    }
+]

package/lib/modules/downlinks/Vicki.json

@@ -0,0 +1,139 @@
+[
+    {
+        "deviceType":"Vicki",
+        "sendWithUplink":"disabled",
+        "port":2,
+        "priority":"NORMAL",
+        "confirmed":false,
+        "downlinkParameter":[
+            {
+            "name": "Vicki_ext_Temperatur",
+            "port": 1,
+            "priority": "NORMAL",
+            "type": "number",
+            "confirmed": false,
+            "front": "3C",
+            "end": "0D0218",
+            "lengthInByte": 2,
+            "on": "01",
+            "off": "11",
+            "onClick": "030111",
+            "multiplyfaktor": 10,
+            "unit": "Grad",
+            "decimalPlaces": 1
+            },
+            {
+            "name": "Vicki_Interval",
+            "port": 1,
+            "priority": "NORMAL",
+            "type": "number",
+            "confirmed": false,
+            "front": "02",
+            "end": "12",
+            "lengthInByte": 2,
+            "on": "01",
+            "off": "11",
+            "onClick": "030111",
+            "multiplyfaktor": "1",
+            "unit": "Minuten",
+            "deviceType": "Vicki"
+            },
+            {
+            "name": "Vicki_Target_Temperature",
+            "port": 1,
+            "priority": "NORMAL",
+            "type": "number",
+            "confirmed": false,
+            "front": "0E",
+            "end": "",
+            "lengthInByte": 1,
+            "on": "01",
+            "off": "11",
+            "onClick": "030111",
+            "multiplyfaktor": "1",
+            "unit": "Grad",
+            "decimalPlaces": 0
+            },
+            {
+            "name": "Vicki_Max_Temperature",
+            "port": 1,
+            "priority": "NORMAL",
+            "type": "number",
+            "confirmed": false,
+            "front": "0805",
+            "end": "15",
+            "lengthInByte": 1,
+            "on": "01",
+            "off": "11",
+            "onClick": "030111",
+            "multiplyfaktor": "1",
+            "unit": "Grad",
+            "deviceType": "Vicki"
+            },
+            {
+            "name": "Vicki_Get_Infos",
+            "port": 1,
+            "priority": "NORMAL",
+            "type": "button",
+            "confirmed": false,
+            "front": "03",
+            "end": "11",
+            "lengthInByte": 2,
+            "on": "01",
+            "off": "11",
+            "onClick": "041215184634",
+            "multiplyfaktor": "1",
+            "unit": "",
+            "deviceType": "Vicki"
+            },
+            {
+            "name": "Vicki_Motor_Callibration",
+            "port": 1,
+            "priority": "NORMAL",
+            "type": "button",
+            "confirmed": false,
+            "front": "03",
+            "end": "11",
+            "lengthInByte": 2,
+            "on": "01",
+            "off": "11",
+            "onClick": "03",
+            "multiplyfaktor": "1",
+            "unit": "",
+            "deviceType": "Vicki"
+            },
+            {
+            "name": "Vicki_Child_Lock",
+            "port": 1,
+            "priority": "NORMAL",
+            "type": "boolean",
+            "confirmed": false,
+            "front": "03",
+            "end": "11",
+            "lengthInByte": 2,
+            "on": "070114",
+            "off": "070014",
+            "onClick": "030111",
+            "multiplyfaktor": "1",
+            "unit": "",
+            "deviceType": "Vicki"
+            },
+            {
+            "name": "Vicki_Mode_2",
+            "port": 1,
+            "priority": "NORMAL",
+            "type": "boolean",
+            "confirmed": false,
+            "front": "03",
+            "end": "11",
+            "lengthInByte": 2,
+            "on": "0D02",
+            "off": "0D01",
+            "onClick": "030111",
+            "multiplyfaktor": "1",
+            "unit": "",
+            "decimalPlaces": "1"
+            }
+        ]
+    }
+]

package/lib/modules/downlinks/{all.json → baseDevices/internalBaseDevice.json}

@@ -1,19 +1,20 @@
 [
     {
-        "deviceType":"all",
+        "deviceType":"internalBaseDevice",
         "sendWithUplink":"disabled",
         "downlinkParameter":[
             {
+                "notInConfig": true,
                 "name": "push",
                 "type": "json",
                 "deviceType": "all"
             },
             {
+                "notInConfig": true,
                 "name": "replace",
                 "type": "json",
                 "deviceType": "all"
             }
         ]
-     }
-        
+     }  
 ]

package/lib/modules/messagehandler.js

@@ -14,10 +14,10 @@ class messagehandlerClass {
 	async handleMessage(topic,message){
 		// Select datahandling in case of origin
 		switch(this.adapter.config.origin){
-			case "ttn":
+			case this.adapter.origin.ttn:
 				await this.handleTtnMessage(topic,message);
 				break;
-			case "chirpstack":
+			case this.adapter.origin.chirpstack:
 				await this.handleChirpstackMessage(topic,message);
 		}
 	}
@@ -38,9 +38,10 @@ class messagehandlerClass {
 			for(const adapterObject of Object.values(adapterObjectsAtStart)){
 				if(adapterObject.type === "state" && (adapterObject._id.indexOf("downlink.control") !== -1)){
 					const changeInfo = await this.adapter.getChangeInfo(adapterObject._id);
-					const downlinkConfig = this.adapter.downlinkConfighandler.getDownlinkConfig(changeInfo,{startupCheck:true});
-					if(!downlinkConfig || this.stateForbidden(changeInfo.changedState)){
+					const downlinkParameter = this.adapter.downlinkConfighandler.getDownlinkParameter(changeInfo,{startupCheck:true});
+					if(!downlinkParameter || this.stateForbidden(changeInfo.changedState)){
 						await this.adapter.delObjectAsync(this.adapter.removeNamespace(adapterObject._id));
+						this.adapter.log.debug(`${activeFunction}: the state ${changeInfo.changedState} was deleted out of ${changeInfo.objectStartDirectory}`);
 					}
 				}
 			}
@@ -62,14 +63,14 @@ class messagehandlerClass {
 			const changeInfo = await this.adapter.getChangeInfo(`${deviceStartdirectory}.fillDownlinkFolder`);
 			const foundLength = {};
 			//iterate downlinkDevice
-			for(const downlinkDevice in this.adapter.downlinkConfighandler.activeDownlinkDeviceConfigs){
+			for(const downlinkDevice in this.adapter.downlinkConfighandler.activeDownlinkConfigs){
 				// query for match deviceType
-				if((downlinkDevice === "all" || changeInfo.deviceType.indexOf(downlinkDevice) === 0)){
+				if((downlinkDevice === "all" || downlinkDevice === this.adapter.downlinkConfighandler.internalDevices.baseDevice || changeInfo.deviceType.indexOf(downlinkDevice) === 0)){
 					// iterate downlinkConfig
-					for(const downlinkConfig of Object.values(this.adapter.downlinkConfighandler.activeDownlinkDeviceConfigs[downlinkDevice].downlinkState)){
+					for(const downlinkConfig of Object.values(this.adapter.downlinkConfighandler.activeDownlinkConfigs[downlinkDevice].downlinkState)){
 						this.adapter.log.silly(`the downlinkconfig ${JSON.stringify(downlinkConfig)}, will checked.`);
 						// check for forbidden states
-						if(this.stateForbidden(changeInfo.changedState)){
+						if(this.stateForbidden(downlinkConfig.name)){
 							continue;
 						}
 						// Create found length if not defined
@@ -100,7 +101,7 @@ class messagehandlerClass {
 								},
 								native: {},
 							});
-							if(downlinkDevice !=="all"){
+							if(downlinkDevice !=="all" && downlinkDevice === this.adapter.downlinkConfighandler.internalDevices.baseDevice){
 								foundLength[downlinkConfig.name] = downlinkDevice.length;
 							}
 						}
@@ -115,9 +116,9 @@ class messagehandlerClass {
 
 	stateForbidden(stateName){
 		switch(this.adapter.config.origin){
-			case "ttn":
+			case this.adapter.origin.ttn:
 				return false;
-			case "chirpstack":
+			case this.adapter.origin.chirpstack:
 				return stateName === "replace";
 		}
 	}

package/lib/modules/mqttclient.js

@@ -53,9 +53,9 @@ class mqttClientClass {
 
 	getSubscribtionArray(){
 		switch(this.adapter.config.origin){
-			case "ttn":
+			case this.adapter.origin.ttn:
 				return ["v3/+/devices/+/up","v3/+/devices/+/down/#"];
-			case "chirpstack":
+			case this.adapter.origin.chirpstack:
 				return ["application/+/device/+/event/up","application/+/device/+/command/down"];
 		}
 	}

package/main.js

@@ -26,6 +26,11 @@ class Lorawan extends utils.Adapter {
 		// this.on("objectChange", this.onObjectChange.bind(this));
 		// this.on("message", this.onMessage.bind(this));
 		this.on("unload", this.onUnload.bind(this));
+
+		this.origin = {
+			ttn: "ttn",
+			chirpstack: "chirpstack"
+		};
 	}
 
 	/**
@@ -34,7 +39,6 @@ class Lorawan extends utils.Adapter {
 	async onReady() {
 		const activeFunction = "onReady";
 		try{
-			this.log.warn("START");
 			// create downlinkConfigs
 			this.downlinkConfighandler = new downlinkConfighandlerClass(this);
 
@@ -56,7 +60,7 @@ class Lorawan extends utils.Adapter {
 			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.activeDownlinkDeviceConfigs)}`);
+			this.log.silly(`the whole reacable downlinkconfigs are: ${JSON.stringify(this.downlinkConfighandler.activeDownlinkConfigs)}`);
 
 			/*setTimeout(async () => {
 				await this.startSimulation();
@@ -139,55 +143,25 @@ class Lorawan extends utils.Adapter {
 						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});
-						if(this.config.origin === "ttn"){
-							let appending = "push";
-							if(changeInfo?.changedState === "push"){
-								const downlinkTopic = this.downlinkConfighandler?.getDownlinkTopic(changeInfo,`/down/${appending}`);
-								await this.sendDownlink(downlinkTopic,state.val);
-								this.setStateAsync(id,state.val,true);
-							}
-							else if(changeInfo?.changedState === "replace"){
-								appending = "replace";
-								const downlinkTopic = this.downlinkConfighandler?.getDownlinkTopic(changeInfo,`/down/${appending}`);
-								await this.sendDownlink(downlinkTopic,state.val,changeInfo);
-								this.setStateAsync(id,state.val,true);
-							}
-							else{
-								const downlinkTopic = this.downlinkConfighandler?.getDownlinkTopic(changeInfo,`/down/${appending}`);
-								const downlinkConfig = this.downlinkConfighandler?.getDownlinkConfig(changeInfo);
-								if(downlinkConfig !== undefined){
-									const payloadInHex = this.downlinkConfighandler?.calculatePayloadInHex(downlinkConfig,state);
-									await this.writeNextSend(changeInfo,payloadInHex);
-									if(!changeInfo?.bestMatchForDeviceType || this.downlinkConfighandler?.activeDownlinkDeviceConfigs[changeInfo.bestMatchForDeviceType].sendWithUplink === "disabled"){
-										const downlink = this.downlinkConfighandler?.getDownlink(downlinkConfig,payloadInHex,changeInfo);
-										if(downlink !== undefined){
-											await this.sendDownlink(downlinkTopic,JSON.stringify(downlink),changeInfo);
-										}
-									}
-									this.setStateAsync(id,state.val,true);
-								}
-							}
+						const suffix = this.downlinkConfighandler?.getDownlinkTopicSuffix(changeInfo?.changedState);
+						if(changeInfo?.changedState === "push" || changeInfo?.changedState === "replace"){
+							const downlinkTopic = this.downlinkConfighandler?.getDownlinkTopic(changeInfo,suffix);
+							await this.sendDownlink(downlinkTopic,state.val);
+							this.setStateAsync(id,state.val,true);
 						}
-						else if(this.config.origin === "chirpstack"){
-							if(changeInfo?.changedState === "push"){
-								const downlinkTopic = this.downlinkConfighandler?.getDownlinkTopic(changeInfo,`/down`);
-								await this.sendDownlink(downlinkTopic,state.val,changeInfo);
-								this.setStateAsync(id,state.val,true);
-							}
-							else{
-								const downlinkTopic = this.downlinkConfighandler?.getDownlinkTopic(changeInfo,`/down`);
-								const downlinkConfig = this.downlinkConfighandler?.getDownlinkConfig(changeInfo);
-								if(downlinkConfig !== undefined){
-									const payloadInHex = this.downlinkConfighandler?.calculatePayloadInHex(downlinkConfig,state);
-									await this.writeNextSend(changeInfo,payloadInHex);
-									if(!changeInfo?.bestMatchForDeviceType || this.downlinkConfighandler?.activeDownlinkDeviceConfigs[changeInfo.bestMatchForDeviceType].sendWithUplink === "disabled"){
-										const downlink = this.downlinkConfighandler?.getDownlink(downlinkConfig,payloadInHex,changeInfo);
-										if(downlink !== undefined){
-											await this.sendDownlink(downlinkTopic,JSON.stringify(downlink),changeInfo);
-										}
+						else{
+							const downlinkTopic = this.downlinkConfighandler?.getDownlinkTopic(changeInfo,suffix);
+							const downlinkParameter = this.downlinkConfighandler?.getDownlinkParameter(changeInfo);
+							if(downlinkParameter !== undefined){
+								const payloadInHex = this.downlinkConfighandler?.calculatePayloadInHex(downlinkParameter,state);
+								await this.writeNextSend(changeInfo,payloadInHex);
+								if(!changeInfo?.bestMatchForDeviceType || this.downlinkConfighandler?.activeDownlinkConfigs[changeInfo.bestMatchForDeviceType].sendWithUplink === "disabled"){
+									const downlink = this.downlinkConfighandler?.getDownlink(downlinkParameter,payloadInHex,changeInfo);
+									if(downlink !== undefined){
+										await this.sendDownlink(downlinkTopic,JSON.stringify(downlink),changeInfo);
 									}
-									this.setStateAsync(id,state.val,true);
 								}
+								this.setStateAsync(id,state.val,true);
 							}
 						}
 					}
@@ -201,8 +175,8 @@ class Lorawan extends utils.Adapter {
 						for(const adapterObject of Object.values(adapterObjects)){
 							if(adapterObject.type === "state" && (adapterObject._id.indexOf(`${changeInfo?.objectStartDirectory}.downlink.control`) !== -1)){
 								const changeInfo = await this.getChangeInfo(adapterObject._id);
-								const downlinkConfig = this.downlinkConfighandler?.getDownlinkConfig(changeInfo,{startupCheck:true});
-								if(!downlinkConfig){
+								const downlinkParameter = this.downlinkConfighandler?.getDownlinkParameter(changeInfo,{startupCheck:true});
+								if(!downlinkParameter){
 									await this.delObjectAsync(this.removeNamespace(adapterObject._id));
 								}
 							}
@@ -213,9 +187,11 @@ class Lorawan extends utils.Adapter {
 					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?.activeDownlinkDeviceConfigs){
+						for(const devicename in this.downlinkConfighandler?.activeDownlinkConfigs){
 							index++;
-							this.log.info(`Device ${index}: ${devicename}`);
+							if(devicename !== this.downlinkConfighandler.internalDevices.baseDevice){
+								this.log.info(`Device ${index}: ${devicename}`);
+							}
 						}
 						this.setStateAsync(id,state.val,true);
 					}
@@ -235,21 +211,12 @@ class Lorawan extends utils.Adapter {
 		try{
 			this.log.silly(`Check for send downlink with uplink.`);
 			const changeInfo = await this.getChangeInfo(id,{withBestMatch:true});
-			if(changeInfo && changeInfo.bestMatchForDeviceType && this.downlinkConfighandler?.activeDownlinkDeviceConfigs[changeInfo.bestMatchForDeviceType].sendWithUplink !== "disabled"){
+			if(changeInfo && changeInfo.bestMatchForDeviceType && this.downlinkConfighandler?.activeDownlinkConfigs[changeInfo.bestMatchForDeviceType].sendWithUplink !== "disabled"){
 				const nextSend = await this.getNextSend(changeInfo?.objectStartDirectory);
 				if(nextSend?.val !== "0"){
-					let appending = "";
-					switch(this.config.origin){
-						case "ttn":
-							appending = `/down/push`;
-							break;
-
-						case "chirpstack":
-							appending = `/down`;
-							break;
-					}
-					const downlinkTopic = this.downlinkConfighandler?.getDownlinkTopic(changeInfo,appending);
-					const downlinkConfig = this.downlinkConfighandler?.activeDownlinkDeviceConfigs[changeInfo.bestMatchForDeviceType];
+					const suffix = this.downlinkConfighandler?.getDownlinkTopicSuffix("push");
+					const downlinkTopic = this.downlinkConfighandler?.getDownlinkTopic(changeInfo,suffix);
+					const downlinkConfig = this.downlinkConfighandler?.activeDownlinkConfigs[changeInfo.bestMatchForDeviceType];
 					const downlink = this.downlinkConfighandler?.getDownlink(downlinkConfig,nextSend?.val,changeInfo);
 					if(downlink !== undefined){
 						await this.sendDownlink(downlinkTopic,JSON.stringify(downlink),changeInfo);
@@ -269,7 +236,7 @@ class Lorawan extends utils.Adapter {
 
 	async writeNextSend(changeInfo,payloadInHex){
 		const idFolderNextSend = `${changeInfo.objectStartDirectory}.${this.messagehandler?.directoryhandler.reachableSubfolders.downlinkNextSend}`;
-		if(changeInfo.bestMatchForDeviceType && this.downlinkConfighandler?.activeDownlinkDeviceConfigs[changeInfo.bestMatchForDeviceType].sendWithUplink === "enabled & collect"){
+		if(changeInfo.bestMatchForDeviceType && this.downlinkConfighandler?.activeDownlinkConfigs[changeInfo.bestMatchForDeviceType].sendWithUplink === "enabled & collect"){
 			const nextSend = await this.getStateAsync(`${idFolderNextSend}.hex`);
 			if(nextSend?.val !== "0"){
 				payloadInHex = nextSend?.val + payloadInHex;
@@ -300,11 +267,11 @@ class Lorawan extends utils.Adapter {
 		}
 		let payload = "";
 		switch(this.config.origin){
-			case "ttn":
+			case this.origin.ttn:
 				payload = downlink.downlinks[0].frm_payload;
 				break;
 
-			case "chirpstack":
+			case this.origin.chirpstack:
 				payload = downlink.data;
 				break;
 		}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.lorawan",
-  "version": "0.1.2",
+  "version": "0.1.4",
   "description": "converts the desired lora gateway data to a ioBroker structure",
   "author": {
     "name": "BenAhrdt",
@@ -25,7 +25,7 @@
   },
   "dependencies": {
     "@iobroker/adapter-core": "^3.0.4",
-    "mqtt": "^5.3.4"
+    "mqtt": "^5.3.5"
   },
   "devDependencies": {
     "@alcalzone/release-script": "^3.7.0",
@@ -38,12 +38,12 @@
     "@types/chai": "^4.3.11",
     "@types/chai-as-promised": "^7.1.8",
     "@types/mocha": "^10.0.6",
-    "@types/node": "^20.10.6",
+    "@types/node": "^20.11.14",
     "@types/proxyquire": "^1.3.31",
-    "@types/sinon": "^17.0.2",
+    "@types/sinon": "^17.0.3",
     "@types/sinon-chai": "^3.2.12",
     "chai-as-promised": "^7.1.1",
-    "chai": "^4.4.0",
+    "chai": "^4.4.1",
     "eslint": "^8.56.0",
     "mocha": "^10.2.0",
     "proxyquire": "^2.1.3",