ETM-Schurig/powersync-core
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge PR #268: Add units: newton, newtonmeter and rpm

Browse Source
This commit is contained in:
Jenkins nymea 2020-02-23 23:38:29 +01:00
commit 59747e03c1
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libnymea/typeutils.h
View File

@ -138,7 +138,10 @@ public:
UnitVoltAmpereReactive, UnitVoltAmpereReactive,
UnitAmpereHour, UnitAmpereHour,
UnitMicroSiemensPerCentimeter, UnitMicroSiemensPerCentimeter,
UnitDuration UnitDuration,
UnitNewton,
UnitNewtonMeter,
UnitRpm
}; };
Q_ENUM(Unit) Q_ENUM(Unit)

2
nymea.pro
View File

@ -8,7 +8,7 @@ JSON_PROTOCOL_VERSION_MAJOR=4
JSON_PROTOCOL_VERSION_MINOR=2 JSON_PROTOCOL_VERSION_MINOR=2
JSON_PROTOCOL_VERSION="$${JSON_PROTOCOL_VERSION_MAJOR}.$${JSON_PROTOCOL_VERSION_MINOR}" JSON_PROTOCOL_VERSION="$${JSON_PROTOCOL_VERSION_MAJOR}.$${JSON_PROTOCOL_VERSION_MINOR}"
LIBNYMEA_API_VERSION_MAJOR=4 LIBNYMEA_API_VERSION_MAJOR=4
LIBNYMEA_API_VERSION_MINOR=0 LIBNYMEA_API_VERSION_MINOR=1
LIBNYMEA_API_VERSION_PATCH=0 LIBNYMEA_API_VERSION_PATCH=0
LIBNYMEA_API_VERSION="$${LIBNYMEA_API_VERSION_MAJOR}.$${LIBNYMEA_API_VERSION_MINOR}.$${LIBNYMEA_API_VERSION_PATCH}" LIBNYMEA_API_VERSION="$${LIBNYMEA_API_VERSION_MAJOR}.$${LIBNYMEA_API_VERSION_MINOR}.$${LIBNYMEA_API_VERSION_PATCH}"

5
tests/auto/api.json
View File

@ -294,7 +294,10 @@
"UnitVoltAmpereReactive", "UnitVoltAmpereReactive",
"UnitAmpereHour", "UnitAmpereHour",
"UnitMicroSiemensPerCentimeter", "UnitMicroSiemensPerCentimeter",
"UnitDuration" "UnitDuration",
"UnitNewton",
"UnitNewtonMeter",
"UnitRpm"
], ],
"UserError": [ "UserError": [
"UserErrorNoError", "UserErrorNoError",