Add new units and bump json api version

pull/135/head
Simon Stürz 2018-08-14 11:31:37 +02:00 committed by Michael Zanetti
parent 0f56846ffd
commit f9343534f4
4 changed files with 16 additions and 4 deletions

View File

@ -301,6 +301,14 @@
\li Types::UnitAmpereHour
\li 48
\li The value of the \l{Param} has unit \tt {[Ah]} \unicode{0x2192} ampere hour.
\row
\li Types::UnitMicroSiemensPerCentimeter
\li 49
\li The value of the \l{Param} has unit \tt {[μS/cm]} \unicode{0x2192} microsiemens per centimeter (conductivity).
\row
\li Types::UnitDuration
\li 50
\li The value of the \l{Param} has unit \tt {[ms]} \unicode{0x2192} milliseconds and represents a duration.
\endtable
\chapter UUID Types

View File

@ -129,7 +129,9 @@ public:
UnitMilliVolt,
UnitVoltAmpere,
UnitVoltAmpereReactive,
UnitAmpereHour
UnitAmpereHour,
UnitMicroSiemensPerCentimeter,
UnitDuration
};
Q_ENUM(Unit)

View File

@ -6,7 +6,7 @@ NYMEA_PLUGINS_PATH=/usr/lib/$$system('dpkg-architecture -q DEB_HOST_MULTIARCH')/
# define protocol versions
JSON_PROTOCOL_VERSION_MAJOR=1
JSON_PROTOCOL_VERSION_MINOR=7
JSON_PROTOCOL_VERSION_MINOR=8
REST_API_VERSION=1
DEFINES += NYMEA_VERSION_STRING=\\\"$${NYMEA_VERSION_STRING}\\\" \

View File

@ -1,4 +1,4 @@
1.7
1.8
{
"methods": {
"Actions.ExecuteAction": {
@ -1565,7 +1565,9 @@
"UnitMilliVolt",
"UnitVoltAmpere",
"UnitVoltAmpereReactive",
"UnitAmpereHour"
"UnitAmpereHour",
"UnitMicroSiemensPerCentimeter",
"UnitDuration"
],
"UserError": [
"UserErrorNoError",