patrick/OpenDTU-old
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

powermeter refactor: rename providers in enum

Browse Source 
the enum values did not change, but their name (only relevant in the
code) are now more expressive.
This commit is contained in:
Bernhard Kirchen 2024-05-08 11:15:36 +02:00
parent 2397e5cdf5
commit 33683d26c8
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/PowerMeterProvider.h
View File

@ -11,10 +11,10 @@ public:
MQTT = 0, MQTT = 0,
SDM1PH = 1, SDM1PH = 1,
SDM3PH = 2, SDM3PH = 2,
HTTP = 3, HTTP_JSON = 3,
SML = 4, SERIAL_SML = 4,
SMAHM2 = 5, SMAHM2 = 5,
TIBBER = 6 HTTP_SML = 6
}; };
// returns true if the provider is ready for use, false otherwise // returns true if the provider is ready for use, false otherwise

6
src/PowerMeter.cpp
View File

@ -41,16 +41,16 @@ void PowerMeterClass::updateSettings()
case PowerMeterProvider::Type::SDM3PH: case PowerMeterProvider::Type::SDM3PH:
_upProvider = std::make_unique<PowerMeterSerialSdm>(); _upProvider = std::make_unique<PowerMeterSerialSdm>();
break; break;
case PowerMeterProvider::Type::HTTP: case PowerMeterProvider::Type::HTTP_JSON:
_upProvider = std::make_unique<PowerMeterHttpJson>(); _upProvider = std::make_unique<PowerMeterHttpJson>();
break; break;
case PowerMeterProvider::Type::SML: case PowerMeterProvider::Type::SERIAL_SML:
_upProvider = std::make_unique<PowerMeterSerialSml>(); _upProvider = std::make_unique<PowerMeterSerialSml>();
break; break;
case PowerMeterProvider::Type::SMAHM2: case PowerMeterProvider::Type::SMAHM2:
_upProvider = std::make_unique<PowerMeterUdpSmaHomeManager>(); _upProvider = std::make_unique<PowerMeterUdpSmaHomeManager>();
break; break;
case PowerMeterProvider::Type::TIBBER: case PowerMeterProvider::Type::HTTP_SML:
_upProvider = std::make_unique<PowerMeterHttpSml>(); _upProvider = std::make_unique<PowerMeterHttpSml>();
break; break;
} }

4
src/WebApi_powermeter.cpp
View File

@ -128,7 +128,7 @@ void WebApiPowerMeterClass::onAdminPost(AsyncWebServerRequest* request)
return; return;
} }
if (static_cast<PowerMeterProvider::Type>(root["source"].as<uint8_t>()) == PowerMeterProvider::Type::HTTP) { if (static_cast<PowerMeterProvider::Type>(root["source"].as<uint8_t>()) == PowerMeterProvider::Type::HTTP_JSON) {
JsonArray http_phases = root["http_phases"]; JsonArray http_phases = root["http_phases"];
for (uint8_t i = 0; i < http_phases.size(); i++) { for (uint8_t i = 0; i < http_phases.size(); i++) {
JsonObject phase = http_phases[i].as<JsonObject>(); JsonObject phase = http_phases[i].as<JsonObject>();
@ -174,7 +174,7 @@ void WebApiPowerMeterClass::onAdminPost(AsyncWebServerRequest* request)
} }
} }
if (static_cast<PowerMeterProvider::Type>(root["source"].as<uint8_t>()) == PowerMeterProvider::Type::TIBBER) { if (static_cast<PowerMeterProvider::Type>(root["source"].as<uint8_t>()) == PowerMeterProvider::Type::HTTP_SML) {
JsonObject tibber = root["tibber"]; JsonObject tibber = root["tibber"];
if (!tibber.containsKey("url") if (!tibber.containsKey("url")