cleanup

hoylabs · Jan 12, 2025 · 088c3e0 · 088c3e0
1 parent ef68c79
commit 088c3e0
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 10 deletions.
diff --git a/include/solarcharger/Controller.h b/include/solarcharger/Controller.h
@@ -6,7 +6,6 @@
 #include <TaskSchedulerDeclarations.h>
 #include <solarcharger/Provider.h>
 #include <solarcharger/Stats.h>
-#include <VeDirectMpptController.h>
 
 namespace SolarChargers {
 

diff --git a/include/solarcharger/HassIntegration.h b/include/solarcharger/HassIntegration.h
@@ -2,7 +2,6 @@
 #pragma once
 
 #include <Arduino.h>
-#include <ArduinoJson.h>
 
 namespace SolarChargers {
 

diff --git a/include/solarcharger/Provider.h b/include/solarcharger/Provider.h
@@ -1,8 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 #pragma once
 
-#include <VeDirectMpptController.h>
-
 namespace SolarChargers {
 
 class Stats;

diff --git a/include/solarcharger/victron/Provider.h b/include/solarcharger/victron/Provider.h
@@ -4,10 +4,7 @@
 #include <mutex>
 #include <memory>
 #include <TaskSchedulerDeclarations.h>
-
-#include <Configuration.h>
 #include <solarcharger/Provider.h>
-#include <solarcharger/victron/HassIntegration.h>
 #include <solarcharger/victron/Stats.h>
 #include <VeDirectMpptController.h>
 

diff --git a/include/solarcharger/victron/Stats.h b/include/solarcharger/victron/Stats.h
@@ -42,7 +42,7 @@ class Stats : public ::SolarChargers::Stats {
 
     void populateJsonWithInstanceStats(const JsonObject &root, const VeDirectMpptController::data_t &mpptData) const;
 
-    void publish_mppt_data(const VeDirectMpptController::data_t &mpptData, const VeDirectMpptController::data_t &frame) const;
+    void publishMpptData(const VeDirectMpptController::data_t &mpptData, const VeDirectMpptController::data_t &frame) const;
 };
 
 } // namespace SolarChargers::Victron
diff --git a/src/solarcharger/victron/HassIntegration.cpp b/src/solarcharger/victron/HassIntegration.cpp
@@ -131,6 +131,7 @@ void HassIntegration::publishSensor(const char *caption, const char *icon, const
     publish(configTopic, buffer);
 
 }
+
 void HassIntegration::publishBinarySensor(const char *caption, const char *icon, const char *subTopic,
                                                       const char *payload_on, const char *payload_off,
                                                       const VeDirectMpptController::data_t &mpptData) const

diff --git a/src/solarcharger/victron/Stats.cpp b/src/solarcharger/victron/Stats.cpp
@@ -263,7 +263,7 @@ void Stats::mqttPublish() const
             if (!currentData) { continue; }
 
             auto const& previousData = _previousData[entry.first];
-            publish_mppt_data(*currentData, previousData);
+            publishMpptData(*currentData, previousData);
 
             if (!_PublishFull) {
                 _previousData[entry.first] = *currentData;
@@ -288,7 +288,7 @@ void Stats::mqttPublish() const
     }
 }
 
-void Stats::publish_mppt_data(const VeDirectMpptController::data_t &currentData, const VeDirectMpptController::data_t &previousData) const {
+void Stats::publishMpptData(const VeDirectMpptController::data_t &currentData, const VeDirectMpptController::data_t &previousData) const {
     String value;
     String topic = "victron/";
     topic.concat(currentData.serialNr_SER);