diff --git a/genericthings/integrationplugingenericthings.cpp b/genericthings/integrationplugingenericthings.cpp
index fbef166..4698727 100644
--- a/genericthings/integrationplugingenericthings.cpp
+++ b/genericthings/integrationplugingenericthings.cpp
@@ -592,6 +592,45 @@ void IntegrationPluginGenericThings::executeAction(ThingActionInfo *info)
} else {
Q_ASSERT_X(false, "executeAction", QString("Unhandled actionTypeId: %1").arg(action.actionTypeId().toString()).toUtf8());
}
+ } else if (thing->thingClassId() == phSensorThingClassId) {
+ if (action.actionTypeId() == phSensorInputActionTypeId) {
+ double value = info->action().paramValue(phSensorInputActionInputParamTypeId).toDouble();
+ thing->setStateValue(phSensorInputStateTypeId, value);
+ double min = info->thing()->setting(phSensorSettingsMinInputParamTypeId).toDouble();
+ double max = info->thing()->setting(phSensorSettingsMaxInputParamTypeId).toDouble();
+ double newValue = mapDoubleValue(value, min, max, 0, 14);
+ double roundingFactor = qPow(10, info->thing()->setting(phSensorSettingsAccuracyParamTypeId).toInt());
+ newValue = qRound(newValue * roundingFactor) / roundingFactor;
+ thing->setStateValue(phSensorPhStateTypeId, newValue);
+ info->finish(Thing::ThingErrorNoError);
+ return;
+ }
+ } else if (thing->thingClassId() == orpSensorThingClassId) {
+ if (action.actionTypeId() == orpSensorInputActionTypeId) {
+ double value = info->action().paramValue(orpSensorInputActionInputParamTypeId).toDouble();
+ thing->setStateValue(orpSensorInputStateTypeId, value);
+ double min = info->thing()->setting(orpSensorSettingsMinORPParamTypeId).toDouble();
+ double max = info->thing()->setting(orpSensorSettingsMaxORPParamTypeId).toDouble();
+ double newValue = mapDoubleValue(value, 0, 100, min, max);
+ double roundingFactor = qPow(10, info->thing()->setting(orpSensorSettingsAccuracyParamTypeId).toInt());
+ newValue = qRound(newValue * roundingFactor) / roundingFactor;
+ thing->setStateValue(orpSensorOrpStateTypeId, newValue);
+ info->finish(Thing::ThingErrorNoError);
+ return;
+ }
+ } else if (thing->thingClassId() == o2SensorThingClassId) {
+ if (action.actionTypeId() == o2SensorInputActionTypeId) {
+ double value = info->action().paramValue(o2SensorInputActionInputParamTypeId).toDouble();
+ thing->setStateValue(o2SensorInputStateTypeId, value);
+ double min = info->thing()->setting(o2SensorSettingsMinInputParamTypeId).toDouble();
+ double max = info->thing()->setting(o2SensorSettingsMaxInputParamTypeId).toDouble();
+ double newValue = mapDoubleValue(value, min, max, 0, 100);
+ double roundingFactor = qPow(10, info->thing()->setting(o2SensorSettingsAccuracyParamTypeId).toInt());
+ newValue = qRound(newValue * roundingFactor) / roundingFactor;
+ thing->setStateValue(o2SensorO2saturationStateTypeId, newValue);
+ info->finish(Thing::ThingErrorNoError);
+ return;
+ }
} else if (thing->thingClassId() == pressureSensorThingClassId) {
if (action.actionTypeId() == pressureSensorInputActionTypeId) {
double value = info->action().param(pressureSensorInputActionInputParamTypeId).value().toDouble();
@@ -607,6 +646,21 @@ void IntegrationPluginGenericThings::executeAction(ThingActionInfo *info)
} else {
Q_ASSERT_X(false, "executeAction", QString("Unhandled actionTypeId: %1").arg(action.actionTypeId().toString()).toUtf8());
}
+ } else if (thing->thingClassId() == coSensorThingClassId) {
+ if (action.actionTypeId() == coSensorInputActionTypeId) {
+ double value = info->action().param(coSensorInputActionInputParamTypeId).value().toDouble();
+ thing->setStateValue(coSensorInputStateTypeId, value);
+ double min = info->thing()->setting(coSensorSettingsMinCOParamTypeId).toDouble();
+ double max = info->thing()->setting(coSensorSettingsMaxCOParamTypeId).toDouble();
+ double newValue = mapDoubleValue(value, 0, 100, min, max);
+ double roundingFactor = qPow(10, info->thing()->setting(coSensorSettingsAccuracyParamTypeId).toInt());
+ newValue = qRound(newValue * roundingFactor) / roundingFactor;
+ thing->setStateValue(coSensorCoStateTypeId, newValue);
+ info->finish(Thing::ThingErrorNoError);
+ return;
+ } else {
+ Q_ASSERT_X(false, "executeAction", QString("Unhandled actionTypeId: %1").arg(action.actionTypeId().toString()).toUtf8());
+ }
} else if (thing->thingClassId() == co2SensorThingClassId) {
if (action.actionTypeId() == co2SensorInputActionTypeId) {
double value = info->action().param(co2SensorInputActionInputParamTypeId).value().toDouble();
@@ -622,6 +676,21 @@ void IntegrationPluginGenericThings::executeAction(ThingActionInfo *info)
} else {
Q_ASSERT_X(false, "executeAction", QString("Unhandled actionTypeId: %1").arg(action.actionTypeId().toString()).toUtf8());
}
+ } else if (thing->thingClassId() == gasSensorThingClassId) {
+ if (action.actionTypeId() == gasSensorInputActionTypeId) {
+ double value = info->action().param(gasSensorInputActionInputParamTypeId).value().toDouble();
+ thing->setStateValue(gasSensorInputStateTypeId, value);
+ double min = info->thing()->setting(gasSensorSettingsMinValueParamTypeId).toDouble();
+ double max = info->thing()->setting(gasSensorSettingsMaxValueParamTypeId).toDouble();
+ double newValue = mapDoubleValue(value, 0, 100, min, max);
+ double roundingFactor = qPow(10, info->thing()->setting(gasSensorSettingsAccuracyParamTypeId).toInt());
+ newValue = qRound(newValue * roundingFactor) / roundingFactor;
+ thing->setStateValue(gasSensorGasStateTypeId, newValue);
+ info->finish(Thing::ThingErrorNoError);
+ return;
+ } else {
+ Q_ASSERT_X(false, "executeAction", QString("Unhandled actionTypeId: %1").arg(action.actionTypeId().toString()).toUtf8());
+ }
} else if (thing->thingClassId() == lightSensorThingClassId) {
if (action.actionTypeId() == lightSensorInputActionTypeId) {
double value = info->action().param(lightSensorInputActionInputParamTypeId).value().toDouble();
@@ -789,6 +858,14 @@ void IntegrationPluginGenericThings::executeAction(ThingActionInfo *info)
info->finish(Thing::ThingErrorNoError);
return;
}
+ } else if (thing->thingClassId() == waterSensorThingClassId) {
+ if (action.actionTypeId() == waterSensorWaterDetectedActionTypeId) {
+ bool waterDetected = action.paramValue(waterSensorWaterDetectedActionWaterDetectedParamTypeId).toBool();
+ qCDebug(dcGenericThings()).nospace() << "Water sensor is " << (waterDetected ? "" : "not") << "detecting water";
+ thing->setStateValue(waterSensorWaterDetectedStateTypeId, waterDetected);
+ info->finish(Thing::ThingErrorNoError);
+ return;
+ }
} else if (thing->thingClassId() == presenceSensorThingClassId) {
if (action.actionTypeId() == presenceSensorIsPresentActionTypeId) {
bool isPresent = action.paramValue(presenceSensorIsPresentActionIsPresentParamTypeId).toBool();
diff --git a/genericthings/integrationplugingenericthings.json b/genericthings/integrationplugingenericthings.json
index 2411fc9..a4f0ff5 100644
--- a/genericthings/integrationplugingenericthings.json
+++ b/genericthings/integrationplugingenericthings.json
@@ -955,6 +955,179 @@
}
]
},
+ {
+ "id": "e2934fa1-59c3-4de8-82f2-66181136085c",
+ "name": "phSensor",
+ "displayName": "PH sensor",
+ "createMethods": ["user"],
+ "interfaces": ["phsensor"],
+ "settingsTypes": [
+ {
+ "id": "a8ff2e16-e06c-4b1e-839a-a06691a12d64",
+ "name": "minInput",
+ "displayName": "Minimum input value",
+ "type": "double",
+ "defaultValue": 0
+ },
+ {
+ "id": "a8889e45-59e5-4cc4-b228-611f8f19f531",
+ "name": "maxInput",
+ "displayName": "Maximum input value",
+ "type": "double",
+ "defaultValue": 100
+ },
+ {
+ "id": "bb41de73-31d0-4b21-8f80-14467120aae4",
+ "name": "accuracy",
+ "displayName": "Accuracy (decimal places)",
+ "type": "uint",
+ "minValue": 0,
+ "maxValue": 5,
+ "defaultValue": 1
+ }
+ ],
+ "stateTypes": [
+ {
+ "id": "743514b1-8018-4525-b87a-c5f414146ff2",
+ "name": "ph",
+ "displayName": "PH",
+ "displayNameEvent": "PH changed",
+ "type": "double",
+ "defaultValue": 7,
+ "minValue": 0,
+ "maxValue": 14
+ },
+ {
+ "id": "614a039b-9ed9-4b62-9c74-01ba4ac42f16",
+ "name": "input",
+ "displayName": "Input value",
+ "displayNameEvent": "Input value changed",
+ "displayNameAction": "Set input value",
+ "type": "double",
+ "minValue": 0,
+ "defaultValue": 50,
+ "maxValue": 100,
+ "ioType": "analogOutput",
+ "writable": true
+ }
+ ]
+ },
+ {
+ "id": "3edeec39-ab9d-4697-90cc-0bba089384cf",
+ "name": "orpSensor",
+ "displayName": "Generic ORP sensor",
+ "createMethods": ["user"],
+ "interfaces": ["orpsensor"],
+ "settingsTypes": [
+ {
+ "id": "396bf3f9-a3fc-44c3-90f8-b316670116a7",
+ "name": "minORP",
+ "displayName": "Minimum input value",
+ "type": "double",
+ "defaultValue": -1500
+ },
+ {
+ "id": "bd0774c9-1b89-49ce-b0f8-66ff26ca10db",
+ "name": "maxORP",
+ "displayName": "Maximum input ORP value",
+ "type": "double",
+ "defaultValue": 1500
+ },
+ {
+ "id": "1f218ad8-652a-4bda-987d-3e183ff040b2",
+ "name": "accuracy",
+ "displayName": "Accuracy (decimal places)",
+ "type": "uint",
+ "minValue": 0,
+ "maxValue": 5,
+ "defaultValue": 0
+ }
+ ],
+ "stateTypes": [
+ {
+ "id": "e5ed3535-2e5d-412e-85f8-782cbccd7731",
+ "name": "orp",
+ "displayName": "ORP",
+ "displayNameEvent": "ORP changed",
+ "type": "double",
+ "unit": "MilliVolt",
+ "defaultValue": 0,
+ "minValue": -1500,
+ "maxValue": 1500
+ },
+ {
+ "id": "020ff04f-a157-4925-9c55-2b45389208fc",
+ "name": "input",
+ "displayName": "Input value",
+ "displayNameEvent": "Input value changed",
+ "displayNameAction": "Set input value",
+ "type": "double",
+ "minValue": 0,
+ "defaultValue": 0,
+ "maxValue": 100,
+ "ioType": "analogOutput",
+ "writable": true
+ }
+ ]
+ },
+ {
+ "id": "a8cf20ec-132b-4f6f-b5ec-73dc2f873b43",
+ "name": "o2Sensor",
+ "displayName": "Generic O2 sensor",
+ "createMethods": ["user"],
+ "interfaces": ["o2sensor"],
+ "settingsTypes": [
+ {
+ "id": "58e84041-d451-44a2-972e-13a79b449b58",
+ "name": "minInput",
+ "displayName": "Minimum input value",
+ "type": "double",
+ "defaultValue": 0
+ },
+ {
+ "id": "198847f6-a188-42b0-9e0b-15587eaabbed",
+ "name": "maxInput",
+ "displayName": "Maximum input value",
+ "type": "double",
+ "defaultValue": 100
+ },
+ {
+ "id": "d79701ac-1619-42d8-b10f-a55e8e2ab3f1",
+ "name": "accuracy",
+ "displayName": "Accuracy (decimal places)",
+ "type": "uint",
+ "minValue": 0,
+ "maxValue": 5,
+ "defaultValue": 0
+ }
+ ],
+ "stateTypes": [
+ {
+ "id": "a3ff7641-87d9-4b07-b8e5-e6aa92b90088",
+ "name": "o2saturation",
+ "displayName": "O2 saturation",
+ "displayNameEvent": "O2 saturation changed",
+ "type": "double",
+ "unit": "Percentage",
+ "defaultValue": 0,
+ "minValue": 0,
+ "maxValue": 100
+ },
+ {
+ "id": "7e74fca7-84d0-4f3e-9f26-4232b7b9f507",
+ "name": "input",
+ "displayName": "Input value",
+ "displayNameEvent": "Input value changed",
+ "displayNameAction": "Set input value",
+ "type": "double",
+ "minValue": 0,
+ "defaultValue": 0,
+ "maxValue": 100,
+ "ioType": "analogOutput",
+ "writable": true
+ }
+ ]
+ },
{
"id": "9a8d804b-d1dc-450a-8c41-be491e5cdda0",
"name": "pressureSensor",
@@ -1014,6 +1187,64 @@
}
]
},
+ {
+ "id": "262a29b2-b5df-4ee2-822c-e672f50d97b6",
+ "name": "coSensor",
+ "displayName": "Generic CO sensor",
+ "createMethods": ["user"],
+ "interfaces": ["cosensor"],
+ "settingsTypes": [
+ {
+ "id": "e850b044-fd70-446c-a943-3c88407425f5",
+ "name": "minCO",
+ "displayName": "Minimum CO",
+ "type": "double",
+ "defaultValue": 0,
+ "unit": "PartsPerMillion"
+ },
+ {
+ "id": "e9def195-1b67-4a1b-8030-cbbc6209d52e",
+ "name": "maxCO",
+ "displayName": "Maximum CO",
+ "type": "double",
+ "defaultValue": 2000,
+ "unit": "PartsPerMillion"
+ },
+ {
+ "id": "9c8a9553-7b68-4b58-a8f1-3c6b591998c0",
+ "name": "accuracy",
+ "displayName": "Accuracy (decimal places)",
+ "type": "uint",
+ "minValue": 0,
+ "maxValue": 5,
+ "defaultValue": 1
+ }
+ ],
+ "stateTypes": [
+ {
+ "id": "9eebe9d2-b34b-4847-bc25-109e2b8cab24",
+ "name": "co",
+ "displayName": "CO level",
+ "displayNameEvent": "CO level changed",
+ "type": "double",
+ "unit": "PartsPerMillion",
+ "defaultValue": 0
+ },
+ {
+ "id": "cf3ec5ec-7098-47c5-9666-b3c52eba1b1d",
+ "name": "input",
+ "displayName": "Input value",
+ "displayNameEvent": "Input value changed",
+ "displayNameAction": "Set input value",
+ "type": "double",
+ "defaultValue": 0,
+ "minValue": 0,
+ "maxValue": 100,
+ "writable": true,
+ "ioType": "analogOutput"
+ }
+ ]
+ },
{
"id": "a58a2dae-4148-4a4d-ab34-2a11124454a0",
"name": "co2Sensor",
@@ -1072,6 +1303,64 @@
}
]
},
+ {
+ "id": "25c6725f-5c15-485b-9ec4-cb0e11ab6b32",
+ "name": "gasSensor",
+ "displayName": "Generic flammable gas sensor",
+ "createMethods": ["user"],
+ "interfaces": ["gassensor"],
+ "settingsTypes": [
+ {
+ "id": "480945ea-6262-408d-b799-cbff905a40db",
+ "name": "minValue",
+ "displayName": "Minimum value",
+ "type": "double",
+ "defaultValue": 0,
+ "unit": "PartsPerMillion"
+ },
+ {
+ "id": "51f4a830-3ef9-4fa2-b36b-5976f724f8a1",
+ "name": "maxValue",
+ "displayName": "Maximum value",
+ "type": "double",
+ "defaultValue": 10000,
+ "unit": "PartsPerMillion"
+ },
+ {
+ "id": "1c7465b1-490d-43db-bb67-a179a6923a57",
+ "name": "accuracy",
+ "displayName": "Accuracy (decimal places)",
+ "type": "uint",
+ "minValue": 0,
+ "maxValue": 5,
+ "defaultValue": 1
+ }
+ ],
+ "stateTypes": [
+ {
+ "id": "5135648f-57b7-44b0-b9d0-c5accad09356",
+ "name": "gas",
+ "displayName": "Gas level",
+ "displayNameEvent": "Gas level changed",
+ "type": "double",
+ "unit": "PartsPerMillion",
+ "defaultValue": 0
+ },
+ {
+ "id": "e3eb500a-ac00-426c-932a-dee4fd6fbcf5",
+ "name": "input",
+ "displayName": "Input value",
+ "displayNameEvent": "Input value changed",
+ "displayNameAction": "Set input value",
+ "type": "double",
+ "defaultValue": 0,
+ "minValue": 0,
+ "maxValue": 100,
+ "writable": true,
+ "ioType": "analogOutput"
+ }
+ ]
+ },
{
"id": "d4d873fd-f0fc-433f-b615-91c1506a1890",
"name": "lightSensor",
@@ -1373,6 +1662,26 @@
}
]
},
+ {
+ "id": "09b9cb86-f551-4efe-9a7d-2f7624e9510f",
+ "name": "waterSensor",
+ "displayName": "Gerneric water sensor",
+ "createMethods": ["user"],
+ "interfaces": ["watersensor"],
+ "stateTypes": [
+ {
+ "id": "b2427b85-1f62-4635-b546-1961191426ef",
+ "name": "waterDetected",
+ "displayName": "Water detected",
+ "displayNameEvent": "Water detected",
+ "displayNameAction": "Set water detected",
+ "type": "bool",
+ "defaultValue": false,
+ "writable": true,
+ "ioType": "digitalOutput"
+ }
+ ]
+ },
{
"id": "339a0c54-4086-404f-8d36-bcf20621b785",
"name": "presenceSensor",
diff --git a/genericthings/translations/b3188696-2585-4806-bf98-30ab576ce5c8-de.ts b/genericthings/translations/b3188696-2585-4806-bf98-30ab576ce5c8-de.ts
index 399d7a8..0a47a36 100644
--- a/genericthings/translations/b3188696-2585-4806-bf98-30ab576ce5c8-de.ts
+++ b/genericthings/translations/b3188696-2585-4806-bf98-30ab576ce5c8-de.ts
@@ -7,10 +7,20 @@
Accuracy (decimal places)The name of the ParamType (ThingClass: lightSensor, Type: settings, ID: {f800988f-1ad5-4ffb-9aa8-70ef17614966})
----------
+The name of the ParamType (ThingClass: gasSensor, Type: settings, ID: {1c7465b1-490d-43db-bb67-a179a6923a57})
+----------
The name of the ParamType (ThingClass: co2Sensor, Type: settings, ID: {236831a8-a455-4e38-a9cd-eabbebaa3f67})
----------
+The name of the ParamType (ThingClass: coSensor, Type: settings, ID: {9c8a9553-7b68-4b58-a8f1-3c6b591998c0})
+----------
The name of the ParamType (ThingClass: pressureSensor, Type: settings, ID: {021a17d8-9e5e-4dd6-835d-1a3e1ffd6b23})
----------
+The name of the ParamType (ThingClass: o2Sensor, Type: settings, ID: {d79701ac-1619-42d8-b10f-a55e8e2ab3f1})
+----------
+The name of the ParamType (ThingClass: orpSensor, Type: settings, ID: {1f218ad8-652a-4bda-987d-3e183ff040b2})
+----------
+The name of the ParamType (ThingClass: phSensor, Type: settings, ID: {bb41de73-31d0-4b21-8f80-14467120aae4})
+----------
The name of the ParamType (ThingClass: moistureSensor, Type: settings, ID: {3c967a68-9951-4c9a-b019-79b913e762b6})
----------
The name of the ParamType (ThingClass: humiditySensor, Type: settings, ID: {38064841-6121-4862-a639-08fb0b778511})
@@ -192,18 +202,48 @@ The name of the ParamType (ThingClass: lightSensor, EventType: input, ID: {520e5
----------
The name of the StateType ({520e5d27-7d15-4d79-94cf-5d01f5a09ea8}) of ThingClass lightSensor
----------
+The name of the ParamType (ThingClass: gasSensor, ActionType: input, ID: {e3eb500a-ac00-426c-932a-dee4fd6fbcf5})
+----------
+The name of the ParamType (ThingClass: gasSensor, EventType: input, ID: {e3eb500a-ac00-426c-932a-dee4fd6fbcf5})
+----------
+The name of the StateType ({e3eb500a-ac00-426c-932a-dee4fd6fbcf5}) of ThingClass gasSensor
+----------
The name of the ParamType (ThingClass: co2Sensor, ActionType: input, ID: {7dc765f8-fa9b-4199-8f21-49ed452f226d})
----------
The name of the ParamType (ThingClass: co2Sensor, EventType: input, ID: {7dc765f8-fa9b-4199-8f21-49ed452f226d})
----------
The name of the StateType ({7dc765f8-fa9b-4199-8f21-49ed452f226d}) of ThingClass co2Sensor
----------
+The name of the ParamType (ThingClass: coSensor, ActionType: input, ID: {cf3ec5ec-7098-47c5-9666-b3c52eba1b1d})
+----------
+The name of the ParamType (ThingClass: coSensor, EventType: input, ID: {cf3ec5ec-7098-47c5-9666-b3c52eba1b1d})
+----------
+The name of the StateType ({cf3ec5ec-7098-47c5-9666-b3c52eba1b1d}) of ThingClass coSensor
+----------
The name of the ParamType (ThingClass: pressureSensor, ActionType: input, ID: {c320577c-371a-442b-ac80-b692ff2064c9})
----------
The name of the ParamType (ThingClass: pressureSensor, EventType: input, ID: {c320577c-371a-442b-ac80-b692ff2064c9})
----------
The name of the StateType ({c320577c-371a-442b-ac80-b692ff2064c9}) of ThingClass pressureSensor
----------
+The name of the ParamType (ThingClass: o2Sensor, ActionType: input, ID: {7e74fca7-84d0-4f3e-9f26-4232b7b9f507})
+----------
+The name of the ParamType (ThingClass: o2Sensor, EventType: input, ID: {7e74fca7-84d0-4f3e-9f26-4232b7b9f507})
+----------
+The name of the StateType ({7e74fca7-84d0-4f3e-9f26-4232b7b9f507}) of ThingClass o2Sensor
+----------
+The name of the ParamType (ThingClass: orpSensor, ActionType: input, ID: {020ff04f-a157-4925-9c55-2b45389208fc})
+----------
+The name of the ParamType (ThingClass: orpSensor, EventType: input, ID: {020ff04f-a157-4925-9c55-2b45389208fc})
+----------
+The name of the StateType ({020ff04f-a157-4925-9c55-2b45389208fc}) of ThingClass orpSensor
+----------
+The name of the ParamType (ThingClass: phSensor, ActionType: input, ID: {614a039b-9ed9-4b62-9c74-01ba4ac42f16})
+----------
+The name of the ParamType (ThingClass: phSensor, EventType: input, ID: {614a039b-9ed9-4b62-9c74-01ba4ac42f16})
+----------
+The name of the StateType ({614a039b-9ed9-4b62-9c74-01ba4ac42f16}) of ThingClass phSensor
+----------
The name of the ParamType (ThingClass: moistureSensor, ActionType: input, ID: {ce64a425-d990-4fc1-966b-be6de445792b})
----------
The name of the ParamType (ThingClass: moistureSensor, EventType: input, ID: {ce64a425-d990-4fc1-966b-be6de445792b})
@@ -227,10 +267,20 @@ The name of the StateType ({fed37466-1264-4ac1-84fd-aff3a1f7ff04}) of ThingClass
Input value changedThe name of the EventType ({520e5d27-7d15-4d79-94cf-5d01f5a09ea8}) of ThingClass lightSensor
----------
+The name of the EventType ({e3eb500a-ac00-426c-932a-dee4fd6fbcf5}) of ThingClass gasSensor
+----------
The name of the EventType ({7dc765f8-fa9b-4199-8f21-49ed452f226d}) of ThingClass co2Sensor
----------
+The name of the EventType ({cf3ec5ec-7098-47c5-9666-b3c52eba1b1d}) of ThingClass coSensor
+----------
The name of the EventType ({c320577c-371a-442b-ac80-b692ff2064c9}) of ThingClass pressureSensor
----------
+The name of the EventType ({7e74fca7-84d0-4f3e-9f26-4232b7b9f507}) of ThingClass o2Sensor
+----------
+The name of the EventType ({020ff04f-a157-4925-9c55-2b45389208fc}) of ThingClass orpSensor
+----------
+The name of the EventType ({614a039b-9ed9-4b62-9c74-01ba4ac42f16}) of ThingClass phSensor
+----------
The name of the EventType ({ce64a425-d990-4fc1-966b-be6de445792b}) of ThingClass moistureSensor
----------
The name of the EventType ({a8223e65-e704-4f84-9bbe-d8fc42597047}) of ThingClass humiditySensor
@@ -395,11 +445,7 @@ The name of the EventType ({181df603-d45f-4d3d-a358-97aa3e4ac0bd}) of ThingClass
Power
- The name of the ParamType (ThingClass: extendedSmartMeterConsumer, EventType: currentPower, ID: {5983d714-5f80-42d8-bee2-9228b6382b3b})
-----------
-The name of the StateType ({5983d714-5f80-42d8-bee2-9228b6382b3b}) of ThingClass extendedSmartMeterConsumer
-----------
-The name of the ParamType (ThingClass: ventilationFlow, ActionType: power, ID: {adf9a8dd-da13-4070-a3bd-9d4be26ebcd1})
+ The name of the ParamType (ThingClass: ventilationFlow, ActionType: power, ID: {adf9a8dd-da13-4070-a3bd-9d4be26ebcd1})
----------
The name of the ParamType (ThingClass: ventilationFlow, EventType: power, ID: {adf9a8dd-da13-4070-a3bd-9d4be26ebcd1})
----------
@@ -444,9 +490,7 @@ The name of the StateType ({018038d7-1d02-4b17-8fe3-babca044b087}) of ThingClass
Power changed
- The name of the EventType ({5983d714-5f80-42d8-bee2-9228b6382b3b}) of ThingClass extendedSmartMeterConsumer
-----------
-The name of the EventType ({409b635e-a754-4b5c-b3f0-d1c5a0fb3f03}) of ThingClass heating
+ The name of the EventType ({409b635e-a754-4b5c-b3f0-d1c5a0fb3f03}) of ThingClass heating
----------
The name of the EventType ({8b6e4a67-6522-408b-b676-8d2f09ed2d54}) of ThingClass light
----------
@@ -485,10 +529,20 @@ The name of the ActionType ({59bfd575-709f-4e43-9726-de26e6d4ca8b}) of ThingClas
Set input valueThe name of the ActionType ({520e5d27-7d15-4d79-94cf-5d01f5a09ea8}) of ThingClass lightSensor
----------
+The name of the ActionType ({e3eb500a-ac00-426c-932a-dee4fd6fbcf5}) of ThingClass gasSensor
+----------
The name of the ActionType ({7dc765f8-fa9b-4199-8f21-49ed452f226d}) of ThingClass co2Sensor
----------
+The name of the ActionType ({cf3ec5ec-7098-47c5-9666-b3c52eba1b1d}) of ThingClass coSensor
+----------
The name of the ActionType ({c320577c-371a-442b-ac80-b692ff2064c9}) of ThingClass pressureSensor
----------
+The name of the ActionType ({7e74fca7-84d0-4f3e-9f26-4232b7b9f507}) of ThingClass o2Sensor
+----------
+The name of the ActionType ({020ff04f-a157-4925-9c55-2b45389208fc}) of ThingClass orpSensor
+----------
+The name of the ActionType ({614a039b-9ed9-4b62-9c74-01ba4ac42f16}) of ThingClass phSensor
+----------
The name of the ActionType ({ce64a425-d990-4fc1-966b-be6de445792b}) of ThingClass moistureSensor
----------
The name of the ActionType ({a8223e65-e704-4f84-9bbe-d8fc42597047}) of ThingClass humiditySensor
@@ -632,43 +686,43 @@ The name of the EventType ({0212a287-c5ae-4644-8803-adfdd8caeb9a}) of ThingClass
Energy
- The name of the ParamType (ThingClass: extendedSmartMeterConsumer, EventType: totalEnergyConsumed, ID: {5821edb7-e6cb-4e5a-9d0b-3375126d3367})
+ The name of the ParamType (ThingClass: smartMeter, EventType: totalEnergyConsumed, ID: {5821edb7-e6cb-4e5a-9d0b-3375126d3367})
----------
-The name of the StateType ({5821edb7-e6cb-4e5a-9d0b-3375126d3367}) of ThingClass extendedSmartMeterConsumer
+The name of the StateType ({5821edb7-e6cb-4e5a-9d0b-3375126d3367}) of ThingClass smartMeterEnergieEnergy changed
- The name of the EventType ({5821edb7-e6cb-4e5a-9d0b-3375126d3367}) of ThingClass extendedSmartMeterConsumer
+ The name of the EventType ({5821edb7-e6cb-4e5a-9d0b-3375126d3367}) of ThingClass smartMeterEnergie geändertImpulse/kWh
- The name of the ParamType (ThingClass: extendedSmartMeterConsumer, Type: settings, ID: {c361732b-68eb-447e-a434-e84031231871})
+ The name of the ParamType (ThingClass: smartMeter, Type: settings, ID: {c361732b-68eb-447e-a434-e84031231871})Impulse/kWhImpulse input
- The name of the ParamType (ThingClass: extendedSmartMeterConsumer, ActionType: impulseInput, ID: {9cd7e5ca-f8f8-48d5-9785-911ae75158c3})
+ The name of the ParamType (ThingClass: smartMeter, ActionType: impulseInput, ID: {9cd7e5ca-f8f8-48d5-9785-911ae75158c3})
----------
-The name of the ParamType (ThingClass: extendedSmartMeterConsumer, EventType: impulseInput, ID: {9cd7e5ca-f8f8-48d5-9785-911ae75158c3})
+The name of the ParamType (ThingClass: smartMeter, EventType: impulseInput, ID: {9cd7e5ca-f8f8-48d5-9785-911ae75158c3})
----------
-The name of the StateType ({9cd7e5ca-f8f8-48d5-9785-911ae75158c3}) of ThingClass extendedSmartMeterConsumer
+The name of the StateType ({9cd7e5ca-f8f8-48d5-9785-911ae75158c3}) of ThingClass smartMeterImpulseingangImpulse input changed
- The name of the EventType ({9cd7e5ca-f8f8-48d5-9785-911ae75158c3}) of ThingClass extendedSmartMeterConsumer
+ The name of the EventType ({9cd7e5ca-f8f8-48d5-9785-911ae75158c3}) of ThingClass smartMeterImpulseingang geändertSet impulse input
- The name of the ActionType ({9cd7e5ca-f8f8-48d5-9785-911ae75158c3}) of ThingClass extendedSmartMeterConsumer
+ The name of the ActionType ({9cd7e5ca-f8f8-48d5-9785-911ae75158c3}) of ThingClass smartMeterSetze ImpulseingangTimeframe for power calculation
- The name of the ParamType (ThingClass: extendedSmartMeterConsumer, Type: settings, ID: {73c9acc3-8f76-40d7-a79b-a1f08bb308d4})
+ The name of the ParamType (ThingClass: smartMeter, Type: settings, ID: {73c9acc3-8f76-40d7-a79b-a1f08bb308d4})Zeitfenster für Leistungsberechnung
@@ -1285,7 +1339,166 @@ The name of the StateType ({5a273bba-0bef-49fb-870a-7f2df8fc14b6}) of ThingClass
Set air flow rateThe name of the ActionType ({5a273bba-0bef-49fb-870a-7f2df8fc14b6}) of ThingClass ventilationFlow
- Luftfluß ändern
+ Luftfluß ändern
+
+
+ CO level
+ The name of the ParamType (ThingClass: coSensor, EventType: co, ID: {9eebe9d2-b34b-4847-bc25-109e2b8cab24})
+----------
+The name of the StateType ({9eebe9d2-b34b-4847-bc25-109e2b8cab24}) of ThingClass coSensor
+ CO Wert
+
+
+ CO level changed
+ The name of the EventType ({9eebe9d2-b34b-4847-bc25-109e2b8cab24}) of ThingClass coSensor
+ CO Wert geändert
+
+
+ Current Power usage
+ The name of the ParamType (ThingClass: smartMeter, EventType: currentPower, ID: {5983d714-5f80-42d8-bee2-9228b6382b3b})
+----------
+The name of the StateType ({5983d714-5f80-42d8-bee2-9228b6382b3b}) of ThingClass smartMeter
+ Aktueller Energieverbrauch
+
+
+ Current Power usage changed
+ The name of the EventType ({5983d714-5f80-42d8-bee2-9228b6382b3b}) of ThingClass smartMeter
+ Aktueller Energieverbrauch geändert
+
+
+ Gas level
+ The name of the ParamType (ThingClass: gasSensor, EventType: gas, ID: {5135648f-57b7-44b0-b9d0-c5accad09356})
+----------
+The name of the StateType ({5135648f-57b7-44b0-b9d0-c5accad09356}) of ThingClass gasSensor
+ Gaswert
+
+
+ Gas level changed
+ The name of the EventType ({5135648f-57b7-44b0-b9d0-c5accad09356}) of ThingClass gasSensor
+ Gaswert geändert
+
+
+ Generic CO sensor
+ The name of the ThingClass ({262a29b2-b5df-4ee2-822c-e672f50d97b6})
+ Generischer CO Sensor
+
+
+ Generic O2 sensor
+ The name of the ThingClass ({a8cf20ec-132b-4f6f-b5ec-73dc2f873b43})
+ Generischer O2 Sensor
+
+
+ Generic ORP sensor
+ The name of the ThingClass ({3edeec39-ab9d-4697-90cc-0bba089384cf})
+ Generischer ORP Sensor
+
+
+ Generic flammable gas sensor
+ The name of the ThingClass ({25c6725f-5c15-485b-9ec4-cb0e11ab6b32})
+ Generischer Sensor für entflammbare Gase
+
+
+ Gerneric water sensor
+ The name of the ThingClass ({09b9cb86-f551-4efe-9a7d-2f7624e9510f})
+ Generischer Wassersensor
+
+
+ Maximum CO
+ The name of the ParamType (ThingClass: coSensor, Type: settings, ID: {e9def195-1b67-4a1b-8030-cbbc6209d52e})
+ Maximaler CO Wert
+
+
+ Maximum input ORP value
+ The name of the ParamType (ThingClass: orpSensor, Type: settings, ID: {bd0774c9-1b89-49ce-b0f8-66ff26ca10db})
+ Minimaler ORP Eingangswert
+
+
+ Maximum input value
+ The name of the ParamType (ThingClass: o2Sensor, Type: settings, ID: {198847f6-a188-42b0-9e0b-15587eaabbed})
+----------
+The name of the ParamType (ThingClass: phSensor, Type: settings, ID: {a8889e45-59e5-4cc4-b228-611f8f19f531})
+ Maximaler Eingangswert
+
+
+ Maximum value
+ The name of the ParamType (ThingClass: gasSensor, Type: settings, ID: {51f4a830-3ef9-4fa2-b36b-5976f724f8a1})
+ Maximaler Wert
+
+
+ Minimum CO
+ The name of the ParamType (ThingClass: coSensor, Type: settings, ID: {e850b044-fd70-446c-a943-3c88407425f5})
+ Minimaler CO Wert
+
+
+ Minimum input value
+ The name of the ParamType (ThingClass: o2Sensor, Type: settings, ID: {58e84041-d451-44a2-972e-13a79b449b58})
+----------
+The name of the ParamType (ThingClass: orpSensor, Type: settings, ID: {396bf3f9-a3fc-44c3-90f8-b316670116a7})
+----------
+The name of the ParamType (ThingClass: phSensor, Type: settings, ID: {a8ff2e16-e06c-4b1e-839a-a06691a12d64})
+ Minimaler Eingangswert
+
+
+ Minimum value
+ The name of the ParamType (ThingClass: gasSensor, Type: settings, ID: {480945ea-6262-408d-b799-cbff905a40db})
+ Minimaler Wert
+
+
+ O2 saturation
+ The name of the ParamType (ThingClass: o2Sensor, EventType: o2saturation, ID: {a3ff7641-87d9-4b07-b8e5-e6aa92b90088})
+----------
+The name of the StateType ({a3ff7641-87d9-4b07-b8e5-e6aa92b90088}) of ThingClass o2Sensor
+ O2 Sättigung
+
+
+ O2 saturation changed
+ The name of the EventType ({a3ff7641-87d9-4b07-b8e5-e6aa92b90088}) of ThingClass o2Sensor
+ O2 Sättigung geändert
+
+
+ ORP
+ The name of the ParamType (ThingClass: orpSensor, EventType: orp, ID: {e5ed3535-2e5d-412e-85f8-782cbccd7731})
+----------
+The name of the StateType ({e5ed3535-2e5d-412e-85f8-782cbccd7731}) of ThingClass orpSensor
+ ORP
+
+
+ ORP changed
+ The name of the EventType ({e5ed3535-2e5d-412e-85f8-782cbccd7731}) of ThingClass orpSensor
+ ORP Wert geändert
+
+
+ PH
+ The name of the ParamType (ThingClass: phSensor, EventType: ph, ID: {743514b1-8018-4525-b87a-c5f414146ff2})
+----------
+The name of the StateType ({743514b1-8018-4525-b87a-c5f414146ff2}) of ThingClass phSensor
+ PH
+
+
+ PH changed
+ The name of the EventType ({743514b1-8018-4525-b87a-c5f414146ff2}) of ThingClass phSensor
+ PH Wert geändert
+
+
+ PH sensor
+ The name of the ThingClass ({e2934fa1-59c3-4de8-82f2-66181136085c})
+ PH Sensor
+
+
+ Set water detected
+ The name of the ActionType ({b2427b85-1f62-4635-b546-1961191426ef}) of ThingClass waterSensor
+ Setze Wasser erkannt
+
+
+ Water detected
+ The name of the ParamType (ThingClass: waterSensor, ActionType: waterDetected, ID: {b2427b85-1f62-4635-b546-1961191426ef})
+----------
+The name of the ParamType (ThingClass: waterSensor, EventType: waterDetected, ID: {b2427b85-1f62-4635-b546-1961191426ef})
+----------
+The name of the EventType ({b2427b85-1f62-4635-b546-1961191426ef}) of ThingClass waterSensor
+----------
+The name of the StateType ({b2427b85-1f62-4635-b546-1961191426ef}) of ThingClass waterSensor
+ Wasser erkannt
diff --git a/genericthings/translations/b3188696-2585-4806-bf98-30ab576ce5c8-en_US.ts b/genericthings/translations/b3188696-2585-4806-bf98-30ab576ce5c8-en_US.ts
index a714624..dc720ff 100644
--- a/genericthings/translations/b3188696-2585-4806-bf98-30ab576ce5c8-en_US.ts
+++ b/genericthings/translations/b3188696-2585-4806-bf98-30ab576ce5c8-en_US.ts
@@ -7,10 +7,20 @@
Accuracy (decimal places)The name of the ParamType (ThingClass: lightSensor, Type: settings, ID: {f800988f-1ad5-4ffb-9aa8-70ef17614966})
----------
+The name of the ParamType (ThingClass: gasSensor, Type: settings, ID: {1c7465b1-490d-43db-bb67-a179a6923a57})
+----------
The name of the ParamType (ThingClass: co2Sensor, Type: settings, ID: {236831a8-a455-4e38-a9cd-eabbebaa3f67})
----------
+The name of the ParamType (ThingClass: coSensor, Type: settings, ID: {9c8a9553-7b68-4b58-a8f1-3c6b591998c0})
+----------
The name of the ParamType (ThingClass: pressureSensor, Type: settings, ID: {021a17d8-9e5e-4dd6-835d-1a3e1ffd6b23})
----------
+The name of the ParamType (ThingClass: o2Sensor, Type: settings, ID: {d79701ac-1619-42d8-b10f-a55e8e2ab3f1})
+----------
+The name of the ParamType (ThingClass: orpSensor, Type: settings, ID: {1f218ad8-652a-4bda-987d-3e183ff040b2})
+----------
+The name of the ParamType (ThingClass: phSensor, Type: settings, ID: {bb41de73-31d0-4b21-8f80-14467120aae4})
+----------
The name of the ParamType (ThingClass: moistureSensor, Type: settings, ID: {3c967a68-9951-4c9a-b019-79b913e762b6})
----------
The name of the ParamType (ThingClass: humiditySensor, Type: settings, ID: {38064841-6121-4862-a639-08fb0b778511})
@@ -192,18 +202,48 @@ The name of the ParamType (ThingClass: lightSensor, EventType: input, ID: {520e5
----------
The name of the StateType ({520e5d27-7d15-4d79-94cf-5d01f5a09ea8}) of ThingClass lightSensor
----------
+The name of the ParamType (ThingClass: gasSensor, ActionType: input, ID: {e3eb500a-ac00-426c-932a-dee4fd6fbcf5})
+----------
+The name of the ParamType (ThingClass: gasSensor, EventType: input, ID: {e3eb500a-ac00-426c-932a-dee4fd6fbcf5})
+----------
+The name of the StateType ({e3eb500a-ac00-426c-932a-dee4fd6fbcf5}) of ThingClass gasSensor
+----------
The name of the ParamType (ThingClass: co2Sensor, ActionType: input, ID: {7dc765f8-fa9b-4199-8f21-49ed452f226d})
----------
The name of the ParamType (ThingClass: co2Sensor, EventType: input, ID: {7dc765f8-fa9b-4199-8f21-49ed452f226d})
----------
The name of the StateType ({7dc765f8-fa9b-4199-8f21-49ed452f226d}) of ThingClass co2Sensor
----------
+The name of the ParamType (ThingClass: coSensor, ActionType: input, ID: {cf3ec5ec-7098-47c5-9666-b3c52eba1b1d})
+----------
+The name of the ParamType (ThingClass: coSensor, EventType: input, ID: {cf3ec5ec-7098-47c5-9666-b3c52eba1b1d})
+----------
+The name of the StateType ({cf3ec5ec-7098-47c5-9666-b3c52eba1b1d}) of ThingClass coSensor
+----------
The name of the ParamType (ThingClass: pressureSensor, ActionType: input, ID: {c320577c-371a-442b-ac80-b692ff2064c9})
----------
The name of the ParamType (ThingClass: pressureSensor, EventType: input, ID: {c320577c-371a-442b-ac80-b692ff2064c9})
----------
The name of the StateType ({c320577c-371a-442b-ac80-b692ff2064c9}) of ThingClass pressureSensor
----------
+The name of the ParamType (ThingClass: o2Sensor, ActionType: input, ID: {7e74fca7-84d0-4f3e-9f26-4232b7b9f507})
+----------
+The name of the ParamType (ThingClass: o2Sensor, EventType: input, ID: {7e74fca7-84d0-4f3e-9f26-4232b7b9f507})
+----------
+The name of the StateType ({7e74fca7-84d0-4f3e-9f26-4232b7b9f507}) of ThingClass o2Sensor
+----------
+The name of the ParamType (ThingClass: orpSensor, ActionType: input, ID: {020ff04f-a157-4925-9c55-2b45389208fc})
+----------
+The name of the ParamType (ThingClass: orpSensor, EventType: input, ID: {020ff04f-a157-4925-9c55-2b45389208fc})
+----------
+The name of the StateType ({020ff04f-a157-4925-9c55-2b45389208fc}) of ThingClass orpSensor
+----------
+The name of the ParamType (ThingClass: phSensor, ActionType: input, ID: {614a039b-9ed9-4b62-9c74-01ba4ac42f16})
+----------
+The name of the ParamType (ThingClass: phSensor, EventType: input, ID: {614a039b-9ed9-4b62-9c74-01ba4ac42f16})
+----------
+The name of the StateType ({614a039b-9ed9-4b62-9c74-01ba4ac42f16}) of ThingClass phSensor
+----------
The name of the ParamType (ThingClass: moistureSensor, ActionType: input, ID: {ce64a425-d990-4fc1-966b-be6de445792b})
----------
The name of the ParamType (ThingClass: moistureSensor, EventType: input, ID: {ce64a425-d990-4fc1-966b-be6de445792b})
@@ -227,10 +267,20 @@ The name of the StateType ({fed37466-1264-4ac1-84fd-aff3a1f7ff04}) of ThingClass
Input value changedThe name of the EventType ({520e5d27-7d15-4d79-94cf-5d01f5a09ea8}) of ThingClass lightSensor
----------
+The name of the EventType ({e3eb500a-ac00-426c-932a-dee4fd6fbcf5}) of ThingClass gasSensor
+----------
The name of the EventType ({7dc765f8-fa9b-4199-8f21-49ed452f226d}) of ThingClass co2Sensor
----------
+The name of the EventType ({cf3ec5ec-7098-47c5-9666-b3c52eba1b1d}) of ThingClass coSensor
+----------
The name of the EventType ({c320577c-371a-442b-ac80-b692ff2064c9}) of ThingClass pressureSensor
----------
+The name of the EventType ({7e74fca7-84d0-4f3e-9f26-4232b7b9f507}) of ThingClass o2Sensor
+----------
+The name of the EventType ({020ff04f-a157-4925-9c55-2b45389208fc}) of ThingClass orpSensor
+----------
+The name of the EventType ({614a039b-9ed9-4b62-9c74-01ba4ac42f16}) of ThingClass phSensor
+----------
The name of the EventType ({ce64a425-d990-4fc1-966b-be6de445792b}) of ThingClass moistureSensor
----------
The name of the EventType ({a8223e65-e704-4f84-9bbe-d8fc42597047}) of ThingClass humiditySensor
@@ -395,11 +445,7 @@ The name of the EventType ({181df603-d45f-4d3d-a358-97aa3e4ac0bd}) of ThingClass
Power
- The name of the ParamType (ThingClass: extendedSmartMeterConsumer, EventType: currentPower, ID: {5983d714-5f80-42d8-bee2-9228b6382b3b})
-----------
-The name of the StateType ({5983d714-5f80-42d8-bee2-9228b6382b3b}) of ThingClass extendedSmartMeterConsumer
-----------
-The name of the ParamType (ThingClass: ventilationFlow, ActionType: power, ID: {adf9a8dd-da13-4070-a3bd-9d4be26ebcd1})
+ The name of the ParamType (ThingClass: ventilationFlow, ActionType: power, ID: {adf9a8dd-da13-4070-a3bd-9d4be26ebcd1})
----------
The name of the ParamType (ThingClass: ventilationFlow, EventType: power, ID: {adf9a8dd-da13-4070-a3bd-9d4be26ebcd1})
----------
@@ -444,9 +490,7 @@ The name of the StateType ({018038d7-1d02-4b17-8fe3-babca044b087}) of ThingClass
Power changed
- The name of the EventType ({5983d714-5f80-42d8-bee2-9228b6382b3b}) of ThingClass extendedSmartMeterConsumer
-----------
-The name of the EventType ({409b635e-a754-4b5c-b3f0-d1c5a0fb3f03}) of ThingClass heating
+ The name of the EventType ({409b635e-a754-4b5c-b3f0-d1c5a0fb3f03}) of ThingClass heating
----------
The name of the EventType ({8b6e4a67-6522-408b-b676-8d2f09ed2d54}) of ThingClass light
----------
@@ -485,10 +529,20 @@ The name of the ActionType ({59bfd575-709f-4e43-9726-de26e6d4ca8b}) of ThingClas
Set input valueThe name of the ActionType ({520e5d27-7d15-4d79-94cf-5d01f5a09ea8}) of ThingClass lightSensor
----------
+The name of the ActionType ({e3eb500a-ac00-426c-932a-dee4fd6fbcf5}) of ThingClass gasSensor
+----------
The name of the ActionType ({7dc765f8-fa9b-4199-8f21-49ed452f226d}) of ThingClass co2Sensor
----------
+The name of the ActionType ({cf3ec5ec-7098-47c5-9666-b3c52eba1b1d}) of ThingClass coSensor
+----------
The name of the ActionType ({c320577c-371a-442b-ac80-b692ff2064c9}) of ThingClass pressureSensor
----------
+The name of the ActionType ({7e74fca7-84d0-4f3e-9f26-4232b7b9f507}) of ThingClass o2Sensor
+----------
+The name of the ActionType ({020ff04f-a157-4925-9c55-2b45389208fc}) of ThingClass orpSensor
+----------
+The name of the ActionType ({614a039b-9ed9-4b62-9c74-01ba4ac42f16}) of ThingClass phSensor
+----------
The name of the ActionType ({ce64a425-d990-4fc1-966b-be6de445792b}) of ThingClass moistureSensor
----------
The name of the ActionType ({a8223e65-e704-4f84-9bbe-d8fc42597047}) of ThingClass humiditySensor
@@ -632,43 +686,43 @@ The name of the EventType ({0212a287-c5ae-4644-8803-adfdd8caeb9a}) of ThingClass
Energy
- The name of the ParamType (ThingClass: extendedSmartMeterConsumer, EventType: totalEnergyConsumed, ID: {5821edb7-e6cb-4e5a-9d0b-3375126d3367})
+ The name of the ParamType (ThingClass: smartMeter, EventType: totalEnergyConsumed, ID: {5821edb7-e6cb-4e5a-9d0b-3375126d3367})
----------
-The name of the StateType ({5821edb7-e6cb-4e5a-9d0b-3375126d3367}) of ThingClass extendedSmartMeterConsumer
+The name of the StateType ({5821edb7-e6cb-4e5a-9d0b-3375126d3367}) of ThingClass smartMeterEnergy changed
- The name of the EventType ({5821edb7-e6cb-4e5a-9d0b-3375126d3367}) of ThingClass extendedSmartMeterConsumer
+ The name of the EventType ({5821edb7-e6cb-4e5a-9d0b-3375126d3367}) of ThingClass smartMeterImpulse/kWh
- The name of the ParamType (ThingClass: extendedSmartMeterConsumer, Type: settings, ID: {c361732b-68eb-447e-a434-e84031231871})
+ The name of the ParamType (ThingClass: smartMeter, Type: settings, ID: {c361732b-68eb-447e-a434-e84031231871})Impulse input
- The name of the ParamType (ThingClass: extendedSmartMeterConsumer, ActionType: impulseInput, ID: {9cd7e5ca-f8f8-48d5-9785-911ae75158c3})
+ The name of the ParamType (ThingClass: smartMeter, ActionType: impulseInput, ID: {9cd7e5ca-f8f8-48d5-9785-911ae75158c3})
----------
-The name of the ParamType (ThingClass: extendedSmartMeterConsumer, EventType: impulseInput, ID: {9cd7e5ca-f8f8-48d5-9785-911ae75158c3})
+The name of the ParamType (ThingClass: smartMeter, EventType: impulseInput, ID: {9cd7e5ca-f8f8-48d5-9785-911ae75158c3})
----------
-The name of the StateType ({9cd7e5ca-f8f8-48d5-9785-911ae75158c3}) of ThingClass extendedSmartMeterConsumer
+The name of the StateType ({9cd7e5ca-f8f8-48d5-9785-911ae75158c3}) of ThingClass smartMeterImpulse input changed
- The name of the EventType ({9cd7e5ca-f8f8-48d5-9785-911ae75158c3}) of ThingClass extendedSmartMeterConsumer
+ The name of the EventType ({9cd7e5ca-f8f8-48d5-9785-911ae75158c3}) of ThingClass smartMeterSet impulse input
- The name of the ActionType ({9cd7e5ca-f8f8-48d5-9785-911ae75158c3}) of ThingClass extendedSmartMeterConsumer
+ The name of the ActionType ({9cd7e5ca-f8f8-48d5-9785-911ae75158c3}) of ThingClass smartMeterTimeframe for power calculation
- The name of the ParamType (ThingClass: extendedSmartMeterConsumer, Type: settings, ID: {73c9acc3-8f76-40d7-a79b-a1f08bb308d4})
+ The name of the ParamType (ThingClass: smartMeter, Type: settings, ID: {73c9acc3-8f76-40d7-a79b-a1f08bb308d4})
@@ -1261,6 +1315,7 @@ The name of the StateType ({f477e227-0d2d-4d88-a545-7dedf36266d5}) of ThingClass
String state changedThe name of the EventType ({f477e227-0d2d-4d88-a545-7dedf36266d5}) of ThingClass generic
+ Air flow rate
@@ -1286,6 +1341,165 @@ The name of the StateType ({5a273bba-0bef-49fb-870a-7f2df8fc14b6}) of ThingClass
The name of the ActionType ({5a273bba-0bef-49fb-870a-7f2df8fc14b6}) of ThingClass ventilationFlow
+
+ CO level
+ The name of the ParamType (ThingClass: coSensor, EventType: co, ID: {9eebe9d2-b34b-4847-bc25-109e2b8cab24})
+----------
+The name of the StateType ({9eebe9d2-b34b-4847-bc25-109e2b8cab24}) of ThingClass coSensor
+
+
+
+ CO level changed
+ The name of the EventType ({9eebe9d2-b34b-4847-bc25-109e2b8cab24}) of ThingClass coSensor
+
+
+
+ Current Power usage
+ The name of the ParamType (ThingClass: smartMeter, EventType: currentPower, ID: {5983d714-5f80-42d8-bee2-9228b6382b3b})
+----------
+The name of the StateType ({5983d714-5f80-42d8-bee2-9228b6382b3b}) of ThingClass smartMeter
+
+
+
+ Current Power usage changed
+ The name of the EventType ({5983d714-5f80-42d8-bee2-9228b6382b3b}) of ThingClass smartMeter
+
+
+
+ Gas level
+ The name of the ParamType (ThingClass: gasSensor, EventType: gas, ID: {5135648f-57b7-44b0-b9d0-c5accad09356})
+----------
+The name of the StateType ({5135648f-57b7-44b0-b9d0-c5accad09356}) of ThingClass gasSensor
+
+
+
+ Gas level changed
+ The name of the EventType ({5135648f-57b7-44b0-b9d0-c5accad09356}) of ThingClass gasSensor
+
+
+
+ Generic CO sensor
+ The name of the ThingClass ({262a29b2-b5df-4ee2-822c-e672f50d97b6})
+
+
+
+ Generic O2 sensor
+ The name of the ThingClass ({a8cf20ec-132b-4f6f-b5ec-73dc2f873b43})
+
+
+
+ Generic ORP sensor
+ The name of the ThingClass ({3edeec39-ab9d-4697-90cc-0bba089384cf})
+
+
+
+ Generic flammable gas sensor
+ The name of the ThingClass ({25c6725f-5c15-485b-9ec4-cb0e11ab6b32})
+
+
+
+ Gerneric water sensor
+ The name of the ThingClass ({09b9cb86-f551-4efe-9a7d-2f7624e9510f})
+
+
+
+ Maximum CO
+ The name of the ParamType (ThingClass: coSensor, Type: settings, ID: {e9def195-1b67-4a1b-8030-cbbc6209d52e})
+
+
+
+ Maximum input ORP value
+ The name of the ParamType (ThingClass: orpSensor, Type: settings, ID: {bd0774c9-1b89-49ce-b0f8-66ff26ca10db})
+
+
+
+ Maximum input value
+ The name of the ParamType (ThingClass: o2Sensor, Type: settings, ID: {198847f6-a188-42b0-9e0b-15587eaabbed})
+----------
+The name of the ParamType (ThingClass: phSensor, Type: settings, ID: {a8889e45-59e5-4cc4-b228-611f8f19f531})
+
+
+
+ Maximum value
+ The name of the ParamType (ThingClass: gasSensor, Type: settings, ID: {51f4a830-3ef9-4fa2-b36b-5976f724f8a1})
+
+
+
+ Minimum CO
+ The name of the ParamType (ThingClass: coSensor, Type: settings, ID: {e850b044-fd70-446c-a943-3c88407425f5})
+
+
+
+ Minimum input value
+ The name of the ParamType (ThingClass: o2Sensor, Type: settings, ID: {58e84041-d451-44a2-972e-13a79b449b58})
+----------
+The name of the ParamType (ThingClass: orpSensor, Type: settings, ID: {396bf3f9-a3fc-44c3-90f8-b316670116a7})
+----------
+The name of the ParamType (ThingClass: phSensor, Type: settings, ID: {a8ff2e16-e06c-4b1e-839a-a06691a12d64})
+
+
+
+ Minimum value
+ The name of the ParamType (ThingClass: gasSensor, Type: settings, ID: {480945ea-6262-408d-b799-cbff905a40db})
+
+
+
+ O2 saturation
+ The name of the ParamType (ThingClass: o2Sensor, EventType: o2saturation, ID: {a3ff7641-87d9-4b07-b8e5-e6aa92b90088})
+----------
+The name of the StateType ({a3ff7641-87d9-4b07-b8e5-e6aa92b90088}) of ThingClass o2Sensor
+
+
+
+ O2 saturation changed
+ The name of the EventType ({a3ff7641-87d9-4b07-b8e5-e6aa92b90088}) of ThingClass o2Sensor
+
+
+
+ ORP
+ The name of the ParamType (ThingClass: orpSensor, EventType: orp, ID: {e5ed3535-2e5d-412e-85f8-782cbccd7731})
+----------
+The name of the StateType ({e5ed3535-2e5d-412e-85f8-782cbccd7731}) of ThingClass orpSensor
+
+
+
+ ORP changed
+ The name of the EventType ({e5ed3535-2e5d-412e-85f8-782cbccd7731}) of ThingClass orpSensor
+
+
+
+ PH
+ The name of the ParamType (ThingClass: phSensor, EventType: ph, ID: {743514b1-8018-4525-b87a-c5f414146ff2})
+----------
+The name of the StateType ({743514b1-8018-4525-b87a-c5f414146ff2}) of ThingClass phSensor
+
+
+
+ PH changed
+ The name of the EventType ({743514b1-8018-4525-b87a-c5f414146ff2}) of ThingClass phSensor
+
+
+
+ PH sensor
+ The name of the ThingClass ({e2934fa1-59c3-4de8-82f2-66181136085c})
+
+
+
+ Set water detected
+ The name of the ActionType ({b2427b85-1f62-4635-b546-1961191426ef}) of ThingClass waterSensor
+
+
+
+ Water detected
+ The name of the ParamType (ThingClass: waterSensor, ActionType: waterDetected, ID: {b2427b85-1f62-4635-b546-1961191426ef})
+----------
+The name of the ParamType (ThingClass: waterSensor, EventType: waterDetected, ID: {b2427b85-1f62-4635-b546-1961191426ef})
+----------
+The name of the EventType ({b2427b85-1f62-4635-b546-1961191426ef}) of ThingClass waterSensor
+----------
+The name of the StateType ({b2427b85-1f62-4635-b546-1961191426ef}) of ThingClass waterSensor
+
+ IntegrationPluginGenericThings