ETM-Schurig
/
nymea
mirror of https://github.com/nymea/nymea.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

start cleanup of multisensor plugin

pull/135/head
Simon Stürz 2017-03-06 13:05:13 +01:00 committed by Michael Zanetti
parent 2e4b02099b
commit 8d648b7eb8
3 changed files with 104 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
plugins/deviceplugins/multisensor/translations/de_DE.ts
View File

@ -4,105 +4,117 @@
<context>
<name>MultiSensor</name>
<message>
<location filename="../../../../../build-guh-Desktop-Debug/plugins/deviceplugins/multisensor/plugininfo.h" line="46"/>
<location filename="../../../../../build-guh-Desktop-Debug/plugins/deviceplugins/multisensor/plugininfo.h" line="49"/>
<source>MultiSensor</source>
<extracomment>The name of the plugin MultiSensor (23bf0d8d-df7d-4bee-80ee-f015c5a7f52e)</extracomment>
<translation>Multi Sensor</translation>
</message>
<message>
<location filename="../../../../../build-guh-Desktop-Debug/plugins/deviceplugins/multisensor/plugininfo.h" line="49"/>
<location filename="../../../../../build-guh-Desktop-Debug/plugins/deviceplugins/multisensor/plugininfo.h" line="52"/>
<source>Texas Instruments</source>
<extracomment>The name of the vendor (2edf543e-dc2c-4693-bb0c-e76c0d305fad)</extracomment>
<translation>Texas Instruments</translation>
</message>
<message>
<location filename="../../../../../build-guh-Desktop-Debug/plugins/deviceplugins/multisensor/plugininfo.h" line="52"/>
<source>SensorTag</source>
<extracomment>The name of the DeviceClass (158a06b6-b27f-4951-957e-6f1e3b44f604)</extracomment>
<translation>Sensor Tag</translation>
</message>
<message>
<location filename="../../../../../build-guh-Desktop-Debug/plugins/deviceplugins/multisensor/plugininfo.h" line="55"/>
<source>name</source>
<extracomment>The name of the paramType (bdb9d684-2f98-45f5-889c-f184c1e73dc7) of SensorTag</extracomment>
<translation>Name</translation>
<source>Sensor Tag</source>
<extracomment>The name of the DeviceClass (158a06b6-b27f-4951-957e-6f1e3b44f604)</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../../build-guh-Desktop-Debug/plugins/deviceplugins/multisensor/plugininfo.h" line="58"/>
<source>mac address</source>
<extracomment>The name of the paramType (d51ed68e-c84a-4136-a5b5-be2f95fd5a0f) of SensorTag</extracomment>
<translation>Mac Adresse</translation>
<source>name</source>
<extracomment>The name of the paramType (bdb9d684-2f98-45f5-889c-f184c1e73dc7) of Sensor Tag</extracomment>
<translation>Name</translation>
</message>
<message>
<location filename="../../../../../build-guh-Desktop-Debug/plugins/deviceplugins/multisensor/plugininfo.h" line="61"/>
<source>available changed</source>
<extracomment>The name of the autocreated EventType (a9629b11-0f34-47f0-a0f0-f758a6aec2b4)</extracomment>
<translation>Verfügbarkeit geändert</translation>
<source>mac address</source>
<extracomment>The name of the paramType (d51ed68e-c84a-4136-a5b5-be2f95fd5a0f) of Sensor Tag</extracomment>
<translation>Mac Adresse</translation>
</message>
<message>
<location filename="../../../../../build-guh-Desktop-Debug/plugins/deviceplugins/multisensor/plugininfo.h" line="64"/>
<source>available</source>
<extracomment>The name of the ParamType of StateType (a9629b11-0f34-47f0-a0f0-f758a6aec2b4) of DeviceClass SensorTag</extracomment>
<translation>Verfügbar</translation>
<source>connected changed</source>
<extracomment>The name of the autocreated EventType (a9629b11-0f34-47f0-a0f0-f758a6aec2b4)</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../../build-guh-Desktop-Debug/plugins/deviceplugins/multisensor/plugininfo.h" line="67"/>
<source>connected</source>
<extracomment>The name of the ParamType of StateType (a9629b11-0f34-47f0-a0f0-f758a6aec2b4) of DeviceClass Sensor Tag</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../../build-guh-Desktop-Debug/plugins/deviceplugins/multisensor/plugininfo.h" line="70"/>
<source>IR temperature changed</source>
<extracomment>The name of the autocreated EventType (c664e9ec-a045-49ba-add1-1642ceba7c4f)</extracomment>
<translation>IR Temperatur geändert</translation>
</message>
<message>
<location filename="../../../../../build-guh-Desktop-Debug/plugins/deviceplugins/multisensor/plugininfo.h" line="70"/>
<location filename="../../../../../build-guh-Desktop-Debug/plugins/deviceplugins/multisensor/plugininfo.h" line="73"/>
<source>IR temperature</source>
<extracomment>The name of the ParamType of StateType (c664e9ec-a045-49ba-add1-1642ceba7c4f) of DeviceClass SensorTag</extracomment>
<extracomment>The name of the ParamType of StateType (c664e9ec-a045-49ba-add1-1642ceba7c4f) of DeviceClass Sensor Tag</extracomment>
<translation>IR Temperatur</translation>
</message>
<message>
<location filename="../../../../../build-guh-Desktop-Debug/plugins/deviceplugins/multisensor/plugininfo.h" line="73"/>
<location filename="../../../../../build-guh-Desktop-Debug/plugins/deviceplugins/multisensor/plugininfo.h" line="76"/>
<source>humidity changed</source>
<extracomment>The name of the autocreated EventType (e83a50ff-96c9-4b6d-889f-f4238353e794)</extracomment>
<translation>Luftfeuchtigkeit geändert</translation>
</message>
<message>
<location filename="../../../../../build-guh-Desktop-Debug/plugins/deviceplugins/multisensor/plugininfo.h" line="76"/>
<location filename="../../../../../build-guh-Desktop-Debug/plugins/deviceplugins/multisensor/plugininfo.h" line="79"/>
<source>humidity</source>
<extracomment>The name of the ParamType of StateType (e83a50ff-96c9-4b6d-889f-f4238353e794) of DeviceClass SensorTag</extracomment>
<extracomment>The name of the ParamType of StateType (e83a50ff-96c9-4b6d-889f-f4238353e794) of DeviceClass Sensor Tag</extracomment>
<translation>Luftfeuchtigkeit</translation>
</message>
<message>
<location filename="../../../../../build-guh-Desktop-Debug/plugins/deviceplugins/multisensor/plugininfo.h" line="79"/>
<location filename="../../../../../build-guh-Desktop-Debug/plugins/deviceplugins/multisensor/plugininfo.h" line="82"/>
<source>temperature changed</source>
<extracomment>The name of the autocreated EventType (8359ada9-df1c-4e60-bb87-9e21d05ee2e2)</extracomment>
<translation>Temperatur geändert</translation>
</message>
<message>
<location filename="../../../../../build-guh-Desktop-Debug/plugins/deviceplugins/multisensor/plugininfo.h" line="82"/>
<location filename="../../../../../build-guh-Desktop-Debug/plugins/deviceplugins/multisensor/plugininfo.h" line="85"/>
<source>temperature</source>
<extracomment>The name of the ParamType of StateType (8359ada9-df1c-4e60-bb87-9e21d05ee2e2) of DeviceClass SensorTag</extracomment>
<extracomment>The name of the ParamType of StateType (8359ada9-df1c-4e60-bb87-9e21d05ee2e2) of DeviceClass Sensor Tag</extracomment>
<translation>Temperatur</translation>
</message>
<message>
<location filename="../../../../../build-guh-Desktop-Debug/plugins/deviceplugins/multisensor/plugininfo.h" line="85"/>
<location filename="../../../../../build-guh-Desktop-Debug/plugins/deviceplugins/multisensor/plugininfo.h" line="88"/>
<source>pressure changed</source>
<extracomment>The name of the autocreated EventType (645633ad-77d4-45b2-8be8-d6ca7a12eb7a)</extracomment>
<translation>Luftdruck geändert</translation>
</message>
<message>
<location filename="../../../../../build-guh-Desktop-Debug/plugins/deviceplugins/multisensor/plugininfo.h" line="88"/>
<location filename="../../../../../build-guh-Desktop-Debug/plugins/deviceplugins/multisensor/plugininfo.h" line="91"/>
<source>pressure</source>
<extracomment>The name of the ParamType of StateType (645633ad-77d4-45b2-8be8-d6ca7a12eb7a) of DeviceClass SensorTag</extracomment>
<extracomment>The name of the ParamType of StateType (645633ad-77d4-45b2-8be8-d6ca7a12eb7a) of DeviceClass Sensor Tag</extracomment>
<translation>Luftdruck</translation>
</message>
<message>
<location filename="../../../../../build-guh-Desktop-Debug/plugins/deviceplugins/multisensor/plugininfo.h" line="91"/>
<location filename="../../../../../build-guh-Desktop-Debug/plugins/deviceplugins/multisensor/plugininfo.h" line="94"/>
<source>moving changed</source>
<extracomment>The name of the autocreated EventType (4be5ca26-0565-419d-b18b-2a5a385d2a3d)</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../../build-guh-Desktop-Debug/plugins/deviceplugins/multisensor/plugininfo.h" line="97"/>
<source>moving</source>
<extracomment>The name of the ParamType of StateType (4be5ca26-0565-419d-b18b-2a5a385d2a3d) of DeviceClass Sensor Tag</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../../build-guh-Desktop-Debug/plugins/deviceplugins/multisensor/plugininfo.h" line="100"/>
<source>left key pressed</source>
<extracomment>The name of the EventType 61478490-bed0-4fed-9d58-f13c35b4f220 of deviceClass SensorTag</extracomment>
<extracomment>The name of the EventType 61478490-bed0-4fed-9d58-f13c35b4f220 of deviceClass Sensor Tag</extracomment>
<translation>Linke Taste gedrückt</translation>
</message>
<message>
<location filename="../../../../../build-guh-Desktop-Debug/plugins/deviceplugins/multisensor/plugininfo.h" line="94"/>
<location filename="../../../../../build-guh-Desktop-Debug/plugins/deviceplugins/multisensor/plugininfo.h" line="103"/>
<source>right key pressed</source>
<extracomment>The name of the EventType b7e927db-af28-4fdc-8eb7-edb02258ff5a of deviceClass SensorTag</extracomment>
<extracomment>The name of the EventType b7e927db-af28-4fdc-8eb7-edb02258ff5a of deviceClass Sensor Tag</extracomment>
<translation>Rechte Taste gedrückt</translation>
</message>
</context>

