Merge pull request #234 from reserve85/dev

Fix Mixed Mode, improved Startup-Init

CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## V 1.100
+### script
+* improve startup: init newLimitSetpoint
+
+## V 1.99
+### script
+* fix mixed mode: if setLimit < getminwatt there was an calulation error (results in setLimit = 0).
+
 ## V 1.98
 ### script
 * added a limit cross-check (real DTU Limit is cross-checked vs. Set Limit +/- 5%) (https://github.com/reserve85/HoymilesZeroExport/issues/223)

HoymilesZeroExport.py

@@ -15,7 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 __author__ = "Tobias Kraft"
-__version__ = "1.98"
+__version__ = "1.100"
 
 import time
 from requests.sessions import Session
@@ -181,7 +181,7 @@ def SetLimitMixedModeWithPriority(pLimit):
         SetLimitMixedModeWithPriority.LastLimitAck = True
         min_watt_all_inverters = GetMinWattFromAllInverters()
         if (CastToInt(pLimit) <= min_watt_all_inverters):
-            pLimit = 0 # set only minWatt for every inv.
+            pLimit = min_watt_all_inverters # set only minWatt for every inv.
             PublishGlobalState("limit", min_watt_all_inverters)
         else:
             PublishGlobalState("limit", CastToInt(pLimit))
@@ -191,7 +191,7 @@ def SetLimitMixedModeWithPriority(pLimit):
         if RemainingLimit >= GetMaxInverterWattFromAllNonBatteryInverters():
             nonBatteryInvertersLimit = GetMaxInverterWattFromAllNonBatteryInverters()
         else:
-            nonBatteryInvertersLimit = RemainingLimit
+            nonBatteryInvertersLimit = RemainingLimit - GetMinWattFromAllBatteryInverters()
 
         for i in range(INVERTER_COUNT):
             if not AVAILABLE[i] or HOY_BATTERY_MODE[i]:
@@ -635,6 +635,14 @@ def GetMinWattFromAllInverters():
         minWatt = minWatt + GetMinWatt(i)
     return minWatt
 
+def GetMinWattFromAllBatteryInverters():
+    minWatt = 0
+    for i in range(INVERTER_COUNT):
+        if (not AVAILABLE[i]) or (not HOY_BATTERY_MODE[i]) or (not HOY_BATTERY_GOOD_VOLTAGE[i]):
+            continue
+        minWatt = minWatt + GetMinWatt(i)
+    return minWatt
+
 def GetMixedMode():
     #if battery mode and custom priority use SetLimitWithPriority
     for i in range(INVERTER_COUNT):
@@ -1607,14 +1615,16 @@ def emit(self, record):
 try:
     logger.info("---Init---")
 
-    newLimitSetpoint = 0
     DTU.CheckMinVersion()
     if GetHoymilesAvailable():
         for i in range(INVERTER_COUNT):
             SetHoymilesPowerStatus(i, True)
-        SetLimit(GetMinWattFromAllInverters())
+        newLimitSetpoint = GetMinWattFromAllInverters()
+        SetLimit(newLimitSetpoint)
         GetHoymilesActualPower()
         GetCheckBattery()
+    else:
+        newLimitSetpoint = 0
     GetPowermeterWatts()
 except Exception as e:
     if hasattr(e, 'message'):