iobroker.device-watcher 2.8.5 → 2.9.0

package/README.md

@@ -189,6 +189,12 @@ It's possible to select:
     Placeholder for the next version (at the beginning of the line):
     ### **WORK IN PROGRESS**
 -->
+### 2.9.0 (2023-04-26)
+
+-   (ciddi89) Fixed: Deactivated instances were not displayed in the daily message about deactivated instances
+-   (ciddi89) Added: Viessmann devices, Homekit-Controller devices
+-   (ciddi89) Improvements: Text of overview messages
+
 ### 2.8.5 (2023-04-20)
 
 -   (ciddi89) Fixed: Error that instances can not be added to the blacklist because of the popup message [#172](https://github.com/ciddi89/ioBroker.device-watcher/issues/172)

package/admin/jsonConfig.json

@@ -142,6 +142,13 @@
 					"lg": 3,
 					"label": "Home Connect"
 				},
+				"homekitControllerDevices": {
+					"type": "checkbox",
+					"sm": 6,
+					"md": 6,
+					"lg": 3,
+					"label": "Homekit-Controller"
+				},
 				"hs100Devices": {
 					"type": "checkbox",
 					"sm": 6,
@@ -352,6 +359,13 @@
 					"lg": 3,
 					"label": "Unifi"
 				},
+				"viessmannDevices": {
+					"type": "checkbox",
+					"sm": 6,
+					"md": 6,
+					"lg": 3,
+					"label": "Viessmann"
+				},
 				"wledDevices": {
 					"type": "checkbox",
 					"sm": 6,
@@ -1875,6 +1889,18 @@
 					"hidden": "!data.homeconnectDevices",
 					"hideOnlyControl": false
 				},
+				"homekitControllerMaxMinutes": {
+					"type": "number",
+					"min": -1,
+					"max": 100000,
+					"sm": 6,
+					"md": 6,
+					"lg": 3,
+					"label": "Homekit-Controller",
+					"help": "in minutes",
+					"hidden": "!data.homekitControllerDevices",
+					"hideOnlyControl": false
+				},
 				"hs100MaxMinutes": {
 					"type": "number",
 					"min": 1,
@@ -2247,6 +2273,18 @@
 					"hidden": "!data.unifiDevices",
 					"hideOnlyControl": false
 				},
