iobroker.device-watcher 2.2.0 → 2.2.1

package/README.md

@@ -90,6 +90,11 @@ If you don't want a specifice device in the list, you can add it in the blacklis
     Placeholder for the next version (at the beginning of the line):
     ### **WORK IN PROGRESS**
 -->
+### 2.2.1 (2022-12-28)
+
+-   (ciddi89) Innogy Smarthome added
+-   (ciddi89) Lists for each adapter are working again
+
 ### 2.2.0 (2022-12-27)
 
 -   (Scrounger) Yamaha MusicCast adapter added

package/admin/jsonConfig.json

@@ -116,6 +116,13 @@
 					"lg": 3,
 					"label": "Hue Extended"
 				},
+				"innogyDevices": {
+					"type": "checkbox",
+					"sm": 6,
+					"md": 6,
+					"lg": 3,
+					"label": "Innogy Smarthome"
+				},
 				"jeelinkDevices": {
 					"type": "checkbox",
 					"sm": 6,
@@ -1219,6 +1226,18 @@
 					"hidden": "!data.hueExtDevices",
 					"hideOnlyControl": false
 				},
+				"innogyMaxMinutes": {
+					"type": "number",
+					"min": 0,
+					"max": 100000,
+					"sm": 6,
+					"md": 6,
+					"lg": 3,
+					"label": "Innogy Smarthome",
+					"help": "in minutes",
+					"hidden": "!data.innogyDevices",
+					"hideOnlyControl": false
+				},
 				"jeelinkMaxMinutes": {
 					"type": "number",
 					"min": 1,

package/io-package.json

@@ -1,8 +1,21 @@
 {
   "common": {
     "name": "device-watcher",
-    "version": "2.2.0",
+    "version": "2.2.1",
     "news": {
+      "2.2.1": {
+        "en": "Innogy Smarthome added\nLists for each adapter are working again",
+        "de": "Innogy Smarthome hinzugefügt\nListen für jeden Adapter arbeiten wieder",
+        "ru": "Innogy Smarthome добавлено\nСписки для каждого адаптера работают снова",
+        "pt": "Innogy Smarthome adicionado\nListas para cada adaptador estão funcionando novamente",
+        "nl": "Innogy Smarthome toegevoegd\nLeugens voor elke adapter werken weer",
+        "fr": "Innogy Smarthome ajouté\nLes listes pour chaque adaptateur fonctionnent à nouveau",
+        "it": "Innogy Smarthome aggiunto\nLe liste per ogni adattatore funzionano di nuovo",
+        "es": "Innogy Smarthome añadido\nListas para cada adaptador están trabajando de nuevo",
+        "pl": "Innogia Smarthome dodała\nLista do każdej adaptacji ponownie działa",
+        "uk": "Innogy Smarthome додано\nСписки для кожного адаптера працюють знову",
+        "zh-cn": "诺特·萨马尔·罗马\n每个适应人员名单正再次工作。"
+      },
       "2.2.0": {
         "en": "Yamaha MusicCast adapter added\nsend update message on state change\ndatapoints and scheduled notification for updateable devices added\nreaction for state changes of battery datapoints added\nsend message and write lists directly if one device has low battery\nsend message and write lists directly if on device is going online or offline",
         "de": "Yamaha Musik Cast Adapter hinzugefügt\naktualisierungsnachricht über zustandsänderung senden\ndatenpunkte und geplante benachrichtigung für aktualisierte geräte hinzugefügt\nreaktion auf zustandsänderungen von batteriedatenpunkten hinzugefügt\nsende nachrichten und schreiblisten direkt, wenn ein gerät einen niedrigen akku hat\nnachrichten und schreiblisten direkt senden, wenn auf dem gerät online oder offline geht",
@@ -80,19 +93,6 @@
         "pl": "lupusec, adapter HS100, Zigbee2MQTT i MaxCube\nzmienił nazwę Homematic na HM-RPC\nudało się to zrobić zupełnienie czarnej listy\nczyścił kod i skrócił niektóre z nich",
         "uk": "додано Lupusec, HS100 адаптер, Zigbee2MQTT і MaxCube\nзмінено назву Homematic до HM-RPC\nвиготовлений комплетально макіяж чорного списку\nочистити код і скорочувати деякі",
         "zh-cn": "加上Lupusec,HS100适应者,Zigbee2MQTT和MaxCube\n家庭名称改为HM-RPC\n填写黑名单\na. 守则的清理和缩短某些人"
-      },
-      "1.1.0": {
-        "en": "removed indicatoren for daily sent messages\nchanged selector for shelly devices\nadded Zigbee2MQTT adapter\nadded cron function to use own time for daily overview messages",
-        "de": "entfernte anzeige für täglich gesendete nachrichten\ngeänderter selektor für shelly-geräte\nzigbee2MQTT Adapter hinzugefügt\nzusätzliche cron-funktion, um eigene zeit für tägliche übersichtsnachrichten zu verwenden",
-        "ru": "удаленный индикатор для ежедневных отправленных сообщений\nизменен селектор для оболочки устройств\nдобавлен адаптер Zigbee2MQTT\nдобавлена функция cron для использования собственного времени для ежедневного обзора сообщений",
-        "pt": "indicador removido para mensagens enviadas diárias\nseletor alterado para dispositivos shelly\nadicionado adaptador Zigbee2MQTT\nfunção cron adicionada para usar o próprio tempo para mensagens de visão geral diária",
-        "nl": "verwijderde indicatoren voor dagelijks verzonden berichten\nverschoonde selector voor shelly apparaten\nvoegde Zigbee2MQT adapter toe\nvoegde kroonfunctie toe om dagelijks overzicht te gebruiken",
-        "fr": "indicateur supprimé pour les messages envoyés quotidiennement\nsélecteur modifié pour les dispositifs shelly\nadaptateur Zigbee2MQTT\nfonction cron ajoutée pour utiliser son propre temps pour les messages d'aperçu quotidien",
-        "it": "indicatore rimosso per messaggi inviati giornalieri\nselettore modificato per dispositivi shelly\naggiunto adattatore Zigbee2MQTT\nfunzione di cron aggiunto per utilizzare il proprio tempo per i messaggi di visione quotidiana",
-        "es": "indicador eliminado para mensajes enviados diariamente\nselector cambiado para dispositivos de vaina\nadaptador Zigbee2MQTT\nfunción cron agregada para utilizar tiempo propio para mensajes de visión general diaria",
-        "pl": "usunąć wskaźniki do codziennego przesyłania wiadomości\nzmieniono wybór dla urządzeń ostrzałowych\nadapter Zigbee2MQTT\ndodała funkcję krona do codziennego użytku",
-        "zh-cn": "d. 每天发出的讯息的清除指标\n炮火装置的选择\n增加Zigbee2MQTT适应人员\nb. 利用自己的时间进行日常概览信息",
-        "uk": "видалено індикатор щоденних відправлених повідомлень\nзмінено селектор для пристроїв shelly\nдодано адаптер Zigbee2MQTT\nдодано функцію cron для використання власного часу для щоденних оглядових повідомлень"
       }
     },
     "titleLang": {
@@ -205,6 +205,8 @@
     "hueMaxMinutes": 0,
     "hueExtDevices": false,
     "hueextMaxMinutes": 0,
+    "innogyDevices": false,
+    "innogyMaxMinutes": 0,
     "jeelinkDevices": false,
     "jeelinkMaxMinutes": 300,
     "lupusecDevices": false,

package/lib/arrApart.js

@@ -133,6 +133,15 @@ const arrApart = {
 		reach: '.reachable',
 		isLowBat: 'none',
 	},
+	innogy: {
+		Selektor: 'innogy-smarthome.*.IsReachable',
+		adapterID: 'innogy',
+		adapter: 'Innogy Smarthome',
+		battery: 'none',
+		rssiState: 'none',
+		reach: '.IsReachable',
+		isLowBat: '.LowBattery',
+	},
 	jeelink: {
 		Selektor: 'jeelink.*.lowBatt',
 		adapterID: 'jeelink',

package/main.js

@@ -85,6 +85,7 @@ class DeviceWatcher extends utils.Adapter {
 				hs100: this.config.hs100Devices,
 				hue: this.config.hueDevices,
 				hueExt: this.config.hueExtDevices,
+				innogy: this.config.innogyDevices,
 				jeelink: this.config.jeelinkDevices,
 				lupusec: this.config.lupusecDevices,
 				maxcube: this.config.maxcubeDevices,
@@ -132,6 +133,7 @@ class DeviceWatcher extends utils.Adapter {
 				hs100: this.config.hs100MaxMinutes,
 				hue: this.config.hueMaxMinutes,
 				hueExt: this.config.hueextMaxMinutes,
+				innogy: this.config.innogyMaxMinutes,
 				jeelink: this.config.jeelinkMaxMinutes,
 				lupusec: this.config.lupusecMaxMinutes,
 				maxcube: this.config.maxcubeMaxMinutes,
@@ -249,92 +251,107 @@ class DeviceWatcher extends utils.Adapter {
 			let oldStatus;
 			let oldSignalStrength;
 
-			for (const i of this.listAllDevicesRaw) {
+			for (const device of this.listAllDevicesRaw) {
 				// On statechange update available datapoint
 				switch (id) {
-					case i.UpdateDP:
+					case device.UpdateDP:
 						if (state.val) {
-							i.Upgradable = state.val;
+							device.Upgradable = state.val;
 
 							await this.createLists();
-
 							await this.writeDatapoints();
-							await this.sendDeviceUpdatesNotification(i.Device, i.Adapter, i.Path);
+							if (this.config.createOwnFolder) await this.createDataForEachAdapter(device.adapterID);
+							if (!this.blacklistNotify.includes(device.Path)) {
+								await this.sendDeviceUpdatesNotification(device.Device, device.Adapter);
+							}
 						}
 						break;
 
-					case i.SignalStrengthDP:
-						oldSignalStrength = i.SignalStrength;
-						i.SignalStrength = await this.calculateSignalStrength(state, i.adapterID);
-						if (oldSignalStrength !== i.SignalStrength) {
+					case device.SignalStrengthDP:
+						oldSignalStrength = device.SignalStrength;
+						device.SignalStrength = await this.calculateSignalStrength(state, device.adapterID);
+						if (oldSignalStrength !== device.SignalStrength) {
 							await this.createLists();
-
 							await this.writeDatapoints();
+							if (this.config.createOwnFolder) await this.createDataForEachAdapter(device.adapterID);
 						}
 						break;
 
-					case i.batteryDP:
-						oldLowBatState = i.LowBat;
-						batteryData = await this.getBatteryData(state.val, oldLowBatState, i.adapterID);
-
-						i.Battery = batteryData[0];
-						i.BatteryRaw = batteryData[2];
-						i.LowBat = await this.setLowbatIndicator(state.val, undefined, i.LowBatDP);
-
-						if (i.LowBat && oldLowBatState !== i.LowBat) {
-							await this.createLists();
-
-							await this.writeDatapoints();
-							if (this.config.checkSendBatteryMsg) {
-								await this.sendLowBatNoticiation(i.Device, i.Adapter, i.Battery, i.Path);
+					case device.batteryDP:
+						if (device.isBatteryDevice) {
+							oldLowBatState = device.LowBat;
+							batteryData = await this.getBatteryData(state.val, oldLowBatState, device.adapterID);
+
+							device.Battery = batteryData[0];
+							device.BatteryRaw = batteryData[2];
+							device.LowBat = await this.setLowbatIndicator(state.val, undefined, device.LowBatDP);
+
+							if (device.LowBat && oldLowBatState !== device.LowBat) {
+								await this.createLists();
+								await this.writeDatapoints();
+								if (this.config.createOwnFolder) await this.createDataForEachAdapter(device.adapterID);
+								if (this.config.checkSendBatteryMsg && !this.blacklistNotify.includes(device.Path)) {
+									await this.sendLowBatNoticiation(device.Device, device.Adapter, device.Battery);
+								}
+							} else if (!device.LowBat && oldLowBatState !== device.LowBat) {
+								await this.createLists();
+								await this.writeDatapoints();
+								if (this.config.createOwnFolder) await this.createDataForEachAdapter(device.adapterID);
 							}
-						} else if (!i.LowBat && oldLowBatState !== i.LowBat) {
-							await this.createLists();
-
-							await this.writeDatapoints();
 						}
 						break;
 
-					case i.LowBatDP:
-						oldLowBatState = i.LowBat;
-						batteryData = await this.getBatteryData(i.BatteryRaw, state.val, i.adapterID);
-						i.Battery = batteryData[0];
-						i.BatteryRaw = batteryData[2];
-						i.LowBat = await this.setLowbatIndicator(i.BatteryRaw, state.val, i.LowBatDP);
-
-						if (i.LowBat && oldLowBatState !== i.LowBat) {
-							await this.createLists();
-
-							await this.writeDatapoints();
-							if (this.config.checkSendBatteryMsg) {
-								await this.sendLowBatNoticiation(i.Device, i.Adapter, i.Battery, i.Path);
+					case device.LowBatDP:
+						if (device.isBatteryDevice) {
+							oldLowBatState = device.LowBat;
+							batteryData = await this.getBatteryData(device.BatteryRaw, state.val, device.adapterID);
+							device.Battery = batteryData[0];
+							device.BatteryRaw = batteryData[2];
+							device.LowBat = await this.setLowbatIndicator(device.BatteryRaw, state.val, device.LowBatDP);
+
+							if (device.LowBat && oldLowBatState !== device.LowBat) {
+								await this.createLists();
+								await this.writeDatapoints();
+								if (this.config.createOwnFolder) await this.createDataForEachAdapter(device.adapterID);
+								if (this.config.checkSendBatteryMsg && !this.blacklistNotify.includes(device.Path)) {
+									await this.sendLowBatNoticiation(device.Device, device.Adapter, device.Battery);
+								}
+							} else if (!device.LowBat && oldLowBatState !== device.LowBat) {
+								await this.createLists();
+								await this.writeDatapoints();
+								if (this.config.createOwnFolder) await this.createDataForEachAdapter(device.adapterID);
 							}
-						} else if (!i.LowBat && oldLowBatState !== i.LowBat) {
-							await this.createLists();
-
-							await this.writeDatapoints();
 						}
+
 						break;
-					case i.UnreachDP:
-					case i.DeviceStateSelectorDP:
-					case i.rssiPeerSelectorDP:
-					case i.Path:
-						oldStatus = i.Status;
-						i.UnreachState = await this.getInitValue(i.UnreachDP);
-						contactData = await this.getOnlineState(i.Path, i.adapterID, i.UnreachDP, i.SignalStrength, i.UnreachState, i.DeviceStateSelectorDP, i.rssiPeerSelectorDP);
+					case device.UnreachDP:
+					case device.DeviceStateSelectorDP:
+					case device.rssiPeerSelectorDP:
+					case device.Path:
+						oldStatus = device.Status;
+						device.UnreachState = await this.getInitValue(device.UnreachDP);
+						contactData = await this.getOnlineState(
+							device.Path,
+							device.adapterID,
+							device.UnreachDP,
+							device.SignalStrength,
+							device.UnreachState,
+							device.DeviceStateSelectorDP,
+							device.rssiPeerSelectorDP,
+						);
 						if (contactData !== undefined) {
-							i.LastContact = contactData[0];
-							i.Status = contactData[1];
-							i.SignalStrength = contactData[2];
+							device.LastContact = contactData[0];
+							device.Status = contactData[1];
+							device.SignalStrength = contactData[2];
 						}
-						if (i.Status !== oldStatus) {
+						if (device.Status !== oldStatus) {
 							await this.createLists();
-
 							await this.writeDatapoints();
+							if (this.config.createOwnFolder) await this.createDataForEachAdapter(device.adapterID);
 						}
 
-						if (i.Status && oldStatus !== i.Status && this.config.checkSendOfflineMsg) {
-							await this.sendOfflineNotifications(i.Device, i.Adapter, i.Status, i.LastContact, i.Path);
+						if (device.Status && oldStatus !== device.Status && this.config.checkSendOfflineMsg && !this.blacklistNotify.includes(device.Path)) {
+							await this.sendOfflineNotifications(device.Device, device.Adapter, device.Status, device.LastContact);
 						}
 						break;
 				}
@@ -780,7 +797,13 @@ class DeviceWatcher extends utils.Adapter {
 
 	/**
 	 * get online state and time
-	 *
+	 * @param {object} id - ID
+	 * @param {string} adapterID - ID of Adapter
+	 * @param {string} unreachDP - Datapoint of Unreach
+	 * @param {object} linkQuality - Linkquality Value
+	 * @param {object} deviceUnreachState - State of deviceUnreach datapoint
+	 * @param {string} deviceStateSelectorDP - Selector of device state (like .state)
+	 * @param {string} rssiPeerSelectorDP - HM RSSI Peer Datapoint
 	 */
 	async getOnlineState(id, adapterID, unreachDP, linkQuality, deviceUnreachState, deviceStateSelectorDP, rssiPeerSelectorDP) {
 		let lastContactString;
@@ -925,17 +948,25 @@ class DeviceWatcher extends utils.Adapter {
 	 * when was last contact of device
 	 */
 	async checkLastContact() {
-		for (const i of this.listAllDevicesRaw) {
-			const oldContactState = i.Status;
-			i.UnreachState = await this.getInitValue(i.UnreachDP);
-			const contactData = await this.getOnlineState(i.Path, i.adapterID, i.UnreachDP, i.SignalStrength, i.UnreachState, i.DeviceStateSelectorDP, i.rssiPeerSelectorDP);
+		for (const device of this.listAllDevicesRaw) {
+			const oldContactState = device.Status;
+			device.UnreachState = await this.getInitValue(device.UnreachDP);
+			const contactData = await this.getOnlineState(
+				device.Path,
+				device.adapterID,
+				device.UnreachDP,
+				device.SignalStrength,
+				device.UnreachState,
+				device.DeviceStateSelectorDP,
+				device.rssiPeerSelectorDP,
+			);
 			if (contactData !== undefined) {
-				i.LastContact = contactData[0];
-				i.Status = contactData[1];
-				i.linkQuality = contactData[2];
+				device.LastContact = contactData[0];
+				device.Status = contactData[1];
+				device.linkQuality = contactData[2];
 			}
-			if (oldContactState !== i.Status) {
-				await this.sendOfflineNotifications(i.Device, i.Adapter, i.Status, i.LastContact, i.Path);
+			if (this.config.checkSendOfflineMsg && oldContactState !== device.Status && !this.blacklistNotify.includes(device.Path)) {
+				await this.sendOfflineNotifications(device.Device, device.Adapter, device.Status, device.LastContact);
 			}
 		}
 		await this.createLists();
@@ -1152,13 +1183,12 @@ class DeviceWatcher extends utils.Adapter {
 				return;
 			}
 		} // <-- end of loop
-		await this.createLists();
 	} // <-- end of createData
 
 	/**
 	 * Create Lists
 	 */
-	async createLists() {
+	async createLists(adptName) {
 		this.linkQualityDevices = [];
 		this.batteryPowered = [];
 		this.batteryLowPowered = [];
@@ -1168,78 +1198,84 @@ class DeviceWatcher extends utils.Adapter {
 		this.offlineDevicesRaw = [];
 		this.upgradableList = [];
 
-		for (const device of this.listAllDevicesRaw) {
-			/*----------  fill raw lists  ----------*/
-			// low bat list
-			if (device.LowBat && device.Status !== 'Offline') {
-				this.batteryLowPoweredRaw.push({
-					Path: device.Path,
-					Device: device.Device,
-					Adapter: device.Adapter,
-					Battery: device.Battery,
-				});
-			}
-			// offline raw list
-			if (device.Status === 'Offline') {
-				this.offlineDevicesRaw.push({
-					Path: device.Path,
-					Device: device.Device,
-					Adapter: device.Adapter,
-					'Last contact': device.LastContact,
-				});
-			}
+		if (adptName === undefined) {
+			adptName = '';
+		}
 
-			/*----------  fill user lists  ----------*/
-			if (!this.blacklistLists.includes(device.Path)) {
-				this.listAllDevices.push({
-					Device: device.Device,
-					Adapter: device.Adapter,
-					Battery: device.Battery,
-					'Signal strength': device.SignalStrength,
-					'Last contact': device.LastContact,
-					Status: device.Status,
-				});
-				// LinkQuality lists
-				if (device.SignalStrength != ' - ') {
-					this.linkQualityDevices.push({
-						Device: device.Device,
-						Adapter: device.Adapter,
-						'Signal strength': device.SignalStrength,
-					});
-				}
-				// Battery lists
-				if (device['isBatteryDevice']) {
-					this.batteryPowered.push({
-						Device: device.Device,
-						Adapter: device.Adapter,
-						Battery: device.Battery,
-						Status: device.Status,
-					});
-				}
-				// Low Bat lists
+		for (const device of this.listAllDevicesRaw) {
+			if (device.adapterID.includes(adptName)) {
+				/*----------  fill raw lists  ----------*/
+				// low bat list
 				if (device.LowBat && device.Status !== 'Offline') {
-					this.batteryLowPowered.push({
+					this.batteryLowPoweredRaw.push({
+						Path: device.Path,
 						Device: device.Device,
 						Adapter: device.Adapter,
 						Battery: device.Battery,
 					});
 				}
-
-				// Offline List
+				// offline raw list
 				if (device.Status === 'Offline') {
-					this.offlineDevices.push({
+					this.offlineDevicesRaw.push({
+						Path: device.Path,
 						Device: device.Device,
 						Adapter: device.Adapter,
 						'Last contact': device.LastContact,
 					});
 				}
 
-				// Device update List
-				if (device.Upgradable) {
-					this.upgradableList.push({
+				/*----------  fill user lists  ----------*/
+				if (!this.blacklistLists.includes(device.Path)) {
+					this.listAllDevices.push({
 						Device: device.Device,
 						Adapter: device.Adapter,
+						Battery: device.Battery,
+						'Signal strength': device.SignalStrength,
+						'Last contact': device.LastContact,
+						Status: device.Status,
 					});
+					// LinkQuality lists
+					if (device.SignalStrength != ' - ') {
+						this.linkQualityDevices.push({
+							Device: device.Device,
+							Adapter: device.Adapter,
+							'Signal strength': device.SignalStrength,
+						});
+					}
+					// Battery lists
+					if (device['isBatteryDevice']) {
+						this.batteryPowered.push({
+							Device: device.Device,
+							Adapter: device.Adapter,
+							Battery: device.Battery,
+							Status: device.Status,
+						});
+					}
+					// Low Bat lists
+					if (device.LowBat && device.Status !== 'Offline') {
+						this.batteryLowPowered.push({
+							Device: device.Device,
+							Adapter: device.Adapter,
+							Battery: device.Battery,
+						});
+					}
+
+					// Offline List
+					if (device.Status === 'Offline') {
+						this.offlineDevices.push({
+							Device: device.Device,
+							Adapter: device.Adapter,
+							'Last contact': device.LastContact,
+						});
+					}
+
+					// Device update List
+					if (device.Upgradable) {
+						this.upgradableList.push({
+							Device: device.Device,
+							Adapter: device.Adapter,
+						});
+					}
 				}
 			}
 		}
@@ -1281,14 +1317,12 @@ class DeviceWatcher extends utils.Adapter {
 		// create Data for each Adapter in own lists
 		this.log.debug(`Function started: ${this.createDataForEachAdapter.name}`);
 
-		await this.resetVars(); // reset the arrays and counts
-
 		try {
-			for (const i of this.listAllDevicesRaw) {
-				if (i.adapterID.includes(adptName)) {
+			for (const device of this.listAllDevicesRaw) {
+				if (device.adapterID.includes(adptName)) {
 					// list device only if selected adapter matched with device
-					await this.createLists();
-					await this.writeDatapoints();
+					await this.createLists(adptName);
+					await this.writeDatapoints(adptName);
 				}
 			}
 
@@ -1307,10 +1341,9 @@ class DeviceWatcher extends utils.Adapter {
 		this.log.debug(`Function started: ${this.createDataOfAllAdapter.name}`);
 
 		try {
-			await this.resetVars(); // reset the arrays and counts
-
 			for (let i = 0; i < this.arrDev.length; i++) {
 				await this.createData(i);
+				await this.createLists();
 			}
 			await this.writeDatapoints(); // fill the datapoints
 		} catch (error) {
@@ -1525,21 +1558,18 @@ class DeviceWatcher extends utils.Adapter {
 	 * @param {string} deviceName
 	 * @param {string} adapter
 	 * @param {string} battery
-	 * @param {string} devicePath
 	 **/
-	async sendLowBatNoticiation(deviceName, adapter, battery, devicePath) {
+	async sendLowBatNoticiation(deviceName, adapter, battery) {
 		this.log.debug(`Start the function: ${this.sendLowBatNoticiation.name}`);
 
 		try {
 			let msg = '';
 			let deviceList = '';
 
-			if (!this.blacklistNotify.includes(devicePath)) {
-				if (!this.config.showAdapterNameinMsg) {
-					deviceList = `${deviceList}\n${deviceName} (${battery})`;
-				} else {
-					deviceList = `${deviceList}\n${adapter}: ${deviceName} (${battery})`;
-				}
+			if (!this.config.showAdapterNameinMsg) {
+				deviceList = `${deviceList}\n${deviceName} (${battery})`;
+			} else {
+				deviceList = `${deviceList}\n${adapter}: ${deviceName} (${battery})`;
 			}
 			msg = `Gerät mit geringer Batterie erkannt: \n`;
 
@@ -1554,21 +1584,24 @@ class DeviceWatcher extends utils.Adapter {
 
 	/**
 	 * send message if an device is offline
+	 * @param {string} deviceName
+	 * @param {string} adapter
+	 * @param {string} status
+	 * @param {string} lastContact
 	 */
-	async sendOfflineNotifications(deviceName, adapter, status, lastContact, devicePath) {
+	async sendOfflineNotifications(deviceName, adapter, status, lastContact) {
 		this.log.debug(`Start the function: ${this.sendOfflineNotifications.name}`);
 
 		try {
 			let msg = '';
 			let deviceList = '';
 
-			if (!this.blacklistNotify.includes(devicePath)) {
-				if (!this.config.showAdapterNameinMsg) {
-					deviceList = `${deviceList}\n${deviceName} (${lastContact})`;
-				} else {
-					deviceList = `${deviceList}\n${adapter}: ${deviceName} (${lastContact})`;
-				}
+			if (!this.config.showAdapterNameinMsg) {
+				deviceList = `${deviceList}\n${deviceName} (${lastContact})`;
+			} else {
+				deviceList = `${deviceList}\n${adapter}: ${deviceName} (${lastContact})`;
 			}
+
 			if (status === 'Online') {
 				// make singular if it is only one device
 				msg = 'Folgendes Gerät ist wieder erreichbar: \n';
@@ -1644,22 +1677,20 @@ class DeviceWatcher extends utils.Adapter {
 	 * check if device updates are available and send notification
 	 * @param {string} deviceName
 	 * @param {string} adapter
-	 * @param {string} devicePath
 	 **/
-	async sendDeviceUpdatesNotification(deviceName, adapter, devicePath) {
+	async sendDeviceUpdatesNotification(deviceName, adapter) {
 		this.log.debug(`Start the function: ${this.sendDeviceUpdatesNotification.name}`);
 
 		try {
 			let msg = '';
 			let deviceList = '';
 
-			if (!this.blacklistNotify.includes(devicePath)) {
-				if (!this.config.showAdapterNameinMsg) {
-					deviceList = `${deviceList}\n${deviceName}`;
-				} else {
-					deviceList = `${deviceList}\n${adapter}: ${deviceName}`;
-				}
+			if (!this.config.showAdapterNameinMsg) {
+				deviceList = `${deviceList}\n${deviceName}`;
+			} else {
+				deviceList = `${deviceList}\n${adapter}: ${deviceName}`;
 			}
+
 			msg = `Neue Geräte Updates vorhanden: \n`;
 
 			this.log.info(msg + deviceList);
@@ -1725,36 +1756,6 @@ class DeviceWatcher extends utils.Adapter {
 		}
 	} //<--End of daily offline notification
 
-	/**
-	 * reset arrays and counts
-	 */
-	async resetVars() {
-		//Reset all arrays and counts
-		this.log.debug(`Function started: ${this.resetVars.name}`);
-
-		// arrays
-		this.offlineDevices = [];
-		this.linkQualityDevices = [];
-		this.batteryPowered = [];
-		this.batteryLowPowered = [];
-		this.listAllDevices = [];
-		//this.listAllDevicesRaw = [];
-
-		// raws
-		this.batteryLowPoweredRaw = [];
-		this.offlineDevicesRaw = [];
-
-		// counts
-		this.offlineDevicesCount = 0;
-		this.deviceCounter = 0;
-		this.linkQualityCount = 0;
-		this.batteryPoweredCount = 0;
-		this.lowBatteryPoweredCount = 0;
-		this.upgradableDevicesCount = 0;
-
-		this.log.debug(`Function finished: ${this.resetVars.name}`);
-	} // <-- end of resetVars
-
 	/**
 	 * @param {string} [adptName] - Adaptername
 	 */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.device-watcher",
-  "version": "2.2.0",
+  "version": "2.2.1",
   "description": "Watchdog for devices",
   "author": {
     "name": "Christian Behrends",