implemented requested changes

hoylabs · Oct 18, 2024 · 2bb357e · 2bb357e
1 parent 71f0c18
commit 2bb357e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/lib/Hoymiles/src/inverters/InverterAbstract.cpp b/lib/Hoymiles/src/inverters/InverterAbstract.cpp
@@ -299,7 +299,7 @@ void InverterAbstract::resetRadioStats()
     RadioStats = {};
 }
 
-std::vector<ChannelNum_t> InverterAbstract::getChannels() const
+std::vector<ChannelNum_t> InverterAbstract::getChannelsDC() const
 {
     std::vector<ChannelNum_t> l;
     for (uint8_t i = 0; i < getChannelMetaDataSize(); i++) {
@@ -320,7 +320,7 @@ std::vector<MpptNum_t> InverterAbstract::getMppts() const
     return l;
 }
 
-std::vector<ChannelNum_t> InverterAbstract::getChannelsByMppt(const MpptNum_t mppt) const
+std::vector<ChannelNum_t> InverterAbstract::getChannelsDCByMppt(const MpptNum_t mppt) const
 {
     std::vector<ChannelNum_t> l;
     for (uint8_t i = 0; i < getChannelMetaDataSize(); i++) {

diff --git a/lib/Hoymiles/src/inverters/InverterAbstract.h b/lib/Hoymiles/src/inverters/InverterAbstract.h
@@ -130,8 +130,8 @@ class InverterAbstract {
     SystemConfigParaParser* SystemConfigPara();
 
     std::vector<MpptNum_t> getMppts() const;
-    std::vector<ChannelNum_t> getChannels() const;
-    std::vector<ChannelNum_t> getChannelsByMppt(const MpptNum_t mppt) const;
+    std::vector<ChannelNum_t> getChannelsDC() const;
+    std::vector<ChannelNum_t> getChannelsDCByMppt(const MpptNum_t mppt) const;
 
 protected:
     HoymilesRadio* _radio;

diff --git a/src/PowerLimiterSolarInverter.cpp b/src/PowerLimiterSolarInverter.cpp
@@ -73,7 +73,7 @@ uint16_t PowerLimiterSolarInverter::scaleLimit(uint16_t expectedOutputWatts)
     if (!isProducing()) { return expectedOutputWatts; }
 
     auto pStats = _spInverter->Statistics();
-    std::vector<ChannelNum_t> dcChnls = _spInverter->getChannels();
+    std::vector<ChannelNum_t> dcChnls = _spInverter->getChannelsDC();
     std::vector<MpptNum_t> dcMppts = _spInverter->getMppts();
     size_t dcTotalChnls = dcChnls.size();
     size_t dcTotalMppts = dcMppts.size();
@@ -110,7 +110,7 @@ uint16_t PowerLimiterSolarInverter::scaleLimit(uint16_t expectedOutputWatts)
 
         for (auto& m : dcMppts) {
             float mpptPowerAC = 0.0;
-            std::vector<ChannelNum_t> mpptChnls = _spInverter->getChannelsByMppt(m);
+            std::vector<ChannelNum_t> mpptChnls = _spInverter->getChannelsDCByMppt(m);
 
             for (auto& c : mpptChnls) {
                 mpptPowerAC += pStats->getChannelFieldValue(TYPE_DC, c, FLD_PDC) * inverterEfficiencyFactor;
@@ -169,7 +169,7 @@ uint16_t PowerLimiterSolarInverter::scaleLimit(uint16_t expectedOutputWatts)
     size_t dcProdMppts = 0;
     for (auto& m : dcMppts) {
         float dcPowerMppt = 0.0;
-        std::vector<ChannelNum_t> mpptChnls = _spInverter->getChannelsByMppt(m);
+        std::vector<ChannelNum_t> mpptChnls = _spInverter->getChannelsDCByMppt(m);
 
         for (auto& c : mpptChnls) {
             dcPowerMppt += pStats->getChannelFieldValue(TYPE_DC, c, FLD_PDC);