mirror of https://github.com/nymea/nymea.git
Add new units and bump json api version
parent
0f56846ffd
commit
f9343534f4
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -129,7 +129,9 @@ public:
|
|||
UnitMilliVolt,
|
||||
UnitVoltAmpere,
|
||||
UnitVoltAmpereReactive,
|
||||
UnitAmpereHour
|
||||
UnitAmpereHour,
|
||||
UnitMicroSiemensPerCentimeter,
|
||||
UnitDuration
|
||||
};
|
||||
Q_ENUM(Unit)
|
||||
|
||||
|
|
|
|||
|
|
@ -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}\\\" \
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
1.7
|
||||
1.8
|
||||
{
|
||||
"methods": {
|
||||
"Actions.ExecuteAction": {
|
||||
|
|
@ -1565,7 +1565,9 @@
|
|||
"UnitMilliVolt",
|
||||
"UnitVoltAmpere",
|
||||
"UnitVoltAmpereReactive",
|
||||
"UnitAmpereHour"
|
||||
"UnitAmpereHour",
|
||||
"UnitMicroSiemensPerCentimeter",
|
||||
"UnitDuration"
|
||||
],
|
||||
"UserError": [
|
||||
"UserErrorNoError",
|
||||
|
|
|
|||
Loading…
Reference in New Issue