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

Merge PR #244: Herz has been fixed to Hertz in the core

Browse Source
This commit is contained in:
Simon Stürz 2019-09-27 00:08:43 +02:00
commit 5061b09e98
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libnymea-app-core/jsonrpc/jsontypes.cpp
View File

@ -587,8 +587,10 @@ QPair<Types::Unit, QString> JsonTypes::stringToUnit(const QString &unitString)
return QPair<Types::Unit, QString>(Types::UnitEuro, "€");
} else if (unitString == "UnitDollar") {
return QPair<Types::Unit, QString>(Types::UnitDollar, "$");
} else if (unitString == "UnitHerz") {
return QPair<Types::Unit, QString>(Types::UnitHerz, "Hz");
} else if (unitString == "UnitHerz") { // legacy
return QPair<Types::Unit, QString>(Types::UnitHertz, "Hz");
} else if (unitString == "UnitHertz") {
return QPair<Types::Unit, QString>(Types::UnitHertz, "Hz");
} else if (unitString == "UnitAmpere") {
return QPair<Types::Unit, QString>(Types::UnitAmpere, "A");
} else if (unitString == "UnitMilliAmpere") {

2
libnymea-common/types/types.h
View File

@ -88,7 +88,7 @@ public:
UnitPartsPerMillion,
UnitEuro,
UnitDollar,
UnitHerz,
UnitHertz,
UnitAmpere,
UnitMilliAmpere,
UnitVolt,