mend

UBCFormulaElectric · Feb 1, 2025 · b5e12e6 · b5e12e6
1 parent fde67bf
commit b5e12e6
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 54 deletions.
diff --git a/firmware/quintuna/VC/src/io/io_loadswitch.c b/firmware/quintuna/VC/src/io/io_loadswitch.c
@@ -3,54 +3,18 @@
 #include <assert.h>
 
 
-const Efuse bms_en_switch = {
-    .enable_gpio = &bms_en,
-    .cur_sns_adc_channel = &bms_i_sns
-};
-const Efuse front_en_switch = {
-    .enable_gpio = &front_en,
-    .cur_sns_adc_channel = &front_i_sns
-};
-const Efuse dam_en_switch = {
-    .enable_gpio = &dam_en,
-    .cur_sns_adc_channel = &dam_i_sns,
-};
-const Efuse rsm_en_switch = {
-    .enable_gpio = &rsm_en,
-    .cur_sns_adc_channel = &rsm_i_sns
-};
-const Efuse inv_l_pwr_switch = {
-    .enable_gpio = &l_inv_en,
-    .cur_sns_adc_channel = &inv_l_pwr_i_sns,
-};
-const Efuse inv_r_pwr_switch = {
-    .enable_gpio = &r_inv_en,
-    .cur_sns_adc_channel = &inv_r_pwr_i_sns
-};
-const Efuse pump_rl_pwr_switch = {
-    .enable_gpio = &rl_pump_en,
-    .cur_sns_adc_channel = &pump_rl_pwr_i_sns
-};
-const Efuse pump_rr_pwr_switch = {
-    .enable_gpio = &rr_pump_en,
-    .cur_sns_adc_channel = &pump_rr_pwr_i_sns
-};
-const Efuse pump_f_pwr_switch = {
-    .enable_gpio = &f_pump_en,
-    .cur_sns_adc_channel = &pump_f_pwr_i_sns
-};
-const Efuse l_rad_fan_switch = {
-    .enable_gpio = &l_rad_fan_en,
-    .cur_sns_adc_channel = &l_rad_fan_i_sns
-};
-const Efuse r_rad_fan_switch = {
-    .enable_gpio = &r_rad_fan_en,
-    .cur_sns_adc_channel = &r_rad_fan_i_sns
-};
-const Efuse extra_switch = {
-    .enable_gpio = &extra_en,
-    .cur_sns_adc_channel = &extra_i_sns
-};
+const Efuse bms_en_switch = {.enable_gpio = &bms_en,.cur_sns_adc_channel = &bms_i_sns};
+const Efuse front_en_switch = {.enable_gpio = &front_en, .cur_sns_adc_channel = &front_i_sns};
+const Efuse dam_en_switch = {.enable_gpio = &dam_en,.cur_sns_adc_channel = &dam_i_sns,};
+const Efuse rsm_en_switch = {.enable_gpio = &rsm_en,.cur_sns_adc_channel = &rsm_i_sns};
+const Efuse inv_l_pwr_switch = {.enable_gpio = &l_inv_en,,cur_sns_adc_channel = &inv_l_pwr_i_sns,};
+const Efuse inv_r_pwr_switch = {.enable_gpio = &r_inv_en,.cur_sns_adc_channel = &inv_r_pwr_i_sns};
+const Efuse pump_rl_pwr_switch = {.enable_gpio = &rl_pump_en,.cur_sns_adc_channel = &pump_rl_pwr_i_sns};
+const Efuse pump_rr_pwr_switch = {.enable_gpio = &rr_pump_en,.cur_sns_adc_channel = &pump_rr_pwr_i_sns};
+const Efuse pump_f_pwr_switch = {.enable_gpio = &f_pump_en,.cur_sns_adc_channel = &pump_f_pwr_i_sns};
+const Efuse l_rad_fan_switch = {.enable_gpio = &l_rad_fan_en,.cur_sns_adc_channel = &l_rad_fan_i_sns};
+const Efuse r_rad_fan_switch = {.enable_gpio = &r_rad_fan_en,.cur_sns_adc_channel = &r_rad_fan_i_sns};
+const Efuse extra_switch = {.enable_gpio = &extra_en,.cur_sns_adc_channel = &extra_i_sns};
 
 const LoadSwitch inverter_loadswitch = {
     .efuse1 = &inv_l_pwr_switch,

diff --git a/firmware/quintuna/VC/src/io/io_loadswitch.h b/firmware/quintuna/VC/src/io/io_loadswitch.h
@@ -2,7 +2,7 @@
 
 #include <stdbool.h>
 
-//#ifdef TARGET_EMBEDDED
+#ifdef TARGET_EMBEDDED
 
 #include "hw_gpios.h"
 #include "hw_adcs.h"
@@ -17,13 +17,13 @@ typedef struct
     const Gpio       *enable_gpio;
     const AdcChannel *cur_sns_adc_channel;
 } Efuse;
-//#else
+#else
 
-// #include "app_utils.h"
-// EMPTY_STRUCT(LoadSwitch)
-// EMPTY_STRUCT(Efuse)
+#include "app_utils.h"
+EMPTY_STRUCT(LoadSwitch)
+EMPTY_STRUCT(Efuse)
 
-//#endif
+#endif
 
 extern const LoadSwitch loadswitch_front;
 extern const LoadSwitch loadswitch_rear;