Generalized generic HW and interrupt handlers for all components

concordia-fsae · Feb 18, 2025 · bb29915 · bb29915
1 parent b6bff39
commit bb29915
Show file tree

Hide file tree

Showing 21 changed files with 38 additions and 637 deletions.
diff --git a/components/bms_boss/HW/HW.c b/components/bms_boss/HW/HW.c
diff --git a/components/bms_boss/HW/include/HW.h b/components/bms_boss/HW/include/HW.h
diff --git a/components/bms_boss/SConscript b/components/bms_boss/SConscript
@@ -151,7 +151,7 @@ project_source_files = [
 ]
 
 project_hw_files = [
-    HW_DIR.File("HW.c"),
+    SHARED_HW.File("HW.c"),
     HW_DIR.File("HW_adc.c"),
     HW_DIR.File("HW_can_componentSpecific.c"),
     HW_DIR.File("HW_gpio_componentSpecific.c"),

diff --git a/components/bms_worker/HW/HW.c b/components/bms_worker/HW/HW.c
diff --git a/components/bms_worker/HW/include/HW.h b/components/bms_worker/HW/include/HW.h
diff --git a/components/bms_worker/HW/include/HW_intc.h b/components/bms_worker/HW/include/HW_intc.h
diff --git a/components/bms_worker/SConscript b/components/bms_worker/SConscript
@@ -164,7 +164,7 @@ src_files = [
 ]
 
 hw_files = [
-    HW_DIR.File("HW.c"),
+    SHARED_HW.File("HW.c"),
     HW_DIR.File("HW_adc.c"),
     HW_DIR.File("HW_can_componentSpecific.c"),
     HW_DIR.File("HW_dma.c"),

diff --git a/components/vc/front/src/HW/HW.c → components/shared/code/HW/HW.c b/components/vc/front/src/HW/HW.c → components/shared/code/HW/HW.c
@@ -17,6 +17,10 @@
 #include "stm32f1xx.h"
 #include "HW_tim.h"
 
+#include "FeatureDefines_generated.h"
+
+#if (MCU_STM32_PN == FDEFS_STM32_PN_STM32F105) || \
+    (MCU_STM32_PN == FDEFS_STM32_PN_STM32F103XB)
 typedef struct
 {
     volatile uint32_t const CPUID;
@@ -38,6 +42,9 @@ typedef struct
 
 #define AIRCR_RESET        (0x05FA0000UL)
 #define AIRCR_RESET_REQ    (AIRCR_RESET | 0x04UL)
+#else
+#error "Chipset not supported"
+#endif
 
 /******************************************************************************
  *            P U B L I C  F U N C T I O N  P R O T O T Y P E S
@@ -48,9 +55,9 @@ typedef struct
  *
  * @retval Always true 
  */
-bool HW_init(void) 
+HW_StatusTypeDef_E HW_init(void) 
 {
-    return HAL_Init() == HAL_OK;
+    return HAL_Init() == HAL_OK ? HW_OK : HW_ERROR;
 }
 
 /**
@@ -87,5 +94,10 @@ void HW_usDelay(uint8_t us)
 
 void HW_systemHardReset(void)
 {
+#if (MCU_STM32_PN == FDEFS_STM32_PN_STM32F105) || \
+    (MCU_STM32_PN == FDEFS_STM32_PN_STM32F103XB)
     pSCB->AIRCR = AIRCR_RESET_REQ;
+#else
+#error "Chipset not supported"
+#endif
 }
diff --git a/components/vc/rear/include/HW/HW.h → components/shared/code/HW/HW.h b/components/vc/rear/include/HW/HW.h → components/shared/code/HW/HW.h
@@ -28,9 +28,9 @@ typedef enum
  *            P U B L I C  F U N C T I O N  P R O T O T Y P E S
  ******************************************************************************/
 
-bool     HW_init(void);
-uint32_t HW_getTick(void);
-void     HW_delay(uint32_t delay);
-void     HW_usDelay(uint8_t us);
-void     HW_systemHardReset(void);
-void     Error_Handler(void);
+HW_StatusTypeDef_E HW_init(void);
+uint32_t           HW_getTick(void);
+void               HW_delay(uint32_t delay);
+void               HW_usDelay(uint8_t us);
+void               HW_systemHardReset(void);
+void               Error_Handler(void);
diff --git a/components/bms_boss/HW/include/HW_intc.h → components/shared/code/HW/HW_intc.h b/components/bms_boss/HW/include/HW_intc.h → components/shared/code/HW/HW_intc.h
@@ -9,7 +9,11 @@
  *            P U B L I C  F U N C T I O N  P R O T O T Y P E S
  ******************************************************************************/
 
+#include "FeatureDefines_generated.h"
+
+#if FEATURE_IS_ENABLED(MCU_STM32_USE_HAL)
 #include "stm32f1xx.h"
+#endif
 
 void NMI_Handler(void);
 void HardFault_Handler(void);
@@ -19,17 +23,21 @@ void UsageFault_Handler(void);
 void DebugMon_Handler(void);
 
 void DMA1_Channel1_IRQHandler(void);
+
 void ADC1_2_IRQHandler(void);
+
+void TIM1_CC_IRQHandler(void);
 void TIM1_TRG_COM_IRQHandler(void);
 void TIM2_IRQHandler(void);
-void TIM1_CC_IRQHandler(void);
+void TIM3_IRQHandler(void);
+void TIM4_IRQHandler(void);
 
 void CAN1_SCE_IRQHandler(void);
 void CAN1_TX_IRQHandler(void);
 void CAN1_RX0_IRQHandler(void);
 void CAN1_RX1_IRQHandler(void);
 
-#if BMSB_CONFIG_ID == 1U
+#if (MCU_STM32_PN == FDEFS_STM32_PN_STM32F105)
 void CAN2_SCE_IRQHandler(void);
 void CAN2_TX_IRQHandler(void);
 void CAN2_RX0_IRQHandler(void);

diff --git a/components/vc/front/SConscript b/components/vc/front/SConscript
@@ -69,7 +69,7 @@ link_flags = [
     "-Wl,--print-memory-usage",
     # "-Wl,--print-gc-sections",
     "--specs=nano.specs",
-    "-Icomponents/vc/pdu/include/HW"
+    "-Icomponents/vc/front/include/HW"
 ]
 
 as_flags = ["-xassembler-with-cpp"]
@@ -149,7 +149,7 @@ project_source_files = [
 ]
 
 project_hw_files = [
-    HW_DIR.File("HW.c"),
+    SHARED_HW.File("HW.c"),
     HW_DIR.File("HW_adc.c"),
     HW_DIR.File("HW_can_componentSpecific.c"),
     HW_DIR.File("HW_gpio_componentSpecific.c"),