80
plugins/deviceplugins/multisensor/translations/en_US.ts
View File

@ -4,105 +4,117 @@
<context>
<name>MultiSensor</name>
<message>
<location filename="../../../../../build-guh-Desktop-Debug/plugins/deviceplugins/multisensor/plugininfo.h" line="46"/>
<location filename="../../../../../build-guh-Desktop-Debug/plugins/deviceplugins/multisensor/plugininfo.h" line="49"/>
<source>MultiSensor</source>
<extracomment>The name of the plugin MultiSensor (23bf0d8d-df7d-4bee-80ee-f015c5a7f52e)</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../../build-guh-Desktop-Debug/plugins/deviceplugins/multisensor/plugininfo.h" line="49"/>
<location filename="../../../../../build-guh-Desktop-Debug/plugins/deviceplugins/multisensor/plugininfo.h" line="52"/>
<source>Texas Instruments</source>
<extracomment>The name of the vendor (2edf543e-dc2c-4693-bb0c-e76c0d305fad)</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../../build-guh-Desktop-Debug/plugins/deviceplugins/multisensor/plugininfo.h" line="52"/>
<source>SensorTag</source>
<location filename="../../../../../build-guh-Desktop-Debug/plugins/deviceplugins/multisensor/plugininfo.h" line="55"/>
<source>Sensor Tag</source>
<extracomment>The name of the DeviceClass (158a06b6-b27f-4951-957e-6f1e3b44f604)</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../../build-guh-Desktop-Debug/plugins/deviceplugins/multisensor/plugininfo.h" line="55"/>
<source>name</source>
<extracomment>The name of the paramType (bdb9d684-2f98-45f5-889c-f184c1e73dc7) of SensorTag</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../../build-guh-Desktop-Debug/plugins/deviceplugins/multisensor/plugininfo.h" line="58"/>
<source>mac address</source>
<extracomment>The name of the paramType (d51ed68e-c84a-4136-a5b5-be2f95fd5a0f) of SensorTag</extracomment>
<source>name</source>
<extracomment>The name of the paramType (bdb9d684-2f98-45f5-889c-f184c1e73dc7) of Sensor Tag</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../../build-guh-Desktop-Debug/plugins/deviceplugins/multisensor/plugininfo.h" line="61"/>
<source>available changed</source>
<extracomment>The name of the autocreated EventType (a9629b11-0f34-47f0-a0f0-f758a6aec2b4)</extracomment>
<source>mac address</source>
<extracomment>The name of the paramType (d51ed68e-c84a-4136-a5b5-be2f95fd5a0f) of Sensor Tag</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../../build-guh-Desktop-Debug/plugins/deviceplugins/multisensor/plugininfo.h" line="64"/>
<source>available</source>
<extracomment>The name of the ParamType of StateType (a9629b11-0f34-47f0-a0f0-f758a6aec2b4) of DeviceClass SensorTag</extracomment>
<source>connected changed</source>
<extracomment>The name of the autocreated EventType (a9629b11-0f34-47f0-a0f0-f758a6aec2b4)</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../../build-guh-Desktop-Debug/plugins/deviceplugins/multisensor/plugininfo.h" line="67"/>
<source>connected</source>
<extracomment>The name of the ParamType of StateType (a9629b11-0f34-47f0-a0f0-f758a6aec2b4) of DeviceClass Sensor Tag</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../../build-guh-Desktop-Debug/plugins/deviceplugins/multisensor/plugininfo.h" line="70"/>
<source>IR temperature changed</source>
<extracomment>The name of the autocreated EventType (c664e9ec-a045-49ba-add1-1642ceba7c4f)</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../../build-guh-Desktop-Debug/plugins/deviceplugins/multisensor/plugininfo.h" line="70"/>
<location filename="../../../../../build-guh-Desktop-Debug/plugins/deviceplugins/multisensor/plugininfo.h" line="73"/>
<source>IR temperature</source>
<extracomment>The name of the ParamType of StateType (c664e9ec-a045-49ba-add1-1642ceba7c4f) of DeviceClass SensorTag</extracomment>
<extracomment>The name of the ParamType of StateType (c664e9ec-a045-49ba-add1-1642ceba7c4f) of DeviceClass Sensor Tag</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../../build-guh-Desktop-Debug/plugins/deviceplugins/multisensor/plugininfo.h" line="73"/>
<location filename="../../../../../build-guh-Desktop-Debug/plugins/deviceplugins/multisensor/plugininfo.h" line="76"/>
<source>humidity changed</source>
<extracomment>The name of the autocreated EventType (e83a50ff-96c9-4b6d-889f-f4238353e794)</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../../build-guh-Desktop-Debug/plugins/deviceplugins/multisensor/plugininfo.h" line="76"/>
<location filename="../../../../../build-guh-Desktop-Debug/plugins/deviceplugins/multisensor/plugininfo.h" line="79"/>
<source>humidity</source>
<extracomment>The name of the ParamType of StateType (e83a50ff-96c9-4b6d-889f-f4238353e794) of DeviceClass SensorTag</extracomment>
<extracomment>The name of the ParamType of StateType (e83a50ff-96c9-4b6d-889f-f4238353e794) of DeviceClass Sensor Tag</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../../build-guh-Desktop-Debug/plugins/deviceplugins/multisensor/plugininfo.h" line="79"/>
<location filename="../../../../../build-guh-Desktop-Debug/plugins/deviceplugins/multisensor/plugininfo.h" line="82"/>
<source>temperature changed</source>
<extracomment>The name of the autocreated EventType (8359ada9-df1c-4e60-bb87-9e21d05ee2e2)</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../../build-guh-Desktop-Debug/plugins/deviceplugins/multisensor/plugininfo.h" line="82"/>
<location filename="../../../../../build-guh-Desktop-Debug/plugins/deviceplugins/multisensor/plugininfo.h" line="85"/>
<source>temperature</source>
<extracomment>The name of the ParamType of StateType (8359ada9-df1c-4e60-bb87-9e21d05ee2e2) of DeviceClass SensorTag</extracomment>
<extracomment>The name of the ParamType of StateType (8359ada9-df1c-4e60-bb87-9e21d05ee2e2) of DeviceClass Sensor Tag</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../../build-guh-Desktop-Debug/plugins/deviceplugins/multisensor/plugininfo.h" line="85"/>
<location filename="../../../../../build-guh-Desktop-Debug/plugins/deviceplugins/multisensor/plugininfo.h" line="88"/>
<source>pressure changed</source>
<extracomment>The name of the autocreated EventType (645633ad-77d4-45b2-8be8-d6ca7a12eb7a)</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../../build-guh-Desktop-Debug/plugins/deviceplugins/multisensor/plugininfo.h" line="88"/>
<source>pressure</source>
<extracomment>The name of the ParamType of StateType (645633ad-77d4-45b2-8be8-d6ca7a12eb7a) of DeviceClass SensorTag</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../../build-guh-Desktop-Debug/plugins/deviceplugins/multisensor/plugininfo.h" line="91"/>
<source>left key pressed</source>
<extracomment>The name of the EventType 61478490-bed0-4fed-9d58-f13c35b4f220 of deviceClass SensorTag</extracomment>
<source>pressure</source>
<extracomment>The name of the ParamType of StateType (645633ad-77d4-45b2-8be8-d6ca7a12eb7a) of DeviceClass Sensor Tag</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../../build-guh-Desktop-Debug/plugins/deviceplugins/multisensor/plugininfo.h" line="94"/>
<source>moving changed</source>
<extracomment>The name of the autocreated EventType (4be5ca26-0565-419d-b18b-2a5a385d2a3d)</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../../build-guh-Desktop-Debug/plugins/deviceplugins/multisensor/plugininfo.h" line="97"/>
<source>moving</source>
<extracomment>The name of the ParamType of StateType (4be5ca26-0565-419d-b18b-2a5a385d2a3d) of DeviceClass Sensor Tag</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../../build-guh-Desktop-Debug/plugins/deviceplugins/multisensor/plugininfo.h" line="100"/>
<source>left key pressed</source>
<extracomment>The name of the EventType 61478490-bed0-4fed-9d58-f13c35b4f220 of deviceClass Sensor Tag</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../../../../build-guh-Desktop-Debug/plugins/deviceplugins/multisensor/plugininfo.h" line="103"/>
<source>right key pressed</source>
<extracomment>The name of the EventType b7e927db-af28-4fdc-8eb7-edb02258ff5a of deviceClass SensorTag</extracomment>
<extracomment>The name of the EventType b7e927db-af28-4fdc-8eb7-edb02258ff5a of deviceClass Sensor Tag</extracomment>
<translation type="unfinished"></translation>
</message>
</context>

12
plugins/deviceplugins/senic/nuimo.cpp
View File

@ -421,17 +421,27 @@ void Nuimo::serviceError(const QLowEnergyService::ServiceError &error)
case QLowEnergyService::OperationError:
errorString = "Operation error";
break;
case QLowEnergyService::CharacteristicReadError:
errorString = "Characteristic read error";
break;
case QLowEnergyService::CharacteristicWriteError:
errorString = "Characteristic write error";
break;
case QLowEnergyService::DescriptorReadError:
errorString = "Descriptor read error";
break;
case QLowEnergyService::DescriptorWriteError:
errorString = "Descriptor write error";
break;
case QLowEnergyService::UnknownError:
errorString = "Unknown error";
break;
default:
errorString = "Unknown error";
break;
}
qCWarning(dcSenic()) << "Service of " << name() << address().toString() << ":" << errorString;
qCWarning(dcSenic()) << "Service error of" << name() << address().toString() << ":" << errorString;
}
#endif // BLUETOOTH_LE