diff --git a/onewire/README.md b/onewire/README.md index f260753d..0ed3bbba 100644 --- a/onewire/README.md +++ b/onewire/README.md @@ -22,6 +22,9 @@ This integration plugin allows to integrate one-wire devices like temperature se * DS18B20X * Family Code 3B * DS1825 +* Temperature and Humidity Sensors + * Familiy Code 26 + *DS2834 * Switches * Family Code 05 * Single channel switch @@ -46,10 +49,6 @@ You can simulate one-wire device with following init argument: "--fake=10,22,28, More about init arguments here: https://www.owfs.org -The "One wire interface" thing has the toggle button to "Auto add one wire devices". Is this activated one-wire devices that get connected to the bus will appear in nymea automatically. - -NOTE: As long as the "Auto add one wire devices" feature is activated you won't be able to manually discover devices. - ### W1 Kernel Driver Install the kernel driver w1. Raspberry Pi users can use rasp-config to enable 'one wire' which enables W1. There are not further steps necessary, temperature sensors will be discovered if the driver has been loaded successfully. diff --git a/onewire/integrationpluginonewire.cpp b/onewire/integrationpluginonewire.cpp index 48fbdd44..ed9a1cf3 100644 --- a/onewire/integrationpluginonewire.cpp +++ b/onewire/integrationpluginonewire.cpp @@ -89,14 +89,8 @@ void IntegrationPluginOneWire::discoverThings(ThingDiscoveryInfo *info) } } return info->finish(Thing::ThingErrorNoError); - } - - - foreach(Thing *parentDevice, myThings().filterByThingClassId(oneWireInterfaceThingClassId)) { - if (parentDevice->stateValue(oneWireInterfaceAutoAddStateTypeId).toBool()) { - //devices cannot be discovered since auto mode is enabled - continue; - } + } else { + Thing *parentDevice = myThings().filterByThingClassId(oneWireInterfaceThingClassId).first(); m_runningDiscoveries.insert(parentDevice, info); connect(info, &ThingDiscoveryInfo::destroyed, this, [this, parentDevice](){ m_runningDiscoveries.remove(parentDevice); @@ -105,10 +99,6 @@ void IntegrationPluginOneWire::discoverThings(ThingDiscoveryInfo *info) if (m_owfsInterface) m_owfsInterface->discoverDevices(); } - - if (m_runningDiscoveries.isEmpty()) { - info->finish(Thing::ThingErrorNoError, QT_TR_NOOP("All configured one wire interfaces are set up to automatically add new devices.")); - } return; } else { qCWarning(dcOneWire()) << "Discovery called for a deviceclass which does not support discovery? Device class ID:" << info->thingClassId().toString(); @@ -172,6 +162,23 @@ void IntegrationPluginOneWire::setupThing(ThingSetupInfo *info) return info->finish(Thing::ThingErrorHardwareNotAvailable); } } + } else if (thing->thingClassId() == temperatureHumiditySensorThingClassId) { + + qCDebug(dcOneWire) << "Setup one wire temperature and humidity sensor" << thing->params(); + Thing *parentThing = myThings().findById(thing->parentId()); + if (!parentThing) { + qCWarning(dcOneWire()) << "Could not find parent thing for" << thing->name(); + } + if (parentThing->setupComplete()) { + setupOwfsTemperatureHumiditySensor(info); + } else { + connect(parentThing, &Thing::setupStatusChanged, info, [info, parentThing, this] { + if (parentThing->setupComplete()) { + setupOwfsTemperatureHumiditySensor(info); + } + }); + } + return info->finish(Thing::ThingErrorNoError); } else if (thing->thingClassId() == singleChannelSwitchThingClassId) { qCDebug(dcOneWire) << "Setup one wire switch" << thing->params(); @@ -233,10 +240,6 @@ void IntegrationPluginOneWire::executeAction(ThingActionInfo *info) } if (thing->thingClassId() == oneWireInterfaceThingClassId) { - if (action.actionTypeId() == oneWireInterfaceAutoAddActionTypeId){ - thing->setStateValue(oneWireInterfaceAutoAddStateTypeId, action.param(oneWireInterfaceAutoAddActionAutoAddParamTypeId).value()); - return info->finish(Thing::ThingErrorNoError); - } return info->finish(Thing::ThingErrorActionTypeNotFound); } else if (thing->thingClassId() == singleChannelSwitchThingClassId) { @@ -327,6 +330,20 @@ void IntegrationPluginOneWire::setupOwfsTemperatureSensor(ThingSetupInfo *info) } } +void IntegrationPluginOneWire::setupOwfsTemperatureHumiditySensor(ThingSetupInfo *info) +{ + Thing *thing = info->thing(); + QByteArray address = thing->paramValue(temperatureHumiditySensorThingAddressParamTypeId).toByteArray(); + if (m_owfsInterface) { + thing->setStateValue(temperatureHumiditySensorConnectedStateTypeId, m_owfsInterface->isConnected(address)); + thing->setStateValue(temperatureHumiditySensorTemperatureStateTypeId, m_owfsInterface->getTemperature(address)); + thing->setStateValue(temperatureHumiditySensorHumidityStateTypeId, m_owfsInterface->getHumidity(address)); + return info->finish(Thing::ThingErrorNoError); + } else { + qCWarning(dcOneWire()) << "OWFS interface is not available"; + return info->finish(Thing::ThingErrorHardwareNotAvailable); + } +} void IntegrationPluginOneWire::onPluginTimer() { @@ -334,9 +351,6 @@ void IntegrationPluginOneWire::onPluginTimer() if (thing->thingClassId() == oneWireInterfaceThingClassId) { thing->setStateValue(oneWireInterfaceConnectedStateTypeId, m_owfsInterface->interfaceIsAvailable()); - if (thing->stateValue(oneWireInterfaceAutoAddStateTypeId).toBool()) { - m_owfsInterface->discoverDevices(); - } } else if (thing->thingClassId() == temperatureSensorThingClassId) { QByteArray address = thing->paramValue(temperatureSensorThingAddressParamTypeId).toByteArray(); double temperature = 0; @@ -351,12 +365,19 @@ void IntegrationPluginOneWire::onPluginTimer() } } else { - temperature = m_w1Interface->getTemperature(address); - connected = m_w1Interface->deviceAvailable(address); + temperature = m_w1Interface->getTemperature(address); + connected = m_w1Interface->deviceAvailable(address); } thing->setStateValue(temperatureSensorTemperatureStateTypeId, temperature); thing->setStateValue(temperatureSensorConnectedStateTypeId, connected); + } else if (thing->thingClassId() == temperatureHumiditySensorThingClassId) { + if (!m_owfsInterface) + continue; + QByteArray address = thing->paramValue(temperatureHumiditySensorThingAddressParamTypeId).toByteArray(); + thing->setStateValue(temperatureHumiditySensorTemperatureStateTypeId, m_owfsInterface->getTemperature(address)); + thing->setStateValue(temperatureHumiditySensorHumidityStateTypeId, m_owfsInterface->getHumidity(address)); + thing->setStateValue(temperatureHumiditySensorConnectedStateTypeId, m_owfsInterface->isConnected(address)); } else if (thing->thingClassId() == singleChannelSwitchThingClassId) { if (!m_owfsInterface) continue; @@ -391,7 +412,6 @@ void IntegrationPluginOneWire::onOneWireDevicesDiscovered(QListstateValue(oneWireInterfaceAutoAddStateTypeId).toBool(); ThingDescriptors descriptors; foreach (Owfs::OwfsDevice oneWireDevice, oneWireDevices){ switch (oneWireDevice.family) { @@ -414,6 +434,21 @@ void IntegrationPluginOneWire::onOneWireDevicesDiscovered(QListid()); + ParamList params; + params.append(Param(temperatureHumiditySensorThingAddressParamTypeId, oneWireDevice.address)); + params.append(Param(temperatureHumiditySensorThingTypeParamTypeId, oneWireDevice.type)); + foreach (Thing *existingThing, myThings().filterByThingClassId(temperatureHumiditySensorThingClassId)){ + if (existingThing->paramValue(temperatureHumiditySensorThingAddressParamTypeId).toString() == oneWireDevice.address) { + descriptor.setThingId(existingThing->id()); + break; + } + } + descriptor.setParams(params); + descriptors.append(descriptor); + break; + } case 0x05: { //single channel switch ThingDescriptor descriptor(singleChannelSwitchThingClassId, oneWireDevice.type, "One wire single channel switch", parentDevice->id()); ParamList params; @@ -466,14 +501,10 @@ void IntegrationPluginOneWire::onOneWireDevicesDiscovered(QListaddThingDescriptors(descriptors); - info->finish(Thing::ThingErrorNoError); - } + ThingDiscoveryInfo *info = m_runningDiscoveries.take(parentDevice); + if (info && m_runningDiscoveries.isEmpty()) { + info->addThingDescriptors(descriptors); + info->finish(Thing::ThingErrorNoError); } break; } diff --git a/onewire/integrationpluginonewire.h b/onewire/integrationpluginonewire.h index 19c525be..4dbd97be 100644 --- a/onewire/integrationpluginonewire.h +++ b/onewire/integrationpluginonewire.h @@ -61,6 +61,7 @@ private: QHash m_runningDiscoveries; void setupOwfsTemperatureSensor(ThingSetupInfo *info); + void setupOwfsTemperatureHumiditySensor(ThingSetupInfo *info); private slots: void onPluginTimer(); diff --git a/onewire/integrationpluginonewire.json b/onewire/integrationpluginonewire.json index f1cc8dc9..0eaf4376 100644 --- a/onewire/integrationpluginonewire.json +++ b/onewire/integrationpluginonewire.json @@ -31,16 +31,6 @@ "displayNameEvent": "Connected changed", "defaultValue": false, "type": "bool" - }, - { - "id": "64baf50e-8ed4-4526-8b92-7e4662d6fa39", - "name": "autoAdd", - "displayName": "Auto add one wire devices", - "displayNameAction": "Set auto add mode", - "displayNameEvent": "Auto add one wire devices changed", - "defaultValue": false, - "type": "bool", - "writable": true } ] }, @@ -90,6 +80,64 @@ } ] }, + { + "id": "39fd5605-2d8d-43ca-bee3-12636d2ce392", + "name": "temperatureHumiditySensor", + "displayName": "Temperature and Humidity Sensor", + "interfaces": ["temperaturesensor", "humiditysensor"], + "createMethods": ["discovery"], + "paramTypes": [ + { + "id": "be838775-8d2a-4af3-9b65-e6059ed921fe", + "name": "address", + "displayName": "Address", + "type": "QString", + "readOnly": true + }, + { + "id": "3fd26103-fc3c-44ea-a343-1c46ebe601a2", + "name": "type", + "displayName": "Type", + "type": "QString", + "inputType": "TextLine", + "readOnly": true + } + ], + "stateTypes": [ + { + "id": "813e3aba-4791-40e6-ac99-1f1cf97d397c", + "name": "connected", + "displayName": "Connected", + "displayNameEvent": "Connected changed", + "defaultValue": false, + "type": "bool" + }, + { + "id": "de6cbffa-93a2-4d31-99aa-44a335678d4b", + "name": "temperature", + "displayName": "Temperature", + "displayNameEvent": "Temperature changed", + "unit": "DegreeCelsius", + "type": "double", + "minValue": -55, + "maxValue": 125, + "defaultValue": 0, + "ioType": "analogInput" + }, + { + "id": "a74c7e14-f0ce-428b-9866-17f482ca6b77", + "name": "humidity", + "displayName": "Humidity", + "displayNameEvent": "Humidity changed", + "unit": "Percentage", + "type": "double", + "minValue": 0, + "maxValue": 100, + "defaultValue": 0, + "ioType": "analogInput" + } + ] + }, { "id": "6db42501-5451-4aac-9525-5f886b3188e2", "name": "singleChannelSwitch", diff --git a/onewire/owfs.cpp b/onewire/owfs.cpp index 701fedac..65ee3d8c 100644 --- a/onewire/owfs.cpp +++ b/onewire/owfs.cpp @@ -182,6 +182,13 @@ double Owfs::getTemperature(const QByteArray &address) return temperature.toDouble(); } +double Owfs::getHumidity(const QByteArray &address) +{ + QByteArray humidity = getValue(address, "humidity"); + qDebug(dcOneWire()) << "Humidity" << humidity << humidity.replace(',','.').toDouble(); + return humidity.toDouble(); +} + QByteArray Owfs::getType(const QByteArray &address) { QByteArray type = getValue(address, "type"); diff --git a/onewire/owfs.h b/onewire/owfs.h index cc1ba129..94401857 100644 --- a/onewire/owfs.h +++ b/onewire/owfs.h @@ -76,6 +76,7 @@ public: bool isConnected(const QByteArray &address); double getTemperature(const QByteArray &address); + double getHumidity(const QByteArray &address); QByteArray getType(const QByteArray &address); bool getSwitchOutput(const QByteArray &address, SwitchChannel channel); void setSwitchOutput(const QByteArray &address, SwitchChannel channel, bool state); diff --git a/onewire/translations/2c697fb7-0645-466d-9cb9-aa1922c85bee-de.ts b/onewire/translations/2c697fb7-0645-466d-9cb9-aa1922c85bee-de.ts index 47393ec6..0fafa4ef 100644 --- a/onewire/translations/2c697fb7-0645-466d-9cb9-aa1922c85bee-de.ts +++ b/onewire/translations/2c697fb7-0645-466d-9cb9-aa1922c85bee-de.ts @@ -9,53 +9,49 @@ Es wurde keine OWFS Schnittstelle initialisiert. Bitte richten Sie zuerst eine OWFS Schnittstelle ein. - - All configured one wire interfaces are set up to automatically add new devices. - Alle konfigurierten OWFS-Schnittstellen sind so eingerichtet, dass automatisch neue Geräte hinzugefügt werden. - - - + There can only be one one wire interface per system. Error setting up thing Es kann nur eine One-Wire-Schnittstelle pro System geben. - + Error initializing one wire interface. Error setting up thing Fehler beim Initialisieren der One-Wire-Schnittstelle. - - No 1-Wire interface available - Keine One-Wire-Schnittstelle verfügbar + + OWFS interface is not available. + OWFS Schnittstelle ist nicht verfügbar. OneWire - + 1-channel switch The name of the ThingClass ({6db42501-5451-4aac-9525-5f886b3188e2}) 1-Kanal Schalter - + 2-channel switch The name of the ThingClass ({023f2b93-61e1-4422-97f5-3d5c14a6628f}) 2-Kanal Schalter - + 8-channel switch The name of the ThingClass ({71691119-3bda-4424-b853-1a00f21086e1}) 8-Kanal Schalter - - - - + + + + + Address The name of the ParamType (ThingClass: eightChannelSwitch, Type: thing, ID: {e3e6e596-0cd4-42a3-8401-ccf6349314b7}) ---------- @@ -63,29 +59,12 @@ The name of the ParamType (ThingClass: dualChannelSwitch, Type: thing, ID: {b9a1 ---------- The name of the ParamType (ThingClass: singleChannelSwitch, Type: thing, ID: {c9d6b7fd-fa21-473a-b5ed-9c5227749f06}) ---------- +The name of the ParamType (ThingClass: temperatureHumiditySensor, Type: thing, ID: {be838775-8d2a-4af3-9b65-e6059ed921fe}) +---------- The name of the ParamType (ThingClass: temperatureSensor, Type: thing, ID: {b4368f34-d9bb-496f-84ba-091bd4b6a332}) Adresse - - - - Auto add one wire devices - The name of the ParamType (ThingClass: oneWireInterface, ActionType: autoAdd, ID: {64baf50e-8ed4-4526-8b92-7e4662d6fa39}) ----------- -The name of the ParamType (ThingClass: oneWireInterface, EventType: autoAdd, ID: {64baf50e-8ed4-4526-8b92-7e4662d6fa39}) ----------- -The name of the StateType ({64baf50e-8ed4-4526-8b92-7e4662d6fa39}) of ThingClass oneWireInterface - Automatisches hinzufügen von One-Wire-Geräten - - - - Auto add one wire devices changed - The name of the EventType ({64baf50e-8ed4-4526-8b92-7e4662d6fa39}) of ThingClass oneWireInterface - Automatisches hinzufügen von One-Wire-Geräten geändert - - - @@ -95,6 +74,9 @@ The name of the StateType ({64baf50e-8ed4-4526-8b92-7e4662d6fa39}) of ThingClass + + + Connected The name of the ParamType (ThingClass: eightChannelSwitch, EventType: connected, ID: {b99585e0-5147-46e3-9474-fba555bac68a}) ---------- @@ -108,6 +90,10 @@ The name of the ParamType (ThingClass: singleChannelSwitch, EventType: connected ---------- The name of the StateType ({16bae8e8-bfe1-4648-9018-f6ce610f4236}) of ThingClass singleChannelSwitch ---------- +The name of the ParamType (ThingClass: temperatureHumiditySensor, EventType: connected, ID: {813e3aba-4791-40e6-ac99-1f1cf97d397c}) +---------- +The name of the StateType ({813e3aba-4791-40e6-ac99-1f1cf97d397c}) of ThingClass temperatureHumiditySensor +---------- The name of the ParamType (ThingClass: temperatureSensor, EventType: connected, ID: {32305a16-b042-4574-8bd7-ad99d9e8e5da}) ---------- The name of the StateType ({32305a16-b042-4574-8bd7-ad99d9e8e5da}) of ThingClass temperatureSensor @@ -118,11 +104,12 @@ The name of the StateType ({d0ded173-c382-4ee3-8e24-3647b4e16afa}) of ThingClass Verbunden - - - + + + + Connected changed The name of the EventType ({b99585e0-5147-46e3-9474-fba555bac68a}) of ThingClass eightChannelSwitch ---------- @@ -130,15 +117,17 @@ The name of the EventType ({fb6e63db-316b-4959-a349-0ff58a679f71}) of ThingClass ---------- The name of the EventType ({16bae8e8-bfe1-4648-9018-f6ce610f4236}) of ThingClass singleChannelSwitch ---------- +The name of the EventType ({813e3aba-4791-40e6-ac99-1f1cf97d397c}) of ThingClass temperatureHumiditySensor +---------- The name of the EventType ({32305a16-b042-4574-8bd7-ad99d9e8e5da}) of ThingClass temperatureSensor ---------- The name of the EventType ({d0ded173-c382-4ee3-8e24-3647b4e16afa}) of ThingClass oneWireInterface Verbunden geändert - - - + + + Digital output The name of the ParamType (ThingClass: singleChannelSwitch, ActionType: digitalOutput, ID: {ca10a9fd-e4e0-4608-a2d2-6a4ce9644f40}) ---------- @@ -148,12 +137,12 @@ The name of the StateType ({ca10a9fd-e4e0-4608-a2d2-6a4ce9644f40}) of ThingClass Digitaler Ausgang - - - - + + + + Digital output 1 The name of the ParamType (ThingClass: eightChannelSwitch, ActionType: digitalOutput1, ID: {78fa12c0-246c-4112-8be6-5943d3c3cda5}) ---------- @@ -169,8 +158,8 @@ The name of the StateType ({f8b6b4a7-355c-4580-a676-8a4d0d619ff9}) of ThingClass Digitaler Ausgang 1 - - + + Digital output 1 changed The name of the EventType ({78fa12c0-246c-4112-8be6-5943d3c3cda5}) of ThingClass eightChannelSwitch ---------- @@ -178,12 +167,12 @@ The name of the EventType ({f8b6b4a7-355c-4580-a676-8a4d0d619ff9}) of ThingClass Digitaler Ausgang 1 geändert - - - - + + + + Digital output 2 The name of the ParamType (ThingClass: eightChannelSwitch, ActionType: digitalOutput2, ID: {c7d2f4a8-2b13-4a48-81a8-72f4908c775b}) ---------- @@ -199,8 +188,8 @@ The name of the StateType ({82a78aed-5994-4af5-aecb-1806be5de1f3}) of ThingClass Digitaler Ausgang 2 - - + + Digital output 2 changed The name of the EventType ({c7d2f4a8-2b13-4a48-81a8-72f4908c775b}) of ThingClass eightChannelSwitch ---------- @@ -208,9 +197,9 @@ The name of the EventType ({82a78aed-5994-4af5-aecb-1806be5de1f3}) of ThingClass Digitaler Ausgang 2 geändert - - - + + + Digital output 3 The name of the ParamType (ThingClass: eightChannelSwitch, ActionType: digitalOutput3, ID: {4b2ac595-eba9-4364-8cd7-00ff8bccda5a}) ---------- @@ -220,15 +209,15 @@ The name of the StateType ({4b2ac595-eba9-4364-8cd7-00ff8bccda5a}) of ThingClass Digitaler Ausgang 3 - + Digital output 3 changed The name of the EventType ({4b2ac595-eba9-4364-8cd7-00ff8bccda5a}) of ThingClass eightChannelSwitch Digitaler Ausgang 3 geändert - - - + + + Digital output 4 The name of the ParamType (ThingClass: eightChannelSwitch, ActionType: digitalOutput4, ID: {bbbd1863-ef04-4687-803d-3c9ccdfc8d8f}) ---------- @@ -238,15 +227,15 @@ The name of the StateType ({bbbd1863-ef04-4687-803d-3c9ccdfc8d8f}) of ThingClass Digitaler Ausgang 4 - + Digital output 4 changed The name of the EventType ({bbbd1863-ef04-4687-803d-3c9ccdfc8d8f}) of ThingClass eightChannelSwitch Digitaler Ausgang 4 geändert - - - + + + Digital output 5 The name of the ParamType (ThingClass: eightChannelSwitch, ActionType: digitalOutput5, ID: {50855d2b-a700-4030-8674-fee00cc0b4e2}) ---------- @@ -256,15 +245,15 @@ The name of the StateType ({50855d2b-a700-4030-8674-fee00cc0b4e2}) of ThingClass Digitaler Ausgang 5 - + Digital output 5 changed The name of the EventType ({50855d2b-a700-4030-8674-fee00cc0b4e2}) of ThingClass eightChannelSwitch Digitaler Ausgang 5 geändert - - - + + + Digital output 6 The name of the ParamType (ThingClass: eightChannelSwitch, ActionType: digitalOutput6, ID: {a91ce593-09ba-4754-8a2e-e3f507313585}) ---------- @@ -274,15 +263,15 @@ The name of the StateType ({a91ce593-09ba-4754-8a2e-e3f507313585}) of ThingClass Digitaler Ausgang 6 - + Digital output 6 changed The name of the EventType ({a91ce593-09ba-4754-8a2e-e3f507313585}) of ThingClass eightChannelSwitch Digitaler Ausgang 6 geändert - - - + + + Digital output 7 The name of the ParamType (ThingClass: eightChannelSwitch, ActionType: digitalOutput7, ID: {5f46047c-b00d-486f-b169-b738fbc89cdb}) ---------- @@ -292,15 +281,15 @@ The name of the StateType ({5f46047c-b00d-486f-b169-b738fbc89cdb}) of ThingClass Digitaler Ausgang 7 - + Digital output 7 changed The name of the EventType ({5f46047c-b00d-486f-b169-b738fbc89cdb}) of ThingClass eightChannelSwitch Digitaler Ausgang 7 geändert - - - + + + Digital output 8 The name of the ParamType (ThingClass: eightChannelSwitch, ActionType: digitalOutput8, ID: {63334a17-0847-4f53-8007-1b5e72b88aa8}) ---------- @@ -310,56 +299,65 @@ The name of the StateType ({63334a17-0847-4f53-8007-1b5e72b88aa8}) of ThingClass Digitaler Ausgang 8 - + Digital output 8 changed The name of the EventType ({63334a17-0847-4f53-8007-1b5e72b88aa8}) of ThingClass eightChannelSwitch Digitaler Ausgang 8 geändert - + Digital output changed The name of the EventType ({ca10a9fd-e4e0-4608-a2d2-6a4ce9644f40}) of ThingClass singleChannelSwitch Digitaler Ausgang geändert - + + + Humidity + The name of the ParamType (ThingClass: temperatureHumiditySensor, EventType: humidity, ID: {a74c7e14-f0ce-428b-9866-17f482ca6b77}) +---------- +The name of the StateType ({a74c7e14-f0ce-428b-9866-17f482ca6b77}) of ThingClass temperatureHumiditySensor + Luftfeuchte + + + + Humidity changed + The name of the EventType ({a74c7e14-f0ce-428b-9866-17f482ca6b77}) of ThingClass temperatureHumiditySensor + Luftfeuchte geändert + + + OWFS init arguments The name of the ParamType (ThingClass: oneWireInterface, Type: thing, ID: {a0e773ff-fd19-499e-96f0-830168229cd3}) OWFS-Init-Argumente - + OWFS interface The name of the ThingClass ({c36c68d9-6182-4ae1-972d-b8b5e0cf185f}) OWFS Schnittstelle - + One Wire The name of the plugin OneWire ({2c697fb7-0645-466d-9cb9-aa1922c85bee}) One Wire - + One wire The name of the vendor ({cecc5fae-29cf-40c0-b1f8-0af2dc8e8a63}) One Wire - - Set auto add mode - The name of the ActionType ({64baf50e-8ed4-4526-8b92-7e4662d6fa39}) of ThingClass oneWireInterface - Setze automatischen Add-Modus - - - + Set digital output The name of the ActionType ({ca10a9fd-e4e0-4608-a2d2-6a4ce9644f40}) of ThingClass singleChannelSwitch Setze digitalen Ausgang - - + + Set digital output 1 The name of the ActionType ({78fa12c0-246c-4112-8be6-5943d3c3cda5}) of ThingClass eightChannelSwitch ---------- @@ -367,8 +365,8 @@ The name of the ActionType ({f8b6b4a7-355c-4580-a676-8a4d0d619ff9}) of ThingClas Setze digitalen Ausgang 1 - - + + Set digital output 2 The name of the ActionType ({c7d2f4a8-2b13-4a48-81a8-72f4908c775b}) of ThingClass eightChannelSwitch ---------- @@ -376,67 +374,83 @@ The name of the ActionType ({82a78aed-5994-4af5-aecb-1806be5de1f3}) of ThingClas Setze digitalen Ausgang 2 - + Set digital output 3 The name of the ActionType ({4b2ac595-eba9-4364-8cd7-00ff8bccda5a}) of ThingClass eightChannelSwitch Setze digitalen Ausgang 3 - + Set digital output 4 The name of the ActionType ({bbbd1863-ef04-4687-803d-3c9ccdfc8d8f}) of ThingClass eightChannelSwitch Setze digitalen Ausgang 4 - + Set digital output 5 The name of the ActionType ({50855d2b-a700-4030-8674-fee00cc0b4e2}) of ThingClass eightChannelSwitch Setze digitalen Ausgang 5 - + Set digital output 6 The name of the ActionType ({a91ce593-09ba-4754-8a2e-e3f507313585}) of ThingClass eightChannelSwitch Setze digitalen Ausgang 6 - + Set digital output 7 The name of the ActionType ({5f46047c-b00d-486f-b169-b738fbc89cdb}) of ThingClass eightChannelSwitch Setze digitalen Ausgang 7 - + Set digital output 8 The name of the ActionType ({63334a17-0847-4f53-8007-1b5e72b88aa8}) of ThingClass eightChannelSwitch Setze digitalen Ausgang 8 - - + + + + Temperature - The name of the ParamType (ThingClass: temperatureSensor, EventType: temperature, ID: {b04ee2a5-9b27-4ffc-9e12-7e05f5a41690}) + The name of the ParamType (ThingClass: temperatureHumiditySensor, EventType: temperature, ID: {de6cbffa-93a2-4d31-99aa-44a335678d4b}) +---------- +The name of the StateType ({de6cbffa-93a2-4d31-99aa-44a335678d4b}) of ThingClass temperatureHumiditySensor +---------- +The name of the ParamType (ThingClass: temperatureSensor, EventType: temperature, ID: {b04ee2a5-9b27-4ffc-9e12-7e05f5a41690}) ---------- The name of the StateType ({b04ee2a5-9b27-4ffc-9e12-7e05f5a41690}) of ThingClass temperatureSensor Temperatur - + Temperature Sensor The name of the ThingClass ({e13beb24-953c-48b3-9262-7cde31d42ef5}) Termperatursensor - + + Temperature and Humidity Sensor + The name of the ThingClass ({39fd5605-2d8d-43ca-bee3-12636d2ce392}) + Termperatur- und Luftfeuchtesensor + + + + Temperature changed - The name of the EventType ({b04ee2a5-9b27-4ffc-9e12-7e05f5a41690}) of ThingClass temperatureSensor + The name of the EventType ({de6cbffa-93a2-4d31-99aa-44a335678d4b}) of ThingClass temperatureHumiditySensor +---------- +The name of the EventType ({b04ee2a5-9b27-4ffc-9e12-7e05f5a41690}) of ThingClass temperatureSensor Temperatur geändert - - - - + + + + + Type The name of the ParamType (ThingClass: eightChannelSwitch, Type: thing, ID: {34c8f771-4141-4183-9eaf-becbaf362ac8}) ---------- @@ -444,6 +458,8 @@ The name of the ParamType (ThingClass: dualChannelSwitch, Type: thing, ID: {b71e ---------- The name of the ParamType (ThingClass: singleChannelSwitch, Type: thing, ID: {6efc8cb6-81ae-45c0-8910-708401d1ba68}) ---------- +The name of the ParamType (ThingClass: temperatureHumiditySensor, Type: thing, ID: {3fd26103-fc3c-44ea-a343-1c46ebe601a2}) +---------- The name of the ParamType (ThingClass: temperatureSensor, Type: thing, ID: {5005822d-6a32-4bb8-9b77-f79da7382f76}) Typ diff --git a/onewire/translations/2c697fb7-0645-466d-9cb9-aa1922c85bee-en_US.ts b/onewire/translations/2c697fb7-0645-466d-9cb9-aa1922c85bee-en_US.ts index 2e1cf25e..e297b200 100644 --- a/onewire/translations/2c697fb7-0645-466d-9cb9-aa1922c85bee-en_US.ts +++ b/onewire/translations/2c697fb7-0645-466d-9cb9-aa1922c85bee-en_US.ts @@ -9,53 +9,49 @@ - - All configured one wire interfaces are set up to automatically add new devices. - - - - + There can only be one one wire interface per system. Error setting up thing - + Error initializing one wire interface. Error setting up thing - - No 1-Wire interface available + + OWFS interface is not available. OneWire - + 1-channel switch The name of the ThingClass ({6db42501-5451-4aac-9525-5f886b3188e2}) - + 2-channel switch The name of the ThingClass ({023f2b93-61e1-4422-97f5-3d5c14a6628f}) - + 8-channel switch The name of the ThingClass ({71691119-3bda-4424-b853-1a00f21086e1}) - - - - + + + + + Address The name of the ParamType (ThingClass: eightChannelSwitch, Type: thing, ID: {e3e6e596-0cd4-42a3-8401-ccf6349314b7}) ---------- @@ -63,29 +59,12 @@ The name of the ParamType (ThingClass: dualChannelSwitch, Type: thing, ID: {b9a1 ---------- The name of the ParamType (ThingClass: singleChannelSwitch, Type: thing, ID: {c9d6b7fd-fa21-473a-b5ed-9c5227749f06}) ---------- +The name of the ParamType (ThingClass: temperatureHumiditySensor, Type: thing, ID: {be838775-8d2a-4af3-9b65-e6059ed921fe}) +---------- The name of the ParamType (ThingClass: temperatureSensor, Type: thing, ID: {b4368f34-d9bb-496f-84ba-091bd4b6a332}) - - - - Auto add one wire devices - The name of the ParamType (ThingClass: oneWireInterface, ActionType: autoAdd, ID: {64baf50e-8ed4-4526-8b92-7e4662d6fa39}) ----------- -The name of the ParamType (ThingClass: oneWireInterface, EventType: autoAdd, ID: {64baf50e-8ed4-4526-8b92-7e4662d6fa39}) ----------- -The name of the StateType ({64baf50e-8ed4-4526-8b92-7e4662d6fa39}) of ThingClass oneWireInterface - - - - - Auto add one wire devices changed - The name of the EventType ({64baf50e-8ed4-4526-8b92-7e4662d6fa39}) of ThingClass oneWireInterface - - - - @@ -95,6 +74,9 @@ The name of the StateType ({64baf50e-8ed4-4526-8b92-7e4662d6fa39}) of ThingClass + + + Connected The name of the ParamType (ThingClass: eightChannelSwitch, EventType: connected, ID: {b99585e0-5147-46e3-9474-fba555bac68a}) ---------- @@ -108,6 +90,10 @@ The name of the ParamType (ThingClass: singleChannelSwitch, EventType: connected ---------- The name of the StateType ({16bae8e8-bfe1-4648-9018-f6ce610f4236}) of ThingClass singleChannelSwitch ---------- +The name of the ParamType (ThingClass: temperatureHumiditySensor, EventType: connected, ID: {813e3aba-4791-40e6-ac99-1f1cf97d397c}) +---------- +The name of the StateType ({813e3aba-4791-40e6-ac99-1f1cf97d397c}) of ThingClass temperatureHumiditySensor +---------- The name of the ParamType (ThingClass: temperatureSensor, EventType: connected, ID: {32305a16-b042-4574-8bd7-ad99d9e8e5da}) ---------- The name of the StateType ({32305a16-b042-4574-8bd7-ad99d9e8e5da}) of ThingClass temperatureSensor @@ -118,11 +104,12 @@ The name of the StateType ({d0ded173-c382-4ee3-8e24-3647b4e16afa}) of ThingClass - - - + + + + Connected changed The name of the EventType ({b99585e0-5147-46e3-9474-fba555bac68a}) of ThingClass eightChannelSwitch ---------- @@ -130,15 +117,17 @@ The name of the EventType ({fb6e63db-316b-4959-a349-0ff58a679f71}) of ThingClass ---------- The name of the EventType ({16bae8e8-bfe1-4648-9018-f6ce610f4236}) of ThingClass singleChannelSwitch ---------- +The name of the EventType ({813e3aba-4791-40e6-ac99-1f1cf97d397c}) of ThingClass temperatureHumiditySensor +---------- The name of the EventType ({32305a16-b042-4574-8bd7-ad99d9e8e5da}) of ThingClass temperatureSensor ---------- The name of the EventType ({d0ded173-c382-4ee3-8e24-3647b4e16afa}) of ThingClass oneWireInterface - - - + + + Digital output The name of the ParamType (ThingClass: singleChannelSwitch, ActionType: digitalOutput, ID: {ca10a9fd-e4e0-4608-a2d2-6a4ce9644f40}) ---------- @@ -148,12 +137,12 @@ The name of the StateType ({ca10a9fd-e4e0-4608-a2d2-6a4ce9644f40}) of ThingClass - - - - + + + + Digital output 1 The name of the ParamType (ThingClass: eightChannelSwitch, ActionType: digitalOutput1, ID: {78fa12c0-246c-4112-8be6-5943d3c3cda5}) ---------- @@ -169,8 +158,8 @@ The name of the StateType ({f8b6b4a7-355c-4580-a676-8a4d0d619ff9}) of ThingClass - - + + Digital output 1 changed The name of the EventType ({78fa12c0-246c-4112-8be6-5943d3c3cda5}) of ThingClass eightChannelSwitch ---------- @@ -178,12 +167,12 @@ The name of the EventType ({f8b6b4a7-355c-4580-a676-8a4d0d619ff9}) of ThingClass - - - - + + + + Digital output 2 The name of the ParamType (ThingClass: eightChannelSwitch, ActionType: digitalOutput2, ID: {c7d2f4a8-2b13-4a48-81a8-72f4908c775b}) ---------- @@ -199,8 +188,8 @@ The name of the StateType ({82a78aed-5994-4af5-aecb-1806be5de1f3}) of ThingClass - - + + Digital output 2 changed The name of the EventType ({c7d2f4a8-2b13-4a48-81a8-72f4908c775b}) of ThingClass eightChannelSwitch ---------- @@ -208,9 +197,9 @@ The name of the EventType ({82a78aed-5994-4af5-aecb-1806be5de1f3}) of ThingClass - - - + + + Digital output 3 The name of the ParamType (ThingClass: eightChannelSwitch, ActionType: digitalOutput3, ID: {4b2ac595-eba9-4364-8cd7-00ff8bccda5a}) ---------- @@ -220,15 +209,15 @@ The name of the StateType ({4b2ac595-eba9-4364-8cd7-00ff8bccda5a}) of ThingClass - + Digital output 3 changed The name of the EventType ({4b2ac595-eba9-4364-8cd7-00ff8bccda5a}) of ThingClass eightChannelSwitch - - - + + + Digital output 4 The name of the ParamType (ThingClass: eightChannelSwitch, ActionType: digitalOutput4, ID: {bbbd1863-ef04-4687-803d-3c9ccdfc8d8f}) ---------- @@ -238,15 +227,15 @@ The name of the StateType ({bbbd1863-ef04-4687-803d-3c9ccdfc8d8f}) of ThingClass - + Digital output 4 changed The name of the EventType ({bbbd1863-ef04-4687-803d-3c9ccdfc8d8f}) of ThingClass eightChannelSwitch - - - + + + Digital output 5 The name of the ParamType (ThingClass: eightChannelSwitch, ActionType: digitalOutput5, ID: {50855d2b-a700-4030-8674-fee00cc0b4e2}) ---------- @@ -256,15 +245,15 @@ The name of the StateType ({50855d2b-a700-4030-8674-fee00cc0b4e2}) of ThingClass - + Digital output 5 changed The name of the EventType ({50855d2b-a700-4030-8674-fee00cc0b4e2}) of ThingClass eightChannelSwitch - - - + + + Digital output 6 The name of the ParamType (ThingClass: eightChannelSwitch, ActionType: digitalOutput6, ID: {a91ce593-09ba-4754-8a2e-e3f507313585}) ---------- @@ -274,15 +263,15 @@ The name of the StateType ({a91ce593-09ba-4754-8a2e-e3f507313585}) of ThingClass - + Digital output 6 changed The name of the EventType ({a91ce593-09ba-4754-8a2e-e3f507313585}) of ThingClass eightChannelSwitch - - - + + + Digital output 7 The name of the ParamType (ThingClass: eightChannelSwitch, ActionType: digitalOutput7, ID: {5f46047c-b00d-486f-b169-b738fbc89cdb}) ---------- @@ -292,15 +281,15 @@ The name of the StateType ({5f46047c-b00d-486f-b169-b738fbc89cdb}) of ThingClass - + Digital output 7 changed The name of the EventType ({5f46047c-b00d-486f-b169-b738fbc89cdb}) of ThingClass eightChannelSwitch - - - + + + Digital output 8 The name of the ParamType (ThingClass: eightChannelSwitch, ActionType: digitalOutput8, ID: {63334a17-0847-4f53-8007-1b5e72b88aa8}) ---------- @@ -310,56 +299,65 @@ The name of the StateType ({63334a17-0847-4f53-8007-1b5e72b88aa8}) of ThingClass - + Digital output 8 changed The name of the EventType ({63334a17-0847-4f53-8007-1b5e72b88aa8}) of ThingClass eightChannelSwitch - + Digital output changed The name of the EventType ({ca10a9fd-e4e0-4608-a2d2-6a4ce9644f40}) of ThingClass singleChannelSwitch - + + + Humidity + The name of the ParamType (ThingClass: temperatureHumiditySensor, EventType: humidity, ID: {a74c7e14-f0ce-428b-9866-17f482ca6b77}) +---------- +The name of the StateType ({a74c7e14-f0ce-428b-9866-17f482ca6b77}) of ThingClass temperatureHumiditySensor + + + + + Humidity changed + The name of the EventType ({a74c7e14-f0ce-428b-9866-17f482ca6b77}) of ThingClass temperatureHumiditySensor + + + + OWFS init arguments The name of the ParamType (ThingClass: oneWireInterface, Type: thing, ID: {a0e773ff-fd19-499e-96f0-830168229cd3}) - + OWFS interface The name of the ThingClass ({c36c68d9-6182-4ae1-972d-b8b5e0cf185f}) - + One Wire The name of the plugin OneWire ({2c697fb7-0645-466d-9cb9-aa1922c85bee}) - + One wire The name of the vendor ({cecc5fae-29cf-40c0-b1f8-0af2dc8e8a63}) - - Set auto add mode - The name of the ActionType ({64baf50e-8ed4-4526-8b92-7e4662d6fa39}) of ThingClass oneWireInterface - - - - + Set digital output The name of the ActionType ({ca10a9fd-e4e0-4608-a2d2-6a4ce9644f40}) of ThingClass singleChannelSwitch - - + + Set digital output 1 The name of the ActionType ({78fa12c0-246c-4112-8be6-5943d3c3cda5}) of ThingClass eightChannelSwitch ---------- @@ -367,8 +365,8 @@ The name of the ActionType ({f8b6b4a7-355c-4580-a676-8a4d0d619ff9}) of ThingClas - - + + Set digital output 2 The name of the ActionType ({c7d2f4a8-2b13-4a48-81a8-72f4908c775b}) of ThingClass eightChannelSwitch ---------- @@ -376,67 +374,83 @@ The name of the ActionType ({82a78aed-5994-4af5-aecb-1806be5de1f3}) of ThingClas - + Set digital output 3 The name of the ActionType ({4b2ac595-eba9-4364-8cd7-00ff8bccda5a}) of ThingClass eightChannelSwitch - + Set digital output 4 The name of the ActionType ({bbbd1863-ef04-4687-803d-3c9ccdfc8d8f}) of ThingClass eightChannelSwitch - + Set digital output 5 The name of the ActionType ({50855d2b-a700-4030-8674-fee00cc0b4e2}) of ThingClass eightChannelSwitch - + Set digital output 6 The name of the ActionType ({a91ce593-09ba-4754-8a2e-e3f507313585}) of ThingClass eightChannelSwitch - + Set digital output 7 The name of the ActionType ({5f46047c-b00d-486f-b169-b738fbc89cdb}) of ThingClass eightChannelSwitch - + Set digital output 8 The name of the ActionType ({63334a17-0847-4f53-8007-1b5e72b88aa8}) of ThingClass eightChannelSwitch - - + + + + Temperature - The name of the ParamType (ThingClass: temperatureSensor, EventType: temperature, ID: {b04ee2a5-9b27-4ffc-9e12-7e05f5a41690}) + The name of the ParamType (ThingClass: temperatureHumiditySensor, EventType: temperature, ID: {de6cbffa-93a2-4d31-99aa-44a335678d4b}) +---------- +The name of the StateType ({de6cbffa-93a2-4d31-99aa-44a335678d4b}) of ThingClass temperatureHumiditySensor +---------- +The name of the ParamType (ThingClass: temperatureSensor, EventType: temperature, ID: {b04ee2a5-9b27-4ffc-9e12-7e05f5a41690}) ---------- The name of the StateType ({b04ee2a5-9b27-4ffc-9e12-7e05f5a41690}) of ThingClass temperatureSensor - + Temperature Sensor The name of the ThingClass ({e13beb24-953c-48b3-9262-7cde31d42ef5}) - - Temperature changed - The name of the EventType ({b04ee2a5-9b27-4ffc-9e12-7e05f5a41690}) of ThingClass temperatureSensor + + Temperature and Humidity Sensor + The name of the ThingClass ({39fd5605-2d8d-43ca-bee3-12636d2ce392}) - - - - + + + Temperature changed + The name of the EventType ({de6cbffa-93a2-4d31-99aa-44a335678d4b}) of ThingClass temperatureHumiditySensor +---------- +The name of the EventType ({b04ee2a5-9b27-4ffc-9e12-7e05f5a41690}) of ThingClass temperatureSensor + + + + + + + + Type The name of the ParamType (ThingClass: eightChannelSwitch, Type: thing, ID: {34c8f771-4141-4183-9eaf-becbaf362ac8}) ---------- @@ -444,6 +458,8 @@ The name of the ParamType (ThingClass: dualChannelSwitch, Type: thing, ID: {b71e ---------- The name of the ParamType (ThingClass: singleChannelSwitch, Type: thing, ID: {6efc8cb6-81ae-45c0-8910-708401d1ba68}) ---------- +The name of the ParamType (ThingClass: temperatureHumiditySensor, Type: thing, ID: {3fd26103-fc3c-44ea-a343-1c46ebe601a2}) +---------- The name of the ParamType (ThingClass: temperatureSensor, Type: thing, ID: {5005822d-6a32-4bb8-9b77-f79da7382f76})