iobroker.device-watcher 2.3.0 → 2.4.0

package/main.js

@@ -10,7 +10,7 @@ const schedule = require('node-schedule');
 const arrApart = require('./lib/arrApart.js'); // list of supported adapters
 
 // Sentry error reporting, disable when testing code!
-const enableSendSentry = false;
+const enableSendSentry = true;
 
 // indicator if the adapter is running or not (for intervall/shedule)
 let isUnloaded = false;
@@ -32,7 +32,7 @@ class DeviceWatcher extends utils.Adapter {
 		this.blacklistLists = [];
 		this.blacklistAdapterLists = [];
 		this.blacklistNotify = [];
-		this.arrDev = [];
+		this.selAdapter = [];
 		this.adapterSelected = [];
 		this.upgradableList = [];
 
@@ -40,6 +40,7 @@ class DeviceWatcher extends utils.Adapter {
 		this.listAllDevicesRaw = [];
 		this.batteryLowPoweredRaw = [];
 		this.offlineDevicesRaw = [];
+		this.upgradableDevicesRaw = [];
 
 		// counts
 		this.offlineDevicesCount = 0;
@@ -65,14 +66,12 @@ class DeviceWatcher extends utils.Adapter {
 	async onReady() {
 		this.log.debug(`Adapter ${adapterName} was started`);
 
-		isUnloaded = false;
-
 		try {
 			this.listOnlyBattery = this.config.listOnlyBattery;
 			this.createOwnFolder = this.config.createOwnFolder;
 			this.createHtmlList = this.config.createHtmlList;
 
-			this.supAdapter = {
+			this.configSetAdapter = {
 				alexa2: this.config.alexa2Devices,
 				apcups: this.config.apcupsDevices,
 				ble: this.config.bleDevices,
@@ -86,6 +85,7 @@ class DeviceWatcher extends utils.Adapter {
 				harmony: this.config.harmonyDevices,
 				hmiP: this.config.hmiPDevices,
 				hmrpc: this.config.hmrpcDevices,
+				homeconnect: this.config.homeconnectDevices,
 				hs100: this.config.hs100Devices,
 				hue: this.config.hueDevices,
 				hueExt: this.config.hueExtDevices,
@@ -106,6 +106,7 @@ class DeviceWatcher extends utils.Adapter {
 				ping: this.config.pingDevices,
 				roomba: this.config.roombaDevices,
 				shelly: this.config.shellyDevices,
+				smartgarden: this.config.smartgardenDevices,
 				sonoff: this.config.sonoffDevices,
 				sonos: this.config.sonosDevices,
 				sureflap: this.config.sureflapDevices,
@@ -121,7 +122,7 @@ class DeviceWatcher extends utils.Adapter {
 				zwave: this.config.zwaveDevices,
 			};
 
-			this.maxMinutes = {
+			this.configMaxMinutes = {
 				alexa2: this.config.alexa2MaxMinutes,
 				apcups: this.config.apcupsMaxMinutes,
 				ble: this.config.bleMaxMinutes,
@@ -135,6 +136,7 @@ class DeviceWatcher extends utils.Adapter {
 				harmony: this.config.harmonyMaxMinutes,
 				hmiP: this.config.hmiPMaxMinutes,
 				hmrpc: this.config.hmrpcMaxMinutes,
+				homeconnect: this.config.homeconnectMaxMinutes,
 				hs100: this.config.hs100MaxMinutes,
 				hue: this.config.hueMaxMinutes,
 				hueExt: this.config.hueextMaxMinutes,
@@ -155,6 +157,7 @@ class DeviceWatcher extends utils.Adapter {
 				ping: this.config.pingMaxMinutes,
 				roomba: this.config.roombaMaxMinutes,
 				shelly: this.config.shellyMaxMinutes,
+				smartgarden: this.config.smartgardenMaxMinutes,
 				sonoff: this.config.sonoffMaxMinutes,
 				sonos: this.config.sonosMaxMinutes,
 				sureflap: this.config.sureflapMaxMinutes,
@@ -171,20 +174,16 @@ class DeviceWatcher extends utils.Adapter {
 			};
 
 			for (const [id] of Object.entries(arrApart)) {
-				if (!isUnloaded) {
-					if (this.supAdapter[id]) {
-						this.arrDev.push(arrApart[id]);
-						this.adapterSelected.push(await this.capitalize(id));
-					}
-				} else {
-					return; // cancel run if unloaded was called.
+				if (this.configSetAdapter[id]) {
+					this.selAdapter.push(arrApart[id]);
+					this.adapterSelected.push(await this.capitalize(id));
 				}
 			}
 
 			//Check if an Adapter is selected.
 			if (this.adapterSelected.length >= 1) {
 				// show list in debug log
-				this.log.debug(JSON.stringify(this.arrDev));
+				this.log.debug(JSON.stringify(this.selAdapter));
 
 				this.log.info(`Number of selected adapters: ${this.adapterSelected.length}. Loading data from: ${this.adapterSelected.join(', ')} ...`);
 			} else {
@@ -203,7 +202,7 @@ class DeviceWatcher extends utils.Adapter {
 			if (this.createOwnFolder) {
 				try {
 					for (const [id] of Object.entries(arrApart)) {
-						if (this.supAdapter !== undefined && this.supAdapter[id]) {
+						if (this.configSetAdapter !== undefined && this.configSetAdapter[id]) {
 							await this.createDPsForEachAdapter(id);
 							if (this.createHtmlList) await this.createHtmlListDatapoints(id);
 							this.log.debug(`Created datapoints for ${this.capitalize(id)}`);
@@ -214,7 +213,7 @@ class DeviceWatcher extends utils.Adapter {
 				}
 			}
 
-			// create HTML list
+			// create HTML list datapoints
 			if (this.createHtmlList) await this.createHtmlListDatapoints();
 
 			//read data first at start
@@ -250,79 +249,115 @@ class DeviceWatcher extends utils.Adapter {
 			let oldLowBatState;
 			let contactData;
 			let oldStatus;
+			let isLowBatValue;
 
 			for (const device of this.listAllDevicesRaw) {
 				// On statechange update available datapoint
 				switch (id) {
+					case device.instanceAliveDP:
+						device.instanceAlive = state.val;
+						break;
+
 					case device.UpdateDP:
-						if (state.val) {
+						if (device.instanceAlive) {
 							device.Upgradable = state.val;
-							if (!this.blacklistNotify.includes(device.Path)) {
-								await this.sendDeviceUpdatesNotification(device.Device, device.Adapter);
+							if (state.val) {
+								if (!this.blacklistNotify.includes(device.Path)) {
+									await this.sendDeviceUpdatesNotification(device.Device, device.Adapter);
+								}
 							}
 						}
 						break;
 
 					case device.SignalStrengthDP:
-						device.SignalStrength = await this.calculateSignalStrength(state, device.adapterID);
+						if (device.instanceAlive) {
+							device.SignalStrength = await this.calculateSignalStrength(state, device.adapterID);
+						}
 						break;
 
 					case device.batteryDP:
-						if (device.isBatteryDevice) {
-							oldLowBatState = device.LowBat;
-							batteryData = await this.getBatteryData(state.val, oldLowBatState, device.adapterID);
-
-							device.Battery = batteryData[0];
-							device.BatteryRaw = batteryData[2];
-							device.LowBat = await this.setLowbatIndicator(state.val, undefined, device.LowBatDP);
+						if (device.instanceAlive) {
+							if (device.isBatteryDevice) {
+								oldLowBatState = device.LowBat;
+								batteryData = await this.getBatteryData(state.val, oldLowBatState, device.adapterID);
+
+								device.Battery = batteryData[0];
+								device.BatteryRaw = batteryData[2];
+								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)) {
-									await this.sendLowBatNoticiation(device.Device, device.Adapter, device.Battery);
+								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.LowBatDP:
-						if (device.isBatteryDevice) {
-							oldLowBatState = device.LowBat;
-							batteryData = await this.getBatteryData(device.BatteryRaw, state.val, device.adapterID);
-							device.Battery = batteryData[0];
-							device.BatteryRaw = batteryData[2];
-							device.LowBat = await this.setLowbatIndicator(device.BatteryRaw, state.val, device.LowBatDP);
-
-							if (device.LowBat && oldLowBatState !== device.LowBat) {
-								if (this.config.checkSendBatteryMsg && !this.blacklistNotify.includes(device.Path)) {
-									await this.sendLowBatNoticiation(device.Device, device.Adapter, device.Battery);
+						if (device.instanceAlive) {
+							if (device.isBatteryDevice) {
+								oldLowBatState = device.LowBat;
+								batteryData = await this.getBatteryData(device.BatteryRaw, state.val, device.adapterID);
+								device.Battery = batteryData[0];
+								device.BatteryRaw = batteryData[2];
+								device.LowBat = await this.setLowbatIndicator(device.BatteryRaw, state.val, device.faultReport, 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.faultReportDP:
+						if (device.instanceAlive) {
+							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.adapterID,
-							device.UnreachDP,
-							device.SignalStrength,
-							device.UnreachState,
-							device.DeviceStateSelectorDP,
-							device.rssiPeerSelectorDP,
-						);
-						if (contactData !== undefined) {
-							device.LastContact = contactData[0];
-							device.Status = contactData[1];
-							device.SignalStrength = contactData[2];
-						}
+						if (device.instanceAlive) {
+							oldStatus = device.Status;
+							device.UnreachState = await this.getInitValue(device.UnreachDP);
+							contactData = await this.getOnlineState(
+								device.timeSelector,
+								device.adapterID,
+								device.UnreachDP,
+								device.SignalStrength,
+								device.UnreachState,
+								device.DeviceStateSelectorDP,
+								device.rssiPeerSelectorDP,
+							);
+							if (contactData !== undefined) {
+								device.LastContact = contactData[0];
+								device.Status = contactData[1];
+								device.SignalStrength = contactData[2];
+							}
 
-						if (this.config.checkSendOfflineMsg && oldStatus !== device.Status && !this.blacklistNotify.includes(device.Path)) {
-							await this.sendOfflineNotifications(device.Device, device.Adapter, device.Status, device.LastContact);
+							if (this.config.checkSendOfflineMsg && oldStatus !== device.Status && !this.blacklistNotify.includes(device.Path)) {
+								await this.sendOfflineNotifications(device.Device, device.Adapter, device.Status, device.LastContact);
+							}
 						}
 						break;
 				}
@@ -370,6 +405,37 @@ class DeviceWatcher extends utils.Adapter {
 		}
 	}
 
+	/**
+	 * main function
+	 */
+	async main() {
+		this.log.debug(`Function started: ${this.main.name}`);
+
+		// fill counts and lists of all selected adapter
+		try {
+			await this.createDataOfAllAdapter();
+			this.log.debug(`Created and filled data for all adapters`);
+		} catch (error) {
+			this.errorReporting('[main - create data of all adapter]', error);
+		}
+
+		// fill datapoints for each adapter if selected
+		if (this.createOwnFolder) {
+			try {
+				for (const [id] of Object.entries(arrApart)) {
+					if (this.configSetAdapter !== undefined && this.configSetAdapter[id]) {
+						await this.createDataForEachAdapter(id);
+						this.log.debug(`Created and filled data for ${this.capitalize(id)}`);
+					}
+				}
+			} catch (error) {
+				this.errorReporting('[main - create and fill datapoints for each adapter]', error);
+			}
+		}
+
+		this.log.debug(`Function finished: ${this.main.name}`);
+	} //<--End of main function
+
 	/**
 	 * refresh data with interval
 	 * is neccessary to refresh lastContact data, especially of devices without state changes
@@ -383,7 +449,7 @@ class DeviceWatcher extends utils.Adapter {
 
 		if (this.createOwnFolder) {
 			for (const [id] of Object.entries(arrApart)) {
-				if (this.supAdapter !== undefined && this.supAdapter[id]) {
+				if (this.configSetAdapter !== undefined && this.configSetAdapter[id]) {
 					await this.createLists(id);
 					await this.writeDatapoints(id);
 					this.log.debug(`Created and filled data for ${this.capitalize(id)}`);
@@ -409,117 +475,284 @@ class DeviceWatcher extends utils.Adapter {
 	} // <-- refreshData end
 
 	/**
-	 * main function
+	 * create blacklist
 	 */
-	async main() {
-		this.log.debug(`Function started: ${this.main.name}`);
+	async createBlacklist() {
+		this.log.debug(`Function started: ${this.createBlacklist.name}`);
 
-		// fill counts and lists of all selected adapter
-		try {
-			await this.createDataOfAllAdapter();
-			this.log.debug(`Created and filled data for all adapters`);
-		} catch (error) {
-			this.errorReporting('[main - create data of all adapter]', error);
-		}
+		const myBlacklist = this.config.tableBlacklist;
 
-		// fill datapoints for each adapter if selected
-		if (this.createOwnFolder) {
+		for (const i in myBlacklist) {
 			try {
-				for (const [id] of Object.entries(arrApart)) {
-					if (this.supAdapter !== undefined && this.supAdapter[id]) {
-						await this.createDataForEachAdapter(id);
-						this.log.debug(`Created and filled data for ${this.capitalize(id)}`);
-					}
+				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);
+				}
+				if (myBlacklist[i].checkIgnorAdapterLists) {
+					this.blacklistAdapterLists.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('[main - create and fill datapoints for each adapter]', error);
+				this.errorReporting('[createBlacklist]', error);
 			}
 		}
 
-		this.log.debug(`Function finished: ${this.main.name}`);
-	} //<--End of main function
+		if (this.blacklistLists.length >= 1) this.log.info(`Found items on blacklist for lists: ${this.blacklistLists}`);
+		if (this.blacklistAdapterLists.length >= 1) this.log.info(`Found items on blacklist for lists: ${this.blacklistAdapterLists}`);
+		if (this.blacklistNotify.length >= 1) this.log.info(`Found items on blacklist for notificatioons: ${this.blacklistNotify}`);
 
-	/**
-	 * @param {string} id - id which should be capitalize
-	 */
-	capitalize(id) {
-		//make the first letter uppercase
-		return id && id[0].toUpperCase() + id.slice(1);
+		this.log.debug(`Function finished: ${this.createBlacklist.name}`);
 	}
 
 	/**
-	 * @param {number} dpValue - get Time of this datapoint
+	 * @param {object} i - Device Object
 	 */
-	async getTimestamp(dpValue) {
-		const time = new Date();
-		return (dpValue = Math.round((time.getTime() - dpValue) / 1000 / 60));
-	}
+	async createData(i) {
+		const devices = await this.getForeignStatesAsync(this.selAdapter[i].Selektor);
+		const adapterID = this.selAdapter[i].adapterID;
 
-	/**
-	 * @param {object} obj - State of datapoint
-	 */
-	async getInitValue(obj) {
-		//state can be null or undefinded
-		const foreignState = await this.getForeignStateAsync(obj);
-		if (foreignState) return foreignState.val;
-	}
+		/*----------  Start of loop  ----------*/
+		for (const [id] of Object.entries(devices)) {
+			/*=============================================
+				=              get Instanz		          =
+				=============================================*/
+			const instance = id.slice(0, id.indexOf('.') + 2);
+			const instanceAliveDP = `system.adapter.${instance}.alive`;
+			const instanceAlive = await this.getInitValue(instanceAliveDP);
+			this.subscribeForeignStates(instanceAliveDP);
 
-	/**
-	 * @param {object} obj - State of own datapoint
-	 */
-	async getOwnInitValue(obj) {
-		//state can be null or undefinded for own states
-		const stateVal = await this.getStateAsync(obj);
-		if (stateVal) return stateVal.val;
-	}
+			/*=============================================
+				=              Get device name		          =
+				=============================================*/
+			const deviceName = await this.getDeviceName(id, i);
 
-	/**
-	 * @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 {};
-	}
+			/*=============================================
+				=              Get adapter name		          =
+				=============================================*/
+			const adapter = this.selAdapter[i].adapter;
 
-	/**
-	 * create blacklist
-	 */
-	async createBlacklist() {
-		this.log.debug(`Function started: ${this.createBlacklist.name}`);
+			/*=============================================
+				=            Get path to datapoints	   	      =
+				=============================================*/
+			const currDeviceString = id.slice(0, id.lastIndexOf('.') + 1 - 1);
+			const shortCurrDeviceString = currDeviceString.slice(0, currDeviceString.lastIndexOf('.') + 1 - 1);
 
-		if (!isUnloaded) {
-			const myBlacklist = this.config.tableBlacklist;
+			/*=============================================
+				=            Get signal strength              =
+				=============================================*/
+			let deviceQualityDP = currDeviceString + this.selAdapter[i].rssiState;
+			let deviceQualityState;
 
-			for (const i in myBlacklist) {
-				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);
-					}
-					if (myBlacklist[i].checkIgnorAdapterLists) {
-						this.blacklistAdapterLists.push(blacklistParse.path);
-					}
-					// push devices in list to ignor device in notifications
-					if (myBlacklist[i].checkIgnorNotify) {
-						this.blacklistNotify.push(blacklistParse.path);
+			switch (adapterID) {
+				case 'mihomeVacuum':
+					deviceQualityDP = shortCurrDeviceString + this.selAdapter[i].rssiState;
+					deviceQualityState = await this.getForeignStateAsync(deviceQualityDP);
+					break;
+
+				case 'netatmo':
+					deviceQualityState = await this.getForeignStateAsync(deviceQualityDP);
+					if (!deviceQualityState) {
+						deviceQualityDP = currDeviceString + this.selAdapter[i].rfState;
+						deviceQualityState = await this.getForeignStateAsync(deviceQualityDP);
 					}
-				} catch (error) {
-					this.errorReporting('[createBlacklist]', error);
+					break;
+
+				default:
+					deviceQualityState = await this.getForeignStateAsync(deviceQualityDP);
+					break;
+			}
+			//subscribe to states
+			this.subscribeForeignStates(deviceQualityDP);
+
+			let linkQuality = await this.calculateSignalStrength(deviceQualityState, adapterID);
+
+			/*=============================================
+				=         	    Get battery data       	      =
+				=============================================*/
+			let deviceBatteryStateDP;
+			let deviceBatteryState;
+			let batteryHealth;
+			let batteryHealthRaw;
+			let lowBatIndicator;
+			let isBatteryDevice;
+			let isLowBatDP;
+			let faultReportingDP;
+			let faultReportingState;
+
+			const deviceChargerStateDP = currDeviceString + this.selAdapter[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.selAdapter[i].battery;
+						deviceBatteryState = await this.getInitValue(deviceBatteryStateDP);
+						if (deviceBatteryState === undefined) {
+							deviceBatteryStateDP = shortCurrDeviceString + this.selAdapter[i].battery2;
+							deviceBatteryState = await this.getInitValue(deviceBatteryStateDP);
+						}
+						break;
+					default:
+						deviceBatteryStateDP = currDeviceString + this.selAdapter[i].battery;
+						deviceBatteryState = await this.getInitValue(deviceBatteryStateDP);
+						if (deviceBatteryState === undefined) {
+							deviceBatteryStateDP = currDeviceString + this.selAdapter[i].battery2;
+							deviceBatteryState = await this.getInitValue(deviceBatteryStateDP);
+						}
+						break;
+				}
+
+				// Get low bat states
+				isLowBatDP = currDeviceString + this.selAdapter[i].isLowBat;
+				let deviceLowBatState = await this.getInitValue(isLowBatDP);
+				if (deviceLowBatState === undefined) {
+					isLowBatDP = currDeviceString + this.selAdapter[i].isLowBat2;
+					deviceLowBatState = await this.getInitValue(isLowBatDP);
+				}
+				if (deviceLowBatState === undefined) isLowBatDP = 'none';
+
+				faultReportingDP = shortCurrDeviceString + this.selAdapter[i].faultReporting;
+				faultReportingState = await this.getInitValue(faultReportingDP);
+
+				//subscribe to states
+				this.subscribeForeignStates(deviceBatteryStateDP);
+				this.subscribeForeignStates(isLowBatDP);
+				this.subscribeForeignStates(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, faultReportingState, adapterID);
 				}
 			}
 
-			if (this.blacklistLists.length >= 1) this.log.info(`Found items on blacklist for lists: ${this.blacklistLists}`);
-			if (this.blacklistAdapterLists.length >= 1) this.log.info(`Found items on blacklist for lists: ${this.blacklistAdapterLists}`);
-			if (this.blacklistNotify.length >= 1) this.log.info(`Found items on blacklist for notificatioons: ${this.blacklistNotify}`);
-		} else {
-			return; // cancel run if unloaded was called.
-		}
+			/*=============================================
+				=          Get last contact of device         =
+				=============================================*/
+			let unreachDP = currDeviceString + this.selAdapter[i].reach;
+			const deviceStateSelectorDP = shortCurrDeviceString + this.selAdapter[i].stateValue;
+			const rssiPeerSelectorDP = currDeviceString + this.selAdapter[i].rssiPeerState;
+			const timeSelector = currDeviceString + this.selAdapter[i].timeSelector;
+
+			let deviceUnreachState = await this.getInitValue(unreachDP);
+			if (deviceUnreachState === undefined) {
+				unreachDP = shortCurrDeviceString + this.selAdapter[i].reach;
+				deviceUnreachState = await this.getInitValue(shortCurrDeviceString + this.selAdapter[i].reach);
+			}
 
-		this.log.debug(`Function finished: ${this.createBlacklist.name}`);
-	}
+			// subscribe to states
+			this.subscribeForeignStates(timeSelector);
+			this.subscribeForeignStates(unreachDP);
+			this.subscribeForeignStates(deviceStateSelectorDP);
+			this.subscribeForeignStates(rssiPeerSelectorDP);
+
+			const onlineState = await this.getOnlineState(timeSelector, adapterID, unreachDP, linkQuality, deviceUnreachState, deviceStateSelectorDP, rssiPeerSelectorDP);
+			let deviceState;
+			let lastContactString;
+
+			if (onlineState) {
+				lastContactString = onlineState[0];
+				deviceState = onlineState[1];
+				linkQuality = onlineState[2];
+			}
+
+			/*=============================================
+				=            Get update data	              =
+				=============================================*/
+			const deviceUpdateDP = currDeviceString + this.selAdapter[i].upgrade;
+			let isUpgradable;
+
+			if (this.config.checkSendDeviceUpgrade) {
+				const deviceUpdateSelector = await this.getInitValue(deviceUpdateDP);
+
+				if (deviceUpdateSelector) {
+					isUpgradable = true;
+				} else if (!deviceUpdateSelector) {
+					isUpgradable = false;
+				}
+				// subscribe to states
+				this.subscribeForeignStates(deviceUpdateDP);
+			}
+
+			/*=============================================
+				=          		  Fill Raw Lists          	  =
+				=============================================*/
+
+			/* Add only devices with battery in the rawlist */
+			if (this.listOnlyBattery && isBatteryDevice) {
+				this.listAllDevicesRaw.push({
+					Path: id,
+					instanceAliveDP: instanceAliveDP,
+					instanceAlive: instanceAlive,
+					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,
+					UnreachDP: unreachDP,
+					DeviceStateSelectorDP: deviceStateSelectorDP,
+					rssiPeerSelectorDP: rssiPeerSelectorDP,
+					LastContact: lastContactString,
+					Status: deviceState,
+					UpdateDP: deviceUpdateDP,
+					Upgradable: isUpgradable,
+				});
+			} else {
+				/* Add all devices */
+				this.listAllDevicesRaw.push({
+					Path: id,
+					instanceAliveDP: instanceAliveDP,
+					instanceAlive: instanceAlive,
+					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,
+					UnreachDP: unreachDP,
+					DeviceStateSelectorDP: deviceStateSelectorDP,
+					rssiPeerSelectorDP: rssiPeerSelectorDP,
+					LastContact: lastContactString,
+					Status: deviceState,
+					UpdateDP: deviceUpdateDP,
+					Upgradable: isUpgradable,
+				});
+			}
+		} // <-- end of loop
+	} // <-- end of createData
+
+	/*=============================================
+	=            functions to get data            =
+	=============================================*/
 
 	/**
 	 * @param {object} id - deviceID
@@ -539,25 +772,9 @@ class DeviceWatcher extends utils.Adapter {
 			let folderName;
 			let deviceID;
 
-			switch (this.arrDev[i].adapterID) {
-				// Get ID with currDeviceString from datapoint
-				case 'switchbotBle':
-				case 'esphome':
-				case 'apcups':
-					deviceName = await this.getInitValue(currDeviceString + this.arrDev[i].id);
-					break;
-
-				case 'eusec':
-					deviceName = await this.getInitValue(currDeviceString + this.arrDev[i].id);
-					if (deviceName === null || deviceName === undefined) {
-						if (deviceObject && typeof deviceObject === 'object') {
-							deviceName = deviceObject.common.name;
-						}
-					}
-					break;
-
+			switch (this.selAdapter[i].adapterID) {
 				case 'fullybrowser':
-					deviceName = (await this.getInitValue(currDeviceString + this.arrDev[i].id)) + ' ' + (await this.getInitValue(currDeviceString + this.arrDev[i].id2));
+					deviceName = (await this.getInitValue(currDeviceString + this.selAdapter[i].id)) + ' ' + (await this.getInitValue(currDeviceString + this.selAdapter[i].id2));
 					break;
 
 				// Get ID with short currDeviceString from objectjson
@@ -565,6 +782,7 @@ class DeviceWatcher extends utils.Adapter {
 				case 'hmrpc':
 				case 'nukiExt':
 				case 'wled':
+				case 'mqttNuki':
 					if (shortDeviceObject && typeof shortDeviceObject === 'object') {
 						deviceName = shortDeviceObject.common.name;
 					}
@@ -581,7 +799,7 @@ class DeviceWatcher extends utils.Adapter {
 				case 'mihomeVacuum':
 				case 'roomba':
 					folderName = shortCurrDeviceString.slice(shortCurrDeviceString.lastIndexOf('.') + 1);
-					deviceID = await this.getInitValue(shortCurrDeviceString + this.arrDev[i].id);
+					deviceID = await this.getInitValue(shortCurrDeviceString + this.selAdapter[i].id);
 					deviceName = `I${folderName} ${deviceID}`;
 					break;
 
@@ -610,8 +828,11 @@ class DeviceWatcher extends utils.Adapter {
 
 				// Get ID with main selektor from objectjson
 				default:
-					if (deviceObject && typeof deviceObject === 'object') {
-						deviceName = deviceObject.common.name;
+					if (this.selAdapter[i].id !== 'none' || this.selAdapter[i].id !== undefined) deviceName = await this.getInitValue(currDeviceString + this.selAdapter[i].id);
+					if (deviceName === null || deviceName === undefined) {
+						if (deviceObject && typeof deviceObject === 'object') {
+							deviceName = deviceObject.common.name;
+						}
 					}
 					break;
 			}
@@ -639,6 +860,7 @@ class DeviceWatcher extends utils.Adapter {
 						switch (adapterID) {
 							case 'roomba':
 							case 'sonoff':
+							case 'smartgarden':
 								linkQuality = deviceQualityState.val + '%'; // If quality state is already an percent value
 								break;
 							case 'lupusec':
@@ -698,42 +920,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 +970,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) {
+			=            Set Lowbat indicator             =
+			=============================================*/
+		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 +1036,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 +1044,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,29 +1082,39 @@ 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;
 						}
 				}
 
 				/*=============================================
-			=            Set Online Status             =
-			=============================================*/
-				if (this.maxMinutes !== undefined) {
+				=            Set Online Status             =
+				=============================================*/
+				if (this.configMaxMinutes !== undefined) {
 					switch (adapterID) {
 						case 'hmrpc':
+							if (this.configMaxMinutes[adapterID] <= 0) {
+								if (deviceUnreachState === 1) {
+									deviceState = 'Offline'; //set online state to offline
+									linkQuality = '0%'; // set linkQuality to nothing
+								}
+							} else if (lastDeviceUnreachStateChange > this.configMaxMinutes[adapterID] && deviceUnreachState === 1) {
+								deviceState = 'Offline'; //set online state to offline
+								linkQuality = '0%'; // set linkQuality to nothing
+							}
+							break;
 						case 'hmiP':
 						case 'maxcube':
-							if (this.maxMinutes[adapterID] <= 0) {
+							if (this.configMaxMinutes[adapterID] <= 0) {
 								if (deviceUnreachState) {
 									deviceState = 'Offline'; //set online state to offline
 									linkQuality = '0%'; // set linkQuality to nothing
 								}
-							} else if (lastDeviceUnreachStateChange > this.maxMinutes[adapterID] && deviceUnreachState) {
+							} else if (lastDeviceUnreachStateChange > this.configMaxMinutes[adapterID] && deviceUnreachState) {
 								deviceState = 'Offline'; //set online state to offline
 								linkQuality = '0%'; // set linkQuality to nothing
 							}
@@ -881,57 +1129,68 @@ class DeviceWatcher extends utils.Adapter {
 						case 'unifi':
 						case 'zigbee':
 						case 'zigbee2MQTT':
-							if (this.maxMinutes[adapterID] <= 0) {
+							if (this.configMaxMinutes[adapterID] <= 0) {
 								if (!deviceUnreachState) {
 									deviceState = 'Offline'; //set online state to offline
 									linkQuality = '0%'; // set linkQuality to nothing
 								}
-							} else if (!deviceUnreachState && lastDeviceUnreachStateChange > this.maxMinutes[adapterID]) {
+							} else if (!deviceUnreachState && lastDeviceUnreachStateChange > this.configMaxMinutes[adapterID]) {
 								deviceState = 'Offline'; //set online state to offline
 								linkQuality = '0%'; // set linkQuality to nothing
 							}
 							break;
 						case 'mqttClientZigbee2Mqtt':
-							if (this.maxMinutes[adapterID] <= 0) {
+							if (this.configMaxMinutes[adapterID] <= 0) {
 								if (deviceUnreachState !== 'online') {
 									deviceState = 'Offline'; //set online state to offline
 									linkQuality = '0%'; // set linkQuality to nothing
 								}
-							} else if (deviceUnreachState !== 'online' && lastDeviceUnreachStateChange > this.maxMinutes[adapterID]) {
+							} else if (deviceUnreachState !== 'online' && lastDeviceUnreachStateChange > this.configMaxMinutes[adapterID]) {
 								deviceState = 'Offline'; //set online state to offline
 								linkQuality = '0%'; // set linkQuality to nothing
 							}
 							break;
 						case 'mihome':
 							if (deviceUnreachState !== undefined) {
-								if (this.maxMinutes[adapterID] <= 0) {
+								if (this.configMaxMinutes[adapterID] <= 0) {
 									if (!deviceUnreachState) {
 										deviceState = 'Offline'; //set online state to offline
 										linkQuality = '0%'; // set linkQuality to nothing
 									}
-								} else if (lastContact > this.maxMinutes[adapterID]) {
+								} else if (lastContact > this.configMaxMinutes[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) {
+									if (this.configMaxMinutes[adapterID] <= 0) {
 										deviceState = 'Offline'; //set online state to offline
 										linkQuality = '0%'; // set linkQuality to nothing
 									}
-								} else if (lastContact > this.maxMinutes[adapterID]) {
+								} else if (lastContact > this.configMaxMinutes[adapterID]) {
 									deviceState = 'Offline'; //set online state to offline
 									linkQuality = '0%'; // set linkQuality to nothing
 								}
 							}
 							break;
+						case 'smartgarden':
+							if (this.configMaxMinutes[adapterID] <= 0) {
+								if (deviceUnreachState === 'OFFLINE') {
+									deviceState = 'Offline'; //set online state to offline
+									linkQuality = '0%'; // set linkQuality to nothing
+								}
+							} else if (deviceUnreachState === 'OFFLINE' && lastDeviceUnreachStateChange > this.configMaxMinutes[adapterID]) {
+								deviceState = 'Offline'; //set online state to offline
+								linkQuality = '0%'; // set linkQuality to nothing
+							}
+							break;
 						default:
-							if (this.maxMinutes[adapterID] <= 0) {
+							if (this.configMaxMinutes[adapterID] <= 0) {
 								if (!deviceUnreachState) {
 									deviceState = 'Offline'; //set online state to offline
 									linkQuality = '0%'; // set linkQuality to nothing
 								}
-							} else if (lastContact > this.maxMinutes[adapterID]) {
+							} else if (lastContact > this.configMaxMinutes[adapterID]) {
 								deviceState = 'Offline'; //set online state to offline
 								linkQuality = '0%'; // set linkQuality to nothing
 							}
@@ -953,7 +1212,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,
@@ -972,218 +1231,6 @@ class DeviceWatcher extends utils.Adapter {
 		}
 	}
 
-	/**
-	 * @param {object} i - Device Object
-	 */
-	async createData(i) {
-		const devices = await this.getForeignStatesAsync(this.arrDev[i].Selektor);
-		const adapterID = this.arrDev[i].adapterID;
-
-		/*----------  Start of loop  ----------*/
-		for (const [id] of Object.entries(devices)) {
-			if (!isUnloaded) {
-				/*=============================================
-				=              Get device name		          =
-				=============================================*/
-				const deviceName = await this.getDeviceName(id, i);
-
-				/*=============================================
-				=              Get adapter name		          =
-				=============================================*/
-				const adapter = this.arrDev[i].adapter;
-
-				/*=============================================
-				=            Get path to datapoints	   	      =
-				=============================================*/
-				const currDeviceString = id.slice(0, id.lastIndexOf('.') + 1 - 1);
-				const shortCurrDeviceString = currDeviceString.slice(0, currDeviceString.lastIndexOf('.') + 1 - 1);
-
-				/*=============================================
-				=            Get signal strength              =
-				=============================================*/
-				let deviceQualityDP = currDeviceString + this.arrDev[i].rssiState;
-				let deviceQualityState;
-
-				switch (adapterID) {
-					case 'mihomeVacuum':
-						deviceQualityDP = shortCurrDeviceString + this.arrDev[i].rssiState;
-						deviceQualityState = await this.getForeignStateAsync(deviceQualityDP);
-						break;
-
-					case 'netatmo':
-						deviceQualityState = await this.getForeignStateAsync(deviceQualityDP);
-						if (!deviceQualityState) {
-							deviceQualityDP = currDeviceString + this.arrDev[i].rfState;
-							deviceQualityState = await this.getForeignStateAsync(deviceQualityDP);
-						}
-						break;
-
-					default:
-						deviceQualityState = await this.getForeignStateAsync(deviceQualityDP);
-						break;
-				}
-				//subscribe to states
-				this.subscribeForeignStatesAsync(deviceQualityDP);
-
-				let linkQuality = await this.calculateSignalStrength(deviceQualityState, adapterID);
-
-				/*=============================================
-				=         	    Get battery data       	      =
-				=============================================*/
-				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;
-							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;
-							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';
-
-				//subscribe to states
-				this.subscribeForeignStatesAsync(deviceBatteryStateDP);
-				this.subscribeForeignStatesAsync(isLowBatDP);
-
-				const batteryData = await this.getBatteryData(deviceBatteryState, deviceLowBatState, adapterID);
-				const batteryHealth = batteryData[0];
-				const batteryHealthRaw = batteryData[2];
-				const isBatteryDevice = batteryData[1];
-				let lowBatIndicator;
-
-				if (isBatteryDevice) {
-					lowBatIndicator = await this.setLowbatIndicator(deviceBatteryState, deviceLowBatState, isLowBatDP);
-				}
-
-				/*=============================================
-				=          Get last contact of device         =
-				=============================================*/
-				let unreachDP = currDeviceString + this.arrDev[i].reach;
-				const deviceStateSelectorDP = shortCurrDeviceString + this.arrDev[i].stateValue;
-				const rssiPeerSelectorDP = currDeviceString + this.arrDev[i].rssiPeerState;
-
-				let deviceUnreachState = await this.getInitValue(unreachDP);
-				if (deviceUnreachState === undefined) {
-					unreachDP = shortCurrDeviceString + this.arrDev[i].reach;
-					deviceUnreachState = await this.getInitValue(shortCurrDeviceString + this.arrDev[i].reach);
-				}
-
-				// subscribe to states
-				this.subscribeForeignStatesAsync(id);
-				this.subscribeForeignStatesAsync(unreachDP);
-				this.subscribeForeignStatesAsync(deviceStateSelectorDP);
-				this.subscribeForeignStatesAsync(rssiPeerSelectorDP);
-
-				const onlineState = await this.getOnlineState(id, adapterID, unreachDP, linkQuality, deviceUnreachState, deviceStateSelectorDP, rssiPeerSelectorDP);
-				let deviceState;
-				let lastContactString;
-
-				if (onlineState) {
-					lastContactString = onlineState[0];
-					deviceState = onlineState[1];
-					linkQuality = onlineState[2];
-				}
-
-				/*=============================================
-				=            Get update data	              =
-				=============================================*/
-				const deviceUpdateDP = currDeviceString + this.arrDev[i].upgrade;
-				let isUpgradable;
-
-				if (this.config.checkSendDeviceUpgrade) {
-					const deviceUpdateSelector = await this.getInitValue(deviceUpdateDP);
-
-					if (deviceUpdateSelector) {
-						isUpgradable = true;
-					} else if (!deviceUpdateSelector) {
-						isUpgradable = false;
-					}
-					// subscribe to states
-					this.subscribeForeignStatesAsync(deviceUpdateDP);
-				}
-
-				/*=============================================
-				=          		  Fill Raw Lists          	  =
-				=============================================*/
-
-				/* Add only devices with battery in the rawlist */
-				if (this.listOnlyBattery && isBatteryDevice) {
-					this.listAllDevicesRaw.push({
-						Path: id,
-						Device: deviceName,
-						adapterID: adapterID,
-						Adapter: adapter,
-						isBatteryDevice: isBatteryDevice,
-						Battery: batteryHealth,
-						BatteryRaw: batteryHealthRaw,
-						batteryDP: deviceBatteryStateDP,
-						LowBat: lowBatIndicator,
-						LowBatDP: isLowBatDP,
-						SignalStrengthDP: deviceQualityDP,
-						SignalStrength: linkQuality,
-						UnreachState: deviceUnreachState,
-						UnreachDP: unreachDP,
-						DeviceStateSelectorDP: deviceStateSelectorDP,
-						rssiPeerSelectorDP: rssiPeerSelectorDP,
-						LastContact: lastContactString,
-						Status: deviceState,
-						UpdateDP: deviceUpdateDP,
-						Upgradable: isUpgradable,
-					});
-				} else {
-					/* Add all devices */
-					this.listAllDevicesRaw.push({
-						Path: id,
-						Device: deviceName,
-						adapterID: adapterID,
-						Adapter: adapter,
-						isBatteryDevice: isBatteryDevice,
-						Battery: batteryHealth,
-						BatteryRaw: batteryHealthRaw,
-						batteryDP: deviceBatteryStateDP,
-						LowBat: lowBatIndicator,
-						LowBatDP: isLowBatDP,
-						SignalStrengthDP: deviceQualityDP,
-						SignalStrength: linkQuality,
-						UnreachState: deviceUnreachState,
-						UnreachDP: unreachDP,
-						DeviceStateSelectorDP: deviceStateSelectorDP,
-						rssiPeerSelectorDP: rssiPeerSelectorDP,
-						LastContact: lastContactString,
-						Status: deviceState,
-						UpdateDP: deviceUpdateDP,
-						Upgradable: isUpgradable,
-					});
-				}
-			} else {
-				/* cancel run if unloaded was called. */
-				return;
-			}
-		} // <-- end of loop
-	} // <-- end of createData
-
 	/**
 	 * Create Lists
 	 */
@@ -1195,6 +1242,7 @@ class DeviceWatcher extends utils.Adapter {
 		this.offlineDevices = [];
 		this.batteryLowPoweredRaw = [];
 		this.offlineDevicesRaw = [];
+		this.upgradableDevicesRaw = [];
 		this.upgradableList = [];
 
 		if (adptName === undefined) {
@@ -1222,6 +1270,15 @@ class DeviceWatcher extends utils.Adapter {
 				});
 			}
 
+			// upgradable raw list
+			if (device.Upgradable) {
+				this.upgradableDevicesRaw.push({
+					Path: device.Path,
+					Device: device.Device,
+					Adapter: device.Adapter,
+				});
+			}
+
 			if (adptName === '' && !this.blacklistLists.includes(device.Path)) {
 				await this.theLists(device);
 			}
@@ -1263,7 +1320,7 @@ class DeviceWatcher extends utils.Adapter {
 		}
 
 		// Battery lists
-		if (device['isBatteryDevice']) {
+		if (device.isBatteryDevice) {
 			this.batteryPowered.push({
 				Device: device.Device,
 				Adapter: device.Adapter,
@@ -1336,32 +1393,188 @@ class DeviceWatcher extends utils.Adapter {
 					await this.createLists(adptName);
 				}
 			}
-			await this.writeDatapoints(adptName); // fill the datapoints
-		} catch (error) {
-			this.errorReporting('[createDataForEachAdapter]', error);
-		}
-
-		this.log.debug(`Function finished: ${this.createDataForEachAdapter.name}`);
-	} // <-- end of createDataForEachAdapter
+			await this.writeDatapoints(adptName); // fill the datapoints
+		} catch (error) {
+			this.errorReporting('[createDataForEachAdapter]', error);
+		}
+
+		this.log.debug(`Function finished: ${this.createDataForEachAdapter.name}`);
+	} // <-- end of createDataForEachAdapter
+
+	/**
+	 * create Data of all selected adapter in one list
+	 */
+	async createDataOfAllAdapter() {
+		this.log.debug(`Function started: ${this.createDataOfAllAdapter.name}`);
+
+		try {
+			for (let i = 0; i < this.selAdapter.length; i++) {
+				await this.createData(i);
+				await this.createLists();
+			}
+			await this.writeDatapoints(); // fill the datapoints
+		} catch (error) {
+			this.errorReporting('[createDataOfAllAdapter]', error);
+		}
+
+		this.log.debug(`Function finished: ${this.createDataOfAllAdapter.name}`);
+	} // <-- end of createDataOfAllAdapter
+
+	/**
+	 * @param {string} [adptName] - Adaptername
+	 */
+	async writeDatapoints(adptName) {
+		// fill the datapoints
+
+		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) {
+				dpSubFolder = adptName + '.';
+			} else {
+				dpSubFolder = '';
+			}
+
+			// Write Datapoints for counts
+			await this.setStateAsync(`${dpSubFolder}offlineCount`, { val: this.offlineDevicesCount, ack: true });
+			await this.setStateAsync(`${dpSubFolder}countAll`, { val: this.deviceCounter, ack: true });
+			await this.setStateAsync(`${dpSubFolder}batteryCount`, { val: this.batteryPoweredCount, ack: true });
+			await this.setStateAsync(`${dpSubFolder}lowBatteryCount`, { val: this.lowBatteryPoweredCount, ack: true });
+			await this.setStateAsync(`${dpSubFolder}upgradableCount`, { val: this.upgradableDevicesCount, ack: true });
+
+			// List all devices
+			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': '' }];
+			}
+			await this.setStateAsync(`${dpSubFolder}listAll`, { val: JSON.stringify(this.listAllDevices), ack: true });
+
+			// List link quality
+			if (this.linkQualityCount === 0) {
+				// if no device is count, write the JSON List with default value
+				this.linkQualityDevices = [{ Device: '--none--', Adapter: '', 'Signal strength': '' }];
+			}
+			//write JSON list
+			await this.setStateAsync(`${dpSubFolder}linkQualityList`, {
+				val: JSON.stringify(this.linkQualityDevices),
+				ack: true,
+			});
+
+			// List offline devices
+			if (this.offlineDevicesCount === 0) {
+				// if no device is count, write the JSON List with default value
+				this.offlineDevices = [{ Device: '--none--', Adapter: '', 'Last contact': '' }];
+			}
+			//write JSON list
+			await this.setStateAsync(`${dpSubFolder}offlineList`, {
+				val: JSON.stringify(this.offlineDevices),
+				ack: true,
+			});
+
+			// List updatable
+			if (this.upgradableDevicesCount === 0) {
+				// if no device is count, write the JSON List with default value
+				this.upgradableList = [{ Device: '--none--', Adapter: '', 'Last contact': '' }];
+			}
+			//write JSON list
+			await this.setStateAsync(`${dpSubFolder}upgradableList`, {
+				val: JSON.stringify(this.upgradableList),
+				ack: true,
+			});
+
+			// List battery powered
+			if (this.batteryPoweredCount === 0) {
+				// if no device is count, write the JSON List with default value
+				this.batteryPowered = [{ Device: '--none--', Adapter: '', Battery: '' }];
+			}
+			//write JSON list
+			await this.setStateAsync(`${dpSubFolder}batteryList`, {
+				val: JSON.stringify(this.batteryPowered),
+				ack: true,
+			});
+
+			// list battery low powered
+			if (this.lowBatteryPoweredCount === 0) {
+				// if no device is count, write the JSON List with default value
+				this.batteryLowPowered = [{ Device: '--none--', Adapter: '', Battery: '' }];
+			}
+			//write JSON list
+			await this.setStateAsync(`${dpSubFolder}lowBatteryList`, {
+				val: JSON.stringify(this.batteryLowPowered),
+				ack: true,
+			});
+
+			// set booleans datapoints
+			if (this.offlineDevicesCount === 0) {
+				await this.setStateAsync(`${dpSubFolder}oneDeviceOffline`, {
+					val: false,
+					ack: true,
+				});
+			} else {
+				await this.setStateAsync(`${dpSubFolder}oneDeviceOffline`, {
+					val: true,
+					ack: true,
+				});
+			}
+
+			if (this.lowBatteryPoweredCount === 0) {
+				await this.setStateAsync(`${dpSubFolder}oneDeviceLowBat`, {
+					val: false,
+					ack: true,
+				});
+			} else {
+				await this.setStateAsync(`${dpSubFolder}oneDeviceLowBat`, {
+					val: true,
+					ack: true,
+				});
+			}
 
-	/**
-	 * create Data of all selected adapter in one list
-	 */
-	async createDataOfAllAdapter() {
-		this.log.debug(`Function started: ${this.createDataOfAllAdapter.name}`);
+			if (this.upgradableDevicesCount === 0) {
+				await this.setStateAsync(`${dpSubFolder}oneDeviceUpdatable`, {
+					val: false,
+					ack: true,
+				});
+			} else {
+				await this.setStateAsync(`${dpSubFolder}oneDeviceUpdatable`, {
+					val: true,
+					ack: true,
+				});
+			}
 
-		try {
-			for (let i = 0; i < this.arrDev.length; i++) {
-				await this.createData(i);
-				await this.createLists();
+			//write HTML list
+			if (this.createHtmlList) {
+				await this.setStateAsync(`${dpSubFolder}linkQualityListHTML`, {
+					val: await this.creatLinkQualityListHTML(this.linkQualityDevices, this.linkQualityCount),
+					ack: true,
+				});
+				await this.setStateAsync(`${dpSubFolder}offlineListHTML`, {
+					val: await this.createOfflineListHTML(this.offlineDevices, this.offlineDevicesCount),
+					ack: true,
+				});
+				await this.setStateAsync(`${dpSubFolder}batteryListHTML`, {
+					val: await this.createBatteryListHTML(this.batteryPowered, this.batteryPoweredCount, false),
+					ack: true,
+				});
+				await this.setStateAsync(`${dpSubFolder}lowBatteryListHTML`, {
+					val: await this.createBatteryListHTML(this.batteryLowPowered, this.lowBatteryPoweredCount, true),
+					ack: true,
+				});
 			}
-			await this.writeDatapoints(); // fill the datapoints
+
+			// 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) {
-			this.errorReporting('[createDataOfAllAdapter]', error);
+			this.errorReporting('[writeDatapoints]', error);
 		}
+		this.log.debug(`Function finished: ${this.writeDatapoints.name}`);
+	} //<--End  of writing Datapoints
 
-		this.log.debug(`Function finished: ${this.createDataOfAllAdapter.name}`);
-	} // <-- end of createDataOfAllAdapter
+	/*=============================================
+	=       functions to send notifications       =
+	=============================================*/
 
 	/**
 	 * Notification service
@@ -1743,7 +1956,7 @@ class DeviceWatcher extends utils.Adapter {
 				try {
 					let deviceList = '';
 
-					for (const id of this.upgradableList) {
+					for (const id of this.upgradableDevicesRaw) {
 						if (!this.blacklistNotify.includes(id.Path)) {
 							if (!this.config.showAdapterNameinMsg) {
 								deviceList = `${deviceList}\n${id.Device}`;
@@ -1752,7 +1965,6 @@ class DeviceWatcher extends utils.Adapter {
 							}
 						}
 					}
-
 					if (deviceList.length > 0) {
 						this.log.info(`Geräte Upgrade: ${deviceList}`);
 						this.setStateAsync('lastNotification', `Geräte Upgrade: ${deviceList}`, true);
@@ -1766,157 +1978,9 @@ class DeviceWatcher extends utils.Adapter {
 		}
 	} //<--End of daily offline notification
 
-	/**
-	 * @param {string} [adptName] - Adaptername
-	 */
-	async writeDatapoints(adptName) {
-		// fill the datapoints
-
-		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) {
-				dpSubFolder = adptName + '.';
-			} else {
-				dpSubFolder = '';
-			}
-
-			// Write Datapoints for counts
-			await this.setStateAsync(`${dpSubFolder}offlineCount`, { val: this.offlineDevicesCount, ack: true });
-			await this.setStateAsync(`${dpSubFolder}countAll`, { val: this.deviceCounter, ack: true });
-			await this.setStateAsync(`${dpSubFolder}batteryCount`, { val: this.batteryPoweredCount, ack: true });
-			await this.setStateAsync(`${dpSubFolder}lowBatteryCount`, { val: this.lowBatteryPoweredCount, ack: true });
-			await this.setStateAsync(`${dpSubFolder}upgradableCount`, { val: this.upgradableDevicesCount, ack: true });
-
-			// List all devices
-			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': '' }];
-			}
-			await this.setStateAsync(`${dpSubFolder}listAll`, { val: JSON.stringify(this.listAllDevices), ack: true });
-
-			// List link quality
-			if (this.linkQualityCount === 0) {
-				// if no device is count, write the JSON List with default value
-				this.linkQualityDevices = [{ Device: '--none--', Adapter: '', 'Signal strength': '' }];
-			}
-			//write JSON list
-			await this.setStateAsync(`${dpSubFolder}linkQualityList`, {
-				val: JSON.stringify(this.linkQualityDevices),
-				ack: true,
-			});
-
-			// List offline devices
-			if (this.offlineDevicesCount === 0) {
-				// if no device is count, write the JSON List with default value
-				this.offlineDevices = [{ Device: '--none--', Adapter: '', 'Last contact': '' }];
-			}
-			//write JSON list
-			await this.setStateAsync(`${dpSubFolder}offlineList`, {
-				val: JSON.stringify(this.offlineDevices),
-				ack: true,
-			});
-
-			// List updatable
-			if (this.upgradableDevicesCount === 0) {
-				// if no device is count, write the JSON List with default value
-				this.upgradableList = [{ Device: '--none--', Adapter: '', 'Last contact': '' }];
-			}
-			//write JSON list
-			await this.setStateAsync(`${dpSubFolder}upgradableList`, {
-				val: JSON.stringify(this.upgradableList),
-				ack: true,
-			});
-
-			// List battery powered
-			if (this.batteryPoweredCount === 0) {
-				// if no device is count, write the JSON List with default value
-				this.batteryPowered = [{ Device: '--none--', Adapter: '', Battery: '' }];
-			}
-			//write JSON list
-			await this.setStateAsync(`${dpSubFolder}batteryList`, {
-				val: JSON.stringify(this.batteryPowered),
-				ack: true,
-			});
-
-			// list battery low powered
-			if (this.lowBatteryPoweredCount === 0) {
-				// if no device is count, write the JSON List with default value
-				this.batteryLowPowered = [{ Device: '--none--', Adapter: '', Battery: '' }];
-			}
-			//write JSON list
-			await this.setStateAsync(`${dpSubFolder}lowBatteryList`, {
-				val: JSON.stringify(this.batteryLowPowered),
-				ack: true,
-			});
-
-			// set booleans datapoints
-			if (this.offlineDevicesCount === 0) {
-				await this.setStateAsync(`${dpSubFolder}oneDeviceOffline`, {
-					val: false,
-					ack: true,
-				});
-			} else {
-				await this.setStateAsync(`${dpSubFolder}oneDeviceOffline`, {
-					val: true,
-					ack: true,
-				});
-			}
-
-			if (this.lowBatteryPoweredCount === 0) {
-				await this.setStateAsync(`${dpSubFolder}oneDeviceLowBat`, {
-					val: false,
-					ack: true,
-				});
-			} else {
-				await this.setStateAsync(`${dpSubFolder}oneDeviceLowBat`, {
-					val: true,
-					ack: true,
-				});
-			}
-
-			if (this.upgradableDevicesCount === 0) {
-				await this.setStateAsync(`${dpSubFolder}oneDeviceUpdatable`, {
-					val: false,
-					ack: true,
-				});
-			} else {
-				await this.setStateAsync(`${dpSubFolder}oneDeviceUpdatable`, {
-					val: true,
-					ack: true,
-				});
-			}
-
-			//write HTML list
-			if (this.createHtmlList) {
-				await this.setStateAsync(`${dpSubFolder}linkQualityListHTML`, {
-					val: await this.creatLinkQualityListHTML(this.linkQualityDevices, this.linkQualityCount),
-					ack: true,
-				});
-				await this.setStateAsync(`${dpSubFolder}offlineListHTML`, {
-					val: await this.createOfflineListHTML(this.offlineDevices, this.offlineDevicesCount),
-					ack: true,
-				});
-				await this.setStateAsync(`${dpSubFolder}batteryListHTML`, {
-					val: await this.createBatteryListHTML(this.batteryPowered, this.batteryPoweredCount, false),
-					ack: true,
-				});
-				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) {
-			this.errorReporting('[writeDatapoints]', error);
-		}
-		this.log.debug(`Function finished: ${this.writeDatapoints.name}`);
-	} //<--End  of writing Datapoints
+	/*=============================================
+	=       functions to create html lists        =
+	=============================================*/
 
 	/**
 	 * @param {object} devices - Device
@@ -2031,7 +2095,10 @@ class DeviceWatcher extends utils.Adapter {
 		return html;
 	}
 
-	// create datapoints for each adapter
+	/*=============================================
+	=     create datapoints for each adapter      =
+	=============================================*/
+
 	/**
 	 * @param {object} adptName - Adaptername of devices
 	 */
@@ -2480,6 +2547,54 @@ class DeviceWatcher extends utils.Adapter {
 		});
 	}
 
+	/*=============================================
+	=            	help functions   	          =
+	=============================================*/
+
+	/**
+	 * @param {string} id - id which should be capitalize
+	 */
+	capitalize(id) {
+		//make the first letter uppercase
+		return id && id[0].toUpperCase() + id.slice(1);
+	}
+
+	/**
+	 * @param {number} dpValue - get Time of this datapoint
+	 */
+	async getTimestamp(dpValue) {
+		const time = new Date();
+		return (dpValue = Math.round((time.getTime() - dpValue) / 1000 / 60));
+	}
+
+	/**
+	 * @param {object} obj - State of datapoint
+	 */
+	async getInitValue(obj) {
+		//state can be null or undefinded
+		const foreignState = await this.getForeignStateAsync(obj);
+		if (foreignState) return foreignState.val;
+	}
+
+	/**
+	 * @param {object} obj - State of own datapoint
+	 */
+	async getOwnInitValue(obj) {
+		//state can be null or undefinded for own states
+		const stateVal = await this.getStateAsync(obj);
+		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 {};
+	}
+
 	/**
 	 * @param {string} codePart - Message Prefix
 	 * @param {object} error - Sentry message