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

Herz has been fixed to Hertz in the core

Browse Source
This commit is contained in:
Michael Zanetti 2019-09-20 16:03:55 +02:00
parent 2255f99d70
commit 7fef809804
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

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

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

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