iobroker.device-watcher 2.3.0 → 2.3.1

package/README.md

@@ -174,11 +174,21 @@ It's possible to select:
     Placeholder for the next version (at the beginning of the line):
     ### **WORK IN PROGRESS**
 -->
+### 2.3.1 (2023-01-05)
+
+-   (ciddi89) changed HMRPC lowbat to lowbat_alarm
+-   (ciddi89) changed HMRPC unreach to unreach_alarm
+-   (ciddi89) fixed nuki mqtt selector
+-   (ciddi89) added shelly charge datapoint to identify battery devices better
+-   (ciddi89) fixed lowbat issues
+-   (ciddi89) added lowbat support for HMRPC: HM-CC-RT-DN
+-   (ciddi89) added additionally timeSelector for each adapter for better support
+
 ### 2.3.0 (2023-01-03)
 
 -   (ciddi89) sorting for device selection in the blacklist added
 -   (ciddi89) Devices can now also be blacklisted in adapter own list
--   (ciddi89) booleans for lowbat, offline and upgradable added
+-   (ciddi89) booleans for lowbat, offline and upgradable added ([#105](https://github.com/ciddi89/ioBroker.device-watcher/issues/105))
 -   (ciddi89) euSec adapter added ([#73](https://github.com/ciddi89/ioBroker.device-watcher/issues/73))
 
 ### 2.2.2 (2022-12-29)

package/admin/jsonConfig.json

@@ -1134,7 +1134,7 @@
 				},
 				"eusecMaxMinutes": {
 					"type": "number",
-					"min": -1,
+					"min": 1,
 					"max": 100000,
 					"sm": 6,
 					"md": 6,

package/io-package.json

@@ -1,8 +1,21 @@
 {
   "common": {
     "name": "device-watcher",
-    "version": "2.3.0",
+    "version": "2.3.1",
     "news": {
+      "2.3.1": {
+        "en": "changed HMRPC lowbat to lowbat_alarm\nchanged HMRPC unreach to unreach_alarm\nfixed nuki mqtt selector\nadded shelly charge datapoint to identify battery devices better\nfixed lowbat issues\nadded lowbat support for HMRPC: HM-CC-RT-DN\nadded additionally timeSelector for each adapter for better support",
+        "de": "hMRPC lowbat zu lowbat_alarm\nhMRPC unreach to unreach_alarm\nfeste nuki mqt selektion\nhinzugefügt shelly-ladedatenpunkt, um batteriegeräte besser zu identifizieren\nfeste lowbat-probleme\nzusätzliche Lowbat-Unterstützung für HMRPC: HM-CC-RT-DN\nzusätzliche ZeitSelector für jeden Adapter für bessere Unterstützung",
+        "ru": "изменено HMRPC lowbat на lowbat_alarm\nизменил HMRPC unreach к unreach_alarm\nфиксированный нуки mqtt selector\nдобавлена точка заряда оболочки, чтобы определить устройства батареи лучше\nфиксированные низкобатные вопросы\nдобавлена поддержка lowbat для HMRPC: HM-CC-RT-DN\nдобавлено дополнительно timeSelector для каждого адаптера для лучшей поддержки",
+        "pt": "mudou HMRPC lowbat para lowbat_alarm\nmudou HMRPC unreach para unreach_alarm\nseletor nuki mqtt fixo\nadicionado shelly carregar datapoint para identificar dispositivos de bateria melhor\nproblemas fixos\nsuporte adicional de lowbat para HMRPC: HM-CC-RT-DN\nadicionado adicionalmente tempoSeletor para cada adaptador para melhor suporte",
+        "nl": "veranderde HMRPC laagbat om te zakken\nveranderde HMRPC onbereikbaar om te ontrafelen\nvertaling:\nvoegde toegevoegde lading datapoint toe om accu apparatuur te identificeren\ngerepareerde lage problemen\nhM-C-RTN\nvoeg extra tijdsversneller toe voor elke adapter voor betere steun",
+        "fr": "changement de HMRPC basbat to lowbat_alarm\nchangé HMRPC unreach to unreach_alarm\nsélecteur fixe nuki mqt\nle point de données de charge shelly ajouté pour identifier les appareils de batterie mieux\nquestions de bas niveau\nsupport de faible teneur pour HMRPC: HM-CC-RT-DN\nsupplémentaire timeSelector pour chaque adaptateur pour un meilleur support",
+        "it": "cambiato HMRPC lowbat a lowbat_alarm\ncambiato HMRPC unreach a unreach_alarm\nselettore fisso nuki mqtt\naggiunto shelly carica datapoint per identificare meglio i dispositivi della batteria\nproblemi fissi a bassa pressione\nsupporto per HMRPC: HM-CC-RT-DN\naggiunto anche tempoSelettore per ogni adattatore per un miglior supporto",
+        "es": "cambio HMRPC bajobat a lowbat_alarm\ncambió HMRPC sin llegar a unreach_alarm\nfija nuki mqtt selector\nañadir datos de carga total para identificar dispositivos de batería mejor\ncuestiones fijas de baja reducción\nagregado soporte de bajavo para HMRPC: HM-CC-RT-DN\nañadido tiempoSeleccionador para cada adaptador para un mejor soporte",
+        "pl": "zmienił niskobudżetowy słupek HMRPC\nzmienił HMRPC nieodwracany\nnuki mqtt selektor\ndodany punkt ładowania sygnału do identyfikowania urządzeń baterii znacznie lepszy\nniskobata\nwsparcie dla HMRPC: HM-CC-RT-DN\ndodano dodatkowy czas dla każdego adaptera dla lepszego wsparcia",
+        "uk": "змінив HMRPC низькобажан до низької bat_alarm\nзмінив HMRPC unreach_alarm\nфіксований nuki mqtt selector\nдодана точка заряду оболонки для виявлення пристроїв акумулятора краще\nвиправлені проблеми з низькою вагою\nhM-CC-RT-DN\nдодано додатково часСелектор для кожного адаптера для кращої підтримки",
+        "zh-cn": "mR 低巴\nb. MRPC Unach的改变\n固定微基米特选\n增拨的炮击数据点,以查明电池装置,改善\n固定的低巴特问题\n减少对影响方案的支持:HM-CC-DNRT-DN\n每个适应者增加更多时间,以更好地支助"
+      },
       "2.3.0": {
         "en": "sorting for device selection in the blacklist added\nDevices can now also be blacklisted in adapter own list\nbooleans for lowbat, offline and upgradable added\neuSec adapter added ([#73](https://github.com/ciddi89/ioBroker.device-watcher/issues/73))",
         "de": "sortierung für geräteauswahl in der blacklist hinzugefügt\nGeräte können jetzt auch in Adapter-Eigenliste schwarz aufgeführt werden\nbooleans für lowbat, offline und aufrüstbar hinzugefügt\neuSec Adapter hinzugefügt #[73](https://github.com/ciddi89/ioBroker.device-watcher/issues/73)",
@@ -80,19 +93,6 @@
         "pl": "bieżący problem z lokalną sprawą W porównaniu z innymi\ndodać\ndodać adapter\nadapter do Sure Flap\nniskojęzyczna wiadomość",
         "uk": "фіксована проблема з місцевими Порівняти\nдодано тапо\nдодано повністю Адаптери\nдоданий Sure Flap адаптер\nфіксовані низькі повідомлення bat",
         "zh-cn": "固定问题 比较\n增 录\n增 编 增 编\n增 编\n固定的低巴特信息"
-      },
-      "2.0.2": {
-        "en": "added status to battery list\nbatt devices which are offline are now still included in the battery list\nsmall improvements of translations\noffline time settings: you can use 0 instead of -1 (it will be the new standard)\nimprovements of adaptername\nfixed issues [#66](https://github.com/ciddi89/ioBroker.device-watcher/issues/66) & [#67](https://github.com/ciddi89/ioBroker.device-watcher/issues/67)\nrepaired blacklist notifications\nadded handling for blacklist object",
-        "de": "status zur batterieliste hinzugefügt\nbatt-geräte, die offline sind, sind jetzt noch in der batterieliste enthalten\nkleine verbesserungen der übersetzungen\noffline-zeiteinstellungen: sie können 0 anstelle -1 verwenden (es wird der neue standard sein)\nverbesserungen des adapternamens\n[#66](https://github.com/ciddi89/ioBroker.device-watcher/issues/66) & [#67](https://github.com/ciddi89/ioBroker.device-watcher/issues/67)\nreparierte blacklist-benachrichtigungen\nzusätzliche handhabung für blacklist-objekt",
-        "ru": "добавлен статус в список батарей\nbatt устройства, которые являются offline, теперь все еще включены в список батарей\nнебольшие улучшения переводов\nоффлайн настройки времени: вы можете использовать 0 вместо -1 (это будет новый стандарт)\nулучшения логины адаптера\nфиксированные вопросы [#66](https://github.com/ciddi89/ioBroker.device-watcher/issues/66) & [#67](https://github.com/ciddi89/ioBroker.device-watcher/issues/67)\nотремонтированный черный список уведомлений\nдобавлена обработка для объекта blacklist",
-        "pt": "status adicionado à lista de bateria\ndispositivos de batedor que estão offline ainda estão incluídos na lista de baterias\npequenas melhorias de traduções\nconfigurações de tempo off-line: você pode usar 0 em vez de -1 (ele será o novo padrão)\nmelhorias do nome do adaptador\n(http://github.com/ciddi89/ioBroker.device-watcher/issues/66) & [#67](https://github.com/ciddi89/ioBroker.device-watcher/issues/67)\nnotificações de lista negra reparadas\nmanipulação adicionada para objeto de lista negra",
-        "nl": "vertaling:\nbatt apparatuur die offline zijn nog steeds in de batterijlijst\nvertaling:\noffline time settings: je kunt 0 gebruiken in plaats van -1 (het zal de nieuwe standaard zijn)\nverbeteringen van adapternaam\nquality over Quantity (QoQ) Releases Vertaling:\nvertaling:\nvertaling:",
-        "fr": "statut ajouté à la liste de piles\nles dispositifs de chauves-souris qui sont hors ligne sont maintenant toujours inclus dans la liste de batterie\npetites améliorations des traductions\nparamètres de temps hors ligne: vous pouvez utiliser 0 au lieu de -1 (il sera la nouvelle norme)\naméliorations du nom d'adaptateur\n(https://github.com/ciddi89/ioBroker.device-watcher/issues/66) \" [#67](https://github.com/ciddi89/ioBroker.device-watcher/issues/67)\nnotifications de listes noires réparées\nmanipulation supplémentaire pour objet blacklist",
-        "it": "stato aggiunto alla lista della batteria\nbatt dispositivi che sono offline sono ora ancora inclusi nella lista della batteria\npiccoli miglioramenti delle traduzioni\nimpostazioni di tempo offline: è possibile utilizzare 0 invece di -1 (è il nuovo standard)\nmiglioramenti del nome dell'adattatore\n(https://github.com/ciddi89/ioBroker.device-watcher/issues/66) & [#67](https://github.com/ciddi89/ioBroker.device-watcher/issues/67)\nnotifiche di blacklist riparate\ngestione aggiuntiva per oggetto blacklist",
-        "es": "estado añadido a la lista de baterías\ndispositivos de batta que están fuera de línea ahora están incluidos en la lista de baterías\npequeñas mejoras de las traducciones\najustes del tiempo fuera de línea: puede utilizar 0 en lugar de -1 (será el nuevo estándar)\nmejoras en el nombre de adaptador\ncuestiones fijas [#66](https://github.com/ciddi89/ioBroker.device-watcher/issues/66) & [#67](https://github.com/ciddi89/ioBroker.device-watcher/issues/67)\nnotificaciones de lista negra reparadas\nmanejo añadido para objeto de lista negra",
-        "pl": "dodany status baterii\nurządzenia z baterią, które są offline, są obecnie włączone do listy baterii\nmałe poprawki tłumaczenia\nwspółczynnikowy: możesz użyć 0 zamiast -1 (jak będzie nowy standard)\nulepszenia adaptername\nnumery stałe (#66(https:/github.com/ciddi89/ioBroker.device-watcher/issues/66) & #67(https:/github.com/ciddi89/ioBroker.device-watcher/67)\nulepszenia czarnej listy\nobsługa blacklist object",
-        "uk": "додано статус до списку акумуляторів\nпристрої для баттів, які в автономному режимі, все ще включені в список акумуляторів\nневеликі поліпшення перекладів\nв автономному режимі настройки часу: ви можете використовувати 0 замість -1 (це буде новий стандарт)\nполіпшення імені адаптера\n[#66](https://github.com/ciddi89/ioBroker.device-watcher/issues/66) & [#67](https://github.com/ciddi89/ioBroker.device-watcher/issues/67)\nвідремонтовані повідомлення blacklist\nдодана обробка для об'єкта blacklist",
-        "zh-cn": "电池清单的附加地位\nb 现仍在列入电池清单的浮动装置\n翻译的小改进\n时限:你可以使用0.而不是1-1(即新标准)\nb. 改进适应人员名\n固定问题[第66](http://github.com/ciddi89/ioBroker.device-watcher/issues/66)和[#67](http://github.com/ciddi89/Broker.device-watcher/issues/67)\n修理黑名单通知\n黑名单目标的新增处理"
       }
     },
     "titleLang": {
@@ -188,7 +188,7 @@
     "esphomeDevices": false,
     "esphomeMaxMinutes": 0,
     "eusecDevices": false,
-    "eusecMaxMinutes": 0,
+    "eusecMaxMinutes": 300,
     "fritzdectDevices": false,
     "fritzdectMaxMinutes": 0,
     "fullybrowserDevices": false,

package/lib/arrApart.js

@@ -1,7 +1,25 @@
 // arrays of supported adapters
+
+/*
+Default Template:
+	adapterID: { 			// ID for adapter, it should be the same name as in settings etc.
+		Selektor: '',		// main datapoint of one device. Should be available for all devices. So the adapter can found all devices
+		timeSelector: '',	// from which datapoint should the time be taken for the last contact
+		adapterID: '',		// same id as above
+		adapter: '',		// Adapter Name for notifications and tables
+		rssiState: 'none',	// rssi or percent datapoint of link quality (optional)
+		battery: 'none',	// battery datapoint (optional)
+		reach: 'none',		// reachable or connected datapoint (optional)
+		isLowBat: 'none',	// lowBat datapoint (optional)
+		id: 'none',			// datapoint with name of device (optional)
+		upgrade: 'none',	// update datapoint that indicates available updates for the device (optional)
+	}
+*/
+
 const arrApart = {
 	alexa2: {
 		Selektor: 'alexa2.*.online',
+		timeSelector: '.online',
 		adapterID: 'alexa2',
 		adapter: 'Alexa2',
 		battery: 'none',
@@ -10,6 +28,7 @@ const arrApart = {
 	},
 	apcups: {
 		Selektor: 'apcups.*.status',
+		timeSelector: '.status',
 		adapterID: 'apcups',
 		adapter: 'Apc UPS',
 		battery: '.batteryCharge',
@@ -19,6 +38,7 @@ const arrApart = {
 	},
 	ble: {
 		Selektor: 'ble.*.rssi',
+		timeSelector: '.rssi',
 		adapterID: 'ble',
 		adapter: 'Ble',
 		battery: '.battery',
@@ -28,6 +48,7 @@ const arrApart = {
 	},
 	deconz: {
 		Selektor: 'deconz.*.reachable',
+		timeSelector: '.reachable',
 		adapterID: 'deconz',
 		adapter: 'Deconz',
 		battery: '.battery',
@@ -36,6 +57,7 @@ const arrApart = {
 	},
 	enocean: {
 		Selektor: 'enocean.*.rssi',
+		timeSelector: '.rssi',
 		adapterID: 'enocean',
 		adapter: 'Enocean',
 		battery: '.BS',
@@ -45,6 +67,7 @@ const arrApart = {
 	},
 	esphome: {
 		Selektor: 'esphome.*._online',
+		timeSelector: '._online',
 		adapterID: 'esphome',
 		adapter: 'ESPHome',
 		battery: 'none',
@@ -54,6 +77,7 @@ const arrApart = {
 	},
 	eusec: {
 		Selektor: 'eusec.*.software_version',
+		timeSelector: '.software_version',
 		adapterID: 'eusec',
 		adapter: 'euSec',
 		battery: '.battery',
@@ -64,6 +88,7 @@ const arrApart = {
 	},
 	fritzdect: {
 		Selektor: 'fritzdect.*.present',
+		timeSelector: '.present',
 		adapterID: 'fritzdect',
 		adapter: 'Fritz Dect',
 		battery: '.battery',
@@ -72,6 +97,7 @@ const arrApart = {
 	},
 	fullybrowser: {
 		Selektor: 'fullybrowser.*.isFullyAlive',
+		timeSelector: '.isFullyAlive',
 		adapterID: 'fullybrowser',
 		adapter: 'fullyBrowser',
 		rssiState: '.Info.wifiSignalLevel',
@@ -83,6 +109,7 @@ const arrApart = {
 	},
 	harmony: {
 		Selektor: 'harmony.*.hubConnected',
+		timeSelector: '.activities.currentStatus',
 		adapterID: 'harmony',
 		adapter: 'Harmony',
 		battery: 'none',
@@ -91,6 +118,7 @@ const arrApart = {
 	},
 	ham: {
 		Selektor: 'ham.*.Battery-Level',
+		timeSelector: '.Battery-Level',
 		adapterID: 'ham',
 		adapter: 'Ham',
 		battery: '.Battery-Level',
@@ -100,6 +128,7 @@ const arrApart = {
 	},
 	hmiP: {
 		Selektor: 'hmip.*.rssiDeviceValue',
+		timeSelector: '.rssiDeviceValue',
 		adapterID: 'hmiP',
 		adapter: 'Homematic IP',
 		rssiState: '.rssiDeviceValue',
@@ -108,19 +137,22 @@ const arrApart = {
 		isLowBat: '.lowBat',
 	},
 	hmrpc: {
-		Selektor: 'hm-rpc.*.UNREACH',
+		Selektor: 'hm-rpc.*.RSSI_PEER',
+		timeSelector: '.UNREACH',
 		adapterID: 'hmrpc',
 		adapter: 'Homematic RPC',
 		rssiState: '.RSSI_DEVICE',
 		rssiPeerState: '.RSSI_PEER',
 		battery: '.OPERATING_VOLTAGE',
-		reach: '.UNREACH',
-		isLowBat: '.LOW_BAT',
-		isLowBat2: '.LOWBAT',
+		reach: '.UNREACH_ALARM',
+		isLowBat: '.LOW_BAT_ALARM',
+		isLowBat2: '.LOWBAT_ALARM',
 		stateValue: '.1.STATE',
+		faultReporting: '.4.FAULT_REPORTING',
 	},
 	hs100: {
 		Selektor: 'hs100.*.last_update',
+		timeSelector: '.last_update',
 		adapterID: 'hs100',
 		adapter: 'hs100',
 		battery: 'none',
@@ -129,6 +161,7 @@ const arrApart = {
 	},
 	hue: {
 		Selektor: 'hue.*.reachable',
+		timeSelector: '.reachable',
 		adapterID: 'hue',
 		adapter: 'Philips Hue',
 		battery: '.battery',
@@ -137,6 +170,7 @@ const arrApart = {
 	},
 	hueExt: {
 		Selektor: 'hue-extended.*.reachable',
+		timeSelector: '.reachable',
 		adapterID: 'hueExt',
 		adapter: 'Philips Hue Extended',
 		battery: '.config.battery',
@@ -145,6 +179,7 @@ const arrApart = {
 	},
 	innogy: {
 		Selektor: 'innogy-smarthome.*.IsReachable',
+		timeSelector: '.IsReachable',
 		adapterID: 'innogy',
 		adapter: 'Innogy Smarthome',
 		battery: 'none',
@@ -154,6 +189,7 @@ const arrApart = {
 	},
 	jeelink: {
 		Selektor: 'jeelink.*.lowBatt',
+		timeSelector: '.lowBatt',
 		adapterID: 'jeelink',
 		adapter: 'Jeelink',
 		battery: 'none',
@@ -162,6 +198,7 @@ const arrApart = {
 	},
 	lupusec: {
 		Selektor: 'lupusec.*.cond_ok',
+		timeSelector: '.cond_ok',
 		adapterID: 'lupusec',
 		adapter: 'Lupusec',
 		battery: 'none',
@@ -172,6 +209,7 @@ const arrApart = {
 	},
 	maxcube: {
 		Selektor: 'maxcube.*.link_error',
+		timeSelector: '.link_error',
 		adapterID: 'maxcube',
 		adapter: 'Max! Cube',
 		battery: 'none',
@@ -180,6 +218,7 @@ const arrApart = {
 	},
 	meross: {
 		Selektor: 'meross.*.online',
+		timeSelector: '.online',
 		adapterID: 'meross',
 		adapter: 'Meross',
 		battery: '.battery',
@@ -188,6 +227,7 @@ const arrApart = {
 	},
 	mihome: {
 		Selektor: 'mihome.*.percent',
+		timeSelector: '.percent',
 		adapterID: 'mihome',
 		adapter: 'MiHome',
 		battery: '.percent',
@@ -196,6 +236,7 @@ const arrApart = {
 	},
 	mihomeGW: {
 		Selektor: 'mihome.*.connected',
+		timeSelector: '.connected',
 		adapterID: 'mihome',
 		adapter: 'MiHome',
 		battery: 'none',
@@ -204,6 +245,7 @@ const arrApart = {
 	},
 	mihomeVacuum: {
 		Selektor: 'mihome-vacuum.*.connection',
+		timeSelector: '.connection',
 		adapterID: 'mihomeVacuum',
 		adapter: 'MiHome Vacuum',
 		rssiState: '.deviceInfo.wifi_signal',
@@ -215,6 +257,7 @@ const arrApart = {
 	},
 	mqttClientZigbee2Mqtt: {
 		Selektor: 'mqtt-client.*.zigbee2mqtt.*.availability',
+		timeSelector: '.availability',
 		adapterID: 'mqttClientZigbee2Mqtt',
 		adapter: 'MQTT-Client',
 		battery: '.battery',
@@ -223,7 +266,8 @@ const arrApart = {
 		isLowBat: '.battery_low',
 	},
 	mqttNuki: {
-		Selektor: 'mqtt.0.nuki.*.rssi',
+		Selektor: 'mqtt.*.nuki.*.rssi',
+		timeSelector: '.rssi',
 		adapterID: 'mqttNuki',
 		adapter: 'MQTT',
 		battery: '.battery.level',
@@ -233,6 +277,7 @@ const arrApart = {
 	},
 	musiccast: {
 		Selektor: 'musiccast.0.*.online',
+		timeSelector: '.online',
 		adapterID: 'musiccast',
 		adapter: 'MusicCast',
 		battery: 'none',
@@ -242,6 +287,7 @@ const arrApart = {
 	},
 	netatmo: {
 		Selektor: 'netatmo.*.LastUpdate',
+		timeSelector: '.LastUpdate',
 		adapterID: 'netatmo',
 		adapter: 'Netatmo',
 		rssiState: '.WifiStatus',
@@ -252,6 +298,7 @@ const arrApart = {
 	},
 	nukiExt: {
 		Selektor: 'nuki-extended.*.lastDataUpdate',
+		timeSelector: '.lastDataUpdate',
 		adapterID: 'nukiExt',
 		adapter: 'Nuki Extended',
 		rssiState: 'none',
@@ -261,6 +308,7 @@ const arrApart = {
 	},
 	nut: {
 		Selektor: 'nut.*.charge',
+		timeSelector: '.charge',
 		adapterID: 'nut',
 		adapter: 'Nut',
 		battery: '.charge',
@@ -269,6 +317,7 @@ const arrApart = {
 	},
 	ping: {
 		Selektor: 'ping.*.alive',
+		timeSelector: '.alive',
 		adapterID: 'ping',
 		adapter: 'Ping',
 		battery: 'none',
@@ -277,6 +326,7 @@ const arrApart = {
 	},
 	roomba: {
 		Selektor: 'roomba.*.signal',
+		timeSelector: '.signal',
 		adapterID: 'roomba',
 		adapter: 'Roomba',
 		battery: '.battery',
@@ -287,17 +337,20 @@ const arrApart = {
 	},
 	shelly: {
 		Selektor: 'shelly.*.uptime',
+		timeSelector: '.uptime',
 		adapterID: 'shelly',
 		adapter: 'Shelly',
 		rssiState: '.rssi',
 		battery: '.sensor.battery',
 		battery2: '.bat.value',
+		charger: '.bat.charger',
 		reach: '.online',
 		isLowBat: 'none',
 		upgrade: '.firmware',
 	},
 	sonoff: {
 		Selektor: 'sonoff.*.alive',
+		timeSelector: '.alive',
 		adapterID: 'sonoff',
 		adapter: 'Sonoff',
 		rssiState: '.Wifi_RSSI',
@@ -308,6 +361,7 @@ const arrApart = {
 	},
 	sonos: {
 		Selektor: 'sonos.*.alive',
+		timeSelector: '.alive',
 		adapterID: 'sonos',
 		adapter: 'Sonos',
 		battery: 'none',
@@ -316,6 +370,7 @@ const arrApart = {
 	},
 	sureflap: {
 		Selektor: 'sureflap.*.online',
+		timeSelector: '.online',
 		adapterID: 'sureflap',
 		adapter: 'Sure Flap',
 		battery: '.battery_percentage',
@@ -324,6 +379,7 @@ const arrApart = {
 	},
 	switchbotBle: {
 		Selektor: 'switchbot-ble.*.rssi',
+		timeSelector: '.rssi',
 		adapterID: 'switchbotBle',
 		adapter: 'Switchbot Ble',
 		battery: '.battery',
@@ -334,6 +390,7 @@ const arrApart = {
 	},
 	tado: {
 		Selektor: 'tado.*.batteryState',
+		timeSelector: '.batteryState',
 		adapterID: 'tado',
 		adapter: 'Tado',
 		rssiState: 'none',
@@ -344,6 +401,7 @@ const arrApart = {
 	},
 	tapo: {
 		Selektor: 'tapo.*.last_update',
+		timeSelector: '.last_update',
 		adapterID: 'tapo',
 		adapter: 'Tapo',
 		rssiState: '.rssi',
@@ -354,6 +412,7 @@ const arrApart = {
 	},
 	tradfri: {
 		Selektor: 'tradfri.*.lastSeen',
+		timeSelector: '.lastSeen',
 		adapterID: 'tradfri',
 		adapter: 'Tradfri',
 		rssiState: 'none',
@@ -364,6 +423,7 @@ const arrApart = {
 	},
 	unifi: {
 		Selektor: 'unifi.*.state',
+		timeSelector: '.uptime',
 		adapterID: 'unifi',
 		adapter: 'Unifi',
 		battery: 'none',
@@ -374,6 +434,7 @@ const arrApart = {
 	},
 	wled: {
 		Selektor: 'wled.*._online',
+		timeSelector: '._online',
 		adapterID: 'wled',
 		adapter: 'WLED',
 		rssiState: '.wifi.rssi',
@@ -384,6 +445,7 @@ const arrApart = {
 	},
 	yeelight: {
 		Selektor: 'yeelight-2.*.connect',
+		timeSelector: '.connect',
 		adapterID: 'yeelight',
 		adapter: 'Yeelight',
 		battery: 'none',
@@ -392,6 +454,7 @@ const arrApart = {
 	},
 	zigbee: {
 		Selektor: 'zigbee.*.link_quality',
+		timeSelector: '.link_quality',
 		adapterID: 'zigbee',
 		adapter: 'Zigbee',
 		battery: '.battery',
@@ -401,6 +464,7 @@ const arrApart = {
 	},
 	zigbee2MQTT: {
 		Selektor: 'zigbee2mqtt.*.link_quality',
+		timeSelector: '.link_quality',
 		adapterID: 'zigbee2MQTT',
 		adapter: 'Zigbee2MQTT',
 		battery: '.battery',
@@ -410,6 +474,7 @@ const arrApart = {
 	},
 	zwave: {
 		Selektor: 'zwave2.*.ready',
+		timeSelector: '.ready',
 		adapterID: 'zwave',
 		adapter: 'Z-wave 2',
 		battery: '.Battery.level',

package/main.js

@@ -250,6 +250,7 @@ class DeviceWatcher extends utils.Adapter {
 			let oldLowBatState;
 			let contactData;
 			let oldStatus;
+			let isLowBatValue;
 
 			for (const device of this.listAllDevicesRaw) {
 				// On statechange update available datapoint
@@ -274,7 +275,12 @@ class DeviceWatcher extends utils.Adapter {
 
 							device.Battery = batteryData[0];
 							device.BatteryRaw = batteryData[2];
-							device.LowBat = await this.setLowbatIndicator(state.val, undefined, device.LowBatDP);
+							if (device.LowBatDP !== 'none') {
+								isLowBatValue = await this.getInitValue(device.LowBatDP);
+							} else {
+								isLowBatValue = undefined;
+							}
+							device.LowBat = await this.setLowbatIndicator(state.val, isLowBatValue, device.faultReport, device.adapterID);
 
 							if (device.LowBat && oldLowBatState !== device.LowBat) {
 								if (this.config.checkSendBatteryMsg && !this.blacklistNotify.includes(device.Path)) {
@@ -290,7 +296,7 @@ class DeviceWatcher extends utils.Adapter {
 							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);
+							device.LowBat = await this.setLowbatIndicator(device.BatteryRaw, state.val, device.faultReport, device.adapterID);
 
 							if (device.LowBat && oldLowBatState !== device.LowBat) {
 								if (this.config.checkSendBatteryMsg && !this.blacklistNotify.includes(device.Path)) {
@@ -298,16 +304,30 @@ class DeviceWatcher extends utils.Adapter {
 								}
 							}
 						}
+						break;
 
+					case device.faultReportDP:
+						if (device.isBatteryDevice) {
+							oldLowBatState = device.LowBat;
+							batteryData = await this.getBatteryData(device.BatteryRaw, oldLowBatState, device.adapterID);
+
+							device.Battery = batteryData[0];
+							device.BatteryRaw = batteryData[2];
+							device.LowBat = await this.setLowbatIndicator(device.BatteryRaw, undefined, state.val, device.adapterID);
+
+							if (device.LowBat && oldLowBatState !== device.LowBat) {
+								if (this.config.checkSendBatteryMsg && !this.blacklistNotify.includes(device.Path)) {
+									await this.sendLowBatNoticiation(device.Device, device.Adapter, device.Battery);
+								}
+							}
+						}
 						break;
+
 					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.timeSelector,
 							device.adapterID,
 							device.UnreachDP,
 							device.SignalStrength,
@@ -698,42 +718,49 @@ class DeviceWatcher extends utils.Adapter {
 		let batteryHealth;
 		let isBatteryDevice;
 
-		if (deviceBatteryState === undefined) {
-			if (deviceLowBatState !== undefined) {
-				switch (deviceLowBatState) {
-					case 'none':
-						break;
-					default:
-						if (deviceLowBatState !== true || deviceLowBatState === 'NORMAL' || deviceLowBatState === 1) {
+		switch (adapterID) {
+			case 'hmrpc':
+				if (deviceBatteryState === undefined) {
+					if (deviceLowBatState !== undefined) {
+						if (deviceLowBatState !== 1) {
 							batteryHealth = 'ok';
-							isBatteryDevice = true;
 						} else {
 							batteryHealth = 'low';
-							isBatteryDevice = true;
 						}
-						break;
-				}
-			} else {
-				batteryHealth = ' - ';
-			}
-		} else {
-			switch (adapterID) {
-				case 'hmrpc':
-					if (deviceBatteryState === 0 || (deviceBatteryState && deviceBatteryState >= 6)) {
+						isBatteryDevice = true;
+					} else {
+						batteryHealth = ' - ';
+					}
+				} else {
+					if (deviceBatteryState === 0 || deviceBatteryState >= 6) {
 						batteryHealth = ' - ';
 					} else {
 						batteryHealth = deviceBatteryState + 'V';
 						batteryHealthRaw = deviceBatteryState;
 						isBatteryDevice = true;
 					}
-					break;
-				default:
+				}
+				break;
+			default:
+				if (deviceBatteryState === undefined) {
+					if (deviceLowBatState !== undefined) {
+						if (deviceLowBatState !== true || deviceLowBatState === 'NORMAL' || deviceLowBatState === 1) {
+							batteryHealth = 'ok';
+						} else {
+							batteryHealth = 'low';
+						}
+						isBatteryDevice = true;
+					} else {
+						batteryHealth = ' - ';
+					}
+				} else {
 					batteryHealth = deviceBatteryState + '%';
 					batteryHealthRaw = deviceBatteryState;
 					isBatteryDevice = true;
-					break;
-			}
+				}
+				break;
 		}
+
 		return [batteryHealth, isBatteryDevice, batteryHealthRaw];
 	}
 
@@ -741,34 +768,43 @@ class DeviceWatcher extends utils.Adapter {
 	 * set low bat indicator
 	 * @param {object} deviceBatteryState
 	 * @param {object} deviceLowBatState
-	 * @param {object} isLowBatDP
+	 * @param {object} faultReportState
+	 * @param {object} adapterID
 	 */
 
-	async setLowbatIndicator(deviceBatteryState, deviceLowBatState, isLowBatDP) {
+	async setLowbatIndicator(deviceBatteryState, deviceLowBatState, faultReportState, adapterID) {
 		let lowBatIndicator = false;
 		/*=============================================
 		=            Set Lowbat indicator             =
 		=============================================*/
-		if (deviceLowBatState !== null && isLowBatDP !== 'none') {
-			switch (typeof deviceLowBatState) {
-				case 'number':
-					if (deviceLowBatState === 0) {
+		if (deviceLowBatState !== undefined || faultReportState !== undefined) {
+			switch (adapterID) {
+				case 'hmrpc':
+					if (deviceLowBatState === 1 || faultReportState === 6) {
 						lowBatIndicator = true;
 					}
 					break;
+				default:
+					switch (typeof deviceLowBatState) {
+						case 'number':
+							if (deviceLowBatState === 0) {
+								lowBatIndicator = true;
+							}
+							break;
 
-				case 'string':
-					if (deviceLowBatState !== 'NORMAL') {
-						// Tado devices
-						lowBatIndicator = true;
-					}
-					break;
+						case 'string':
+							if (deviceLowBatState !== 'NORMAL') {
+								// Tado devices
+								lowBatIndicator = true;
+							}
+							break;
 
-				case 'boolean':
-					if (deviceLowBatState) {
-						lowBatIndicator = true;
+						case 'boolean':
+							if (deviceLowBatState) {
+								lowBatIndicator = true;
+							}
+							break;
 					}
-					break;
 			}
 		} else {
 			if (deviceBatteryState < this.config.minWarnBatterie) {
@@ -798,7 +834,7 @@ class DeviceWatcher extends utils.Adapter {
 
 	/**
 	 * get online state and time
-	 * @param {object} id - ID
+	 * @param {object} timeSelector - device Timeselector
 	 * @param {string} adapterID - ID of Adapter
 	 * @param {string} unreachDP - Datapoint of Unreach
 	 * @param {object} linkQuality - Linkquality Value
@@ -806,33 +842,33 @@ class DeviceWatcher extends utils.Adapter {
 	 * @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) {
+	async getOnlineState(timeSelector, adapterID, unreachDP, linkQuality, deviceUnreachState, deviceStateSelectorDP, rssiPeerSelectorDP) {
 		let lastContactString;
 		let deviceState = 'Online';
 
 		try {
-			const deviceMainSelector = await this.getForeignStateAsync(id);
-			if (deviceMainSelector) {
+			const deviceTimeSelector = await this.getForeignStateAsync(timeSelector);
+			if (deviceTimeSelector) {
 				const deviceUnreachSelector = await this.getForeignStateAsync(unreachDP);
 				const deviceStateSelector = await this.getForeignStateAsync(deviceStateSelectorDP); // for hmrpc devices
 				const rssiPeerSelector = await this.getForeignStateAsync(rssiPeerSelectorDP);
-				const lastContact = await this.getTimestamp(deviceMainSelector.ts);
-				const lastDeviceUnreachStateChange = deviceUnreachSelector != undefined ? await this.getTimestamp(deviceUnreachSelector.lc) : await this.getTimestamp(deviceMainSelector.ts);
+				const lastContact = await this.getTimestamp(deviceTimeSelector.ts);
+				const lastDeviceUnreachStateChange = deviceUnreachSelector != undefined ? await this.getTimestamp(deviceUnreachSelector.lc) : await this.getTimestamp(timeSelector.ts);
 				//  If there is no contact since user sets minutes add device in offline list
 				// calculate to days after 48 hours
 				switch (unreachDP) {
 					case 'none':
-						lastContactString = await this.getLastContact(deviceMainSelector.ts);
+						lastContactString = await this.getLastContact(deviceTimeSelector.ts);
 						break;
 
 					default:
 						//State changed
 						if (adapterID === 'hmrpc') {
 							if (linkQuality !== ' - ') {
-								if (deviceUnreachState) {
-									lastContactString = await this.getLastContact(deviceMainSelector.lc);
+								if (deviceUnreachState === 1) {
+									lastContactString = await this.getLastContact(deviceTimeSelector.lc);
 								} else {
-									lastContactString = await this.getLastContact(deviceMainSelector.ts);
+									lastContactString = await this.getLastContact(deviceTimeSelector.ts);
 								}
 							} else {
 								if (deviceStateSelector) {
@@ -844,10 +880,10 @@ class DeviceWatcher extends utils.Adapter {
 								}
 							}
 						} else {
-							if (!deviceUnreachState) {
-								lastContactString = await this.getLastContact(deviceMainSelector.lc);
+							if (deviceUnreachState === 0) {
+								lastContactString = await this.getLastContact(deviceTimeSelector.lc);
 							} else {
-								lastContactString = await this.getLastContact(deviceMainSelector.ts);
+								lastContactString = await this.getLastContact(deviceTimeSelector.ts);
 							}
 							break;
 						}
@@ -859,6 +895,16 @@ class DeviceWatcher extends utils.Adapter {
 				if (this.maxMinutes !== undefined) {
 					switch (adapterID) {
 						case 'hmrpc':
+							if (this.maxMinutes[adapterID] <= 0) {
+								if (deviceUnreachState === 1) {
+									deviceState = 'Offline'; //set online state to offline
+									linkQuality = '0%'; // set linkQuality to nothing
+								}
+							} else if (lastDeviceUnreachStateChange > this.maxMinutes[adapterID] && deviceUnreachState === 1) {
+								deviceState = 'Offline'; //set online state to offline
+								linkQuality = '0%'; // set linkQuality to nothing
+							}
+							break;
 						case 'hmiP':
 						case 'maxcube':
 							if (this.maxMinutes[adapterID] <= 0) {
@@ -953,7 +999,7 @@ class DeviceWatcher extends utils.Adapter {
 			const oldContactState = device.Status;
 			device.UnreachState = await this.getInitValue(device.UnreachDP);
 			const contactData = await this.getOnlineState(
-				device.Path,
+				device.timeSelector,
 				device.adapterID,
 				device.UnreachDP,
 				device.SignalStrength,
@@ -1032,49 +1078,65 @@ class DeviceWatcher extends utils.Adapter {
 				=============================================*/
 				let deviceBatteryStateDP;
 				let deviceBatteryState;
-				// Get battery states
-				switch (adapterID) {
-					case 'hueExt':
-					case 'mihomeVacuum':
-					case 'mqttNuki':
-						deviceBatteryStateDP = shortCurrDeviceString + this.arrDev[i].battery;
-						deviceBatteryState = await this.getInitValue(deviceBatteryStateDP);
-						if (deviceBatteryState === undefined) {
-							deviceBatteryStateDP = shortCurrDeviceString + this.arrDev[i].battery2;
+				let batteryHealth;
+				let batteryHealthRaw;
+				let lowBatIndicator;
+				let isBatteryDevice;
+				let isLowBatDP;
+				let faultReportingDP;
+				let faultReportingState;
+
+				const deviceChargerStateDP = currDeviceString + this.arrDev[i].charger;
+				const deviceChargerState = await this.getInitValue(deviceChargerStateDP);
+
+				if (deviceChargerState === undefined || deviceChargerState === false) {
+					// Get battery states
+					switch (adapterID) {
+						case 'hueExt':
+						case 'mihomeVacuum':
+						case 'mqttNuki':
+							deviceBatteryStateDP = shortCurrDeviceString + this.arrDev[i].battery;
 							deviceBatteryState = await this.getInitValue(deviceBatteryStateDP);
-						}
-						break;
-					default:
-						deviceBatteryStateDP = currDeviceString + this.arrDev[i].battery;
-						deviceBatteryState = await this.getInitValue(deviceBatteryStateDP);
-						if (deviceBatteryState === undefined) {
-							deviceBatteryStateDP = currDeviceString + this.arrDev[i].battery2;
+							if (deviceBatteryState === undefined) {
+								deviceBatteryStateDP = shortCurrDeviceString + this.arrDev[i].battery2;
+								deviceBatteryState = await this.getInitValue(deviceBatteryStateDP);
+							}
+							break;
+						default:
+							deviceBatteryStateDP = currDeviceString + this.arrDev[i].battery;
 							deviceBatteryState = await this.getInitValue(deviceBatteryStateDP);
-						}
-						break;
-				}
+							if (deviceBatteryState === undefined) {
+								deviceBatteryStateDP = currDeviceString + this.arrDev[i].battery2;
+								deviceBatteryState = await this.getInitValue(deviceBatteryStateDP);
+							}
+							break;
+					}
 
-				// Get low bat states
-				let isLowBatDP = currDeviceString + this.arrDev[i].isLowBat;
-				let deviceLowBatState = await this.getInitValue(isLowBatDP);
-				if (deviceLowBatState === undefined) {
-					isLowBatDP = currDeviceString + this.arrDev[i].isLowBat2;
-					deviceLowBatState = await this.getInitValue(isLowBatDP);
-				}
-				if (deviceLowBatState === undefined) isLowBatDP = 'none';
+					// Get low bat states
+					isLowBatDP = currDeviceString + this.arrDev[i].isLowBat;
+					let deviceLowBatState = await this.getInitValue(isLowBatDP);
+					if (deviceLowBatState === undefined) {
+						isLowBatDP = currDeviceString + this.arrDev[i].isLowBat2;
+						deviceLowBatState = await this.getInitValue(isLowBatDP);
+					}
+					if (deviceLowBatState === undefined) isLowBatDP = 'none';
 
-				//subscribe to states
-				this.subscribeForeignStatesAsync(deviceBatteryStateDP);
-				this.subscribeForeignStatesAsync(isLowBatDP);
+					faultReportingDP = shortCurrDeviceString + this.arrDev[i].faultReporting;
+					faultReportingState = await this.getInitValue(faultReportingDP);
 
-				const batteryData = await this.getBatteryData(deviceBatteryState, deviceLowBatState, adapterID);
-				const batteryHealth = batteryData[0];
-				const batteryHealthRaw = batteryData[2];
-				const isBatteryDevice = batteryData[1];
-				let lowBatIndicator;
+					//subscribe to states
+					this.subscribeForeignStatesAsync(deviceBatteryStateDP);
+					this.subscribeForeignStatesAsync(isLowBatDP);
+					this.subscribeForeignStatesAsync(faultReportingDP);
+
+					const batteryData = await this.getBatteryData(deviceBatteryState, deviceLowBatState, adapterID);
+					batteryHealth = batteryData[0];
+					batteryHealthRaw = batteryData[2];
+					isBatteryDevice = batteryData[1];
 
-				if (isBatteryDevice) {
-					lowBatIndicator = await this.setLowbatIndicator(deviceBatteryState, deviceLowBatState, isLowBatDP);
+					if (isBatteryDevice) {
+						lowBatIndicator = await this.setLowbatIndicator(deviceBatteryState, deviceLowBatState, faultReportingState, adapterID);
+					}
 				}
 
 				/*=============================================
@@ -1083,6 +1145,7 @@ class DeviceWatcher extends utils.Adapter {
 				let unreachDP = currDeviceString + this.arrDev[i].reach;
 				const deviceStateSelectorDP = shortCurrDeviceString + this.arrDev[i].stateValue;
 				const rssiPeerSelectorDP = currDeviceString + this.arrDev[i].rssiPeerState;
+				const timeSelector = currDeviceString + this.arrDev[i].timeSelector;
 
 				let deviceUnreachState = await this.getInitValue(unreachDP);
 				if (deviceUnreachState === undefined) {
@@ -1091,12 +1154,12 @@ class DeviceWatcher extends utils.Adapter {
 				}
 
 				// subscribe to states
-				this.subscribeForeignStatesAsync(id);
+				this.subscribeForeignStatesAsync(timeSelector);
 				this.subscribeForeignStatesAsync(unreachDP);
 				this.subscribeForeignStatesAsync(deviceStateSelectorDP);
 				this.subscribeForeignStatesAsync(rssiPeerSelectorDP);
 
-				const onlineState = await this.getOnlineState(id, adapterID, unreachDP, linkQuality, deviceUnreachState, deviceStateSelectorDP, rssiPeerSelectorDP);
+				const onlineState = await this.getOnlineState(timeSelector, adapterID, unreachDP, linkQuality, deviceUnreachState, deviceStateSelectorDP, rssiPeerSelectorDP);
 				let deviceState;
 				let lastContactString;
 
@@ -1135,12 +1198,15 @@ class DeviceWatcher extends utils.Adapter {
 						Device: deviceName,
 						adapterID: adapterID,
 						Adapter: adapter,
+						timeSelector: timeSelector,
 						isBatteryDevice: isBatteryDevice,
 						Battery: batteryHealth,
 						BatteryRaw: batteryHealthRaw,
 						batteryDP: deviceBatteryStateDP,
 						LowBat: lowBatIndicator,
 						LowBatDP: isLowBatDP,
+						faultReport: faultReportingState,
+						faultReportDP: faultReportingDP,
 						SignalStrengthDP: deviceQualityDP,
 						SignalStrength: linkQuality,
 						UnreachState: deviceUnreachState,
@@ -1159,12 +1225,15 @@ class DeviceWatcher extends utils.Adapter {
 						Device: deviceName,
 						adapterID: adapterID,
 						Adapter: adapter,
+						timeSelector: timeSelector,
 						isBatteryDevice: isBatteryDevice,
 						Battery: batteryHealth,
 						BatteryRaw: batteryHealthRaw,
 						batteryDP: deviceBatteryStateDP,
 						LowBat: lowBatIndicator,
 						LowBatDP: isLowBatDP,
+						faultReport: faultReportingState,
+						faultReportDP: faultReportingDP,
 						SignalStrengthDP: deviceQualityDP,
 						SignalStrength: linkQuality,
 						UnreachState: deviceUnreachState,
@@ -1263,7 +1332,7 @@ class DeviceWatcher extends utils.Adapter {
 		}
 
 		// Battery lists
-		if (device['isBatteryDevice']) {
+		if (device.isBatteryDevice) {
 			this.batteryPowered.push({
 				Device: device.Device,
 				Adapter: device.Adapter,

package/package.json

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