From 325ab03e24f3a4f6de251bf40810130f6592db05 Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Mon, 28 Jan 2019 17:13:37 +0100 Subject: [PATCH] Add MicrSiementsPerCentimeter unit support --- libnymea-app-core/jsonrpc/jsontypes.cpp | 2 ++ libnymea-common/types/types.h | 1 + 2 files changed, 3 insertions(+) diff --git a/libnymea-app-core/jsonrpc/jsontypes.cpp b/libnymea-app-core/jsonrpc/jsontypes.cpp index 890166c6..da50bcd6 100644 --- a/libnymea-app-core/jsonrpc/jsontypes.cpp +++ b/libnymea-app-core/jsonrpc/jsontypes.cpp @@ -583,6 +583,8 @@ QPair JsonTypes::stringToUnit(const QString &unitString) return QPair(Types::UnitPercentage, "%"); } else if (unitString == "UnitPartsPerMillion") { return QPair(Types::UnitPartsPerMillion, "ppm"); + } else if (unitString == "UnitMicroSiemensPerCentimeter") { + return QPair(Types::UnitMicroSiemensPerCentimeter, "µS/cm"); } else if (unitString == "UnitEuro") { return QPair(Types::UnitEuro, "€"); } else if (unitString == "UnitDollar") { diff --git a/libnymea-common/types/types.h b/libnymea-common/types/types.h index 0434925e..2be14b27 100644 --- a/libnymea-common/types/types.h +++ b/libnymea-common/types/types.h @@ -83,6 +83,7 @@ public: UnitKiloWattHour, UnitPercentage, UnitPartsPerMillion, + UnitMicroSiemensPerCentimeter, UnitEuro, UnitDollar };