Fixed Autobalancer

shining-man · May 3, 2024 · 60ec2dc · 60ec2dc
1 parent 5a1a1e9
commit 60ec2dc
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/include/defines.h b/include/defines.h
@@ -9,7 +9,7 @@
 #include "params_dt.h"
 #include "bscTime.h"
 
-#define BSC_SW_VERSION      "V0.5.16"
+#define BSC_SW_VERSION      "V0.5.17"
 
 static const char COMPILE_DATE_TIME[] = "";
 

diff --git a/include/webpages.h b/include/webpages.h
@@ -26,7 +26,7 @@ const char htmlPageRoot[] PROGMEM = "<!DOCTYPE HTML>"
 "</head>"
 "<body>"
   "<div class='topnav'>"
-    "<span class='hl'>Battery Safety Controller&nbsp;&nbsp;&nbsp;V0.5.16</span>"
+    "<span class='hl'>Battery Safety Controller&nbsp;&nbsp;&nbsp;V0.5.17</span>"
   "</div>"
   "<div class='content'>"
     "<div class='cards'>"

diff --git a/src/inverter/ChargeVoltageCtrl.cpp b/src/inverter/ChargeVoltageCtrl.cpp
@@ -65,14 +65,12 @@ namespace nsChargeVoltageCtrl
         uint16_t u16_lMaxCellDiffVoltage = BmsDataUtils::getMaxCellDifferenceFromBms(inverterData.u8_bmsDatasource, inverterData.u16_bmsDatasourceAdd);
         if(u16_lMaxCellDiffVoltage>u16_lDeltaCellVoltage)
         {
-          u16_lDynamicChargeVoltage-=1; //1=100mV
-          if(u16_lDynamicChargeVoltage<0)u16_lDynamicChargeVoltage=0;
+          if (u16_lDynamicChargeVoltage > 0) u16_lDynamicChargeVoltage -= 1; //1=100mV
           return u16_lDynamicChargeVoltage;
         }
         else if(u16_lMaxCellDiffVoltage<u16_lDeltaCellVoltage)
         {
-          u16_lDynamicChargeVoltage+=1; //1=100mV
-          if(u16_lDynamicChargeVoltage>u16_lChargeVoltage)u16_lDynamicChargeVoltage=u16_lChargeVoltage;
+          if(u16_lDynamicChargeVoltage < u16_lChargeVoltage) u16_lDynamicChargeVoltage += 1; //1=100mV
           return u16_lDynamicChargeVoltage;
         }
       }
@@ -156,7 +154,8 @@ namespace nsChargeVoltageCtrl
       // Überprüfen ob Chargevoltage erreicht
       if(inverterData.autobalanceVoltageErreichtTime == 0)
       { 
-        if(inverterData.batteryVoltage >= (u16_lChargeVoltage - u16_lChargeVoltage/100)) 
+        // Der Wert u16_lChargeVoltage muss x10 genommen werden, damit er dem Wert batteryVoltage entspricht
+        if(inverterData.batteryVoltage >= ((u16_lChargeVoltage - u16_lChargeVoltage/100)*10)) 
         {
          inverterData.autobalanceVoltageErreichtTime = millis();
          if(inverterData.autobalanceVoltageErreichtTime == 0) inverterData.autobalanceVoltageErreichtTime++;
@@ -188,7 +187,8 @@ namespace nsChargeVoltageCtrl
       } 
       else
       { 
-        if(inverterData.batteryVoltage >= (u16_lChargeVoltage - u16_lChargeVoltage/100)) 
+        // Der Wert u16_lChargeVoltage muss x10 genommen werden, damit er dem Wert batteryVoltage entspricht
+        if(inverterData.batteryVoltage >= ((u16_lChargeVoltage - u16_lChargeVoltage/100)*10)) 
         {
           inverterData.autobalanceVoltageErreichtTime = millis();
           if(inverterData.autobalanceVoltageErreichtTime == 0) inverterData.autobalanceVoltageErreichtTime++;

diff --git a/src/inverter/InverterBattery.cpp b/src/inverter/InverterBattery.cpp
@@ -105,7 +105,7 @@ namespace nsInverterBattery
       }
       else
       {
-        return (int16_t)(getBmsTempature(inverterData.u8_bmsDatasource,0)*10); //Im Fehlerfall immer Sensor 0 des BMS nehmen
+        return (int16_t)(getBmsTempature(inverterData.u8_bmsDatasource,0)); //Im Fehlerfall immer Sensor 0 des BMS nehmen
       }
     }
     else if(u8_lBmsTempQuelle==2)