Merge branch 'master' of github.com:hytech-racing/MCU

hytech-racing · Feb 7, 2024 · f04848f · f04848f
2 parents dc51166 + 08a9a1b
commit f04848f
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 22 deletions.
diff --git a/lib/interfaces/include/DashboardInterface.h b/lib/interfaces/include/DashboardInterface.h
@@ -6,7 +6,7 @@
 #include "hytech.h"
 
 /* Enum for the modes on the dial, corresponds directly to dial index pos. */
-enum DialMode_e
+enum class DialMode_e
 {
     MODE_1,
     MODE_2,
@@ -17,7 +17,7 @@ enum DialMode_e
 };
 
 /* Enum for defined LED colors. ON will be LED's default color on dashboard*/
-enum LEDColors_e
+enum class LEDColors_e
 {
     OFF,
     ON,
@@ -26,7 +26,7 @@ enum LEDColors_e
 };
 
 /* Enum to index the LED array. Each LED in the CAN message is represented in no particular order. */
-enum DashLED_e
+enum class DashLED_e
 {
     BOTS_LED,
     LAUNCH_CONTROL_LED,

diff --git a/lib/interfaces/src/DashboardInterface.cpp b/lib/interfaces/src/DashboardInterface.cpp
@@ -30,19 +30,19 @@ void DashboardInterface::write()
     msg.drive_buzzer = _data.buzzer_cmd;
 
     // TODO: use logic as to not write data for LEDs that have not changed
-    msg.bots_led = _data.LED[DashLED_e::BOTS_LED];
-    msg.launch_control_led = _data.LED[DashLED_e::LAUNCH_CONTROL_LED];
-    msg.mode_led = _data.LED[DashLED_e::MODE_LED];
-    msg.mechanical_brake_led = _data.LED[DashLED_e::MECH_BRAKE_LED];
-    msg.cockpit_brb_led = _data.LED[DashLED_e::COCKPIT_BRB_LED];
-    msg.inertia_status_led = _data.LED[DashLED_e::INERTIA_LED];
-    msg.start_status_led = _data.LED[DashLED_e::START_LED];
-    msg.motor_controller_error_led = _data.LED[DashLED_e::MC_ERROR_LED];
-    msg.imd_led = _data.LED[DashLED_e::IMD_LED];
-    msg.ams_led = _data.LED[DashLED_e::AMS_LED];
-
-    msg.glv_led = _data.LED[DashLED_e::GLV_LED];
-    msg.pack_charge_led = _data.LED[DashLED_e::CRIT_CHARGE_LED];
+    msg.bots_led = _data.LED[static_cast<int>(DashLED_e::BOTS_LED)];
+    msg.launch_control_led = _data.LED[static_cast<int>(DashLED_e::LAUNCH_CONTROL_LED)];
+    msg.mode_led = _data.LED[static_cast<int>(DashLED_e::MODE_LED)];
+    msg.mechanical_brake_led = _data.LED[static_cast<int>(DashLED_e::MECH_BRAKE_LED)];
+    msg.cockpit_brb_led = _data.LED[static_cast<int>(DashLED_e::COCKPIT_BRB_LED)];
+    msg.inertia_status_led = _data.LED[static_cast<int>(DashLED_e::INERTIA_LED)];
+    msg.start_status_led = _data.LED[static_cast<int>(DashLED_e::START_LED)];
+    msg.motor_controller_error_led = _data.LED[static_cast<int>(DashLED_e::MC_ERROR_LED)];
+    msg.imd_led = _data.LED[static_cast<int>(DashLED_e::IMD_LED)];
+    msg.ams_led = _data.LED[static_cast<int>(DashLED_e::AMS_LED)];
+
+    msg.glv_led = _data.LED[static_cast<int>(DashLED_e::GLV_LED)];
+    msg.pack_charge_led = _data.LED[static_cast<int>(DashLED_e::CRIT_CHARGE_LED)];
 
     CAN_message_t can_msg;
     can_msg.id = Pack_DASHBOARD_MCU_STATE_hytech(&msg, can_msg.buf, &can_msg.len, NULL);

diff --git a/lib/systems/include/TorqueControllerMux.h b/lib/systems/include/TorqueControllerMux.h
@@ -25,12 +25,12 @@ class TorqueControllerMux
 private:
     // Use this to map the dial to TCMUX modes
     std::unordered_map<DialMode_e, TorqueController_e> dialModeMap_ = {
-        {MODE_1, TC_SAFE_MODE},
-        {MODE_2, TC_SAFE_MODE},
-        {ACCEL_LAUNCH_CONTROL, TC_NO_CONTROLLER},
-        {SKIDPAD, TC_NO_CONTROLLER},
-        {AUTOCROSS, TC_NO_CONTROLLER},
-        {ENDURANCE, TC_NO_CONTROLLER},
+        {DialMode_e::MODE_1, TC_SAFE_MODE},
+        {DialMode_e::MODE_2, TC_SAFE_MODE},
+        {DialMode_e::ACCEL_LAUNCH_CONTROL, TC_NO_CONTROLLER},
+        {DialMode_e::SKIDPAD, TC_NO_CONTROLLER},
+        {DialMode_e::AUTOCROSS, TC_NO_CONTROLLER},
+        {DialMode_e::ENDURANCE, TC_NO_CONTROLLER},
     };
     std::unordered_map<TorqueLimit_e, float> torqueLimitMap_ = {
         {TCMUX_LOW_TORQUE, 10.0},