From 33683d26c88e27456f96320bc2ff8924964558d8 Mon Sep 17 00:00:00 2001 From: Bernhard Kirchen Date: Wed, 8 May 2024 11:15:36 +0200 Subject: [PATCH] powermeter refactor: rename providers in enum the enum values did not change, but their name (only relevant in the code) are now more expressive. --- include/PowerMeterProvider.h | 6 +++--- src/PowerMeter.cpp | 6 +++--- src/WebApi_powermeter.cpp | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/PowerMeterProvider.h b/include/PowerMeterProvider.h index 9fb74c78..d3e02f80 100644 --- a/include/PowerMeterProvider.h +++ b/include/PowerMeterProvider.h @@ -11,10 +11,10 @@ public: MQTT = 0, SDM1PH = 1, SDM3PH = 2, - HTTP = 3, - SML = 4, + HTTP_JSON = 3, + SERIAL_SML = 4, SMAHM2 = 5, - TIBBER = 6 + HTTP_SML = 6 }; // returns true if the provider is ready for use, false otherwise diff --git a/src/PowerMeter.cpp b/src/PowerMeter.cpp index 8212529b..37c3ab34 100644 --- a/src/PowerMeter.cpp +++ b/src/PowerMeter.cpp @@ -41,16 +41,16 @@ void PowerMeterClass::updateSettings() case PowerMeterProvider::Type::SDM3PH: _upProvider = std::make_unique(); break; - case PowerMeterProvider::Type::HTTP: + case PowerMeterProvider::Type::HTTP_JSON: _upProvider = std::make_unique(); break; - case PowerMeterProvider::Type::SML: + case PowerMeterProvider::Type::SERIAL_SML: _upProvider = std::make_unique(); break; case PowerMeterProvider::Type::SMAHM2: _upProvider = std::make_unique(); break; - case PowerMeterProvider::Type::TIBBER: + case PowerMeterProvider::Type::HTTP_SML: _upProvider = std::make_unique(); break; } diff --git a/src/WebApi_powermeter.cpp b/src/WebApi_powermeter.cpp index c6cf373f..92b56d89 100644 --- a/src/WebApi_powermeter.cpp +++ b/src/WebApi_powermeter.cpp @@ -128,7 +128,7 @@ void WebApiPowerMeterClass::onAdminPost(AsyncWebServerRequest* request) return; } - if (static_cast(root["source"].as()) == PowerMeterProvider::Type::HTTP) { + if (static_cast(root["source"].as()) == PowerMeterProvider::Type::HTTP_JSON) { JsonArray http_phases = root["http_phases"]; for (uint8_t i = 0; i < http_phases.size(); i++) { JsonObject phase = http_phases[i].as(); @@ -174,7 +174,7 @@ void WebApiPowerMeterClass::onAdminPost(AsyncWebServerRequest* request) } } - if (static_cast(root["source"].as()) == PowerMeterProvider::Type::TIBBER) { + if (static_cast(root["source"].as()) == PowerMeterProvider::Type::HTTP_SML) { JsonObject tibber = root["tibber"]; if (!tibber.containsKey("url")