new etc constants and bms fault fixes

Author: Mayamelon

BMS/src/main.cpp

@@ -59,7 +59,7 @@ bool checkingPrechargeStatus = false;
 bool checkingShutdownStatus = false;
 
 bool prechargeDone = false;
-bool hasBmsFault = true;
+bool hasBmsFault = false; // assume no fault at start
 bool isCharging = false;
 bool hasFansOn = false;
 bool isBalancing = false;
@@ -127,7 +127,6 @@ int main() {
                 continue; // If not an osEventMessage, continue
             }
             // Status Message unpacking from bmsEvent
-            hasBmsFault = false;
 
 
             maxCellTemp = bmsEvent->maxTemp; // Assign the maxTemp from bmsEvent
@@ -168,6 +167,7 @@ int main() {
                 // Process the bmsState value in bmsEvent
                 case BMSThreadState::BMSStartup:
                     printf("BMS Fault Startup State\n");
+                    hasBmsFault = false;
                     break;
                 case BMSThreadState::BMSIdle:
                     // printf("BMS Fault Idle State\n");
@@ -184,7 +184,6 @@ int main() {
                     break;
                 case BMSThreadState::BMSFaultRecover:
                     printf("BMS Fault Recovery State\n");
-                    hasBmsFault = false;
                     break;
                 case BMSThreadState::BMSFault:
                     printf("*** BMS FAULT ***\n");
@@ -251,7 +250,7 @@ int main() {
         }
 
         bms_fault_pin = !hasBmsFault;
-        bms_fault_inverse_pin = !bms_fault_pin;
+        bms_fault_inverse_pin = hasBmsFault;
 
 
         precharge_control_pin = prechargeDone;
@@ -264,7 +263,7 @@ int main() {
         }
         fan_pwm.write(fan_percent / 100.0);
 
-        printf("shutdown state: %x\n", shutdown_measure_pin.read());
+        // printf("shutdown state: %x\n", shutdown_measure_pin.read());
 
         status_message.bmsFault = hasBmsFault;
         status_message.shutdownState = shutdown_measure_pin.read();
@@ -336,8 +335,8 @@ void initIO() {
     fan_pwm.period_us(40);
     fan_pwm.write(0);
     fan_percent = 0;
-    bms_fault_pin = 1; // assume no fault at start, 1 is no fault
-    bms_fault_inverse_pin = 0; // assume no fault at start, 0 is no fault
+    bms_fault_pin = !hasBmsFault; // assume no fault at start, 1 is no fault
+    bms_fault_inverse_pin = hasBmsFault; // assume no fault at start, 0 is no fault
     precharge_control_pin = 0; // positive AIR open at start
     state_of_charge = 100; // TODO: CHANGE TO ACCOUNT FOR POSSIBLE DISCHARGE
 

ETC/src/etc_controller.h

@@ -94,18 +94,18 @@ class ETCController {
     /** The voltage divider slope for the hall-effect 1 sensor. */
     static constexpr float HE1_SCALE = (330.0f / 480.0f);
     /** The voltage for HE1 corresponding to 0% pedal travel. */
-    static constexpr float HE1_LOW_VOLTAGE = 1.824f;
+    static constexpr float HE1_LOW_VOLTAGE = 0.620f;
     /** The voltage for HE1 corresponding to 100% pedal travel. */
-    static constexpr float HE1_HIGH_VOLTAGE = 2.806f;
+    static constexpr float HE1_HIGH_VOLTAGE = 2.420f;
     /** The difference between the maximum and minimum voltages (100% and 0% travel) for HE1. */
     static constexpr float HE1_RANGE =
         ETCController::HE1_HIGH_VOLTAGE - ETCController::HE1_LOW_VOLTAGE;
     /** The voltage divider slope for the hall-effect 2 sensor. */
     static constexpr float HE2_SCALE = (1.0f / 2.0f);
     /** The voltage for HE2 corresponding to 0% pedal travel. */
-    static constexpr float HE2_LOW_VOLTAGE = 1.449f;
+    static constexpr float HE2_LOW_VOLTAGE = 0.420f;
     /** The voltage for HE2 corresponding to 100% pedal travel. */
-    static constexpr float HE2_HIGH_VOLTAGE = 2.206f;
+    static constexpr float HE2_HIGH_VOLTAGE = 1.830f;
     /** The difference between the maximum and minimum voltages (100% and 0% travel) for HE2. */
     static constexpr float HE2_RANGE =
         ETCController::HE2_HIGH_VOLTAGE - ETCController::HE2_LOW_VOLTAGE;