+				"viessmannMaxMinutes": {
+					"type": "number",
+					"min": -1,
+					"max": 100000,
+					"sm": 6,
+					"md": 6,
+					"lg": 3,
+					"label": "Viessmann",
+					"help": "in minutes",
+					"hidden": "!data.viessmannDevices",
+					"hideOnlyControl": false
+				},
 				"wledMaxMinutes": {
 					"type": "number",
 					"min": -1,

package/io-package.json

@@ -1,8 +1,21 @@
 {
 	"common": {
 		"name": "device-watcher",
-		"version": "2.8.5",
+		"version": "2.9.0",
 		"news": {
+			"2.9.0": {
+				"en": "Fixed: Deactivated instances were not displayed in the daily message about deactivated instances\nAdded: Viessmann devices, Homekit-Controller devices\nImprovements: Text of overview messages",
+				"de": "Behoben: Deaktivierte Instanzen wurden nicht in den Übersichtnachrichten über deaktivierte Instanzen angezeigt\nHinzugefügt: Viessmann Geräte, Homekit-Controller Geräte\nVerbesserungen: Text der Übersichtsnachrichten",
+				"ru": "Исправлено: Отключенные экземпляры не отображались в ежедневном сообщении о деактивированных инстанциях\nДобавлены: Viessmann устройства, Homekit-Controller устройства\nУлучшения: Текст обзорных сообщений",
+				"pt": "Corrigido: As instâncias desativadas não foram exibidas na mensagem diária sobre instâncias desativadas\nAdicionado: dispositivos Viessmann, dispositivos Homekit-Controller\nMelhorias: Texto de mensagens de visão geral",
+				"nl": "Gedeactiveerde instanties werden niet getoond in de dagelijkse boodschap over gedeactiveerde instanties\nVertaling:\nImprovementen: Text of overzicht berichten",
+				"fr": "Correction : Les instances désactivées n'ont pas été affichées dans le message quotidien concernant les instances désactivées\nAjouté: Appareils Viessmann, Dispositifs Homekit-Controller\nAméliorations : Texte des messages d ' aperçu",
+				"it": "Risolto: Le istanze disattivate non sono state visualizzate nel messaggio quotidiano sulle istanze disattivate\nAggiunto: dispositivi Viessmann, dispositivi Homekit-Controller\nMiglioramenti: Testo dei messaggi di panoramica",
+				"es": "Fijo: No se mostraron casos desactivados en el mensaje diario sobre casos desactivados\nAñadido: dispositivos Viessmann, dispositivos Homekit-Controller\nMejoras: Texto de los mensajes de visión general",
+				"pl": "Na przykładzie uaktywniono: Zdeaktywowane instancje nie były wyświetlane w codziennym wiadomości o deaktywowanych instancjach\nAdded: urządzenia Viessmanna\nPoprawa: Tekst overview",
+				"uk": "Виправлено: Деактивовані екземпляри не відображалися в щоденному повідомленні про деактивовані екземпляри\nДодано: пристрої Viessmann, пристрої Homekit-Controller\nУдосконалення: Текст повідомлення",
+				"zh-cn": "Fixed:Deactiving cases的每日信息未显示有关违犯事件的报道。\n增 编:维斯曼装置、家里克特-Controller装置\n改进: 总讯案文"
+			},
 			"2.8.5": {
 				"en": "Fixed: Error that instances can not be added to the blacklist because of the popup message [#172](https://github.com/ciddi89/ioBroker.device-watcher/issues/172)\nFixed: That messages have been sent when the instance has briefly jumped from Enabled to Disabled and back to Enabled [#173](https://github.com/ciddi89/ioBroker.device-watcher/issues/173)",
 				"de": "Behoben: Fehler, dass Instanzen aufgrund der Popup-Nachricht nicht zur Blacklist hinzugefügt werden können [#172](https://github.com/ciddi89/ioBroker.device-watcher/issues/172)\nBehoben: Das Meldungen gesendet wurden, wenn die Instanz kurz von Aktiviert auf Deaktiviert und zurück zu Aktiviert gesprungen ist [#173](https://github.com/ciddi89/ioBroker.device-watcher/issues/173)",
@@ -80,19 +93,6 @@
 				"pl": "Added: wsparcie dla LOQED Smart Lock\nAdded: Option to add user/group api key\nAdded: Option, aby wysłać powiadomienie, czy instancja została zatrzymana\nAdded: Option to send castule notification with overview of a zatrzymane instancje\nFixed: Wydanie, jeśli powiadomienia zostały wysłane z przerwy, ale opcja nie została wybrana\nFixed: Ignore akumulatory 0%, jeśli nie były one mniejsze niż 5% przed rozpoczęciem budowy",
 				"uk": "Доданий: Підтримка LOQED Смарт блокування\nДодано: Параметри, щоб додати ключ користувача / групи Api для Pushover\nДоданий: Опція надсилати повідомлення, якщо було припинено\nДодано: Опція для відправки повідомлень про скидання з оглядом припинених екземплярів\nВиправлено: Питання, якщо повідомлення було відправлено припинено, але варіант не був обраний\nВиправлено: значення Ignore батареї 0%, якщо вони не менше 5% до",
 				"zh-cn": "增加:支持LOQED Smart Lock\n增 编:增加用户/集群的备选办法\n增加:如果某一例子被停止,可发出通知。\n增 编:发出简写通知,概述停止事件\nIxed:如果发出通知被阻止,但选择是选择的。\n固定:Ignore电池数值.0%"
-			},
-			"2.7.1": {
-				"en": "Added: Support for Ecovacs-Deebot\nUpdated: Dependencies\nImprovements: Small fixes",
-				"de": "Hinzugefügt: Unterstützung für Ecovacs-Deebot\nAktualisiert: Abhängigkeiten\nVerbesserungen: Kleine Verbesserungen",
-				"ru": "Добавлена: Поддержка Ecovacs-Deebot\nОбновлено: зависимости\nУлучшения: Небольшие исправления",
-				"pt": "Adicionado: Suporte para Ecovacs-Deebot\nAtualizado: Dependências\nMelhorias: Pequenas correções",
-				"nl": "Vertaling:\nOpgepast\nImprovementen: Kleine fixes",
-				"fr": "Ajouté: Soutien à Ecovacs-Deebot\nActualisé : dépenses\nAméliorations : Petites corrections",
-				"it": "Aggiunto: Supporto per Ecovacs-Deebot\nAggiornato: Dipendenze\nMiglioramenti: Piccole correzioni",
-				"es": "Añadido: Apoyo para Ecovacs-Deebot\nActualizado: Dependencias\nMejoras: Arreglos pequeños",
-				"pl": "Wsparcie dla Ecovac-Deebota\nZastrzeżenie: Zależność\nPoprawa: drobne rozwiązanie",
-				"uk": "Додано: Підтримка Ecovacs-Deebot\nОновлено: Залежності\nУдосконалення: Маленькі кріплення",
-				"zh-cn": "增加:支持Ecovacs-Deebot\n更新:属地\n改进: 小型配件"
 			}
 		},
 		"titleLang": {
@@ -234,6 +234,8 @@
 		"hmrpcMaxMinutes": 0,
 		"homeconnectDevices": false,
 		"homeconnectMaxMinutes": 0,
+		"homekitControllerDevices": false,
+		"homekitControllerMaxMinutes": 0,
 		"hs100Devices": false,
 		"hs100MaxMinutes": 300,
 		"hueDevices": false,
@@ -295,6 +297,8 @@
 		"tradfriMaxMinutes": 0,
 		"unifiDevices": false,
 		"unifiMaxMinutes": 0,
+		"viessmannDevices": false,
+		"viessmannMaxMinutes": 0,
 		"wledDevices": false,
 		"wledMaxMinutes": 0,
 		"yeelightDevices": false,

package/lib/arrApart.js

@@ -183,6 +183,7 @@ const arrApart = {
 		battery: 'none',
 		reach: '.unreach',
 		isLowBat: '.lowBat',
+		upgrade: '.info.updateState',
 	},
 	hmrpc: {
 		Selektor: 'hm-rpc.*.RSSI_PEER',
@@ -212,6 +213,18 @@ const arrApart = {
 		id: '.name',
 		upgrade: 'none',
 	},
+	homekitController: {
+		Selektor: 'homekit-controller.*.connected',
+		timeSelector: '.lastDiscovered',
+		adapterID: 'homekitController',
+		adapter: 'Homekit Controller',
+		rssiState: 'none',
+		battery: 'none',
+		reach: '.connected',
+		isLowBat: 'none',
+		id: 'none',
+		upgrade: 'none',
+	},
 	hs100: {
 		Selektor: 'hs100.*.last_update',
 		timeSelector: '.last_update',
@@ -525,6 +538,18 @@ const arrApart = {
 		id: 'none',
 		upgrade: '.upgradable',
 	},
+	viessmann: {
+		Selektor: 'viessmann.*.info.connection',
+		timeSelector: '.lastPoll',
+		adapterID: 'viessmann',
+		adapter: 'Viessmann',
+		rssiState: 'none',
+		battery: 'none',
+		reach: '.connection',
+		isLowBat: 'none',
+		id: 'none',
+		upgrade: 'none',
+	},
 	wled: {
 		Selektor: 'wled.*._online',
 		timeSelector: '._online',

package/main.js

@@ -122,6 +122,7 @@ class DeviceWatcher extends utils.Adapter {
 			hmiP: this.config.hmiPDevices,
 			hmrpc: this.config.hmrpcDevices,
 			homeconnect: this.config.homeconnectDevices,
+			homekitController: this.config.homekitControllerDevices,
 			hs100: this.config.hs100Devices,
 			hue: this.config.hueDevices,
 			hueExt: this.config.hueExtDevices,
@@ -153,6 +154,7 @@ class DeviceWatcher extends utils.Adapter {
 			tapo: this.config.tapoDevices,
 			tradfri: this.config.tradfriDevices,
 			unifi: this.config.unifiDevices,
+			viessmann: this.config.viessmannDevices,
 			wled: this.config.wledDevices,
 			yeelight: this.config.yeelightDevices,
 			zigbee: this.config.zigbeeDevices,
@@ -178,6 +180,7 @@ class DeviceWatcher extends utils.Adapter {
 			hmiP: this.config.hmiPMaxMinutes,
 			hmrpc: this.config.hmrpcMaxMinutes,
 			homeconnect: this.config.homeconnectMaxMinutes,
+			homekitController: this.config.homekitControllerMaxMinutes,
 			hs100: this.config.hs100MaxMinutes,
 			hue: this.config.hueMaxMinutes,
 			hueExt: this.config.hueextMaxMinutes,
@@ -209,6 +212,7 @@ class DeviceWatcher extends utils.Adapter {
 			tapo: this.config.tapoMaxMinutes,
 			tradfri: this.config.tradfriMaxMinutes,
 			unifi: this.config.unifiMaxMinutes,
+			viessmann: this.config.viessmannMaxMinutes,
 			wled: this.config.wledMaxMinutes,
 			yeelight: this.config.yeelightMaxMinutes,
 			zigbee: this.config.zigbeeMaxMinutes,
@@ -447,8 +451,8 @@ class DeviceWatcher extends utils.Adapter {
 						// device updates
 						case deviceData.UpdateDP:
 							if (state.val !== deviceData.Upgradable) {
-								deviceData.Upgradable = state.val;
-								if (state.val === true || state.val === 1) {
+								deviceData.Upgradable = await this.checkDeviceUpdate(deviceData.adapterID, state.val);
+								if (deviceData.Upgradable === true) {
 									if (this.config.checkSendDeviceUpgrade && !this.blacklistNotify.includes(deviceData.Path)) {
 										await this.sendStateNotifications('updateDevice', device);
 									}
@@ -1001,18 +1005,24 @@ class DeviceWatcher extends utils.Adapter {
 				/*=============================================
 			=            Get update data	              =
 			=============================================*/
-				const deviceUpdateDP = currDeviceString + this.selAdapter[i].upgrade;
 				let isUpgradable;
+				let deviceUpdateDP;
 
 				if (this.config.checkSendDeviceUpgrade) {
-					const deviceUpdateSelector = await this.getInitValue(deviceUpdateDP);
+					deviceUpdateDP = currDeviceString + this.selAdapter[i].upgrade;
+					let deviceUpdateSelector = await this.getInitValue(deviceUpdateDP);
+					if (deviceUpdateSelector === undefined) {
+						deviceUpdateDP = shortCurrDeviceString + this.selAdapter[i].upgrade;
+						deviceUpdateSelector = await this.getInitValue(deviceUpdateDP);
+						if (deviceUpdateSelector === undefined) {
+							const shortShortCurrDeviceString = shortCurrDeviceString.slice(0, shortCurrDeviceString.lastIndexOf('.') + 1 - 1);
+							deviceUpdateDP = shortShortCurrDeviceString + this.selAdapter[i].upgrade;
+							deviceUpdateSelector = await this.getInitValue(deviceUpdateDP);
+						}
+					}
 
 					if (deviceUpdateSelector !== undefined) {
-						if (deviceUpdateSelector) {
-							isUpgradable = true;
-						} else if (!deviceUpdateSelector) {
-							isUpgradable = false;
-						}
+						isUpgradable = await this.checkDeviceUpdate(adapterID, deviceUpdateSelector);
 					} else {
 						isUpgradable = ' - ';
 					}
@@ -1107,6 +1117,8 @@ class DeviceWatcher extends utils.Adapter {
 				case 'wled':
 				case 'mqttNuki':
 				case 'loqedSmartLock':
+				case 'viessmann':
+				case 'homekitController':
 					if (shortDeviceObject && typeof shortDeviceObject === 'object') {
 						deviceName = shortDeviceObject.common.name;
 					}
@@ -1441,21 +1453,21 @@ class DeviceWatcher extends utils.Adapter {
 						if (this.configMaxMinutes[adapterID] <= 0) {
 							if (deviceUnreachState === 1) {
 								deviceState = 'Offline'; //set online state to offline
-								linkQuality = '0%'; // set linkQuality to nothing
+								if (linkQuality !== ' - ') linkQuality = '0%'; // set linkQuality to nothing
 							}
 						} else if (lastDeviceUnreachStateChange > this.configMaxMinutes[adapterID] && deviceUnreachState === 1) {
 							deviceState = 'Offline'; //set online state to offline
-							linkQuality = '0%'; // set linkQuality to nothing
+							if (linkQuality !== ' - ') linkQuality = '0%'; // set linkQuality to nothing
 						}
 						break;
 					case 'proxmox':
 						if (this.configMaxMinutes[adapterID] <= 0) {
 							if (deviceUnreachState !== 'running' && deviceUnreachState !== 'online') {
-								deviceState = 'Offline'; //set online state to offline
+								if (linkQuality !== ' - ') deviceState = 'Offline'; //set online state to offline
 							}
 						} else if (lastDeviceUnreachStateChange > this.configMaxMinutes[adapterID] && deviceUnreachState !== 'running' && deviceUnreachState !== 'online') {
 							deviceState = 'Offline'; //set online state to offline
-							linkQuality = '0%'; // set linkQuality to nothing
+							if (linkQuality !== ' - ') linkQuality = '0%'; // set linkQuality to nothing
 						}
 						break;
 					case 'hmiP':
@@ -1463,11 +1475,11 @@ class DeviceWatcher extends utils.Adapter {
 						if (this.configMaxMinutes[adapterID] <= 0) {
 							if (deviceUnreachState) {
 								deviceState = 'Offline'; //set online state to offline
-								linkQuality = '0%'; // set linkQuality to nothing
+								if (linkQuality !== ' - ') linkQuality = '0%'; // set linkQuality to nothing
 							}
 						} else if (lastDeviceUnreachStateChange > this.configMaxMinutes[adapterID] && deviceUnreachState) {
 							deviceState = 'Offline'; //set online state to offline
-							linkQuality = '0%'; // set linkQuality to nothing
+							if (linkQuality !== ' - ') linkQuality = '0%'; // set linkQuality to nothing
 						}
 						break;
 					case 'apcups':
@@ -1483,22 +1495,22 @@ class DeviceWatcher extends utils.Adapter {
 						if (this.configMaxMinutes[adapterID] <= 0) {
 							if (!deviceUnreachState) {
 								deviceState = 'Offline'; //set online state to offline
-								linkQuality = '0%'; // set linkQuality to nothing
+								if (linkQuality !== ' - ') linkQuality = '0%'; // set linkQuality to nothing
 							}
 						} else if (!deviceUnreachState && lastDeviceUnreachStateChange > this.configMaxMinutes[adapterID]) {
 							deviceState = 'Offline'; //set online state to offline
-							linkQuality = '0%'; // set linkQuality to nothing
+							if (linkQuality !== ' - ') linkQuality = '0%'; // set linkQuality to nothing
 						}
 						break;
 					case 'mqttClientZigbee2Mqtt':
 						if (this.configMaxMinutes[adapterID] <= 0) {
 							if (deviceUnreachState !== 'online') {
 								deviceState = 'Offline'; //set online state to offline
-								linkQuality = '0%'; // set linkQuality to nothing
+								if (linkQuality !== ' - ') linkQuality = '0%'; // set linkQuality to nothing
 							}
 						} else if (deviceUnreachState !== 'online' && lastDeviceUnreachStateChange > this.configMaxMinutes[adapterID]) {
 							deviceState = 'Offline'; //set online state to offline
-							linkQuality = '0%'; // set linkQuality to nothing
+							if (linkQuality !== ' - ') linkQuality = '0%'; // set linkQuality to nothing
 						}
 						break;
 					case 'mihome':
@@ -1506,21 +1518,21 @@ class DeviceWatcher extends utils.Adapter {
 							if (this.configMaxMinutes[adapterID] <= 0) {
 								if (!deviceUnreachState) {
 									deviceState = 'Offline'; //set online state to offline
-									linkQuality = '0%'; // set linkQuality to nothing
+									if (linkQuality !== ' - ') linkQuality = '0%'; // set linkQuality to nothing
 								}
 							} else if (lastContact && lastContact > this.configMaxMinutes[adapterID]) {
 								deviceState = 'Offline'; //set online state to offline
-								linkQuality = '0%'; // set linkQuality to nothing
+								if (linkQuality !== ' - ') linkQuality = '0%'; // set linkQuality to nothing
 							}
 						} else {
 							if (this.config.mihomeMaxMinutes <= 0) {
 								if (this.configMaxMinutes[adapterID] <= 0) {
 									deviceState = 'Offline'; //set online state to offline
-									linkQuality = '0%'; // set linkQuality to nothing
+									if (linkQuality !== ' - ') linkQuality = '0%'; // set linkQuality to nothing
 								}
 							} else if (lastContact && lastContact > this.configMaxMinutes[adapterID]) {
 								deviceState = 'Offline'; //set online state to offline
-								linkQuality = '0%'; // set linkQuality to nothing
+								if (linkQuality !== ' - ') linkQuality = '0%'; // set linkQuality to nothing
 							}
 						}
 						break;
@@ -1528,22 +1540,22 @@ class DeviceWatcher extends utils.Adapter {
 						if (this.configMaxMinutes[adapterID] <= 0) {
 							if (deviceUnreachState === 'OFFLINE') {
 								deviceState = 'Offline'; //set online state to offline
-								linkQuality = '0%'; // set linkQuality to nothing
+								if (linkQuality !== ' - ') linkQuality = '0%'; // set linkQuality to nothing
 							}
 						} else if (deviceUnreachState === 'OFFLINE' && lastDeviceUnreachStateChange > this.configMaxMinutes[adapterID]) {
 							deviceState = 'Offline'; //set online state to offline
-							linkQuality = '0%'; // set linkQuality to nothing
+							if (linkQuality !== ' - ') linkQuality = '0%'; // set linkQuality to nothing
 						}
 						break;
 					default:
 						if (this.configMaxMinutes[adapterID] <= 0) {
 							if (!deviceUnreachState) {
 								deviceState = 'Offline'; //set online state to offline
-								linkQuality = '0%'; // set linkQuality to nothing
+								if (linkQuality !== ' - ') linkQuality = '0%'; // set linkQuality to nothing
 							}
 						} else if (lastContact && lastContact > this.configMaxMinutes[adapterID]) {
 							deviceState = 'Offline'; //set online state to offline
-							linkQuality = '0%'; // set linkQuality to nothing
+							if (linkQuality !== ' - ') linkQuality = '0%'; // set linkQuality to nothing
 						}
 						break;
 				}
@@ -1583,8 +1595,35 @@ class DeviceWatcher extends utils.Adapter {
 		}
 	}
 
+	/**
+	 * @param {any} adapterID
+	 * @param {string | number | boolean | null} deviceUpdateSelector
+	 */
+	async checkDeviceUpdate(adapterID, deviceUpdateSelector) {
+		let isUpgradable;
+
+		switch (adapterID) {
+			case 'hmiP':
+				if (deviceUpdateSelector === 'UPDATE_AVAILABLE') {
+					isUpgradable = true;
+				} else {
+					isUpgradable = false;
+				}
+				break;
+			default:
+				if (deviceUpdateSelector) {
+					isUpgradable = true;
+				} else if (!deviceUpdateSelector) {
+					isUpgradable = false;
+				}
+		}
+
+		return isUpgradable;
+	}
+
 	/**
 	 * Create Lists
+	 * @param {string | undefined} [adptName]
 	 */
 	async createLists(adptName) {
 		this.linkQualityDevices = [];
@@ -3057,10 +3096,22 @@ class DeviceWatcher extends utils.Adapter {
 						}
 					}
 					if (list.length === 0) return;
-					message = `Tägliche Meldung über Geräte mit niedrigen Batteriezuständen: ${list}`;
+
+					switch (checkDays.length) {
+						case 1:
+							message = `Wöchentliche Übersicht über Geräte mit niedrigen Batteriezuständen: ${list}`;
+							break;
+						case 7:
+							message = `Tägliche Übersicht über Geräte mit niedrigen Batteriezuständen: ${list}`;
+							break;
+						default:
+							message = `Übersicht über Geräte mit niedrigen Batteriezuständen: ${list}`;
+							break;
+					}
 					setMessage(message);
 				});
 				break;
+
 			case 'offlineDevices':
 				// push the selected days in list
 				if (this.config.checkOfflineMonday) checkDays.push(1);
@@ -3093,10 +3144,22 @@ class DeviceWatcher extends utils.Adapter {
 					}
 
 					if (list.length === 0) return;
-					message = `Tägliche Meldung über offline Geräte: ${list}`;
+
+					switch (checkDays.length) {
+						case 1:
+							message = `Wöchentliche Übersicht über offline Geräte: ${list}`;
+							break;
+						case 7:
+							message = `Tägliche Übersicht über offline Geräte: ${list}`;
+							break;
+						default:
+							message = `Übersicht über offline Geräte: ${list}`;
+							break;
+					}
 					setMessage(message);
 				});
 				break;
+
 			case 'updateDevices':
 				// push the selected days in list
 				if (this.config.checkUpgradeMonday) checkDays.push(1);
@@ -3128,10 +3191,22 @@ class DeviceWatcher extends utils.Adapter {
 						}
 					}
 					if (list.length === 0) return;
-					message = `Tägliche Meldung über verfügbare Geräte Updates: ${list}`;
+
+					switch (checkDays.length) {
+						case 1:
+							message = `Wöchentliche Übersicht über verfügbare Geräte Updates: ${list}`;
+							break;
+						case 7:
+							message = `Tägliche Übersicht über verfügbare Geräte Updates: ${list}`;
+							break;
+						default:
+							message = `Übersicht über verfügbare Geräte Updates: ${list}`;
+							break;
+					}
 					setMessage(message);
 				});
 				break;
+
 			case 'updateAdapter':
 				// push the selected days in list
 				if (this.config.checkAdapterUpdateMonday) checkDays.push(1);
@@ -3158,10 +3233,22 @@ class DeviceWatcher extends utils.Adapter {
 						list = `${list}\n${id.Adapter}: v${id['Available Version']}`;
 					}
 					if (list.length === 0) return;
-					message = `Tägliche Meldung über verfügbare Adapter Updates: ${list}`;
+
+					switch (checkDays.length) {
+						case 1:
+							message = `Wöchentliche Übersicht über verfügbare Adapter Updates: ${list}`;
+							break;
+						case 7:
+							message = `Tägliche Übersicht über verfügbare Adapter Updates: ${list}`;
+							break;
+						default:
+							message = `Übersicht über verfügbare Adapter Updates: ${list}`;
+							break;
+					}
 					setMessage(message);
 				});
 				break;
+
 			case 'errorInstance':
 				// push the selected days in list
 				if (this.config.checkFailedInstancesMonday) checkDays.push(1);
@@ -3212,13 +3299,24 @@ class DeviceWatcher extends utils.Adapter {
 				cron = '5 ' + time[1] + ' ' + time[0] + ' * * ' + checkDays;
 				schedule.scheduleJob(cron, () => {
 					list = '';
-
 					for (const id of this.listDeactivatedInstances) {
-						if (this.blacklistInstancesNotify.includes(id)) continue;
-						list = `${list}\n${id}`;
+						if (this.blacklistInstancesNotify.includes(id.Instance)) continue;
+						list = `${list}\n${id.Instance}`;
 					}
+
 					if (list.length === 0) return;
-					message = `Tägliche Meldung über deaktivierte Instanzen: ${list}`;
+
+					switch (checkDays.length) {
+						case 1:
+							message = `Wöchentliche Übersicht über deaktivierte Instanzen: ${list}`;
+							break;
+						case 7:
+							message = `Tägliche Übersicht über deaktivierte Instanzen: ${list}`;
+							break;
+						default:
+							message = `Übersicht über deaktivierte Instanzen: ${list}`;
+							break;
+					}
 					setMessage(message);
 				});
 				break;

package/package.json

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