iobroker.device-watcher 2.6.0 → 2.7.0

package/admin/jsonConfig.json

@@ -8,7 +8,7 @@
 			"items": {
 				"_headerAdapter": {
 					"type": "header",
-					"text": "Create lists for instances",
+					"text": "Watch adapter/instances",
 					"size": 2
 				},
 				"checkAdapterInstances": {
@@ -16,11 +16,11 @@
 					"sm": 12,
 					"md": 12,
 					"lg": 6,
-					"label": "Watch instances"
+					"label": "Watch adapter/instances"
 				},
 				"_headerDevices": {
 					"type": "header",
-					"text": "Create lists for devices",
+					"text": "Watch devices/services",
 					"size": 2
 				},
 				"alexa2Devices": {
@@ -72,6 +72,13 @@
 					"lg": 3,
 					"label": "euSec"
 				},
+				"fhemTFAsensorsDevices": {
+					"type": "checkbox",
+					"sm": 6,
+					"md": 6,
+					"lg": 3,
+					"label": "FHEM TFA Sensors"
+				},
 				"fritzdectDevices": {
 					"type": "checkbox",
 					"sm": 6,
@@ -86,6 +93,13 @@
 					"lg": 3,
 					"label": "fullyBrowser"
 				},
+				"fullyMQTTDevices": {
+					"type": "checkbox",
+					"sm": 6,
+					"md": 6,
+					"lg": 3,
+					"label": "Fully-MQTT"
+				},
 				"hamDevices": {
 					"type": "checkbox",
 					"sm": 6,
@@ -368,7 +382,9 @@
 				"_headerAdapterInstances": {
 					"type": "header",
 					"text": "Adapter & Instances Notification Settings",
-					"size": 2
+					"size": 2,
+					"hidden": "!data.checkAdapterInstances",
+					"hideOnlyControl": false
 				},
 				"checkSendAdapterUpdateMsg": {
 					"newLine": "true",
@@ -377,7 +393,9 @@
 					"md": 12,
 					"lg": 6,
 					"label": "Adapter update message",
-					"help": "Receive a message when an update for an adapter is available"
+					"help": "Receive a message when an update for an adapter is available",
+					"hidden": "!data.checkAdapterInstances",
+					"hideOnlyControl": false
 				},
 				"checkSendAdapterUpdateMsgDaily": {
 					"type": "checkbox",
@@ -385,7 +403,9 @@
 					"md": 12,
 					"lg": 6,
 					"label": "Overview of updatable adapter",
-					"help": "Get a message with an overview of all updatable adapter"
+					"help": "Get a message with an overview of all updatable adapter",
+					"hidden": "!data.checkAdapterInstances",
+					"hideOnlyControl": false
 				},
 				"_sendIntervallAdapterUpdateDay": {
 					"newLine": true,
@@ -393,7 +413,7 @@
 					"md": 12,
 					"lg": 6,
 					"hidden": "!data.checkSendAdapterUpdateMsgDaily",
-					"hideOnlyControl": true,
+					"hideOnlyControl": false,
 					"items": {
 						"_textDays": {
 							"type": "staticText",
@@ -439,7 +459,7 @@
 					"md": 12,
 					"lg": 6,
 					"hidden": "!data.checkSendAdapterUpdateMsgDaily",
-					"hideOnlyControl": true,
+					"hideOnlyControl": false,
 					"items": {
 						"_textTime": {
 							"type": "staticText",
@@ -458,7 +478,9 @@
 				},
 				"trennerUpdatableAdapter": {
 					"newLine": true,
-					"type": "divider"
+					"type": "divider",
+					"hidden": "!data.checkAdapterInstances",
+					"hideOnlyControl": false
 				},
 				"checkSendInstanceFailedMsg": {
 					"newLine": "true",
@@ -467,7 +489,9 @@
 					"md": 12,
 					"lg": 6,
 					"label": "Instance failed message",
-					"help": "Receive a message when an instance failed"
+					"help": "Receive a message when an instance failed",
+					"hidden": "!data.checkAdapterInstances",
+					"hideOnlyControl": false
 				},
 				"checkSendInstanceFailedDaily": {
 					"type": "checkbox",
@@ -475,7 +499,9 @@
 					"md": 12,
 					"lg": 6,
 					"label": "Overview of failed instances",
-					"help": "Get a message with an overview of all failed instances"
+					"help": "Get a message with an overview of all failed instances",
+					"hidden": "!data.checkAdapterInstances",
+					"hideOnlyControl": false
 				},
 				"_sendIntervallFailedInstancesDay": {
 					"newLine": true,
@@ -483,7 +509,7 @@
 					"md": 12,
 					"lg": 6,
 					"hidden": "!data.checkSendInstanceFailedDaily",
-					"hideOnlyControl": true,
+					"hideOnlyControl": false,
 					"items": {
 						"_textDays": {
 							"type": "staticText",
@@ -529,7 +555,7 @@
 					"md": 12,
 					"lg": 6,
 					"hidden": "!data.checkSendInstanceFailedDaily",
-					"hideOnlyControl": true,
+					"hideOnlyControl": false,
 					"items": {
 						"_textTime": {
 							"type": "staticText",
@@ -548,7 +574,7 @@
 				},
 				"_headerCommon": {
 					"type": "header",
-					"text": "Devices Notification Settings",
+					"text": "Devices/Services Notification Settings",
 					"size": 2
 				},
 				"checkSendOfflineMsg": {
@@ -564,8 +590,8 @@
 					"sm": 12,
 					"md": 12,
 					"lg": 6,
-					"label": "Overview of offline devices",
-					"help": "Get a message with an overview all offline devices"
+					"label": "Overview of offline devices/services",
+					"help": "Get a message with an overview all offline devices/services"
 				},
 				"_sendIntervallOfflineDay": {
 					"newLine": true,
@@ -577,7 +603,7 @@
 					"items": {
 						"_textDays": {
 							"type": "staticText",
-							"text": "Choose the day(s) where you want to get the overview of offline devices:",
+							"text": "Choose the day(s) where you want to get the overview of offline devices/services:",
 							"style": {
 								"fontSize": 16,
 								"marginTop": 20
@@ -636,7 +662,7 @@
 						}
 					}
 				},
-				"trenner": {
+				"_trenner": {
 					"newLine": true,
 					"type": "divider"
 				},
@@ -657,7 +683,7 @@
 					"label": "Overview of low battery devices",
 					"help": "Get a regular message with an overview all low battery devices"
 				},
-				"chooseDay": {
+				"_chooseDay": {
 					"newLine": true,
 					"sm": 12,
 					"md": 12,
@@ -726,7 +752,7 @@
 						}
 					}
 				},
-				"trennerZwei": {
+				"_trennerZwei": {
 					"newLine": true,
 					"type": "divider"
 				},
@@ -844,7 +870,7 @@
 					"text": "Notification Service",
 					"size": 2
 				},
-				"msgServiceText": {
+				"_msgServiceText": {
 					"type": "staticText",
 					"text": "Here you can choose your notification service, you can use more than one service, but you can also leave all blank, then only the datapoint lastNotification will be filled.",
 					"style": {
@@ -858,275 +884,349 @@
 					"help": "Choose your notification services",
 					"options": [
 						{ "label": "Please choose", "value": "none" },
-						{ "label": "Pushover", "value": "pushover" },
-						{ "label": "Telegram", "value": "telegram" },
-						{ "label": "Whatsapp", "value": "whatsapp" },
 						{ "label": "E-Mail", "value": "email" },
 						{ "label": "Jarvis", "value": "jarvis" },
 						{ "label": "Lovelace", "value": "lovelace" },
-						{ "label": "Synochat", "value": "synochat" }
+						{ "label": "Matrix", "value": "matrix" },
+						{ "label": "Pushover", "value": "pushover" },
+						{ "label": "Signal", "value": "signal" },
+						{ "label": "Synochat", "value": "synochat" },
+						{ "label": "Telegram", "value": "telegram" },
+						{ "label": "Whatsapp", "value": "whatsapp" }
 					],
 					"default": "none"
 				},
-				"_headerPushover": {
+				"_headerEmail": {
 					"newLine": true,
 					"type": "header",
-					"text": "Pushover",
+					"text": "Email",
 					"size": 2,
-					"hidden": "data.msgService !== 'pushover'",
+					"hidden": "data.msgService !== 'email' && !data.instanceEmail",
 					"hideOnlyControl": false
 				},
-				"instancePushover": {
+				"instanceEmail": {
 					"newLine": true,
 					"type": "instance",
-					"adapter": "pushover",
+					"adapter": "email",
 					"all": false,
 					"allowDeactivate": true,
 					"sm": 12,
 					"md": 4,
 					"lg": 4,
-					"label": "Pushover Instance",
-					"help": "Please choose the pushover instance",
-					"hidden": "data.msgService !== 'pushover'",
+					"label": "Email Instance",
+					"help": "Please choose the email instance",
+					"hidden": "data.msgService !== 'email' && !data.instanceEmail",
 					"hideOnlyControl": false
 				},
-				"devicePushover": {
+				"sendToEmail": {
 					"type": "text",
 					"sm": 12,
 					"md": 4,
 					"lg": 4,
-					"label": "Device-ID (optional)",
-					"help": "Choose your device",
-					"hidden": "data.msgService !== 'pushover'",
+					"label": "Send to (optional)",
+					"help": "Choose your email address",
+					"hidden": "data.msgService !== 'email' && !data.instanceEmail",
 					"hideOnlyControl": false
 				},
-				"prioPushover": {
-					"type": "select",
+				"subjectEmail": {
+					"type": "text",
 					"sm": 12,
 					"md": 4,
 					"lg": 4,
-					"help": "Choose the priority",
-					"options": [
-						{ "label": "Normal", "value": "" },
-						{ "label": "High Priority", "value": 1 },
-						{ "label": "Silent", "value": -1 },
-						{ "label": "With confirmation", "value": 2 }
-					],
-					"hidden": "data.msgService !== 'pushover'",
+					"label": "Subject (optional)",
+					"help": "Choose your subject for the Email",
+					"hidden": "data.msgService !== 'email' && !data.instanceEmail",
 					"hideOnlyControl": false
 				},
-				"titlePushover": {
+				"headerJarvis": {
+					"newLine": "true",
+					"type": "header",
+					"text": "Jarvis Notification",
+					"size": 2,
+					"hidden": "data.msgService !== 'jarvis' && !data.instanceJarvis",
+					"hideOnlyControl": false
+				},
+				"instanceJarvis": {
+					"newLine": true,
+					"type": "instance",
+					"adapter": "jarvis",
+					"allowDeactivate": true,
+					"all": false,
+					"sm": 12,
+					"md": 4,
+					"lg": 4,
+					"label": "Jarvis Instance",
+					"help": "Please choose the jarvis instance",
+					"hidden": "data.msgService !== 'jarvis' && !data.instanceJarvis",
+					"hideOnlyControl": false
+				},
+				"titleJarvis": {
 					"type": "text",
 					"sm": 12,
 					"md": 4,
 					"lg": 4,
 					"label": "Title (optional)",
 					"help": "Choose your title for Pushmessage",
-					"hidden": "data.msgService !== 'pushover'",
+					"hidden": "data.msgService !== 'jarvis' && !data.instanceJarvis",
 					"hideOnlyControl": false
 				},
-				"headerTelegram": {
+				"headerLovelace": {
 					"newLine": "true",
 					"type": "header",
-					"text": "Telegram",
+					"text": "Lovelace Notification",
 					"size": 2,
-					"hidden": "data.msgService !== 'telegram'",
+					"hidden": "data.msgService !== 'lovelace' && !data.instanceLovelace",
 					"hideOnlyControl": false
 				},
-				"instanceTelegram": {
+				"instanceLovelace": {
 					"newLine": true,
 					"type": "instance",
-					"adapter": "telegram",
-					"all": false,
+					"adapter": "lovelace",
 					"allowDeactivate": true,
+					"all": false,
 					"sm": 12,
 					"md": 4,
 					"lg": 4,
-					"label": "Telegram Instance",
-					"help": "Please choose the telegram instance",
-					"hidden": "data.msgService !== 'telegram'",
-					"hideOnlyControl": false
-				},
-				"deviceTelegram": {
-					"type": "text",
-					"sm": 12,
-					"md": 4,
-					"lg": 4,
-					"label": "Device-ID (optional)",
-					"help": "Choose your device",
-					"hidden": "data.msgService !== 'telegram'",
+					"label": "Lovelace Instance",
+					"help": "Please choose the lovelace instance",
+					"hidden": "data.msgService !== 'lovelace' && !data.instanceLovelace",
 					"hideOnlyControl": false
 				},
-				"chatIdTelegram": {
+				"titleLovelace": {
 					"type": "text",
 					"sm": 12,
 					"md": 4,
 					"lg": 4,
-					"label": "Chat-ID (optional)",
-					"help": "Choose your Chat-ID",
-					"hidden": "data.msgService !== 'telegram'",
+					"label": "Title (optional)",
+					"help": "Choose your title for Pushmessage",
+					"hidden": "data.msgService !== 'lovelace' && !data.instanceLovelace",
 					"hideOnlyControl": false
 				},
-				"headerWhatsapp": {
+				"headerMatrix": {
 					"newLine": "true",
 					"type": "header",
-					"text": "Whatsapp",
+					"text": "Matrix",
 					"size": 2,
-					"hidden": "data.msgService !== 'whatsapp'",
+					"hidden": "data.msgService !== 'matrix' && !data.instanceMatrix",
 					"hideOnlyControl": false
 				},
-				"instanceWhatsapp": {
+				"instanceMatrix": {
 					"newLine": true,
 					"type": "instance",
-					"adapter": "whatsapp-cmb",
-					"all": false,
+					"adapter": "matrix-org",
 					"allowDeactivate": true,
+					"all": false,
 					"sm": 12,
 					"md": 4,
 					"lg": 4,
-					"label": "Whatsapp Instance",
-					"help": "Please choose the Whatsapp instance",
-					"hidden": "data.msgService !== 'whatsapp'",
+					"label": "Matrix Instance",
+					"help": "Please choose the matrix instance",
+					"hidden": "data.msgService !== 'matrix' && !data.instanceMatrix",
 					"hideOnlyControl": false
 				},
-				"phoneWhatapp": {
+				"titleMatrix": {
 					"type": "text",
 					"sm": 12,
 					"md": 4,
 					"lg": 4,
-					"label": "Recipient (optional)",
-					"help": "Choose your recipient",
-					"hidden": "data.msgService !== 'whatsapp'",
+					"label": "Title (optional)",
+					"help": "Choose your title for message",
+					"hidden": "data.msgService !== 'matrix' && !data.instanceMatrix",
 					"hideOnlyControl": false
 				},
-				"_headerEmail": {
+				"_headerPushover": {
 					"newLine": true,
 					"type": "header",
-					"text": "Email",
+					"text": "Pushover",
 					"size": 2,
-					"hidden": "data.msgService !== 'email'",
+					"hidden": "data.msgService !== 'pushover' && !data.instancePushover",
 					"hideOnlyControl": false
 				},
-				"instanceEmail": {
+				"instancePushover": {
 					"newLine": true,
 					"type": "instance",
-					"adapter": "email",
+					"adapter": "pushover",
 					"all": false,
 					"allowDeactivate": true,
 					"sm": 12,
 					"md": 4,
 					"lg": 4,
-					"label": "Email Instance",
-					"help": "Please choose the email instance",
-					"hidden": "data.msgService !== 'email'",
+					"label": "Pushover Instance",
+					"help": "Please choose the pushover instance",
+					"hidden": "data.msgService !== 'pushover' && !data.instancePushover",
 					"hideOnlyControl": false
 				},
-				"sendToEmail": {
+				"devicePushover": {
 					"type": "text",
 					"sm": 12,
 					"md": 4,
 					"lg": 4,
-					"label": "Send to (optional)",
-					"help": "Choose your email address",
-					"hidden": "data.msgService !== 'email'",
+					"label": "Device-ID (optional)",
+					"help": "Choose your device",
+					"hidden": "data.msgService !== 'pushover' && !data.instancePushover",
 					"hideOnlyControl": false
 				},
-				"subjectEmail": {
+				"prioPushover": {
+					"type": "select",
+					"sm": 12,
+					"md": 4,
+					"lg": 4,
+					"help": "Choose the priority",
+					"options": [
+						{ "label": "Normal", "value": "" },
+						{ "label": "High Priority", "value": 1 },
+						{ "label": "Silent", "value": -1 },
+						{ "label": "With confirmation", "value": 2 }
+					],
+					"hidden": "data.msgService !== 'pushover' && !data.instancePushover",
+					"hideOnlyControl": false
+				},
+				"titlePushover": {
 					"type": "text",
 					"sm": 12,
 					"md": 4,
 					"lg": 4,
-					"label": "Subject (optional)",
-					"help": "Choose your subject for the Email",
-					"hidden": "data.msgService !== 'email'",
+					"label": "Title (optional)",
+					"help": "Choose your title for Pushmessage",
+					"hidden": "data.msgService !== 'pushover' && !data.instancePushover",
 					"hideOnlyControl": false
 				},
-				"headerJarvis": {
+				"headerSignal": {
 					"newLine": "true",
 					"type": "header",
-					"text": "Jarvis Notification",
+					"text": "Signal",
 					"size": 2,
-					"hidden": "data.msgService !== 'jarvis'",
+					"hidden": "data.msgService !== 'signal' && !data.instanceSignal",
 					"hideOnlyControl": false
 				},
-				"instanceJarvis": {
+				"instanceSignal": {
 					"newLine": true,
 					"type": "instance",
-					"adapter": "jarvis",
-					"allowDeactivate": true,
+					"adapter": "signal-cmb",
 					"all": false,
+					"allowDeactivate": true,
 					"sm": 12,
 					"md": 4,
 					"lg": 4,
-					"label": "Jarvis Instance",
-					"help": "Please choose the jarvis instance",
-					"hidden": "data.msgService !== 'jarvis'",
+					"label": "Signal Instance",
+					"help": "Please choose the Signal instance",
+					"hidden": "data.msgService !== 'signal' && !data.instanceSignal",
 					"hideOnlyControl": false
 				},
-				"titleJarvis": {
+				"phonSignal": {
 					"type": "text",
 					"sm": 12,
 					"md": 4,
 					"lg": 4,
-					"label": "Title (optional)",
-					"help": "Choose your title for Pushmessage",
-					"hidden": "data.msgService !== 'jarvis'",
+					"label": "Recipient (optional)",
+					"help": "Choose your recipient",
+					"hidden": "data.msgService !== 'signal' && !data.instanceSignal",
 					"hideOnlyControl": false
 				},
-				"headerLovelace": {
+				"headerSynochat": {
 					"newLine": "true",
 					"type": "header",
-					"text": "Lovelace Notification",
+					"text": "Synochat",
 					"size": 2,
-					"hidden": "data.msgService !== 'lovelace'",
+					"hidden": "data.msgService !== 'synochat' && !data.instanceSynochat",
 					"hideOnlyControl": false
 				},
-				"instanceLovelace": {
+				"instanceSynochat": {
 					"newLine": true,
 					"type": "instance",
-					"adapter": "lovelace",
+					"adapter": "synochat",
 					"allowDeactivate": true,
 					"all": false,
 					"sm": 12,
 					"md": 4,
 					"lg": 4,
-					"label": "Lovelace Instance",
-					"help": "Please choose the lovelace instance",
-					"hidden": "data.msgService !== 'lovelace'",
+					"label": "Synochat Instance",
+					"help": "Please choose the Synochat instance",
+					"hidden": "data.msgService !== 'synochat' && !data.instanceSynochat",
 					"hideOnlyControl": false
 				},
-				"titleLovelace": {
+				"channelSynochat": {
 					"type": "text",
 					"sm": 12,
 					"md": 4,
 					"lg": 4,
-					"label": "Title (optional)",
-					"help": "Choose your title for Pushmessage",
-					"hidden": "data.msgService !== 'lovelace'",
+					"label": "Channel",
+					"help": "Enter the channelname for Synochat",
+					"hidden": "data.msgService !== 'synochat' && !data.instanceSynochat",
 					"hideOnlyControl": false
 				},
-				"instanceSynochat": {
+				"headerTelegram": {
+					"newLine": "true",
+					"type": "header",
+					"text": "Telegram",
+					"size": 2,
+					"hidden": "data.msgService !== 'telegram' && !data.instanceTelegram",
+					"hideOnlyControl": false
+				},
+				"instanceTelegram": {
 					"newLine": true,
 					"type": "instance",
-					"adapter": "synochat",
+					"adapter": "telegram",
+					"all": false,
 					"allowDeactivate": true,
+					"sm": 12,
+					"md": 4,
+					"lg": 4,
+					"label": "Telegram Instance",
+					"help": "Please choose the telegram instance",
+					"hidden": "data.msgService !== 'telegram' && !data.instanceTelegram",
+					"hideOnlyControl": false
+				},
+				"deviceTelegram": {
+					"type": "text",
+					"sm": 12,
+					"md": 4,
+					"lg": 4,
+					"label": "Device-ID (optional)",
+					"help": "Choose your device",
+					"hidden": "data.msgService !== 'telegram' && !data.instanceTelegram",
+					"hideOnlyControl": false
+				},
+				"chatIdTelegram": {
+					"type": "text",
+					"sm": 12,
+					"md": 4,
+					"lg": 4,
+					"label": "Chat-ID (optional)",
+					"help": "Choose your Chat-ID",
+					"hidden": "data.msgService !== 'telegram' && !data.instanceTelegram",
+					"hideOnlyControl": false
+				},
+				"headerWhatsapp": {
+					"newLine": "true",
+					"type": "header",
+					"text": "Whatsapp",
+					"size": 2,
+					"hidden": "data.msgService !== 'whatsapp' && !data.instanceWhatsapp",
+					"hideOnlyControl": false
+				},
+				"instanceWhatsapp": {
+					"newLine": true,
+					"type": "instance",
+					"adapter": "whatsapp-cmb",
 					"all": false,
+					"allowDeactivate": true,
 					"sm": 12,
 					"md": 4,
 					"lg": 4,
-					"label": "Synochat Instance",
-					"help": "Please choose the Synochat instance",
-					"hidden": "data.msgService !== 'synochat'",
+					"label": "Whatsapp Instance",
+					"help": "Please choose the Whatsapp instance",
+					"hidden": "data.msgService !== 'whatsapp' && !data.instanceWhatsapp",
 					"hideOnlyControl": false
 				},
-				"channelSynochat": {
+				"phoneWhatapp": {
 					"type": "text",
 					"sm": 12,
 					"md": 4,
 					"lg": 4,
-					"label": "Channel",
-					"help": "Enter the channelname for Synochat",
-					"hidden": "data.msgService !== 'synochat'",
+					"label": "Recipient (optional)",
+					"help": "Choose your recipient",
+					"hidden": "data.msgService !== 'whatsapp' && !data.instanceWhatsapp",
 					"hideOnlyControl": false
 				}
 			}
@@ -1135,102 +1235,97 @@
 			"type": "panel",
 			"label": "Blacklist",
 			"items": {
-				"headerDevices": {
+				"_headerBlacklistInstances": {
 					"newLine": "true",
 					"type": "header",
-					"text": "Devices Blacklist",
-					"size": 2
+					"text": "Instances Blacklist",
+					"size": 2,
+					"hidden": "!data.checkAdapterInstances",
+					"hideOnlyControl": false
 				},
-				"tableBlacklist": {
+				"tableBlacklistInstances": {
 					"type": "table",
 					"nodelete": true,
 					"sm": 12,
 					"md": 12,
 					"lg": 12,
+					"hidden": "!data.checkAdapterInstances",
+					"hideOnlyControl": false,
 					"items": [
 						{
 							"type": "selectSendTo",
-							"title": "Choose which devices should be excluded",
-							"attr": "devices",
+							"title": "Choose which instances should be excluded",
+							"attr": "instances",
 							"filter": false,
 							"allowAddByFilter": false,
 							"sort": false,
-							"jsonData": "{\"deviceName\":\"${globalData.deviceName}\",\"adapter\":\"${globalData.adapter}\",\"path\":\"${globalData.path}\"}",
-							"command": "devicesList",
+							"jsonData": "{\"instanceName\":\"${globalData.instanceName}\",\"adapter\":\"${globalData.adapter}\",\"path\":\"${globalData.path}\"}",
+							"command": "instancesList",
 							"width": "60%"
 						},
 						{
 							"type": "checkbox",
 							"title": "Ignor in notifications",
 							"attr": "checkIgnorNotify",
-							"width": "15%",
-							"alsoDependsOn": ["devices"]
+							"width": "15%"
 						},
 						{
 							"type": "checkbox",
-							"title": "Ignore in main lists",
+							"title": "Ignore in lists",
 							"attr": "checkIgnorLists",
-							"width": "10%",
-							"alsoDependsOn": ["devices"]
-						},
-						{
-							"type": "checkbox",
-							"title": "Ignore in lists per adapter",
-							"attr": "checkIgnorAdapterLists",
-							"width": "10%",
-							"alsoDependsOn": ["devices"]
+							"width": "10%"
 						}
 					]
 				},
-				"headerBlacklistInstances": {
+				"_headerDevices": {
 					"newLine": "true",
 					"type": "header",
-					"text": "Instances Blacklist",
-					"size": 2,
-					"hidden": "!data.checkAdapterInstances && !data.checkSendInstanceFailedMsg && !data.checkSendInstanceFailedMsgDaily",
-					"hideOnlyControl": false
+					"text": "Devices/Services Blacklist",
+					"size": 2
 				},
-				"tableBlacklistInstances": {
+				"tableBlacklist": {
 					"type": "table",
 					"nodelete": true,
 					"sm": 12,
 					"md": 12,
 					"lg": 12,
-					"hidden": "!data.checkAdapterInstances && !data.checkSendInstanceFailedMsg && !data.checkSendInstanceFailedMsgDaily",
-					"hideOnlyControl": false,
 					"items": [
 						{
 							"type": "selectSendTo",
-							"title": "Choose which instances should be excluded",
-							"attr": "instances",
+							"title": "Choose which devices/services should be excluded",
+							"attr": "devices",
 							"filter": false,
 							"allowAddByFilter": false,
 							"sort": false,
-							"jsonData": "{\"instanceName\":\"${globalData.instanceName}\",\"adapter\":\"${globalData.adapter}\",\"path\":\"${globalData.path}\"}",
-							"command": "instancesList",
+							"jsonData": "{\"deviceName\":\"${globalData.deviceName}\",\"adapter\":\"${globalData.adapter}\",\"path\":\"${globalData.path}\"}",
+							"command": "devicesList",
 							"width": "60%"
 						},
 						{
 							"type": "checkbox",
 							"title": "Ignor in notifications",
 							"attr": "checkIgnorNotify",
-							"width": "15%",
-							"alsoDependsOn": ["devices"]
+							"width": "15%"
 						},
 						{
 							"type": "checkbox",
-							"title": "Ignore in lists",
+							"title": "Ignore in main lists",
 							"attr": "checkIgnorLists",
-							"width": "10%",
-							"alsoDependsOn": ["devices"]
+							"width": "10%"
+						},
+						{
+							"type": "checkbox",
+							"title": "Ignore in lists per adapter",
+							"attr": "checkIgnorAdapterLists",
+							"width": "10%"
 						}
 					]
 				}
 			}
 		},
-		"_expertSettings": {
+		"_otherSettings": {
 			"type": "panel",
-			"label": "Expert Settings",
+			"label": "Other Settings",
 			"items": {
 				"_headerOtherSettings": {
 					"type": "header",
@@ -1285,7 +1380,7 @@
 					"text": "Update-Interval",
 					"size": 2
 				},
-				"textUpdateInterval": {
+				"_textUpdateInterval": {
 					"type": "staticText",
 					"text": "Here you can define the update interval of the datapoints/lists. For performance reasons, it is not recommended to select a poll value that is too low. Lower than two seconds is not selectable.",
 					"sm": 12,
@@ -1306,15 +1401,72 @@
 					"label": "Update-Interval",
 					"help": "in seconds",
 					"hideOnlyControl": false
+				}
+			}
+		},
+		"_expertSettings": {
+			"type": "panel",
+			"label": "Expert Settings",
+			"items": {
+				"_headerTimeInstances": {
+					"type": "header",
+					"text": "Error Time for Instances",
+					"size": 2,
+					"hidden": "!data.checkAdapterInstances",
+					"hideOnlyControl": false
+				},
+				"_textTimeInstances": {
+					"type": "staticText",
+					"text": "Here you can define the error time of each instance. The standard value is 20 seconds.",
+					"sm": 12,
+					"md": 12,
+					"lg": 12,
+					"hidden": "!data.checkAdapterInstances",
+					"hideOnlyControl": false,
+					"style": {
+						"fontSize": 16,
+						"marginBottom": 10
+					}
+				},
+				"tableTimeInstance": {
+					"type": "table",
+					"nodelete": true,
+					"sm": 12,
+					"md": 12,
+					"lg": 12,
+					"hidden": "!data.checkAdapterInstances",
+					"hideOnlyControl": false,
+					"items": [
+						{
+							"type": "selectSendTo",
+							"title": "Choose which instances should have a longer downtime",
+							"attr": "instancesTime",
+							"filter": false,
+							"allowAddByFilter": false,
+							"sort": false,
+							"jsonData": "{\"instanceName\":\"${globalData.instanceName}\",\"adapter\":\"${globalData.adapter}\",\"path\":\"${globalData.path}\"}",
+							"command": "instancesListTime",
+							"width": "60%"
+						},
+						{
+							"type": "number",
+							"min": 20,
+							"max": 1000000,
+							"default": 20,
+							"title": "Time in seconds",
+							"attr": "errorTime",
+							"width": "15%"
+						}
+					]
 				},
 				"_headerOfflineTime": {
 					"type": "header",
-					"text": "Offline Time",
+					"text": "Offline Time for devices/services",
 					"size": 2
 				},
-				"textOfflineTime": {
+				"_textOfflineTime": {
 					"type": "staticText",
-					"text": "Here you can define the offline times of each adapter. If you want to use the data points of the devices (online, available, reachable etc.) directly to determine the status, enter ' 0 '.",
+					"text": "Here you can define the offline times of each adapter. If you want to use the data points of the devices/services (online, available, reachable etc.) directly to determine the status, enter ' 0 '.",
 					"sm": 12,
 					"md": 12,
 					"lg": 12,
@@ -1407,6 +1559,18 @@
 					"hidden": "!data.eusecDevices",
 					"hideOnlyControl": false
 				},
+				"fhemTFAsensorsMaxMinutes": {
+					"type": "number",
+					"min": 1,
+					"max": 100000,
+					"sm": 6,
+					"md": 6,
+					"lg": 3,
+					"label": "FHEM TFA sensores",
+					"help": "in minutes",
+					"hidden": "!data.fhemTFAsensorsDevices",
+					"hideOnlyControl": false
+				},
 				"fritzdectMaxMinutes": {
 					"type": "number",
 					"min": -1,
@@ -1431,6 +1595,18 @@
 					"hidden": "!data.fullybrowserDevices",
 					"hideOnlyControl": false
 				},
+				"fullyMQTTMaxMinutes": {
+					"type": "number",
+					"min": -1,
+					"max": 100000,
+					"sm": 6,
+					"md": 6,
+					"lg": 3,
+					"label": "Fully-MQTT",
+					"help": "in minutes",
+					"hidden": "!data.fullyMQTTDevices",
+					"hideOnlyControl": false
+				},
 				"hamMaxMinutes": {
 					"type": "number",
 					"min": 1,