Fixed Latch pin logic, edited switchFaultStatus variable name, renamed IDLE state to RUNNING, and UART pins are no longer swapped

Author: DiegoLHendrix

include/LVSS.hpp

@@ -84,7 +84,8 @@ class LVSS : public CANDevice {
         };
     };
 
-    union switchData {
+    /** Struct to hold the data for individual boards */
+    union switchData_u {
         uint16_t battCurrent;
         uint16_t hibCurrent;
         uint16_t tmsCurrent;
@@ -97,18 +98,10 @@ class LVSS : public CANDevice {
         int16_t switch2Temp;
     };
 
-    union switchFaults {
-        uint16_t switchFaultVal;
-        struct {
-            uint16_t currentFault     : 1;
-            uint16_t temperatureFault : 1;
-        };
-    };
-
     /** FSM State declaration */
     enum class State {
         INITIALIZATION = 0u,
-        IDLE           = 1u,
+        RUNNING        = 1u,
     };
 
     /**
@@ -140,9 +133,8 @@ class LVSS : public CANDevice {
 
     ACS71240 acs71240;
 
-    switchData PowerSwitchState;
-
-    switchFaults SwitchFaults;
+    /** Holds data for individual boards */
+    switchData_u PowerSwitchState;
 
     /** Tracks signal from VCU */
     uint16_t VCUBoardSig = 0;
@@ -151,7 +143,7 @@ class LVSS : public CANDevice {
     uint16_t battPackCurrent = 0x00;
 
     /** Tracks power switch fault */
-    uint16_t switchFaultstatus = 0x00;
+    uint16_t switchFaultStatus = 0x00;
 
     /**
      * The current state of the LVSS
@@ -177,7 +169,7 @@ class LVSS : public CANDevice {
     /**
      * Checks LVSS values
      *
-     * State: State::IDLE
+     * State: State::RUNNING
      */
     void runningState();
 
@@ -241,7 +233,7 @@ class LVSS : public CANDevice {
         /** Transfer data */
         DATA_LINK_START_KEY_21XX(0x00, 0x02),
         DATA_LINK_21XX(0x00, 0x01, CO_TUNSIGNED16, &battPackCurrent),
-        DATA_LINK_21XX(0x00, 0x02, CO_TUNSIGNED16, &switchFaultstatus),
+        DATA_LINK_21XX(0x00, 0x02, CO_TUNSIGNED16, &switchFaultStatus),
 
         DATA_LINK_START_KEY_21XX(0x01, 0x04),
         DATA_LINK_21XX(0x01, 0x01, CO_TUNSIGNED16, &PowerSwitchState.battCurrent),

include/dev/TPS2HB35BQ.hpp

@@ -40,8 +40,8 @@ class TPS2HB35BQ {
     };
 
     enum LatchMode {
-        LATCHED    = 0x00,
-        AUTO_RETRY = 0x01
+        LATCHED    = 0x00, // If there is a fault the power switch will shut off and stay off
+        AUTO_RETRY = 0x01  // If there is a fault the power switch will shut off and try to turn back on until there is no longer a fault
     };
 
     void setPowerSwitchStates(bool powerSwitchOneEnabled, bool powerSwitchTwoEnabled);

src/LVSS.cpp

@@ -28,7 +28,7 @@ void LVSS::process() {
         initState();
         break;
 
-    case State::IDLE:
+    case State::RUNNING:
         runningState();
         break;
     }
@@ -44,7 +44,7 @@ void LVSS::initState() {
     VICOR_FAULT_ACTIVE_STATE = vicorFT.readPin();
 
     if (time::millis() >= 101 && VICOR_FAULT_ACTIVE_STATE == IO::GPIO::State::LOW) {
-        state      = State::IDLE;
+        state      = State::RUNNING;
         isNewState = true;
     }
 }
@@ -79,7 +79,7 @@ void LVSS::runningState() {
 
     if (PowerSwitchState.battCurrent == -1 || PowerSwitchState.tmsCurrent == -1 || PowerSwitchState.accCurrent == -1) {
         log::LOGGER.log(log::Logger::LogLevel::INFO, "Power Switch Error\r\n");
-        switchFaultstatus = INTMAX_MIN;
+        switchFaultStatus = INTMAX_MIN;
     }
 
     log::LOGGER.log(log::Logger::LogLevel::DEBUG,
@@ -96,7 +96,7 @@ void LVSS::runningState() {
 
     if (PowerSwitchState.hibCurrent == -1 || PowerSwitchState.hudlCurrent == -1 || PowerSwitchState.gubCurrent == -1) {
         log::LOGGER.log(log::Logger::LogLevel::INFO, "Power Switch Error\r\n");
-        switchFaultstatus = INTMAX_MIN;
+        switchFaultStatus = INTMAX_MIN;
     }
 
     log::LOGGER.log(log::Logger::LogLevel::DEBUG,
@@ -112,7 +112,7 @@ void LVSS::runningState() {
     if (PowerSwitchState.switch0Temp == -1 || PowerSwitchState.switch1Temp == -1
         || PowerSwitchState.switch2Temp == -1) {
         log::LOGGER.log(log::Logger::LogLevel::INFO, "Power Switch Error\r\n");
-        switchFaultstatus = 1;
+        switchFaultStatus = INTMAX_MIN;
     }
 
     log::LOGGER.log(log::Logger::LogLevel::DEBUG,
@@ -121,6 +121,6 @@ void LVSS::runningState() {
                     PowerSwitchState.switch1Temp,
                     PowerSwitchState.switch2Temp);
 
-    log::LOGGER.log(log::Logger::LogLevel::INFO, "Vicor Current: %d\r\n", acs71240.readCurrent());
+    log::LOGGER.log(log::Logger::LogLevel::DEBUG, "Vicor Current: %d\r\n", acs71240.readCurrent());
 }
 } // namespace LVSS

src/dev/TPS2HB35BQ.cpp

@@ -33,9 +33,9 @@ void TPS2HB35BQ::setDiagStateEnabled(bool state) {
 
 void TPS2HB35BQ::setLatch(LatchMode mode) {
     if (mode == LatchMode::LATCHED) {
-        latchPin.writePin(IO::GPIO::State::LOW);
-    } else if (mode == LatchMode::AUTO_RETRY) {
         latchPin.writePin(IO::GPIO::State::HIGH);
+    } else if (mode == LatchMode::AUTO_RETRY) {
+        latchPin.writePin(IO::GPIO::State::LOW);
     }
 }
 

targets/REV3-LVSS/main.cpp

@@ -44,7 +44,7 @@ int main() {
     EVT::core::platform::init();
 
     // Setup UART
-    IO::UART& uart = IO::getUART<IO::Pin::UART_TX, IO::Pin::UART_RX>(9600, true);
+    IO::UART& uart = IO::getUART<IO::Pin::UART_TX, IO::Pin::UART_RX>(9600);
     log::LOGGER.setUART(&uart);
     log::LOGGER.setLogLevel(log::Logger::LogLevel::INFO);