Merge branch 'master' of github.com:UBCFormulaElectric/Consolidated-F…

…irmware into adi/gps-error-handling
UBCFormulaElectric · Jan 18, 2025 · 553a308 · 553a308
2 parents 73b6c18 + aa76d15
commit 553a308
Show file tree

Hide file tree

Showing 7 changed files with 47 additions and 61 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -64,7 +64,7 @@
         "serverpath": "JLinkGDBServer",
       },
       "windows": {
-        "serverpath": "JLinkGDBServerCLExe",
+        "serverpath": "JLinkGDBServerCL",
       },
       "serverArgs": [
         "-speed",

diff --git a/firmware/quadruna/BMS/src/cubemx/BMS.ioc b/firmware/quadruna/BMS/src/cubemx/BMS.ioc
@@ -109,55 +109,54 @@ Mcu.Pin14=PC5
 Mcu.Pin15=PB0
 Mcu.Pin16=PB1
 Mcu.Pin17=PE7
-Mcu.Pin18=PE11
-Mcu.Pin19=PB12
+Mcu.Pin18=PB12
+Mcu.Pin19=PB13
 Mcu.Pin2=PH1-OSC_OUT
-Mcu.Pin20=PB13
-Mcu.Pin21=PB14
-Mcu.Pin22=PB15
-Mcu.Pin23=PD9
-Mcu.Pin24=PD10
-Mcu.Pin25=PD11
-Mcu.Pin26=PD12
-Mcu.Pin27=PD13
-Mcu.Pin28=PC6
-Mcu.Pin29=PC7
+Mcu.Pin20=PB14
+Mcu.Pin21=PB15
+Mcu.Pin22=PD9
+Mcu.Pin23=PD10
+Mcu.Pin24=PD11
+Mcu.Pin25=PD12
+Mcu.Pin26=PD13
+Mcu.Pin27=PC6
+Mcu.Pin28=PC7
+Mcu.Pin29=PC8
 Mcu.Pin3=PC0
-Mcu.Pin30=PC8
-Mcu.Pin31=PC9
-Mcu.Pin32=PA8
-Mcu.Pin33=PA9
-Mcu.Pin34=PA13(JTMS/SWDIO)
-Mcu.Pin35=PA14(JTCK/SWCLK)
-Mcu.Pin36=PC10
-Mcu.Pin37=PC11
-Mcu.Pin38=PC12
-Mcu.Pin39=PD2
+Mcu.Pin30=PC9
+Mcu.Pin31=PA8
+Mcu.Pin32=PA9
+Mcu.Pin33=PA13(JTMS/SWDIO)
+Mcu.Pin34=PA14(JTCK/SWCLK)
+Mcu.Pin35=PC10
+Mcu.Pin36=PC11
+Mcu.Pin37=PC12
+Mcu.Pin38=PD2
+Mcu.Pin39=PD3
 Mcu.Pin4=PC1
-Mcu.Pin40=PD3
-Mcu.Pin41=PD4
-Mcu.Pin42=PD5
-Mcu.Pin43=PD6
-Mcu.Pin44=PB3(JTDO/TRACESWO)
-Mcu.Pin45=PB6
-Mcu.Pin46=PB7
-Mcu.Pin47=PB8
-Mcu.Pin48=PB9
-Mcu.Pin49=VP_CRC_VS_CRC
+Mcu.Pin40=PD4
+Mcu.Pin41=PD5
+Mcu.Pin42=PD6
+Mcu.Pin43=PB3(JTDO/TRACESWO)
+Mcu.Pin44=PB6
+Mcu.Pin45=PB7
+Mcu.Pin46=PB8
+Mcu.Pin47=PB9
+Mcu.Pin48=VP_CRC_VS_CRC
+Mcu.Pin49=VP_FREERTOS_VS_CMSIS_V2
 Mcu.Pin5=PC2_C
-Mcu.Pin50=VP_FREERTOS_VS_CMSIS_V2
-Mcu.Pin51=VP_IWDG1_VS_IWDG
-Mcu.Pin52=VP_SYS_VS_tim2
-Mcu.Pin53=VP_TIM1_VS_ControllerModeReset
-Mcu.Pin54=VP_TIM1_VS_indirect_ch1
-Mcu.Pin55=VP_TIM3_VS_ClockSourceINT
+Mcu.Pin50=VP_IWDG1_VS_IWDG
+Mcu.Pin51=VP_SYS_VS_tim2
+Mcu.Pin52=VP_TIM1_VS_ControllerModeReset
+Mcu.Pin53=VP_TIM1_VS_indirect_ch1
+Mcu.Pin54=VP_TIM3_VS_ClockSourceINT
 Mcu.Pin6=PC3_C
 Mcu.Pin7=PA0
 Mcu.Pin8=PA1
 Mcu.Pin9=PA2
-Mcu.PinsNb=56
+Mcu.PinsNb=55
 Mcu.ThirdPartyNb=0
-Mcu.UserConstants=TIM3_PRESCALER,8;ADC_FREQUENCY,1000;TIM1_AUTO_RELOAD_REG,0xFFFF;TIMx_FREQUENCY,512000000;IWDG_RESET_FREQUENCY,5;TASK1KHZ_STACK_SIZE,512;TIM1_FREQUENCY,512000000;TASK100HZ_STACK_SIZE,512;TASK1HZ_STACK_SIZE,512;IWDG_WINDOW_DISABLE_VALUE,4095;IWDG_PRESCALER,4;TASKCANRX_STACK_SIZE,512;TIM1_PWM_MIN_FREQUENCY,1;LSI_FREQUENCY,32000;TIM1_PRESCALER,(TIM1_FREQUENCY / TIM1_AUTO_RELOAD_REG / TIM1_PWM_MIN_FREQUENCY)
+Mcu.UserConstants=TIM3_PRESCALER,8;ADC_FREQUENCY,1000;TIM1_AUTO_RELOAD_REG,0xFFFF;TIMx_FREQUENCY,512000000;IWDG_RESET_FREQUENCY,5;TASK1KHZ_STACK_SIZE,512;TIM1_FREQUENCY,256000000;TASK100HZ_STACK_SIZE,512;TASK1HZ_STACK_SIZE,512;IWDG_WINDOW_DISABLE_VALUE,4095;IWDG_PRESCALER,4;TASKCANRX_STACK_SIZE,512;TIM1_PWM_MIN_FREQUENCY,1;LSI_FREQUENCY,32000;TIM1_PRESCALER,(TIM1_FREQUENCY / TIM1_AUTO_RELOAD_REG / TIM1_PWM_MIN_FREQUENCY)
 Mcu.UserName=STM32H733VGTx
 MxCube.Version=6.9.2
 MxDb.Version=DB.6.0.92
@@ -368,7 +367,6 @@ PD9.GPIOParameters=GPIO_Label
 PD9.GPIO_Label=BMS_OK_3V3
 PD9.Locked=true
 PD9.Signal=GPIO_Output
-PE11.Signal=S_TIM1_CH2
 PE7.GPIOParameters=GPIO_Label
 PE7.GPIO_Label=LED
 PE7.Locked=true
@@ -506,9 +504,8 @@ SH.ADCx_INP9.ConfNb=1
 SH.S_TIM15_CH2.0=TIM15_CH2,Input_Capture2_from_TI2
 SH.S_TIM15_CH2.ConfNb=1
 SH.S_TIM1_CH1.0=TIM1_CH1,Input_Capture1_from_TI1
-SH.S_TIM1_CH1.ConfNb=1
-SH.S_TIM1_CH2.0=TIM1_CH2,TriggerSource_TI2FP2
-SH.S_TIM1_CH2.ConfNb=1
+SH.S_TIM1_CH1.1=TIM1_CH1,TriggerSource_TI1FP1
+SH.S_TIM1_CH1.ConfNb=2
 SH.SharedAnalog_PC1.0=ADC1_INN10
 SH.SharedAnalog_PC1.1=ADC1_INP11,IN11-Single-Ended
 SH.SharedAnalog_PC1.ConfNb=2

diff --git a/firmware/quadruna/BMS/src/cubemx/BMS.ioc.md5 b/firmware/quadruna/BMS/src/cubemx/BMS.ioc.md5
@@ -1 +1 @@
-71035ef834f592d578d0a91d7ab21a94
+b0a5ba8fcc46cb0bb8846b7353b0c5d9
diff --git a/firmware/quadruna/BMS/src/cubemx/Inc/main.h b/firmware/quadruna/BMS/src/cubemx/Inc/main.h
@@ -74,7 +74,7 @@ extern "C"
 #define TIMx_FREQUENCY 512000000
 #define IWDG_RESET_FREQUENCY 5
 #define TASK1KHZ_STACK_SIZE 512
-#define TIM1_FREQUENCY 512000000
+#define TIM1_FREQUENCY 256000000
 #define TASK100HZ_STACK_SIZE 512
 #define TASK1HZ_STACK_SIZE 512
 #define IWDG_WINDOW_DISABLE_VALUE 4095

diff --git a/firmware/quadruna/BMS/src/cubemx/Src/main.c b/firmware/quadruna/BMS/src/cubemx/Src/main.c
@@ -651,8 +651,8 @@ static void MX_TIM1_Init(void)
         Error_Handler();
     }
     sSlaveConfig.SlaveMode       = TIM_SLAVEMODE_RESET;
