DPL: reduce/increase limits of solar and smart-buffer inverters based on current AC power

Author: AndreasBoehm

src/PowerLimiterOverscalingInverter.cpp

@@ -44,20 +44,8 @@ uint16_t PowerLimiterOverscalingInverter::applyIncrease(uint16_t increase)
     // do not wake inverter up if it would produce too much power
     if (!isProducing() && _config.LowerPowerLimit > increase) { return 0; }
 
-    uint16_t baseline = getCurrentLimitWatts();
-
-    // when overscaling is in use we must not use the current limit
-    // because it might be scaled.
-    if (overscalingEnabled()) {
-        baseline = getCurrentOutputAcWatts();
-    }
-
-    // inverters in standby can have an arbitrary limit, yet
-    // the baseline is 0 in case we are about to wake it up from standby.
-    if (!isProducing()) { baseline = 0; }
-
     auto actualIncrease = std::min(increase, getMaxIncreaseWatts());
-    setAcOutput(baseline + actualIncrease);
+    setAcOutput(getCurrentOutputAcWatts() + actualIncrease);
     return actualIncrease;
 }
 

src/PowerLimiterSmartBufferInverter.cpp

@@ -59,35 +59,29 @@ uint16_t PowerLimiterSmartBufferInverter::applyReduction(uint16_t reduction, boo
 
     if (reduction == 0) { return 0; }
 
-    auto low = std::min(getCurrentLimitWatts(), getCurrentOutputAcWatts());
+    uint16_t currentOutputAcWatts = getCurrentOutputAcWatts();
+
+    auto low = std::min(getCurrentLimitWatts(), currentOutputAcWatts);
     if (low <= _config.LowerPowerLimit) {
         if (allowStandby && _config.AllowStandby) {
             standby();
-            return std::min(reduction, getCurrentOutputAcWatts());
+            return std::min(reduction, currentOutputAcWatts);
         }
         return 0;
     }
 
-    uint16_t baseline = getCurrentLimitWatts();
-
-    // when overscaling is in use we must not use the current limit
-    // because it might be scaled.
-    if (overscalingEnabled()) {
-        baseline = getCurrentOutputAcWatts();
-    }
-
-    if ((baseline - _config.LowerPowerLimit) >= reduction) {
-        setAcOutput(baseline - reduction);
+    if ((currentOutputAcWatts - _config.LowerPowerLimit) >= reduction) {
+        setAcOutput(currentOutputAcWatts - reduction);
         return reduction;
     }
 
     if (allowStandby && _config.AllowStandby) {
         standby();
-        return std::min(reduction, getCurrentOutputAcWatts());
+        return std::min(reduction, currentOutputAcWatts);
     }
 
     setAcOutput(_config.LowerPowerLimit);
-    return getCurrentOutputAcWatts() - _config.LowerPowerLimit;
+    return currentOutputAcWatts - _config.LowerPowerLimit;
 }
 
 uint16_t PowerLimiterSmartBufferInverter::standby()

src/PowerLimiterSolarInverter.cpp

@@ -108,21 +108,15 @@ uint16_t PowerLimiterSolarInverter::applyReduction(uint16_t reduction, bool)
 
     if (reduction == 0) { return 0; }
 
-    uint16_t baseline = getCurrentLimitWatts();
+    uint16_t currentOutputAcWatts = getCurrentOutputAcWatts();
 
-    // when overscaling is in use we must not use the current limit
-    // because it might be scaled.
-    if (overscalingEnabled()) {
-        baseline = getCurrentOutputAcWatts();
-    }
-
-    if ((baseline - _config.LowerPowerLimit) >= reduction) {
-        setAcOutput(baseline - reduction);
+    if ((currentOutputAcWatts - _config.LowerPowerLimit) >= reduction) {
+        setAcOutput(currentOutputAcWatts - reduction);
         return reduction;
     }
 
     setAcOutput(_config.LowerPowerLimit);
-    return getCurrentOutputAcWatts() - _config.LowerPowerLimit;
+    return currentOutputAcWatts - _config.LowerPowerLimit;
 }
 
 uint16_t PowerLimiterSolarInverter::standby()