iobroker.device-watcher 2.0.0 → 2.0.2

package/main.js

@@ -16,7 +16,6 @@ const enableSendSentry = true;
 let isUnloaded = false;
 
 class DeviceWatcher extends utils.Adapter {
-
 	constructor(options) {
 		super({
 			...options,
@@ -30,12 +29,21 @@ class DeviceWatcher extends utils.Adapter {
 		this.batteryPowered = [];
 		this.batteryLowPowered = [];
 		this.listAllDevices = [];
-		this.listAllDevicesRaw = [];
 		this.blacklistLists = [];
 		this.blacklistNotify = [];
 		this.arrDev = [];
 		this.adapterSelected = [];
 
+		// raw arrays
+		this.listAllDevicesRaw = [];
+		this.batteryLowPoweredRaw = [];
+		this.offlineDevicesRaw = [];
+
+		// raw counts
+		this.offlineDevicesCountRaw = 0;
+		this.offlineDevicesCountRawOld = 0;
+		this.lowBatteryPoweredCountRaw = 0;
+
 		// counts
 		this.offlineDevicesCount = 0;
 		this.deviceCounter = 0;
@@ -51,9 +59,11 @@ class DeviceWatcher extends utils.Adapter {
 		// this.on('objectChange', this.onObjectChange.bind(this));
 		this.on('message', this.onMessage.bind(this));
 		this.on('unload', this.onUnload.bind(this));
-
 	}
 
+	/**
+	 * onReady
+	 */
 	async onReady() {
 		this.log.debug(`Adapter ${adapterName} was started`);
 
@@ -71,7 +81,7 @@ class DeviceWatcher extends utils.Adapter {
 				fritzdect: this.config.fritzdectDevices,
 				ham: this.config.hamDevices,
 				harmony: this.config.harmonyDevices,
-				hmiP : this.config.hmiPDevices,
+				hmiP: this.config.hmiPDevices,
 				hmrpc: this.config.hmrpcDevices,
 				hs100: this.config.hs100Devices,
 				hue: this.config.hueDevices,
@@ -111,7 +121,7 @@ class DeviceWatcher extends utils.Adapter {
 				fritzdect: this.config.fritzdectMaxMinutes,
 				ham: this.config.hamMaxMinutes,
 				harmony: this.config.harmonyMaxMinutes,
-				hmiP : this.config.hmiPMaxMinutes,
+				hmiP: this.config.hmiPMaxMinutes,
 				hmrpc: this.config.hmrpcMaxMinutes,
 				hs100: this.config.hs100MaxMinutes,
 				hue: this.config.hueMaxMinutes,
@@ -158,7 +168,7 @@ class DeviceWatcher extends utils.Adapter {
 				// show list in debug log
 				this.log.debug(JSON.stringify(this.arrDev));
 
-				this.log.info(`Number of selected adapters: ${this.adapterSelected.length}. Loading data from: ${(this.adapterSelected).join(', ')} ...`);
+				this.log.info(`Number of selected adapters: ${this.adapterSelected.length}. Loading data from: ${this.adapterSelected.join(', ')} ...`);
 			} else {
 				this.log.warn(`No adapter selected. Please check the instance configuration!`);
 				return; // cancel run if no adapter is selected
@@ -175,8 +185,7 @@ class DeviceWatcher extends utils.Adapter {
 			try {
 				for (const [id] of Object.entries(arrApart)) {
 					if (!isUnloaded) {
-						if ((this.supAdapter !== undefined) && (this.supAdapter[id])) {
-
+						if (this.supAdapter !== undefined && this.supAdapter[id]) {
 							if (this.config.createOwnFolder) {
 								await this.createDPsForEachAdapter(id);
 								if (this.config.createHtmlList) await this.createHtmlListDatapoints(id);
@@ -202,7 +211,6 @@ class DeviceWatcher extends utils.Adapter {
 
 			// send overview of offline devices
 			if (this.config.checkSendOfflineMsgDaily) await this.sendOfflineNotificationsShedule();
-
 		} catch (error) {
 			this.errorReporting('[onReady]', error);
 			this.terminate ? this.terminate(15) : process.exit(15);
@@ -210,10 +218,10 @@ class DeviceWatcher extends utils.Adapter {
 	} // <-- onReady end
 
 	/**
-     * Is called if a subscribed state changes
-     * @param {string} id
-     * @param {ioBroker.State | null | undefined} state
-     */
+	 * Is called if a subscribed state changes
+	 * @param {string} id
+	 * @param {ioBroker.State | null | undefined} state
+	 */
 	onStateChange(id, state) {
 		if (state) {
 			// The state was changed
@@ -225,8 +233,8 @@ class DeviceWatcher extends utils.Adapter {
 	}
 
 	/**
-     * @param {ioBroker.Message} obj
-     */
+	 * @param {ioBroker.Message} obj
+	 */
 	onMessage(obj) {
 		const devices = [];
 		let myCount = 0;
@@ -234,28 +242,33 @@ class DeviceWatcher extends utils.Adapter {
 
 		switch (obj.command) {
 			case 'devicesList':
-				if(obj.message){
-					try{
+				if (obj.message) {
+					try {
 						result = this.listAllDevicesRaw;
-						for(const element in result){
+						for (const element in result) {
 							const label = 'Device: ' + result[element].Device + '  - Adapter: ' + result[element].Adapter;
-							const myValueObject = {deviceName: result[element].Device, adapter: result[element].Adapter, path: result[element].Path};
-							devices[myCount] = {label: label,value: JSON.stringify(myValueObject)};
-							myCount ++;
+							const myValueObject = {
+								deviceName: result[element].Device,
+								adapter: result[element].Adapter,
+								path: result[element].Path,
+							};
+							devices[myCount] = { label: label, value: JSON.stringify(myValueObject) };
+							myCount++;
 						}
 						this.sendTo(obj.from, obj.command, devices, obj.callback);
-					}
-					catch(error){
+					} catch (error) {
 						this.sendTo(obj.from, obj.command, obj.callback);
 					}
-				}
-				else{
+				} else {
 					this.sendTo(obj.from, obj.command, obj.callback);
 				}
 				break;
 		}
 	}
 
+	/**
+	 * refresh data with interval
+	 */
 	async refreshData() {
 		const nextTimeout = this.config.updateinterval * 1000;
 
@@ -276,9 +289,11 @@ class DeviceWatcher extends utils.Adapter {
 		} else {
 			return; // cancel run if unloaded was called.
 		}
-
 	} // <-- refreshData end
 
+	/**
+	 * main function
+	 */
 	async main() {
 		this.log.debug(`Function started: ${this.main.name}`);
 
@@ -286,7 +301,7 @@ class DeviceWatcher extends utils.Adapter {
 		try {
 			for (const [id] of Object.entries(arrApart)) {
 				if (!isUnloaded) {
-					if ((this.supAdapter !== undefined) && (this.supAdapter[id])) {
+					if (this.supAdapter !== undefined && this.supAdapter[id]) {
 						if (this.config.createOwnFolder) {
 							await this.createDataForEachAdapter(id);
 							this.log.debug(`Created and filled data for ${await this.capitalize(id)}`);
@@ -312,13 +327,12 @@ class DeviceWatcher extends utils.Adapter {
 		this.log.debug(`Function finished: ${this.main.name}`);
 	} //<--End of main function
 
-
 	/**
-	 * @param {string} sentence - Word which should be capitalize
+	 * @param {string} id - id which should be capitalize
 	 */
-	async capitalize(sentence) {
+	capitalize(id) {
 		//make the first letter uppercase
-		return sentence && sentence[0].toUpperCase() + sentence.slice(1);
+		return id && id[0].toUpperCase() + id.slice(1);
 	}
 
 	/**
@@ -326,7 +340,7 @@ class DeviceWatcher extends utils.Adapter {
 	 */
 	async getTimestamp(dpValue) {
 		const time = new Date();
-		return dpValue = Math.round((time.getTime() - dpValue) / 1000 / 60);
+		return (dpValue = Math.round((time.getTime() - dpValue) / 1000 / 60));
 	}
 
 	/**
@@ -347,6 +361,19 @@ class DeviceWatcher extends utils.Adapter {
 		if (stateVal) return stateVal.val;
 	}
 
+	/**
+	 * @param {object} data - object
+	 */
+	async parseData(data) {
+		if (!data) return {};
+		if (typeof data === 'object') return data;
+		if (typeof data === 'string') return JSON.parse(data);
+		return {};
+	}
+
+	/**
+	 * create blacklist
+	 */
 	async createBlacklist() {
 		this.log.debug(`Function started: ${this.createBlacklist.name}`);
 
@@ -354,14 +381,18 @@ class DeviceWatcher extends utils.Adapter {
 			const myBlacklist = this.config.tableBlacklist;
 
 			for (const i in myBlacklist) {
-				const blacklistParse = JSON.parse(myBlacklist[i].devices);
-				// push devices in list to ignor device in lists
-				if (myBlacklist[i].checkIgnorLists) {
-					this.blacklistLists.push(blacklistParse.path);
-				}
-				// push devices in list to ignor device in notifications
-				if (myBlacklist[i].checkIgnorNotify) {
-					this.blacklistNotify.push(blacklistParse.deviceName);
+				try {
+					const blacklistParse = await this.parseData(myBlacklist[i].devices);
+					// push devices in list to ignor device in lists
+					if (myBlacklist[i].checkIgnorLists) {
+						this.blacklistLists.push(blacklistParse.path);
+					}
+					// push devices in list to ignor device in notifications
+					if (myBlacklist[i].checkIgnorNotify) {
+						this.blacklistNotify.push(blacklistParse.path);
+					}
+				} catch (error) {
+					this.errorReporting('[createBlacklist]', error);
 				}
 			}
 
@@ -379,71 +410,87 @@ class DeviceWatcher extends utils.Adapter {
 	 * @param {object} i - each Device
 	 */
 	async getDeviceName(id, i) {
-		const currDeviceString = id.slice(0, (id.lastIndexOf('.') + 1) - 1);
-		const shortCurrDeviceString = currDeviceString.slice(0, (currDeviceString.lastIndexOf('.') + 1) - 1);
-		const shortshortCurrDeviceString = shortCurrDeviceString.slice(0, (shortCurrDeviceString.lastIndexOf('.') + 1) - 1);
-
-		// Get device name
-		const deviceObject = await this.getForeignObjectAsync(currDeviceString);
-		const shortDeviceObject = await this.getForeignObjectAsync(shortCurrDeviceString);
-		const shortshortDeviceObject = await this.getForeignObjectAsync(shortshortCurrDeviceString);
-		let deviceName;
-
-		// Get ID with currDeviceString from datapoint
-		switch (this.arrDev[i].adapter) {
-			// Get ID for Switchbot and ESPHome Devices
-			case 'switchbotBle':
-			case 'esphome':
-				deviceName = await this.getInitValue(currDeviceString + this.arrDev[i].id);
-				break;
+		const currDeviceString = id.slice(0, id.lastIndexOf('.') + 1 - 1);
+		const shortCurrDeviceString = currDeviceString.slice(0, currDeviceString.lastIndexOf('.') + 1 - 1);
+		const shortshortCurrDeviceString = shortCurrDeviceString.slice(0, shortCurrDeviceString.lastIndexOf('.') + 1 - 1);
 
-			// Get ID with short currDeviceString from objectjson
-			case 'hue-extended':
-			case 'hmrpc':
-			case 'nuki-extended':
-			case 'wled':
-				if (shortDeviceObject && typeof shortDeviceObject === 'object') {
-					deviceName = shortDeviceObject.common.name;
-				}
-				break;
-
-			// Get ID with short short currDeviceString from objectjson (HMiP Devices)
-			case 'hmiP':
-				if (shortshortDeviceObject && typeof shortshortDeviceObject === 'object') {
-					deviceName = shortshortDeviceObject.common.name;
-				}
-				break;
-
-			// Get ID with short currDeviceString from datapoint
-			case 'mihomeVacuum':
-			case 'roomba':
-				deviceName = await this.getInitValue(shortCurrDeviceString + this.arrDev[i].id);
-				break;
-
-			//Get ID of foldername
-			case 'tado':
-				deviceName = currDeviceString.slice(currDeviceString.lastIndexOf('.') + 1);
-				break;
-
-			//Get ID of foldername
-			case 'yeelight-2':
-				deviceName = shortCurrDeviceString.slice(shortCurrDeviceString.lastIndexOf('.') + 1);
-				break;
+		try {
+			// Get device name
+			const deviceObject = await this.getForeignObjectAsync(currDeviceString);
+			const shortDeviceObject = await this.getForeignObjectAsync(shortCurrDeviceString);
+			const shortshortDeviceObject = await this.getForeignObjectAsync(shortshortCurrDeviceString);
+			let deviceName;
+
+			// Get ID with currDeviceString from datapoint
+			switch (this.arrDev[i].adapterID) {
+				// Get ID for Switchbot and ESPHome Devices
+				case 'switchbotBle':
+				case 'esphome':
+					deviceName = await this.getInitValue(currDeviceString + this.arrDev[i].id);
+					break;
+
+				// Get ID with short currDeviceString from objectjson
+				case 'hueExt':
+				case 'hmrpc':
+				case 'nukiExt':
+				case 'wled':
+					if (shortDeviceObject && typeof shortDeviceObject === 'object') {
+						deviceName = shortDeviceObject.common.name;
+					}
+					break;
 
-			// Get ID with main selektor from objectjson
-			default:
-				if (deviceObject && typeof deviceObject === 'object') {
-					if (deviceObject.common.name['de'] != undefined) {
-						deviceName = deviceObject.common.name['de'];
-					} else if (deviceObject.common.name['en'] != undefined) {
-						deviceName = deviceObject.common.name['en'];
-					} else {
+				// Get ID with short short currDeviceString from objectjson (HMiP Devices)
+				case 'hmiP':
+					if (shortshortDeviceObject && typeof shortshortDeviceObject === 'object') {
+						deviceName = shortshortDeviceObject.common.name;
+					}
+					break;
+
+				// Get ID with short currDeviceString from datapoint
+				case 'mihomeVacuum':
+				case 'roomba':
+					deviceName = await this.getInitValue(shortCurrDeviceString + this.arrDev[i].id);
+					break;
+
+				//Get ID of foldername
+				case 'tado':
+					deviceName = currDeviceString.slice(currDeviceString.lastIndexOf('.') + 1);
+					break;
+
+				//Get ID of foldername
+				case 'yeelight':
+					deviceName = shortCurrDeviceString.slice(shortCurrDeviceString.lastIndexOf('.') + 1);
+					break;
+
+				// Get ID with main selektor from objectjson
+				default:
+					if (deviceObject && typeof deviceObject === 'object') {
 						deviceName = deviceObject.common.name;
 					}
-				}
-				break;
+					break;
+			}
+			return deviceName;
+		} catch (error) {
+			this.errorReporting('[getDeviceName]', error);
 		}
-		return deviceName;
+	}
+
+	/**
+	 * get Last Contact
+	 * @param {object} selector - Selector
+	 */
+	async getLastContact(selector) {
+		const lastContact = await this.getTimestamp(selector);
+		let lastContactString;
+
+		lastContactString = this.formatDate(new Date(selector), 'hh:mm') + ' Uhr';
+		if (Math.round(lastContact) > 100) {
+			lastContactString = Math.round(lastContact / 60) + ' Stunden';
+		}
+		if (Math.round(lastContact / 60) > 48) {
+			lastContactString = Math.round(lastContact / 60 / 24) + ' Tagen';
+		}
+		return lastContactString;
 	}
 
 	/**
@@ -455,59 +502,73 @@ class DeviceWatcher extends utils.Adapter {
 		this.batteryLowPowered = [];
 		this.listAllDevices = [];
 		this.offlineDevices = [];
+		this.batteryLowPoweredRaw = [];
+		this.offlineDevicesRaw = [];
 
 		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['Last contact'],
+				});
+			}
+
+			/*----------  fill user lists  ----------*/
 			if (!this.blacklistLists.includes(device['Path'])) {
-				this.listAllDevices.push(
-					{
-						'Device': device['Device'],
-						'Adapter': device['Adapter'],
-						'Battery': device['Battery'],
-						'Signal strength': device['Signal strength'],
-						'Last contact': device['Last contact'],
-						'Status': device['Status']
-					}
-				);
+				this.listAllDevices.push({
+					Device: device['Device'],
+					Adapter: device['Adapter'],
+					Battery: device['Battery'],
+					'Signal strength': device['Signal strength'],
+					'Last contact': device['Last contact'],
+					Status: device['Status'],
+				});
 				// LinkQuality lists
 				if (device['Signal strength'] != ' - ') {
-					this.linkQualityDevices.push(
-						{
-							'Device': device['Device'],
-							'Adapter': device['Adapter'],
-							'Signal strength': device['Signal strength']
-						}
-					);
+					this.linkQualityDevices.push({
+						Device: device['Device'],
+						Adapter: device['Adapter'],
+						'Signal strength': device['Signal strength'],
+					});
 				}
 				// Battery lists
-				if (device['Battery'] != ' - ') {
-					this.batteryPowered.push(
-						{
-							'Device': device['Device'],
-							'Adapter': device['Adapter'],
-							'Battery': device['Battery']
-						}
-					);
+				if (device['isBatteryDevice']) {
+					this.batteryPowered.push({
+						Device: device['Device'],
+						Adapter: device['Adapter'],
+						Battery: device['Battery'],
+						Status: device['Status'],
+					});
 				}
 				// Low Bat lists
-				if (device['LowBat']) {
-					this.batteryLowPowered.push(
-						{
-							'Device': device['Device'],
-							'Adapter': device['Adapter'],
-							'Battery': device['Battery']
-						}
-					);
+				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['Last contact']
-						}
-					);
+					this.offlineDevices.push({
+						Device: device['Device'],
+						Adapter: device['Adapter'],
+						'Last contact': device['Last contact'],
+					});
 				}
 			}
 		}
@@ -531,6 +592,11 @@ class DeviceWatcher extends utils.Adapter {
 
 		// Count how many devices are exists
 		this.deviceCounter = this.listAllDevices.length;
+
+		// raws
+
+		// Count how many devcies are offline
+		this.offlineDevicesCountRaw = this.offlineDevicesRaw.length;
 	}
 
 	/**
@@ -538,39 +604,34 @@ class DeviceWatcher extends utils.Adapter {
 	 */
 	async createData(i) {
 		const devices = await this.getForeignStatesAsync(this.arrDev[i].Selektor);
-		const deviceAdapterName = await this.capitalize(this.arrDev[i].adapter);
+		const adapterID = this.arrDev[i].adapterID;
 
-		/*----------  Start of second main loop  ----------*/
+		/*----------  Start of loop  ----------*/
 		for (const [id] of Object.entries(devices)) {
 			if (!isUnloaded) {
-
-
-
+				/*=============================================
+				=              Get device name		          =
+				=============================================*/
 				const deviceName = await this.getDeviceName(id, i);
 
-				const currDeviceString = id.slice(0, (id.lastIndexOf('.') + 1) - 1);
-				const shortCurrDeviceString = currDeviceString.slice(0, (currDeviceString.lastIndexOf('.') + 1) - 1);
+				/*=============================================
+				=              Get adapter name		          =
+				=============================================*/
+				const adapter = this.arrDev[i].adapter;
 
-				// Get battery states
-				const deviceBatteryState = await this.getInitValue(currDeviceString + this.arrDev[i].battery);
-				const shortDeviceBatteryState = await this.getInitValue(shortCurrDeviceString + this.arrDev[i].battery);
-				const shortDeviceBatteryState2 = await this.getInitValue(shortCurrDeviceString + this.arrDev[i].battery2);
+				/*=============================================
+				=            Get path to datapoints	   	      =
+				=============================================*/
+				const currDeviceString = id.slice(0, id.lastIndexOf('.') + 1 - 1);
+				const shortCurrDeviceString = currDeviceString.slice(0, currDeviceString.lastIndexOf('.') + 1 - 1);
 
-
-				//this.devices[deviceName] = currDeviceString + this.arrDev[i].reach;
-
-				/*for (const [value] of Object.entries(this.devices)) {
-						this.log.warn(`${value}`);
-						this.subscribeForeignStatesAsync(value);
-					}*/
-				//this.subscribeForeignStatesAsync(currDeviceString + this.arrDev[i].reach);
-				// <--- END TEST
-
-				// Get link quality
+				/*=============================================
+				=            Get signal strength              =
+				=============================================*/
 				let deviceQualityState;
 				let linkQuality;
 
-				switch (this.arrDev[i].adapter) {
+				switch (adapterID) {
 					case 'mihomeVacuum':
 						deviceQualityState = await this.getForeignStateAsync(shortCurrDeviceString + this.arrDev[i].rssiState);
 						break;
@@ -593,7 +654,7 @@ class DeviceWatcher extends utils.Adapter {
 							if (this.config.trueState) {
 								linkQuality = deviceQualityState.val;
 							} else {
-								switch (this.arrDev[i].adapter) {
+								switch (adapterID) {
 									case 'roomba':
 									case 'sonoff':
 										linkQuality = deviceQualityState.val + '%'; // If quality state is already an percent value
@@ -609,8 +670,8 @@ class DeviceWatcher extends utils.Adapter {
 										} else if (deviceQualityState.val < 0) {
 											linkQuality = Math.min(Math.max(2 * (deviceQualityState.val + 100), 0), 100) + '%';
 											// If Quality State is an value between 0-255 (zigbee) calculate in percent:
-										} else if ((deviceQualityState.val) >= 0) {
-											linkQuality = parseFloat((100 / 255 * deviceQualityState.val).toFixed(0)) + '%';
+										} else if (deviceQualityState.val >= 0) {
+											linkQuality = parseFloat(((100 / 255) * deviceQualityState.val).toFixed(0)) + '%';
 										}
 										break;
 								}
@@ -618,12 +679,12 @@ class DeviceWatcher extends utils.Adapter {
 							break;
 
 						case 'string':
-							switch (this.arrDev[i].adapter) {
+							switch (adapterID) {
 								case 'netatmo':
 									// for Netatmo devices
 									linkQuality = deviceQualityState.val;
 									break;
-								case 'nuki-extended':
+								case 'nukiExt':
 									linkQuality = ' - ';
 									break;
 							}
@@ -633,207 +694,37 @@ class DeviceWatcher extends utils.Adapter {
 					linkQuality = ' - ';
 				}
 
-				// When was the last contact to the device?
-				let lastContactString;
-				let deviceState = 'Online';
-				let lastDeviceUnreachStateChange;
-
-				const deviceMainSelector = await this.getForeignStateAsync(id);
-				const deviceStateSelector = await this.getForeignStateAsync(shortCurrDeviceString + this.arrDev[i].stateValue); // for hmrpc devices
-				const rssiPeerSelector = await this.getForeignStateAsync(currDeviceString + this.arrDev[i].rssiPeerState);
-
-				if (deviceMainSelector) {
-					try {
-						const lastContact = await this.getTimestamp(deviceMainSelector.ts);
-						const lastStateChange = await this.getTimestamp(deviceMainSelector.lc);
-						const deviceUnreachState = await this.getInitValue(currDeviceString + this.arrDev[i].reach);
-						const deviceUnreachSelector = await this.getForeignStateAsync(currDeviceString + this.arrDev[i].reach);
-						if (deviceUnreachSelector) {lastDeviceUnreachStateChange = await this.getTimestamp(deviceUnreachSelector.lc);}
-						const shortDeviceUnreachState = await this.getForeignStateAsync(shortCurrDeviceString + this.arrDev[i].reach);
-
-						const getLastContact = async () => {
-							lastContactString = this.formatDate(new Date((deviceMainSelector.ts)), 'hh:mm') + ' Uhr';
-							if (Math.round(lastContact) > 100) {
-								lastContactString = Math.round(lastContact / 60) + ' Stunden';
-							}
-							if (Math.round(lastContact / 60) > 48) {
-								lastContactString = Math.round(lastContact / 60 / 24) + ' Tagen';
-							}
-							return lastContactString;
-						};
-
-						const getLastStateChange = async () => {
-							lastContactString = this.formatDate(new Date((deviceMainSelector.lc)), 'hh:mm') + ' Uhr';
-							if (Math.round(lastStateChange) > 100) {
-								lastContactString = Math.round(lastStateChange / 60) + ' Stunden';
-							}
-							if (Math.round(lastStateChange / 60) > 48) {
-								lastContactString = Math.round(lastStateChange / 60 / 24) + ' Tagen';
-							}
-							return lastContactString;
-						};
-
-						//  If there is no contact since user sets minutes add device in offline list
-						// calculate to days after 48 hours
-						switch (this.arrDev[i].reach) {
-							case 'none':
-								await getLastContact();
-								break;
-
-							default:
-								//State changed
-								if  (this.arrDev[i].adapter === 'hmrpc') {
-									if (linkQuality != ' - ') {
-										if (deviceUnreachState) {
-											await getLastStateChange();
-										} else {
-											await getLastContact();
-										}
-									} else {
-										if (deviceStateSelector) { // because old hm devices don't send rssi states
-											const lastContactOfState = await this.getTimestamp(deviceStateSelector.ts);
-											const getLastContactOfState = async () => {
-												lastContactString = this.formatDate(new Date((deviceStateSelector.ts)), 'hh:mm') + ' Uhr';
-												if (Math.round(lastContactOfState) > 100) {
-													lastContactString = Math.round(lastContactOfState / 60) + ' Stunden';
-												}
-												if (Math.round(lastContactOfState / 60) > 48) {
-													lastContactString = Math.round(lastContactOfState / 60 / 24) + ' Tagen';
-												}
-												return lastContactString;
-											};
-											await getLastContactOfState();
-										} else if (rssiPeerSelector) { // because old hm sensors don't send rssi/state values
-											const lastContactOfState = await this.getTimestamp(rssiPeerSelector.ts);
-											const getLastContactOfState = async () => {
-												lastContactString = this.formatDate(new Date((rssiPeerSelector.ts)), 'hh:mm') + ' Uhr';
-												if (Math.round(lastContactOfState) > 100) {
-													lastContactString = Math.round(lastContactOfState / 60) + ' Stunden';
-												}
-												if (Math.round(lastContactOfState / 60) > 48) {
-													lastContactString = Math.round(lastContactOfState / 60 / 24) + ' Tagen';
-												}
-												return lastContactString;
-											};
-											await getLastContactOfState();
-										}
-									}
-
-								} else {
-									if (!deviceUnreachState) {
-										await getLastStateChange();
-									} else {
-										await getLastContact();
-									}
-									break;
-								}
-						}
-
-						const adapterID = this.arrDev[i].adapter;
-
-						switch (adapterID) {
-							case 'hmrpc':
-							case 'hmiP':
-							case 'maxcube':
-								if ((this.maxMinutes !== undefined) && (this.maxMinutes[adapterID] === -1)) {
-									if (deviceUnreachState) {
-										deviceState = 'Offline'; //set online state to offline
-									}
-								} else if ((this.maxMinutes !== undefined) && (lastContact > this.maxMinutes[adapterID])) {
-									deviceState = 'Offline'; //set online state to offline
-								}
-								break;
-							case 'ping':
-								if ((this.maxMinutes !== undefined) && (this.maxMinutes[adapterID] === -1)) {
-									if (!deviceUnreachState) {
-										deviceState = 'Offline'; //set online state to offline
-									}
-								} else if ((this.maxMinutes !== undefined) && (lastContact > this.maxMinutes[adapterID]) && (!deviceUnreachState)) {
-									deviceState = 'Offline'; //set online state to offline
-								}
-								break;
-							case 'unifi':
-								if ((this.maxMinutes !== undefined) && (this.maxMinutes[adapterID] === -1)) {
-									if (deviceUnreachState === 0) {
-										deviceState = 'Offline'; //set online state to offline
-									}
-								} else if ((this.maxMinutes !== undefined) && (lastContact > this.maxMinutes[adapterID])) {
-									deviceState = 'Offline'; //set online state to offline
-
-								}
-								break;
-							case 'shelly':
-							case 'sonoff':
-								if ((this.maxMinutes !== undefined) && (this.maxMinutes[adapterID] === -1)) {
-									if (!deviceUnreachState) {
-										deviceState = 'Offline'; //set online state to offline
-									}
-								} else if ((!deviceUnreachState) && (typeof lastDeviceUnreachStateChange !== 'undefined') && (this.maxMinutes !== undefined) && (lastContact > this.maxMinutes[adapterID])) {
-									deviceState = 'Offline'; //set online state to offline
-								}
-								break;
-							case 'mihomeVacuum':
-								if ((this.maxMinutes !== undefined) && (this.maxMinutes[adapterID] === -1)) {
-									if (!shortDeviceUnreachState) {
-										deviceState = 'Offline'; //set online state to offline
-									}
-								} else if ((this.maxMinutes !== undefined) && (lastContact > this.maxMinutes[adapterID])) {
-									deviceState = 'Offline'; //set online state to offline
-								}
-								break;
-							case 'miHome':
-								if (this.arrDev[i].battery === 'none') {
-									if ((this.maxMinutes !== undefined) && (this.maxMinutes[adapterID] === -1)) {
-										if (!deviceUnreachState) {
-											deviceState = 'Offline'; //set online state to offline
-										}
-									} else if ((this.maxMinutes !== undefined) && (lastContact > this.maxMinutes[adapterID])) {
-										deviceState = 'Offline'; //set online state to offline
-									}
-								} else {
-									if (this.config.mihomeMaxMinutes === -1) {
-										if ((this.maxMinutes !== undefined) && (this.maxMinutes[adapterID] === -1)) {
-											deviceState = 'Offline'; //set online state to offline
-										}
-									} else if ((this.maxMinutes !== undefined) && (lastContact > this.maxMinutes[adapterID])) {
-										deviceState = 'Offline'; //set online state to offline
-									}
-								}
-								break;
-							default:
-								if ((this.maxMinutes !== undefined) && (this.maxMinutes[adapterID] === -1)) {
-									if (!deviceUnreachState) {
-										deviceState = 'Offline';  //set online state to offline
-									}
-								} else if ((this.maxMinutes !== undefined) && (lastContact > this.maxMinutes[adapterID])) {
-									deviceState = 'Offline'; //set online state to offline
-								}
-								break;
-						}
-					} catch (error) {
-						this.errorReporting('[getLastContact]', error);
-					}
-				}
-
-				// Get battery states
+				/*=============================================
+				=         	    Get battery data       	      =
+				=============================================*/
 				let batteryHealth;
 				let lowBatIndicator;
+				let isBatteryDevice;
+
+				// Get battery states
+				const deviceBatteryState = await this.getInitValue(currDeviceString + this.arrDev[i].battery);
+				const shortDeviceBatteryState = await this.getInitValue(shortCurrDeviceString + this.arrDev[i].battery);
+				const shortDeviceBatteryState2 = await this.getInitValue(shortCurrDeviceString + this.arrDev[i].battery2);
+
+				// Get low bat states
 				let deviceLowBatState = await this.getInitValue(currDeviceString + this.arrDev[i].isLowBat);
 				if (deviceLowBatState === undefined) {
 					deviceLowBatState = await this.getInitValue(currDeviceString + this.arrDev[i].isLowBat2);
 				}
 
-				if ((!deviceBatteryState) && (!shortDeviceBatteryState) && (!shortDeviceBatteryState2)) {
+				if (!deviceBatteryState && !shortDeviceBatteryState && !shortDeviceBatteryState2) {
 					if (deviceLowBatState !== undefined) {
 						switch (this.arrDev[i].isLowBat || this.arrDev[i].isLowBat2) {
 							case 'none':
 								batteryHealth = ' - ';
 								break;
 							default:
-								if ((deviceLowBatState === false) || (deviceLowBatState === 'NORMAL') || (deviceLowBatState === 1)) {
+								if (deviceLowBatState === false || deviceLowBatState === 'NORMAL' || deviceLowBatState === 1) {
 									batteryHealth = 'ok';
+									isBatteryDevice = true;
 								} else {
 									batteryHealth = 'low';
+									isBatteryDevice = true;
 								}
 								break;
 						}
@@ -841,90 +732,267 @@ class DeviceWatcher extends utils.Adapter {
 						batteryHealth = ' - ';
 					}
 				} else {
-					switch (this.arrDev[i].adapter) {
+					switch (adapterID) {
 						case 'hmrpc':
 							if (deviceBatteryState === 0) {
 								batteryHealth = ' - ';
 							} else {
 								batteryHealth = deviceBatteryState + 'V';
+								isBatteryDevice = true;
 							}
 							break;
 
-						case 'hue-extended':
+						case 'hueExt':
 							if (shortDeviceBatteryState) {
 								batteryHealth = shortDeviceBatteryState + '%';
+								isBatteryDevice = true;
 							}
 							break;
 						case 'mihomeVacuum':
 							if (shortDeviceBatteryState) {
 								batteryHealth = shortDeviceBatteryState + '%';
+								isBatteryDevice = true;
 							} else if (shortDeviceBatteryState2) {
 								batteryHealth = shortDeviceBatteryState2 + '%';
+								isBatteryDevice = true;
 							}
 							break;
 						default:
-							batteryHealth = (deviceBatteryState) + '%';
+							batteryHealth = deviceBatteryState + '%';
+							isBatteryDevice = true;
 					}
 				}
 
-				// fill list with low battery devices
-				switch (this.arrDev[i].adapter) {
-					case 'hmrpc': // there are differnt low bat states between hm and hmIp devices
-						if (deviceLowBatState) {
+				/*=============================================
+				=            Set Lowbat indicator             =
+				=============================================*/
+				switch (typeof deviceLowBatState) {
+					case 'number':
+						if (deviceLowBatState === 0) {
 							lowBatIndicator = true;
 						}
 						break;
-					case 'tado': // there is an string as indicator
-						if (deviceLowBatState != 'NORMAL') {
+
+					case 'string':
+						if (deviceLowBatState !== 'NORMAL') {
+							// Tado devices
 							lowBatIndicator = true;
 						}
 						break;
 
-					default: // for all other devices with low bat states
-						if ((deviceLowBatState === true) || (deviceLowBatState === 0)) {
+					case 'boolean':
+						if (deviceLowBatState) {
 							lowBatIndicator = true;
-						} else if (deviceBatteryState && (deviceBatteryState < this.config.minWarnBatterie)) { // if the battery state is under the set limit
+						}
+						break;
+
+					default: // if the battery state is under the set limit
+						if (deviceBatteryState && deviceBatteryState < this.config.minWarnBatterie) {
 							lowBatIndicator = true;
 						}
+						break;
 				}
-				if (this.listOnlyBattery) {   // Add only devices with battery in the list
-					if (deviceBatteryState || shortDeviceBatteryState) {
-						this.listAllDevicesRaw.push(
-							{
-								'Path': id,
-								'Device': deviceName,
-								'Adapter': deviceAdapterName,
-								'Battery': batteryHealth,
-								'LowBat': lowBatIndicator,
-								'Signal strength': linkQuality,
-								'Last contact': lastContactString,
-								'Status': deviceState
+
+				/*=============================================
+				=          Get last contact of device         =
+				=============================================*/
+				let lastContactString;
+				let deviceState = 'Online';
+
+				const deviceMainSelector = await this.getForeignStateAsync(id);
+				const deviceUnreachSelector = await this.getForeignStateAsync(currDeviceString + this.arrDev[i].reach);
+				const deviceStateSelector = await this.getForeignStateAsync(shortCurrDeviceString + this.arrDev[i].stateValue); // for hmrpc devices
+				const rssiPeerSelector = await this.getForeignStateAsync(currDeviceString + this.arrDev[i].rssiPeerState);
+
+				if (deviceMainSelector) {
+					try {
+						const lastContact = await this.getTimestamp(deviceMainSelector.ts);
+						const deviceUnreachState = await this.getInitValue(currDeviceString + this.arrDev[i].reach);
+						const lastDeviceUnreachStateChange = deviceUnreachSelector != undefined ? await this.getTimestamp(deviceUnreachSelector.lc) : await this.getTimestamp(deviceMainSelector.ts);
+						const shortDeviceUnreachState = await this.getForeignStateAsync(shortCurrDeviceString + this.arrDev[i].reach);
+
+						//  If there is no contact since user sets minutes add device in offline list
+						// calculate to days after 48 hours
+						switch (this.arrDev[i].reach) {
+							case 'none':
+								lastContactString = await this.getLastContact(deviceMainSelector.ts);
+								break;
+
+							default:
+								//State changed
+								if (adapterID === 'hmrpc') {
+									if (linkQuality !== ' - ') {
+										if (deviceUnreachState) {
+											lastContactString = await this.getLastContact(deviceMainSelector.lc);
+										} else {
+											lastContactString = await this.getLastContact(deviceMainSelector.ts);
+										}
+									} else {
+										if (deviceStateSelector) {
+											// because old hm devices don't send rssi states
+											lastContactString = await this.getLastContact(deviceStateSelector.ts);
+										} else if (rssiPeerSelector) {
+											// because old hm sensors don't send rssi/state values
+											lastContactString = await this.getLastContact(rssiPeerSelector.ts);
+										}
+									}
+								} else {
+									if (!deviceUnreachState) {
+										lastContactString = await this.getLastContact(deviceMainSelector.lc);
+									} else {
+										lastContactString = await this.getLastContact(deviceMainSelector.ts);
+									}
+									break;
+								}
+						}
+
+						/*=============================================
+						=            Set Online Status             =
+						=============================================*/
+						if (this.maxMinutes !== undefined) {
+							switch (adapterID) {
+								case 'hmrpc':
+								case 'hmiP':
+								case 'maxcube':
+									if (this.maxMinutes[adapterID] <= 0) {
+										if (deviceUnreachState) {
+											deviceState = 'Offline'; //set online state to offline
+											linkQuality = '0%'; // set linkQuality to nothing
+										}
+									} else if (lastDeviceUnreachStateChange > this.maxMinutes[adapterID] && deviceUnreachState) {
+										deviceState = 'Offline'; //set online state to offline
+										linkQuality = '0%'; // set linkQuality to nothing
+									}
+									break;
+								case 'ping':
+								case 'deconz':
+									if (this.maxMinutes[adapterID] <= 0) {
+										if (!deviceUnreachState) {
+											deviceState = 'Offline'; //set online state to offline
+											linkQuality = '0%'; // set linkQuality to nothing
+										}
+									} else if (lastDeviceUnreachStateChange > this.maxMinutes[adapterID] && !deviceUnreachState) {
+										deviceState = 'Offline'; //set online state to offline
+										linkQuality = '0%'; // set linkQuality to nothing
+									}
+									break;
+								case 'unifi':
+									if (this.maxMinutes[adapterID] <= 0) {
+										if (deviceUnreachState === 0) {
+											deviceState = 'Offline'; //set online state to offline
+											linkQuality = '0%'; // set linkQuality to nothing
+										}
+									} else if (this.maxMinutes !== undefined && lastContact > this.maxMinutes[adapterID]) {
+										deviceState = 'Offline'; //set online state to offline
+										linkQuality = '0%'; // set linkQuality to nothing
+									}
+									break;
+								case 'shelly':
+								case 'sonoff':
+									if (this.maxMinutes[adapterID] <= 0) {
+										if (!deviceUnreachState) {
+											deviceState = 'Offline'; //set online state to offline
+											linkQuality = '0%'; // set linkQuality to nothing
+										}
+									} else if (!deviceUnreachState && lastDeviceUnreachStateChange > this.maxMinutes[adapterID]) {
+										deviceState = 'Offline'; //set online state to offline
+										linkQuality = '0%'; // set linkQuality to nothing
+									}
+									break;
+								case 'mihomeVacuum':
+									if (this.maxMinutes[adapterID] <= 0) {
+										if (!shortDeviceUnreachState) {
+											deviceState = 'Offline'; //set online state to offline
+											linkQuality = '0%'; // set linkQuality to nothing
+										}
+									} else if (lastContact > this.maxMinutes[adapterID]) {
+										deviceState = 'Offline'; //set online state to offline
+										linkQuality = '0%'; // set linkQuality to nothing
+									}
+									break;
+								case 'mihome':
+									if (this.arrDev[i].battery === 'none') {
+										if (this.maxMinutes[adapterID] <= 0) {
+											if (!deviceUnreachState) {
+												deviceState = 'Offline'; //set online state to offline
+												linkQuality = '0%'; // set linkQuality to nothing
+											}
+										} else if (lastContact > this.maxMinutes[adapterID]) {
+											deviceState = 'Offline'; //set online state to offline
+											linkQuality = '0%'; // set linkQuality to nothing
+										}
+									} else {
+										if (this.config.mihomeMaxMinutes <= 0) {
+											if (this.maxMinutes[adapterID] <= 0) {
+												deviceState = 'Offline'; //set online state to offline
+												linkQuality = '0%'; // set linkQuality to nothing
+											}
+										} else if (lastContact > this.maxMinutes[adapterID]) {
+											deviceState = 'Offline'; //set online state to offline
+											linkQuality = '0%'; // set linkQuality to nothing
+										}
+									}
+									break;
+								default:
+									if (this.maxMinutes[adapterID] <= 0) {
+										if (!deviceUnreachState) {
+											deviceState = 'Offline'; //set online state to offline
+											linkQuality = '0%'; // set linkQuality to nothing
+										}
+									} else if (lastContact > this.maxMinutes[adapterID]) {
+										deviceState = 'Offline'; //set online state to offline
+										linkQuality = '0%'; // set linkQuality to nothing
+									}
+									break;
 							}
-						);
+						}
+					} catch (error) {
+						this.errorReporting('[getLastContact]', error);
 					}
-				} else { // Add all devices
-					this.listAllDevicesRaw.push(
-						{
-							'Path': id,
-							'Device': deviceName,
-							'Adapter': deviceAdapterName,
-							'Battery': batteryHealth,
-							'LowBat': lowBatIndicator,
+				}
+
+				/*=============================================
+				=          		  Fill Raw Lists          	  =
+				=============================================*/
+
+				/* Add only devices with battery in the rawlist */
+				if (this.listOnlyBattery) {
+					if (isBatteryDevice) {
+						this.listAllDevicesRaw.push({
+							Path: id,
+							Device: deviceName,
+							Adapter: adapter,
+							isBatteryDevice: isBatteryDevice,
+							Battery: batteryHealth,
+							LowBat: lowBatIndicator,
 							'Signal strength': linkQuality,
 							'Last contact': lastContactString,
-							'Status': deviceState
-						}
-					);
+							Status: deviceState,
+						});
+					}
+				} else {
+					/* Add all devices */
+					this.listAllDevicesRaw.push({
+						Path: id,
+						Device: deviceName,
+						Adapter: adapter,
+						isBatteryDevice: isBatteryDevice,
+						Battery: batteryHealth,
+						LowBat: lowBatIndicator,
+						'Signal strength': linkQuality,
+						'Last contact': lastContactString,
+						Status: deviceState,
+					});
 				}
 			} else {
-				return; // cancel run if unloaded was called.
+				/* cancel run if unloaded was called. */
+				return;
 			}
 		} // <-- end of loop
 		await this.createLists();
 		await this.countDevices();
 	} // <-- end of createData
 
-
 	/**
 	 * @param {string} adptName - Adapter name
 	 */
@@ -932,16 +1000,17 @@ 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 (let i = 0; i < this.arrDev.length; i++) {
-
-				if (this.arrDev[i].adapter.includes(adptName)) { // list device only if selected adapter matched with device
+				if (this.arrDev[i].adapterID.includes(adptName)) {
+					// list device only if selected adapter matched with device
 					await this.createData(i);
 				}
 			}
-			await this.writeDatapoints(adptName); // fill the datapoints
-			await this.resetVars(); // reset the arrays and counts
 
+			await this.writeDatapoints(adptName); // fill the datapoints
 		} catch (error) {
 			this.errorReporting('[createDataForEachAdapter]', error);
 		}
@@ -949,8 +1018,10 @@ class DeviceWatcher extends utils.Adapter {
 		this.log.debug(`Function finished: ${this.createDataForEachAdapter.name}`);
 	} // <-- end of createDataForEachAdapter
 
+	/**
+	 * create Data of all selected adapter in one list
+	 */
 	async createDataOfAllAdapter() {
-		// create Data of all selected adapter in one list
 		this.log.debug(`Function started: ${this.createDataOfAllAdapter.name}`);
 
 		try {
@@ -968,7 +1039,6 @@ class DeviceWatcher extends utils.Adapter {
 			if (this.config.checkSendOfflineMsg) await this.sendOfflineNotifications();
 
 			await this.writeDatapoints(); // fill the datapoints
-
 		} catch (error) {
 			this.errorReporting('[createDataOfAllAdapter]', error);
 		}
@@ -976,13 +1046,11 @@ class DeviceWatcher extends utils.Adapter {
 		this.log.debug(`Function finished: ${this.createDataOfAllAdapter.name}`);
 	} // <-- end of createDataOfAllAdapter
 
-
 	/**
 	 * Notification service
 	 * @param {string} text - Text which should be send
 	 */
 	async sendNotification(text) {
-
 		// Pushover
 		try {
 			if (this.config.instancePushover) {
@@ -996,7 +1064,7 @@ class DeviceWatcher extends utils.Adapter {
 						message: text,
 						title: this.config.titlePushover,
 						device: this.config.devicePushover,
-						priority: this.config.prioPushover
+						priority: this.config.prioPushover,
 					});
 				}
 			}
@@ -1016,7 +1084,7 @@ class DeviceWatcher extends utils.Adapter {
 					await this.sendToAsync(this.config.instanceTelegram, 'send', {
 						text: text,
 						user: this.config.deviceTelegram,
-						chatId: this.config.chatIdTelegram
+						chatId: this.config.chatIdTelegram,
 					});
 				}
 			}
@@ -1035,7 +1103,7 @@ class DeviceWatcher extends utils.Adapter {
 				} else {
 					await this.sendToAsync(this.config.instanceWhatsapp, 'send', {
 						text: text,
-						phone: this.config.phoneWhatsapp
+						phone: this.config.phoneWhatsapp,
 					});
 				}
 			}
@@ -1055,7 +1123,7 @@ class DeviceWatcher extends utils.Adapter {
 					await this.sendToAsync(this.config.instanceEmail, 'send', {
 						sendTo: this.config.sendToEmail,
 						text: text,
-						subject: this.config.subjectEmail
+						subject: this.config.subjectEmail,
 					});
 				}
 			}
@@ -1073,7 +1141,10 @@ class DeviceWatcher extends utils.Adapter {
 					this.log.warn('Jarvis instance is not running. Message could not be sent. Please check your instance configuration.');
 				} else {
 					const jsonText = JSON.stringify(text);
-					await this.setForeignStateAsync(`${this.config.instanceJarvis}.addNotification`, '{"title":"' + this.config.titleJarvis + ' (' + this.formatDate(new Date(), 'DD.MM.YYYY - hh:mm:ss') + ')","message": ' + jsonText + ',"display": "drawer"}');
+					await this.setForeignStateAsync(
+						`${this.config.instanceJarvis}.addNotification`,
+						'{"title":"' + this.config.titleJarvis + ' (' + this.formatDate(new Date(), 'DD.MM.YYYY - hh:mm:ss') + ')","message": ' + jsonText + ',"display": "drawer"}',
+					);
 				}
 			}
 		} catch (error) {
@@ -1090,7 +1161,10 @@ class DeviceWatcher extends utils.Adapter {
 					this.log.warn('Lovelace instance is not running. Message could not be sent. Please check your instance configuration.');
 				} else {
 					const jsonText = JSON.stringify(text);
-					await this.setForeignStateAsync(`${this.config.instanceLovelace}.notifications.add`, '{"message":' + jsonText + ', "title":"' + this.config.titleLovelace + ' (' + this.formatDate(new Date(), 'DD.MM.YYYY - hh:mm:ss') + ')"}');
+					await this.setForeignStateAsync(
+						`${this.config.instanceLovelace}.notifications.add`,
+						'{"message":' + jsonText + ', "title":"' + this.config.titleLovelace + ' (' + this.formatDate(new Date(), 'DD.MM.YYYY - hh:mm:ss') + ')"}',
+					);
 				}
 			}
 		} catch (error) {
@@ -1098,10 +1172,11 @@ class DeviceWatcher extends utils.Adapter {
 		}
 	} // <-- End of sendNotification function
 
+	/**
+	 * send shedule message for low battery devices
+	 */
 	async sendBatteryNotifyShedule() {
-		// send message for low battery devices
-
-		const time = (this.config.checkSendBatteryTime).split(':');
+		const time = this.config.checkSendBatteryTime.split(':');
 
 		const checkDays = []; // list of selected days
 
@@ -1114,8 +1189,9 @@ class DeviceWatcher extends utils.Adapter {
 		if (this.config.checkSaturday) checkDays.push(6);
 		if (this.config.checkSunday) checkDays.push(0);
 
-		if (checkDays.length >= 1) { // check if an day is selected
-			this.log.debug(`Number of selected days for daily battery message: ${checkDays.length}. Send Message on: ${(checkDays).join(', ')} ...`);
+		if (checkDays.length >= 1) {
+			// check if an day is selected
+			this.log.debug(`Number of selected days for daily battery message: ${checkDays.length}. Send Message on: ${checkDays.join(', ')} ...`);
 		} else {
 			this.log.warn(`No days selected for daily battery message. Please check the instance configuration!`);
 			return; // cancel function if no day is selected
@@ -1127,20 +1203,18 @@ class DeviceWatcher extends utils.Adapter {
 				try {
 					let deviceList = '';
 
-					for (const id of this.batteryLowPowered) {
-						if (!this.blacklistNotify.includes(id['Device'])) {
+					for (const id of this.batteryLowPoweredRaw) {
+						if (!this.blacklistNotify.includes(id['Path'])) {
 							deviceList = `${deviceList}\n${id['Device']} (${id['Battery']})`;
 						}
 					}
 
-					if ((this.lowBatteryPoweredCount > 0) && (deviceList.length > 0)) {
+					if (this.lowBatteryPoweredCountRaw > 0 && deviceList.length > 0) {
 						this.log.info(`Niedrige Batteriezustände: ${deviceList}`);
 						this.setStateAsync('lastNotification', `Niedrige Batteriezustände: ${deviceList}`, true);
 
 						this.sendNotification(`Niedriege Batteriezustände: ${deviceList}`);
-
 					}
-
 				} catch (error) {
 					this.errorReporting('[sendBatteryNotifyShedule]', error);
 				}
@@ -1148,48 +1222,48 @@ class DeviceWatcher extends utils.Adapter {
 		}
 	} //<--End of battery notification
 
+	/**
+	 * send message if an device is offline
+	 */
 	async sendOfflineNotifications() {
-		// send message if an device is offline
-
 		this.log.debug(`Start the function: ${this.sendOfflineNotifications.name}`);
 
 		try {
 			let msg = '';
 			let deviceList = '';
-			const offlineDevicesCountOld = await this.getOwnInitValue('offlineCount');
 
-			if ((this.offlineDevicesCount !== offlineDevicesCountOld)) {
-
-				for (const id of this.offlineDevices) {
-					if (!this.blacklistNotify.includes(id['Device'])) {
-						deviceList = `${deviceList}\n${id['Device']} (${id['Last contact']})`;
-					}
+			for (const id of this.offlineDevicesRaw) {
+				if (!this.blacklistNotify.includes(id['Path'])) {
+					deviceList = `${deviceList}\n${id['Device']} (${id['Last contact']})`;
 				}
-				if (deviceList.length > 0) {
-					if (deviceList.length == 0) {
-						msg = 'Alle Geräte sind Online.';
-					} else if (deviceList.length == 1) {	// make singular if it is only one device
-						msg = 'Folgendes Gerät ist seit einiger Zeit nicht erreichbar: \n';
-					} else if (deviceList.length >= 2) {		//make plural if it is more than one device
-						msg = `Folgende Geräte sind seit einiger Zeit nicht erreichbar: \n`;
-					}
-
-					this.log.info(msg + deviceList);
-					await this.setStateAsync('lastNotification', msg + deviceList, true);
-					await this.sendNotification(msg + deviceList);
+			}
+			if (deviceList.length !== this.offlineDevicesCountRawOld) {
+				if (deviceList.length == 0) {
+					msg = 'Alle Geräte sind Online.';
+				} else if (deviceList.length == 1) {
+					// make singular if it is only one device
+					msg = 'Folgendes Gerät ist seit einiger Zeit nicht erreichbar: \n';
+				} else if (deviceList.length >= 2) {
+					//make plural if it is more than one device
+					msg = `Folgende Geräte sind seit einiger Zeit nicht erreichbar: \n`;
 				}
 
+				this.log.info(msg + deviceList);
+				this.offlineDevicesCountRawOld = deviceList.length;
+				await this.setStateAsync('lastNotification', msg + deviceList, true);
+				await this.sendNotification(msg + deviceList);
 			}
 		} catch (error) {
 			this.errorReporting('[sendOfflineMessage]', error);
 		}
 		this.log.debug(`Finished the function: ${this.sendOfflineNotifications.name}`);
-	}//<--End of offline notification
+	} //<--End of offline notification
 
+	/**
+	 * send shedule message with offline devices
+	 */
 	async sendOfflineNotificationsShedule() {
-		// send daily an overview with offline devices
-
-		const time = (this.config.checkSendOfflineTime).split(':');
+		const time = this.config.checkSendOfflineTime.split(':');
 
 		const checkDays = []; // list of selected days
 
@@ -1202,8 +1276,9 @@ class DeviceWatcher extends utils.Adapter {
 		if (this.config.checkOfflineSaturday) checkDays.push(6);
 		if (this.config.checkOfflineSunday) checkDays.push(0);
 
-		if (checkDays.length >= 1) { // check if an day is selected
-			this.log.debug(`Number of selected days for daily offline message: ${checkDays.length}. Send Message on: ${(checkDays).join(', ')} ...`);
+		if (checkDays.length >= 1) {
+			// check if an day is selected
+			this.log.debug(`Number of selected days for daily offline message: ${checkDays.length}. Send Message on: ${checkDays.join(', ')} ...`);
 		} else {
 			this.log.warn(`No days selected for daily offline message. Please check the instance configuration!`);
 			return; // cancel function if no day is selected
@@ -1215,8 +1290,8 @@ class DeviceWatcher extends utils.Adapter {
 				try {
 					let deviceList = '';
 
-					for (const id of this.offlineDevices) {
-						if (!this.blacklistNotify.includes(id['Device'])) {
+					for (const id of this.offlineDevicesRaw) {
+						if (!this.blacklistNotify.includes(id['Path'])) {
 							deviceList = `${deviceList}\n${id['Device']} (${id['Last contact']})`;
 						}
 					}
@@ -1227,14 +1302,16 @@ class DeviceWatcher extends utils.Adapter {
 
 						this.sendNotification(`Geräte Offline: ${deviceList}`);
 					}
-
 				} catch (error) {
 					this.errorReporting('[sendOfflineNotificationsShedule]', error);
 				}
 			});
 		}
-	}//<--End of daily offline notification
+	} //<--End of daily offline notification
 
+	/**
+	 * reset arrays and counts
+	 */
 	async resetVars() {
 		//Reset all arrays and counts
 		this.log.debug(`Function started: ${this.resetVars.name}`);
@@ -1246,6 +1323,13 @@ class DeviceWatcher extends utils.Adapter {
 		this.batteryLowPowered = [];
 		this.listAllDevices = [];
 		this.listAllDevicesRaw = [];
+
+		// raws
+		this.batteryLowPoweredRaw = [];
+		this.offlineDevicesRaw = [];
+		this.lowBatteryPoweredCountRaw = 0;
+		this.offlineDevicesCountRaw = 0;
+
 		// counts
 		this.offlineDevicesCount = 0;
 		this.deviceCounter = 0;
@@ -1256,7 +1340,6 @@ class DeviceWatcher extends utils.Adapter {
 		this.log.debug(`Function finished: ${this.resetVars.name}`);
 	} // <-- end of resetVars
 
-
 	/**
 	 * @param {string} [adptName] - Adaptername
 	 */
@@ -1266,7 +1349,6 @@ class DeviceWatcher extends utils.Adapter {
 		this.log.debug(`Start the function: ${this.writeDatapoints.name}`);
 
 		try {
-
 			let dpSubFolder;
 			//write the datapoints in subfolders with the adaptername otherwise write the dP's in the root folder
 			if (adptName) {
@@ -1282,62 +1364,91 @@ class DeviceWatcher extends utils.Adapter {
 
 			if (this.deviceCounter == 0) {
 				// if no device is count, write the JSON List with default value
-				this.listAllDevices = [{ 'Device': '--none--', 'Adapter': '', 'Battery': '', 'Last contact': '', 'Signal strength': '' }];
+				this.listAllDevices = [{ Device: '--none--', Adapter: '', Battery: '', 'Last contact': '', 'Signal strength': '' }];
 			}
 			await this.setStateAsync(`${dpSubFolder}listAll`, { val: JSON.stringify(this.listAllDevices), ack: true });
 
 			if (this.linkQualityCount == 0) {
 				// if no device is count, write the JSON List with default value
-				this.linkQualityDevices = [{ 'Device': '--none--', 'Adapter': '', 'Signal strength': '' }];
+				this.linkQualityDevices = [{ Device: '--none--', Adapter: '', 'Signal strength': '' }];
 			}
 			//write JSON list
-			await this.setStateAsync(`${dpSubFolder}linkQualityList`, { val: JSON.stringify(this.linkQualityDevices), ack: true });
+			await this.setStateAsync(`${dpSubFolder}linkQualityList`, {
+				val: JSON.stringify(this.linkQualityDevices),
+				ack: true,
+			});
 			//write HTML list
-			if (this.config.createHtmlList) await this.setStateAsync(`${dpSubFolder}linkQualityListHTML`, { val: await this.creatLinkQualityListHTML(this.linkQualityDevices, this.linkQualityCount), ack: true });
+			if (this.config.createHtmlList)
+				await this.setStateAsync(`${dpSubFolder}linkQualityListHTML`, {
+					val: await this.creatLinkQualityListHTML(this.linkQualityDevices, this.linkQualityCount),
+					ack: true,
+				});
 
 			if (this.offlineDevicesCount == 0) {
 				// if no device is count, write the JSON List with default value
-				this.offlineDevices = [{ 'Device': '--none--', 'Adapter': '', 'Last contact': '' }];
+				this.offlineDevices = [{ Device: '--none--', Adapter: '', 'Last contact': '' }];
 			}
 			//write JSON list
-			await this.setStateAsync(`${dpSubFolder}offlineList`, { val: JSON.stringify(this.offlineDevices), ack: true });
+			await this.setStateAsync(`${dpSubFolder}offlineList`, {
+				val: JSON.stringify(this.offlineDevices),
+				ack: true,
+			});
 			//write HTML list
-			if (this.config.createHtmlList) await this.setStateAsync(`${dpSubFolder}offlineListHTML`, { val: await this.createOfflineListHTML(this.offlineDevices, this.offlineDevicesCount), ack: true });
+			if (this.config.createHtmlList)
+				await this.setStateAsync(`${dpSubFolder}offlineListHTML`, {
+					val: await this.createOfflineListHTML(this.offlineDevices, this.offlineDevicesCount),
+					ack: true,
+				});
 
 			if (this.batteryPoweredCount == 0) {
 				// if no device is count, write the JSON List with default value
-				this.batteryPowered = [{ 'Device': '--none--', 'Adapter': '', 'Battery': '' }];
+				this.batteryPowered = [{ Device: '--none--', Adapter: '', Battery: '' }];
 			}
 			//write JSON list
-			await this.setStateAsync(`${dpSubFolder}batteryList`, { val: JSON.stringify(this.batteryPowered), ack: true });
+			await this.setStateAsync(`${dpSubFolder}batteryList`, {
+				val: JSON.stringify(this.batteryPowered),
+				ack: true,
+			});
 			//write HTML list
-			if (this.config.createHtmlList) await this.setStateAsync(`${dpSubFolder}batteryListHTML`, { val: await this.createBatteryListHTML(this.batteryPowered, this.batteryPoweredCount, false), ack: true });
+			if (this.config.createHtmlList)
+				await this.setStateAsync(`${dpSubFolder}batteryListHTML`, {
+					val: await this.createBatteryListHTML(this.batteryPowered, this.batteryPoweredCount, false),
+					ack: true,
+				});
 
 			if (this.lowBatteryPoweredCount == 0) {
 				// if no device is count, write the JSON List with default value
-				this.batteryLowPowered = [{ 'Device': '--none--', 'Adapter': '', 'Battery': '' }];
+				this.batteryLowPowered = [{ Device: '--none--', Adapter: '', Battery: '' }];
 			}
 			//write JSON list
-			await this.setStateAsync(`${dpSubFolder}lowBatteryList`, { val: JSON.stringify(this.batteryLowPowered), ack: true });
+			await this.setStateAsync(`${dpSubFolder}lowBatteryList`, {
+				val: JSON.stringify(this.batteryLowPowered),
+				ack: true,
+			});
 			//write HTML list
-			if (this.config.createHtmlList) await this.setStateAsync(`${dpSubFolder}lowBatteryListHTML`, { val: await this.createBatteryListHTML(this.batteryLowPowered, this.lowBatteryPoweredCount, true), ack: true });
+			if (this.config.createHtmlList)
+				await this.setStateAsync(`${dpSubFolder}lowBatteryListHTML`, {
+					val: await this.createBatteryListHTML(this.batteryLowPowered, this.lowBatteryPoweredCount, true),
+					ack: true,
+				});
 
 			// create timestamp of last run
 			const lastCheck = this.formatDate(new Date(), 'DD.MM.YYYY') + ' - ' + this.formatDate(new Date(), 'hh:mm:ss');
 			await this.setStateAsync('lastCheck', lastCheck, true);
-		}
-		catch (error) {
+		} catch (error) {
 			this.errorReporting('[writeDatapoints]', error);
 		}
 		this.log.debug(`Function finished: ${this.writeDatapoints.name}`);
-	}//<--End  of writing Datapoints
+	} //<--End  of writing Datapoints
 
 	/**
 	 * @param {object} devices - Device
 	 * @param {number} deviceCount - Counted devices
 	 */
 	async creatLinkQualityListHTML(devices, deviceCount) {
-		devices = devices.sort((a, b) => { return a.Device.localeCompare(b.Device); });
+		devices = devices.sort((a, b) => {
+			return a.Device.localeCompare(b.Device);
+		});
 		let html = `<center>
 		<b>Link Quality Devices:<font> ${deviceCount}</b><small></small></font>
 		<p></p>
@@ -1369,7 +1480,9 @@ class DeviceWatcher extends utils.Adapter {
 	 * @param {number} deviceCount - Counted devices
 	 */
 	async createOfflineListHTML(devices, deviceCount) {
-		devices = devices.sort((a, b) => { return a.Device.localeCompare(b.Device); });
+		devices = devices.sort((a, b) => {
+			return a.Device.localeCompare(b.Device);
+		});
 		let html = `<center>
 		<b>Offline Devices: <font color=${deviceCount == 0 ? '#3bcf0e' : 'orange'}>${deviceCount}</b><small></small></font>
 		<p></p>
@@ -1402,7 +1515,9 @@ class DeviceWatcher extends utils.Adapter {
 	 * @param {object} [isLowBatteryList] - list Low Battery Devices
 	 */
 	async createBatteryListHTML(devices, deviceCount, isLowBatteryList) {
-		devices = devices.sort((a, b) => { return a.Device.localeCompare(b.Device); });
+		devices = devices.sort((a, b) => {
+			return a.Device.localeCompare(b.Device);
+		});
 		let html = `<center>
 		<b>${isLowBatteryList == true ? 'Schwache ' : ''}Batterie Devices: <font color=${isLowBatteryList == true ? (deviceCount > 0 ? 'orange' : '#3bcf0e') : ''}>${deviceCount}</b></font>
 		<p></p>
@@ -1416,7 +1531,6 @@ class DeviceWatcher extends utils.Adapter {
 		<tr>
 		<td colspan="5"><hr></td>
 		</tr>`;
-
 		for (const device of devices) {
 			html += `<tr>
 			<td><font>${device.Device}</font></td>
@@ -1427,7 +1541,6 @@ class DeviceWatcher extends utils.Adapter {
 			} else {
 				html += `<td align=right><font color=#3bcf0e>${device.Battery}</font></td>`;
 			}
-
 			html += `</tr>`;
 		}
 
@@ -1440,7 +1553,6 @@ class DeviceWatcher extends utils.Adapter {
 	 * @param {object} adptName - Adaptername of devices
 	 */
 	async createDPsForEachAdapter(adptName) {
-
 		await this.setObjectNotExistsAsync(`${adptName}`, {
 			type: 'channel',
 			common: {
@@ -1450,210 +1562,210 @@ class DeviceWatcher extends utils.Adapter {
 		});
 
 		await this.setObjectNotExistsAsync(`${adptName}.offlineCount`, {
-			'type': 'state',
-			'common': {
-				'name': {
-					'en': 'Number of devices offline',
-					'de': 'Anzahl der Geräte offline',
-					'ru': 'Количество устройств offline',
-					'pt': 'Número de dispositivos offline',
-					'nl': 'Nummer van apparatuur offline',
-					'fr': 'Nombre de dispositifs hors ligne',
-					'it': 'Numero di dispositivi offline',
-					'es': 'Número de dispositivos sin conexión',
-					'pl': 'Ilość urządzeń offline',
-					'zh-cn': '线内装置数量'
+			type: 'state',
+			common: {
+				name: {
+					en: 'Number of devices offline',
+					de: 'Anzahl der Geräte offline',
+					ru: 'Количество устройств offline',
+					pt: 'Número de dispositivos offline',
+					nl: 'Nummer van apparatuur offline',
+					fr: 'Nombre de dispositifs hors ligne',
+					it: 'Numero di dispositivi offline',
+					es: 'Número de dispositivos sin conexión',
+					pl: 'Ilość urządzeń offline',
+					'zh-cn': '线内装置数量',
 				},
-				'type': 'number',
-				'role': 'value',
-				'read': true,
-				'write': false,
+				type: 'number',
+				role: 'value',
+				read: true,
+				write: false,
 			},
-			'native': {}
+			native: {},
 		});
 
 		await this.setObjectNotExistsAsync(`${adptName}.offlineList`, {
-			'type': 'state',
-			'common': {
-				'name': {
-					'en': 'List of offline devices',
-					'de': 'Liste der Offline-Geräte',
-					'ru': 'Список оффлайн устройств',
-					'pt': 'Lista de dispositivos off-line',
-					'nl': 'List van offline apparatuur',
-					'fr': 'Liste des dispositifs hors ligne',
-					'it': 'Elenco dei dispositivi offline',
-					'es': 'Lista de dispositivos sin conexión',
-					'pl': 'Lista urządzeń offline',
-					'zh-cn': '线装置清单'
+			type: 'state',
+			common: {
+				name: {
+					en: 'List of offline devices',
+					de: 'Liste der Offline-Geräte',
+					ru: 'Список оффлайн устройств',
+					pt: 'Lista de dispositivos off-line',
+					nl: 'List van offline apparatuur',
+					fr: 'Liste des dispositifs hors ligne',
+					it: 'Elenco dei dispositivi offline',
+					es: 'Lista de dispositivos sin conexión',
+					pl: 'Lista urządzeń offline',
+					'zh-cn': '线装置清单',
 				},
-				'type': 'array',
-				'role': 'json',
-				'read': true,
-				'write': false,
+				type: 'array',
+				role: 'json',
+				read: true,
+				write: false,
 			},
-			'native': {}
+			native: {},
 		});
 
 		await this.setObjectNotExistsAsync(`${adptName}.listAll`, {
-			'type': 'state',
-			'common': {
-				'name': {
-					'en': 'List of all devices',
-					'de': 'Liste aller Geräte',
-					'ru': 'Список всех устройств',
-					'pt': 'Lista de todos os dispositivos',
-					'nl': 'List van alle apparaten',
-					'fr': 'Liste de tous les dispositifs',
-					'it': 'Elenco di tutti i dispositivi',
-					'es': 'Lista de todos los dispositivos',
-					'pl': 'Lista wszystkich urządzeń',
-					'zh-cn': '所有装置清单'
+			type: 'state',
+			common: {
+				name: {
+					en: 'List of all devices',
+					de: 'Liste aller Geräte',
+					ru: 'Список всех устройств',
+					pt: 'Lista de todos os dispositivos',
+					nl: 'List van alle apparaten',
+					fr: 'Liste de tous les dispositifs',
+					it: 'Elenco di tutti i dispositivi',
+					es: 'Lista de todos los dispositivos',
+					pl: 'Lista wszystkich urządzeń',
+					'zh-cn': '所有装置清单',
 				},
-				'type': 'array',
-				'role': 'json',
-				'read': true,
-				'write': false,
+				type: 'array',
+				role: 'json',
+				read: true,
+				write: false,
 			},
-			'native': {}
+			native: {},
 		});
 
 		await this.setObjectNotExistsAsync(`${adptName}.linkQualityList`, {
-			'type': 'state',
-			'common': {
-				'name': {
-					'en': 'List of devices with signal strength',
-					'de': 'Liste der Geräte mit Signalstärke',
-					'ru': 'Список устройств с силой сигнала',
-					'pt': 'Lista de dispositivos com força de sinal',
-					'nl': 'List van apparaten met signaalkracht',
-					'fr': 'Liste des dispositifs avec force de signal',
-					'it': 'Elenco dei dispositivi con forza del segnale',
-					'es': 'Lista de dispositivos con fuerza de señal',
-					'pl': 'Lista urządzeń z siłą sygnałową',
-					'zh-cn': '具有信号实力的装置清单'
+			type: 'state',
+			common: {
+				name: {
+					en: 'List of devices with signal strength',
+					de: 'Liste der Geräte mit Signalstärke',
+					ru: 'Список устройств с силой сигнала',
+					pt: 'Lista de dispositivos com força de sinal',
+					nl: 'List van apparaten met signaalkracht',
+					fr: 'Liste des dispositifs avec force de signal',
+					it: 'Elenco dei dispositivi con forza del segnale',
+					es: 'Lista de dispositivos con fuerza de señal',
+					pl: 'Lista urządzeń z siłą sygnałową',
+					'zh-cn': '具有信号实力的装置清单',
 				},
-				'type': 'array',
-				'role': 'json',
-				'read': true,
-				'write': false,
+				type: 'array',
+				role: 'json',
+				read: true,
+				write: false,
 			},
-			'native': {}
+			native: {},
 		});
 
 		await this.setObjectNotExistsAsync(`${adptName}.countAll`, {
-			'type': 'state',
-			'common': {
-				'name': {
-					'en': 'Number of all devices',
-					'de': 'Anzahl aller Geräte',
-					'ru': 'Количество всех устройств',
-					'pt': 'Número de todos os dispositivos',
-					'nl': 'Nummer van alle apparaten',
-					'fr': 'Nombre de tous les appareils',
-					'it': 'Numero di tutti i dispositivi',
-					'es': 'Número de todos los dispositivos',
-					'pl': 'Ilość wszystkich urządzeń',
-					'zh-cn': '所有装置的数目'
+			type: 'state',
+			common: {
+				name: {
+					en: 'Number of all devices',
+					de: 'Anzahl aller Geräte',
+					ru: 'Количество всех устройств',
+					pt: 'Número de todos os dispositivos',
+					nl: 'Nummer van alle apparaten',
+					fr: 'Nombre de tous les appareils',
+					it: 'Numero di tutti i dispositivi',
+					es: 'Número de todos los dispositivos',
+					pl: 'Ilość wszystkich urządzeń',
+					'zh-cn': '所有装置的数目',
 				},
-				'type': 'number',
-				'role': 'value',
-				'read': true,
-				'write': false,
+				type: 'number',
+				role: 'value',
+				read: true,
+				write: false,
 			},
-			'native': {}
+			native: {},
 		});
 
 		await this.setObjectNotExistsAsync(`${adptName}.batteryList`, {
-			'type': 'state',
-			'common': {
-				'name': {
-					'en': 'List of devices with battery state',
-					'de': 'Liste der Geräte mit Batteriezustand',
-					'ru': 'Список устройств с состоянием батареи',
-					'pt': 'Lista de dispositivos com estado da bateria',
-					'nl': 'List van apparaten met batterij staat',
-					'fr': 'Liste des appareils avec état de batterie',
-					'it': 'Elenco dei dispositivi con stato della batteria',
-					'es': 'Lista de dispositivos con estado de batería',
-					'pl': 'Lista urządzeń z baterią stanową',
-					'zh-cn': '电池国装置清单'
+			type: 'state',
+			common: {
+				name: {
+					en: 'List of devices with battery state',
+					de: 'Liste der Geräte mit Batteriezustand',
+					ru: 'Список устройств с состоянием батареи',
+					pt: 'Lista de dispositivos com estado da bateria',
+					nl: 'List van apparaten met batterij staat',
+					fr: 'Liste des appareils avec état de batterie',
+					it: 'Elenco dei dispositivi con stato della batteria',
+					es: 'Lista de dispositivos con estado de batería',
+					pl: 'Lista urządzeń z baterią stanową',
+					'zh-cn': '电池国装置清单',
 				},
-				'type': 'array',
-				'role': 'json',
-				'read': true,
-				'write': false,
+				type: 'array',
+				role: 'json',
+				read: true,
+				write: false,
 			},
-			'native': {}
+			native: {},
 		});
 
 		await this.setObjectNotExistsAsync(`${adptName}.lowBatteryList`, {
-			'type': 'state',
-			'common': {
-				'name': {
-					'en': 'List of devices with low battery state',
-					'de': 'Liste der Geräte mit niedrigem Batteriezustand',
-					'ru': 'Список устройств с низким состоянием батареи',
-					'pt': 'Lista de dispositivos com baixo estado da bateria',
-					'nl': 'List van apparaten met lage batterij staat',
-					'fr': 'Liste des appareils à faible état de batterie',
-					'it': 'Elenco di dispositivi con stato di batteria basso',
-					'es': 'Lista de dispositivos con estado de batería bajo',
-					'pl': 'Lista urządzeń o niskim stanie baterii',
-					'zh-cn': '低电池国家装置清单'
+			type: 'state',
+			common: {
+				name: {
+					en: 'List of devices with low battery state',
+					de: 'Liste der Geräte mit niedrigem Batteriezustand',
+					ru: 'Список устройств с низким состоянием батареи',
+					pt: 'Lista de dispositivos com baixo estado da bateria',
+					nl: 'List van apparaten met lage batterij staat',
+					fr: 'Liste des appareils à faible état de batterie',
+					it: 'Elenco di dispositivi con stato di batteria basso',
+					es: 'Lista de dispositivos con estado de batería bajo',
+					pl: 'Lista urządzeń o niskim stanie baterii',
+					'zh-cn': '低电池国家装置清单',
 				},
-				'type': 'array',
-				'role': 'json',
-				'read': true,
-				'write': false,
+				type: 'array',
+				role: 'json',
+				read: true,
+				write: false,
 			},
-			'native': {}
+			native: {},
 		});
 
 		await this.setObjectNotExistsAsync(`${adptName}.lowBatteryCount`, {
-			'type': 'state',
-			'common': {
-				'name': {
-					'en': 'Number of devices with low battery',
-					'de': 'Anzahl der Geräte mit niedriger Batterie',
-					'ru': 'Количество устройств c низкой батареей',
-					'pt': 'Número de dispositivos com bateria baixa',
-					'nl': 'Nummer van apparaten met lage batterij',
-					'fr': 'Nombre de dispositifs avec batterie basse',
-					'it': 'Numero di dispositivi con batteria bassa',
-					'es': 'Número de dispositivos con batería baja',
-					'pl': 'Liczba urządzeń z niską baterią',
-					'zh-cn': '低电池的装置数量'
+			type: 'state',
+			common: {
+				name: {
+					en: 'Number of devices with low battery',
+					de: 'Anzahl der Geräte mit niedriger Batterie',
+					ru: 'Количество устройств c низкой батареей',
+					pt: 'Número de dispositivos com bateria baixa',
+					nl: 'Nummer van apparaten met lage batterij',
+					fr: 'Nombre de dispositifs avec batterie basse',
+					it: 'Numero di dispositivi con batteria bassa',
+					es: 'Número de dispositivos con batería baja',
+					pl: 'Liczba urządzeń z niską baterią',
+					'zh-cn': '低电池的装置数量',
 				},
-				'type': 'number',
-				'role': 'value',
-				'read': true,
-				'write': false,
+				type: 'number',
+				role: 'value',
+				read: true,
+				write: false,
 			},
-			'native': {}
+			native: {},
 		});
 
 		await this.setObjectNotExistsAsync(`${adptName}.batteryCount`, {
-			'type': 'state',
-			'common': {
-				'name': {
-					'en': 'Number of devices with battery',
-					'de': 'Anzahl der Geräte mit Batterie',
-					'ru': 'Количество устройств c батареей',
-					'pt': 'Número de dispositivos com bateria',
-					'nl': 'Nummer van apparaten met batterij',
-					'fr': 'Nombre de dispositifs avec batterie',
-					'it': 'Numero di dispositivi con batteria',
-					'es': 'Número de dispositivos con batería',
-					'pl': 'Liczba urządzeń z baterią',
-					'zh-cn': '电池的装置数量'
+			type: 'state',
+			common: {
+				name: {
+					en: 'Number of devices with battery',
+					de: 'Anzahl der Geräte mit Batterie',
+					ru: 'Количество устройств c батареей',
+					pt: 'Número de dispositivos com bateria',
+					nl: 'Nummer van apparaten met batterij',
+					fr: 'Nombre de dispositifs avec batterie',
+					it: 'Numero di dispositivi con batteria',
+					es: 'Número de dispositivos con batería',
+					pl: 'Liczba urządzeń z baterią',
+					'zh-cn': '电池的装置数量',
 				},
-				'type': 'number',
-				'role': 'value',
-				'read': true,
-				'write': false,
+				type: 'number',
+				role: 'value',
+				read: true,
+				write: false,
 			},
-			'native': {}
+			native: {},
 		});
 	}
 
@@ -1661,7 +1773,6 @@ class DeviceWatcher extends utils.Adapter {
 	 * @param {object} [adptName] - Adaptername of devices
 	 **/
 	async createHtmlListDatapoints(adptName) {
-
 		let dpSubFolder;
 		//write the datapoints in subfolders with the adaptername otherwise write the dP's in the root folder
 		if (adptName) {
@@ -1671,95 +1782,95 @@ class DeviceWatcher extends utils.Adapter {
 		}
 
 		await this.setObjectNotExistsAsync(`${dpSubFolder}offlineListHTML`, {
-			'type': 'state',
-			'common': {
-				'name': {
-					'en': 'HTML List of offline devices',
-					'de': 'HTML Liste der Offline-Geräte',
-					'ru': 'HTML Список оффлайн устройств',
-					'pt': 'HTML Lista de dispositivos off-line',
-					'nl': 'HTML List van offline apparatuur',
-					'fr': 'HTML Liste des dispositifs hors ligne',
-					'it': 'HTML Elenco dei dispositivi offline',
-					'es': 'HTML Lista de dispositivos sin conexión',
-					'pl': 'HTML Lista urządzeń offline',
-					'zh-cn': 'HTML 线装置清单'
+			type: 'state',
+			common: {
+				name: {
+					en: 'HTML List of offline devices',
+					de: 'HTML Liste der Offline-Geräte',
+					ru: 'HTML Список оффлайн устройств',
+					pt: 'HTML Lista de dispositivos off-line',
+					nl: 'HTML List van offline apparatuur',
+					fr: 'HTML Liste des dispositifs hors ligne',
+					it: 'HTML Elenco dei dispositivi offline',
+					es: 'HTML Lista de dispositivos sin conexión',
+					pl: 'HTML Lista urządzeń offline',
+					'zh-cn': 'HTML 线装置清单',
 				},
-				'type': 'string',
-				'role': 'html',
-				'read': true,
-				'write': false,
+				type: 'string',
+				role: 'html',
+				read: true,
+				write: false,
 			},
-			'native': {}
+			native: {},
 		});
 
 		await this.setObjectNotExistsAsync(`${dpSubFolder}linkQualityListHTML`, {
-			'type': 'state',
-			'common': {
-				'name': {
-					'en': 'HTML List of devices with signal strength',
-					'de': 'HTML Liste der Geräte mit Signalstärke',
-					'ru': 'HTML Список устройств с силой сигнала',
-					'pt': 'HTML Lista de dispositivos com força de sinal',
-					'nl': 'HTML List van apparaten met signaalkracht',
-					'fr': 'HTML Liste des dispositifs avec force de signal',
-					'it': 'HTML Elenco dei dispositivi con forza del segnale',
-					'es': 'HTML Lista de dispositivos con fuerza de señal',
-					'pl': 'HTML Lista urządzeń z siłą sygnałową',
-					'zh-cn': 'HTML 具有信号实力的装置清单'
+			type: 'state',
+			common: {
+				name: {
+					en: 'HTML List of devices with signal strength',
+					de: 'HTML Liste der Geräte mit Signalstärke',
+					ru: 'HTML Список устройств с силой сигнала',
+					pt: 'HTML Lista de dispositivos com força de sinal',
+					nl: 'HTML List van apparaten met signaalkracht',
+					fr: 'HTML Liste des dispositifs avec force de signal',
+					it: 'HTML Elenco dei dispositivi con forza del segnale',
+					es: 'HTML Lista de dispositivos con fuerza de señal',
+					pl: 'HTML Lista urządzeń z siłą sygnałową',
+					'zh-cn': 'HTML 具有信号实力的装置清单',
 				},
-				'type': 'string',
-				'role': 'value',
-				'read': true,
-				'write': false,
+				type: 'string',
+				role: 'value',
+				read: true,
+				write: false,
 			},
-			'native': {}
+			native: {},
 		});
 
 		await this.setObjectNotExistsAsync(`${dpSubFolder}batteryListHTML`, {
-			'type': 'state',
-			'common': {
-				'name': {
-					'en': 'HTML List of devices with battery state',
-					'de': 'HTML Liste der Geräte mit Batteriezustand',
-					'ru': 'HTML Список устройств с состоянием батареи',
-					'pt': 'HTML Lista de dispositivos com estado da bateria',
-					'nl': 'HTML List van apparaten met batterij staat',
-					'fr': 'HTML Liste des appareils avec état de batterie',
-					'it': 'HTML Elenco dei dispositivi con stato della batteria',
-					'es': 'HTML Lista de dispositivos con estado de batería',
-					'pl': 'HTML Lista urządzeń z baterią stanową',
-					'zh-cn': 'HTML 电池国装置清单'
+			type: 'state',
+			common: {
+				name: {
+					en: 'HTML List of devices with battery state',
+					de: 'HTML Liste der Geräte mit Batteriezustand',
+					ru: 'HTML Список устройств с состоянием батареи',
+					pt: 'HTML Lista de dispositivos com estado da bateria',
+					nl: 'HTML List van apparaten met batterij staat',
+					fr: 'HTML Liste des appareils avec état de batterie',
+					it: 'HTML Elenco dei dispositivi con stato della batteria',
+					es: 'HTML Lista de dispositivos con estado de batería',
+					pl: 'HTML Lista urządzeń z baterią stanową',
+					'zh-cn': 'HTML 电池国装置清单',
 				},
-				'type': 'string',
-				'role': 'html',
-				'read': true,
-				'write': false,
+				type: 'string',
+				role: 'html',
+				read: true,
+				write: false,
 			},
-			'native': {}
+			native: {},
 		});
 
 		await this.setObjectNotExistsAsync(`${dpSubFolder}lowBatteryListHTML`, {
-			'type': 'state',
-			'common': {
-				'name': {
-					'en': 'HTML List of devices with low battery state',
-					'de': 'HTML Liste der Geräte mit niedrigem Batteriezustand',
-					'ru': 'HTML Список устройств с низким состоянием батареи',
-					'pt': 'HTML Lista de dispositivos com baixo estado da bateria',
-					'nl': 'HTML List van apparaten met lage batterij staat',
-					'fr': 'HTML Liste des appareils à faible état de batterie',
-					'it': 'HTML Elenco di dispositivi con stato di batteria basso',
-					'es': 'HTML Lista de dispositivos con estado de batería bajo',
-					'pl': 'HTML Lista urządzeń o niskim stanie baterii',
-					'zh-cn': 'HTML 低电池国家装置清单'
+			type: 'state',
+			common: {
+				name: {
+					en: 'HTML List of devices with low battery state',
+					de: 'HTML Liste der Geräte mit niedrigem Batteriezustand',
+					ru: 'HTML Список устройств с низким состоянием батареи',
+					pt: 'HTML Lista de dispositivos com baixo estado da bateria',
+					nl: 'HTML List van apparaten met lage batterij staat',
+					fr: 'HTML Liste des appareils à faible état de batterie',
+					it: 'HTML Elenco di dispositivi con stato di batteria basso',
+					es: 'HTML Lista de dispositivos con estado de batería bajo',
+					pl: 'HTML Lista urządzeń o niskim stanie baterii',
+					'zh-cn': 'HTML 低电池国家装置清单',
 				},
-				'type': 'string',
-				'role': 'html',
-				'read': true,
-				'write': false,
+				type: 'string',
+				role: 'html',
+				read: true,
+				write: false,
 			},
-			'native': {}
+			native: {},
 		});
 	}
 
@@ -1782,10 +1893,9 @@ class DeviceWatcher extends utils.Adapter {
 		}
 	} // <-- end of errorReporting
 
-
 	/**
-     * @param {() => void} callback
-     */
+	 * @param {() => void} callback
+	 */
 	onUnload(callback) {
 		try {
 			if (this.refreshDataTimeout) {