-    sSlaveConfig.InputTrigger    = TIM_TS_TI2FP2;
-    sSlaveConfig.TriggerPolarity = TIM_INPUTCHANNELPOLARITY_FALLING;
+    sSlaveConfig.InputTrigger    = TIM_TS_TI1FP1;
+    sSlaveConfig.TriggerPolarity = TIM_INPUTCHANNELPOLARITY_RISING;
     sSlaveConfig.TriggerFilter   = 0;
     if (HAL_TIM_SlaveConfigSynchro(&htim1, &sSlaveConfig) != HAL_OK)
     {

diff --git a/firmware/quadruna/BMS/src/cubemx/Src/stm32h7xx_hal_msp.c b/firmware/quadruna/BMS/src/cubemx/Src/stm32h7xx_hal_msp.c
@@ -506,19 +506,10 @@ void HAL_TIM_Base_MspInit(TIM_HandleTypeDef *htim_base)
         /* Peripheral clock enable */
         __HAL_RCC_TIM1_CLK_ENABLE();
 
-        __HAL_RCC_GPIOE_CLK_ENABLE();
         __HAL_RCC_GPIOA_CLK_ENABLE();
         /**TIM1 GPIO Configuration
-        PE11     ------> TIM1_CH2
         PA8     ------> TIM1_CH1
         */
-        GPIO_InitStruct.Pin       = GPIO_PIN_11;
-        GPIO_InitStruct.Mode      = GPIO_MODE_AF_PP;
-        GPIO_InitStruct.Pull      = GPIO_NOPULL;
-        GPIO_InitStruct.Speed     = GPIO_SPEED_FREQ_LOW;
-        GPIO_InitStruct.Alternate = GPIO_AF1_TIM1;
-        HAL_GPIO_Init(GPIOE, &GPIO_InitStruct);
-
         GPIO_InitStruct.Pin       = GPIO_PIN_8;
         GPIO_InitStruct.Mode      = GPIO_MODE_AF_PP;
         GPIO_InitStruct.Pull      = GPIO_NOPULL;
@@ -600,11 +591,8 @@ void HAL_TIM_Base_MspDeInit(TIM_HandleTypeDef *htim_base)
         __HAL_RCC_TIM1_CLK_DISABLE();
 
         /**TIM1 GPIO Configuration
-        PE11     ------> TIM1_CH2
         PA8     ------> TIM1_CH1
         */
-        HAL_GPIO_DeInit(GPIOE, GPIO_PIN_11);
-
         HAL_GPIO_DeInit(GPIOA, GPIO_PIN_8);
 
         /* TIM1 interrupt DeInit */

diff --git a/scripts/code_generation/jsoncan/jsoncan.cmake b/scripts/code_generation/jsoncan/jsoncan.cmake
@@ -121,6 +121,7 @@ function(log_bus_load CAR)
 endfunction()
 
 log_bus_load("quadruna")
+log_bus_load("quintuna")
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		71035ef834f592d578d0a91d7ab21a94
		b0a5ba8fcc46cb0bb8846b7353b0c5d9
Original file line number	Diff line number	Diff line change
Expand Up		@@ -121,6 +121,7 @@ function(log_bus_load CAR)
		endfunction()

		log_bus_load("quadruna")
		log_bus_load("quintuna")