rename 'getPowerOutputWatts' to 'getOutputPowerWatts'

hoylabs · Dec 4, 2024 · a7615d1 · a7615d1
1 parent ba4083b
commit a7615d1
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 10 deletions.
diff --git a/include/SolarCharger.h b/include/SolarCharger.h
@@ -19,7 +19,7 @@ class SolarChargerClass {
     uint32_t getDataAgeMillis(size_t idx);
 
     // total output of all MPPT charge controllers in Watts
-    int32_t getPowerOutputWatts();
+    int32_t getOutputPowerWatts();
 
     // total panel input power of all MPPT charge controllers in Watts
     int32_t getPanelPowerWatts();

diff --git a/include/SolarChargerProvider.h b/include/SolarChargerProvider.h
@@ -20,7 +20,7 @@ class SolarChargerProvider {
     virtual uint32_t getDataAgeMillis() const = 0;
     virtual uint32_t getDataAgeMillis(size_t idx) const = 0;
     // total output of all MPPT charge controllers in Watts
-    virtual int32_t getPowerOutputWatts() const = 0;
+    virtual int32_t getOutputPowerWatts() const = 0;
 
     // total panel input power of all MPPT charge controllers in Watts
     virtual int32_t getPanelPowerWatts() const = 0;

diff --git a/include/VictronMppt.h b/include/VictronMppt.h
@@ -3,11 +3,11 @@
 
 #include <mutex>
 #include <memory>
+#include <TaskSchedulerDeclarations.h>
 
-#include "VeDirectMpptController.h"
 #include "SolarChargerProvider.h"
+#include "VeDirectMpptController.h"
 #include "Configuration.h"
-#include <TaskSchedulerDeclarations.h>
 
 class VictronMppt : public SolarChargerProvider {
 public:
@@ -29,7 +29,7 @@ class VictronMppt : public SolarChargerProvider {
     std::optional<VeDirectMpptController::data_t> getData(size_t idx = 0) const final;
 
     // total output of all MPPT charge controllers in Watts
-    int32_t getPowerOutputWatts() const final;
+    int32_t getOutputPowerWatts() const final;
 
     // total panel input power of all MPPT charge controllers in Watts
     int32_t getPanelPowerWatts() const final;

diff --git a/src/PowerLimiter.cpp b/src/PowerLimiter.cpp
@@ -426,7 +426,7 @@ void PowerLimiterClass::fullSolarPassthrough(PowerLimiterClass::Status reason)
     uint16_t targetOutput = 0;
 
     if (SolarCharger.isDataValid()) {
-        targetOutput = static_cast<uint16_t>(std::max<int32_t>(0, SolarCharger.getPowerOutputWatts()));
+        targetOutput = static_cast<uint16_t>(std::max<int32_t>(0, SolarCharger.getOutputPowerWatts()));
         targetOutput = dcPowerBusToInverterAc(targetOutput);
     }
 
@@ -682,7 +682,7 @@ uint16_t PowerLimiterClass::getSolarPassthroughPower()
         return 0;
     }
 
-    return SolarCharger.getPowerOutputWatts();
+    return SolarCharger.getOutputPowerWatts();
 }
 
 float PowerLimiterClass::getBatteryInvertersOutputAcWatts()

diff --git a/src/SolarCharger.cpp b/src/SolarCharger.cpp
@@ -97,12 +97,12 @@ uint32_t SolarChargerClass::getDataAgeMillis(size_t idx)
 
 
 // total output of all MPPT charge controllers in Watts
-int32_t SolarChargerClass::getPowerOutputWatts()
+int32_t SolarChargerClass::getOutputPowerWatts()
 {
     std::lock_guard<std::mutex> lock(_mutex);
 
     if (_upProvider) {
-        return _upProvider->getPowerOutputWatts();
+        return _upProvider->getOutputPowerWatts();
     }
 
     return 0;

diff --git a/src/VictronMppt.cpp b/src/VictronMppt.cpp
@@ -128,7 +128,7 @@ std::optional<VeDirectMpptController::data_t> VictronMppt::getData(size_t idx) c
     return _controllers[idx]->getData();
 }
 
-int32_t VictronMppt::getPowerOutputWatts() const
+int32_t VictronMppt::getOutputPowerWatts() const
 {
     int32_t sum = 0;