Fixed enum. Fixed config typo.

added some vars for future BMS IMBALANCE fault codes.
thankthemaker · Oct 15, 2023 · ef854ff · ef854ff
1 parent 70ee05e
commit ef854ff
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 13 deletions.
diff --git a/src/AppConfiguration.cpp b/src/AppConfiguration.cpp
@@ -62,7 +62,7 @@ boolean AppConfiguration::readPreferences() {
     config.ledFrequency = doc["ledFrequency"] | "KHZ800";
     config.lightBarLedFrequency = doc["lightBarLedFrequency"] | "KHZ800";
     config.isLightBarReversed = doc["isLightBarReversed"] | false;
-    config.isLightBarReversed = doc["isLightBarLedTypeDifferent"] | false;
+    config.isLightBarLedTypeDifferent = doc["isLightBarLedTypeDifferent"] | false;
     config.idleLightTimeout = doc["idleLightTimeout"] | 60000;
     config.mallGrab = doc["mallGrab"] | false;
     config.logLevel = doc["logLevel"] | Logger::SILENT;

diff --git a/src/BMSController.cpp b/src/BMSController.cpp
@@ -8,7 +8,10 @@
 #define BMS_ON_PIN 16 
 #endif
 
-BMSController::BMSController() {}
+BMSController::BMSController(VescData *vescData) 
+{
+  this->vescData = vescData;
+}
 
 void BMSController::init(CanBus* canbus) {
   canbus_=canbus;
@@ -70,7 +73,6 @@ void BMSController::broadcastVESCBMS()
 
   canbus_->bmsI(relay->getCurrentMilliamps() / 1000.0f > 0.0f ? relay->getCurrentMilliamps() / 1000.0f : 0.0f);
 
-
   boolean isBalancing;
   boolean isCharging=relay->isCharging();
   if (isCharging && relay->getBmsReportedSOC()>=99)
@@ -126,8 +128,8 @@ void BMSController::broadcastVESCBMS()
 
   if(isBatteryCellOvercharged(cellMillivolts,cellSeries)) fault_state=BMS_FAULT_CODE_CELL_SOFT_OVER_VOLTAGE;
   if(isBatteryCellUndercharged(cellMillivolts,cellSeries)) fault_state=BMS_FAULT_CODE_CELL_SOFT_UNDER_VOLTAGE;
-  //FAULT CODE not yet finalized
-  //if(isBatteryCellImbalanced(cellMillivolts,cellSeries)) fault_state=BMS_FAULT_CODE_CELL_IMBALANCE;
+  //if(batteryCellVariance(cellMillivolts,cellSeries)>=cellMaxVarianceSoft) fault_state=BMS_FAULT_CODE_CELL_SOFT_IMBALANCE;
+  //if(batteryCellVariance(cellMillivolts,cellSeries)>=cellMaxVarianceHard) fault_state=BMS_FAULT_CODE_CELL_HARD_IMBALANCE;
   if(isBatteryCellTempMax(thermTemps,cellThermistors)) fault_state = (isCharging) ? BMS_FAULT_CODE_CHARGE_OVER_TEMP_CELLS : BMS_FAULT_CODE_DISCHARGE_OVER_TEMP_CELLS;
   if(isBatteryCellTempMin(thermTemps,cellThermistors)) fault_state = (isCharging) ? BMS_FAULT_CODE_CHARGE_UNDER_TEMP_CELLS : BMS_FAULT_CODE_DISCHARGE_UNDER_TEMP_CELLS;
   const int8_t bmsTemp=thermTemps[4];
@@ -156,7 +158,7 @@ boolean BMSController::isBatteryCellUndercharged(const uint16_t* cellMillivolts,
   return false;
 }
 
-boolean BMSController::isBatteryCellImbalanced(const uint16_t* cellMillivolts, int numCells)
+float BMSController::batteryCellVariance(const uint16_t* cellMillivolts, int numCells)
 {
     // Calculate the mean
     float sum = 0.0;
@@ -172,8 +174,7 @@ boolean BMSController::isBatteryCellImbalanced(const uint16_t* cellMillivolts, i
     }
     variance /= numCells;
 
-    if(variance>=cellMaxVariance) return true;
-    return false;
+    return variance;
 }
 
 boolean BMSController::isBatteryCellTempMax(const int8_t* thermTemps, int temp_max)

diff --git a/src/BMSController.h b/src/BMSController.h
@@ -6,13 +6,16 @@
 #include "settings.h"
 #include "ArduinoJson.h"
 #include "CanBus.h"
+#include "VescData.h"
+#include "VescCanConstants.h"
 
 //https://github.com/lolwheel/Owie/commit/8f10e0897eda7f6e3ca40afeaff909a97b9f7751
 
 // UART RX is connected to the *BMS* White line for OneWheel Pint.
 class BMSController {
 public:
-    BMSController();
+    BMSController(VescData *vescData);
+    VescData *vescData;
     void init(CanBus*);
     void loop();
     BmsRelay *relay;
@@ -29,7 +32,7 @@ class BMSController {
 
     boolean isBatteryCellOvercharged(const uint16_t*, int);
     boolean isBatteryCellUndercharged(const uint16_t*, int);
-    boolean isBatteryCellImbalanced(const uint16_t*, int);
+    float batteryCellVariance(const uint16_t*, int);
     boolean isBatteryCellTempMax(const int8_t*, int);
     boolean isBatteryCellTempMin(const int8_t*, int);
     boolean isBMSTempMax(const int8_t);
@@ -57,5 +60,7 @@ class BMSController {
     float cellTempMin=10;
     float bmsTempMax=60;
     float bmsTempMin=10;
-    float cellMaxVariance=0.0001;
+    float cellMaxVarianceSoft=0.00001f;
+    float cellMaxVarianceHard=0.00005f;
+    boolean chargeOnly=true;
 };
diff --git a/src/ILedController.h b/src/ILedController.h
@@ -8,7 +8,7 @@
 #define LOG_TAG_LED "ILedController"
 
 // Pattern types supported:
-enum  Pattern { NONE, RAINBOW_CYCLE, TRANS_PRIDE, THEATER_CHASE, COLOR_WIPE, CYLON, FADE, RESCUE_FLASH_LIGHT, PULSE, SLIDE, BATTERY_INDICATOR};
+enum  Pattern { NONE, RAINBOW_CYCLE, THEATER_CHASE, COLOR_WIPE, CYLON, FADE, RESCUE_FLASH_LIGHT, PULSE, SLIDE, BATTERY_INDICATOR, TRANS_PRIDE};
 // Patern directions supported:
 enum  Direction { FORWARD, REVERSE };
 

diff --git a/src/main.cpp b/src/main.cpp
@@ -51,7 +51,7 @@ LightBarController *lightbar = new LightBarController();
 void localLogger(Logger::Level level, const char *module, const char *message);
 
 #if defined(CANBUS_ENABLED) && defined(BMS_TX_PIN) && defined(BMS_ON_PIN)
-  BMSController *bmsController = new BMSController();
+  BMSController *bmsController = new BMSController(&vescData);
 #endif
 
 void setup() {