Skip to content

Commit 58d28b6

Browse files
Aditya-Dhiman4Aditya-Dhiman4
committed
temporary commit to test efuses
1 parent 7395264 commit 58d28b6

File tree

20 files changed

+242
-1529
lines changed

20 files changed

+242
-1529
lines changed

‎.vscode/launch.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@
3030
{
3131
"name": "Debug Embedded: VC (Quintuna)",
3232
"cwd": "${workspaceRoot}",
33-
"executable": "build_fw_dev/firmware/quintuna/VC/quintuna_VC.hex",
33+
"executable": "build_fw_dev/firmware/quintuna/VC/quintuna_VC_app.hex",
3434
"symbolFiles": [
3535
// This order matters, or RTT won't work! (app has to be last)
36-
"build_fw_dev/firmware/quintuna/VC/quintuna_VC_boot.elf",
36+
//"build_fw_dev/firmware/quintuna/VC/quintuna_VC_boot.elf",
3737
"build_fw_dev/firmware/quintuna/VC/quintuna_VC_app.elf"
3838
],
3939
"preLaunchTask": "Build Embedded: VC (Quintuna)",
@@ -56,7 +56,7 @@
5656
],
5757
"device": "STM32H733VG",
5858
"interface": "swd",
59-
"showDevDebugOutput": "none",
59+
"showDevDebugOutput": "raw",
6060
"rttConfig": {
6161
"enabled": true,
6262
"address": "auto",

‎firmware/quintuna/VC/CMakeLists.txt‎

Lines changed: 24 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,7 @@ list(APPEND IO_SRCS
3131
"${SHARED_IO_INCLUDE_DIR}/io_efuse/io_efuse.c"
3232
"${SHARED_IO_INCLUDE_DIR}/io_efuse/io_efuse_ST_VND5/io_efuse_ST_VND5.c"
3333
"${SHARED_IO_INCLUDE_DIR}/io_efuse/io_efuse_TI_TPS25/io_efuse_TI_TPS25.c"
34-
"${SHARED_IO_INCLUDE_DIR}/io_potentiometer.c"
3534
"${SHARED_IO_INCLUDE_DIR}/io_bootHandler.c"
36-
"${SHARED_IO_INCLUDE_DIR}/io_imu.c"
3735
)
3836
set(IO_INCLUDE_DIRS
3937
"${CMAKE_CURRENT_SOURCE_DIR}/src/io"
@@ -52,18 +50,33 @@ list(APPEND HW_SRCS
5250
"${SHARED_HW_INCLUDE_DIR}/hw_assert.c"
5351
"${SHARED_HW_INCLUDE_DIR}/hw_bootup.c"
5452
"${SHARED_HW_INCLUDE_DIR}/hw_usb.c"
55-
"${SHARED_HW_INCLUDE_DIR}/hw_uart.c"
56-
"${SHARED_HW_INCLUDE_DIR}/hw_i2c.c"
5753
"${SHARED_HW_INCLUDE_DIR}/hw_adc.c"
5854
"${SHARED_HW_INCLUDE_DIR}/hw_error.c"
59-
"${SHARED_HW_INCLUDE_DIR}/hw_i2c.c"
60-
"${SHARED_HW_INCLUDE_DIR}/hw_can_hx.c"
6155
"${SHARED_HW_INCLUDE_DIR}/hw_chimera_v2.c"
6256
"${SHARED_HW_INCLUDE_DIR}/hw_utils.c"
6357
"${SHARED_HW_INCLUDE_DIR}/hw_ubsan.c"
6458
"${SHARED_HW_INCLUDE_DIR}/hw_resetReason.c"
6559
"${SHARED_HW_INCLUDE_DIR}/hw_freeRtosConfigs.c"
6660
)
61+
62+
# Explicitly drop peripherals that are removed from the IOC
63+
list(REMOVE_ITEM IO_SRCS
64+
"${SHARED_IO_INCLUDE_DIR}/io_potentiometer.c"
65+
"${SHARED_IO_INCLUDE_DIR}/io_imu.c"
66+
"${CMAKE_CURRENT_SOURCE_DIR}/src/io/io_imu_config.c"
67+
"${CMAKE_CURRENT_SOURCE_DIR}/src/io/io_sbgEllipse.c"
68+
"${CMAKE_CURRENT_SOURCE_DIR}/src/io/io_powerMonitoring.c"
69+
)
70+
list(REMOVE_ITEM HW_SRCS
71+
"${CMAKE_CURRENT_SOURCE_DIR}/src/hw/hw_i2cs.c"
72+
"${CMAKE_CURRENT_SOURCE_DIR}/src/hw/hw_uarts.c"
73+
"${CMAKE_CURRENT_SOURCE_DIR}/src/hw/hw_cans.c"
74+
"${CMAKE_CURRENT_SOURCE_DIR}/src/hw/hw_chimeraConfig_v2.c"
75+
"${SHARED_HW_INCLUDE_DIR}/hw_chimera_v2.c"
76+
)
77+
list(REMOVE_ITEM APP_SRCS
78+
"${CMAKE_CURRENT_SOURCE_DIR}/src/app/app_powerMonitoring.c"
79+
)
6780
set(HW_INCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/src/hw" "${CMAKE_CURRENT_SOURCE_DIR}/src" "${SHARED_HW_INCLUDE_DIR}")
6881

6982
if ("${TARGET}" STREQUAL "binary")
@@ -85,19 +98,19 @@ if ("${TARGET}" STREQUAL "binary")
8598
"stm32h7xx_hal_dma_ex.c"
8699
"stm32h7xx_hal_dma.c"
87100
"stm32h7xx_hal_exti.c"
88-
"stm32h7xx_hal_fdcan.c"
101+
# "stm32h7xx_hal_fdcan.c"
89102
"stm32h7xx_hal_gpio.c"
90103
"stm32h7xx_hal_iwdg.c"
91104
"stm32h7xx_hal_pwr_ex.c"
92105
"stm32h7xx_hal_rcc_ex.c"
93106
"stm32h7xx_hal_rcc.c"
94107
"stm32h7xx_hal_tim_ex.c"
95108
"stm32h7xx_hal_tim.c"
96-
"stm32h7xx_hal_uart_ex.c"
97-
"stm32h7xx_hal_uart.c"
109+
# "stm32h7xx_hal_uart_ex.c"
110+
# "stm32h7xx_hal_uart.c"
98111
"stm32h7xx_hal.c"
99-
"stm32h7xx_hal_i2c.c"
100-
"stm32h7xx_hal_i2c_ex.c"
112+
# "stm32h7xx_hal_i2c.c"
113+
# "stm32h7xx_hal_i2c_ex.c"
101114
"stm32h7xx_hal_pcd.c"
102115
"stm32h7xx_hal_pcd_ex.c"
103116
"stm32h7xx_ll_usb.c"

‎firmware/quintuna/VC/src/app/vehicle_dynamics/app_vehicleDynamicsConstants.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
// DD5-14-10-POW motor is relative to their nominal torque (9.8 Nm) where 100% torque is 9.8. The motors are able to
5858
// output up to 21 Nm, this however cannot be a sustained behaviour. Note the message takes a int 16 that is essentially
5959
// your percentage of nominal torque * 1000
60-
#define PEDAL_REMAPPING(torque) ((int16_t)((torque / NOMINAL_TORQUE_REQUEST_NM) * 1000.0f))
60+
#define PEDAL_REMAPPING(torque) ((int16_t)(((float)torque / NOMINAL_TORQUE_REQUEST_NM) * 1000.0f))
6161
#define TORQUE_TO_POWER(torque, rpm) ((torque) * ((float)(rpm) / (GEAR_RATIO)) / (POWER_TO_TORQUE_CONVERSION_FACTOR))
6262
#define POWER_TO_TORQUE(power, rpm) \
6363
(((power) * POWER_TO_TORQUE_CONVERSION_FACTOR) / \

‎firmware/quintuna/VC/src/cubemx/Inc/main.h‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -41,19 +41,19 @@ extern "C"
4141

4242
/* Exported constants --------------------------------------------------------*/
4343
/* USER CODE BEGIN EC */
44-
extern ADC_HandleTypeDef hadc1;
45-
extern ADC_HandleTypeDef hadc2;
46-
extern FDCAN_HandleTypeDef hfdcan1;
47-
extern FDCAN_HandleTypeDef hfdcan2;
48-
extern FDCAN_HandleTypeDef hfdcan3;
49-
extern I2C_HandleTypeDef hi2c2;
50-
extern I2C_HandleTypeDef hi2c3;
51-
extern I2C_HandleTypeDef hi2c4;
52-
extern I2C_HandleTypeDef hi2c5;
53-
extern IWDG_HandleTypeDef hiwdg1;
54-
extern TIM_HandleTypeDef htim3;
55-
extern UART_HandleTypeDef huart8;
56-
extern PCD_HandleTypeDef hpcd_USB_OTG_HS;
44+
extern ADC_HandleTypeDef hadc1;
45+
extern ADC_HandleTypeDef hadc2;
46+
// extern FDCAN_HandleTypeDef hfdcan1;
47+
// extern FDCAN_HandleTypeDef hfdcan2;
48+
// extern FDCAN_HandleTypeDef hfdcan3;
49+
// extern I2C_HandleTypeDef hi2c2;
50+
// extern I2C_HandleTypeDef hi2c3;
51+
// extern I2C_HandleTypeDef hi2c4;
52+
// extern I2C_HandleTypeDef hi2c5;
53+
extern IWDG_HandleTypeDef hiwdg1;
54+
extern TIM_HandleTypeDef htim3;
55+
// extern UART_HandleTypeDef huart8;
56+
extern PCD_HandleTypeDef hpcd_USB_OTG_HS;
5757
/* USER CODE END EC */
5858

5959
/* Exported macro ------------------------------------------------------------*/

‎firmware/quintuna/VC/src/cubemx/Inc/stm32h7xx_hal_conf.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ extern "C"
3636
#define HAL_MODULE_ENABLED
3737

3838
#define HAL_ADC_MODULE_ENABLED
39-
#define HAL_FDCAN_MODULE_ENABLED
39+
/* #define HAL_FDCAN_MODULE_ENABLED */
4040
/* #define HAL_FMAC_MODULE_ENABLED */
4141
/* #define HAL_CEC_MODULE_ENABLED */
4242
/* #define HAL_COMP_MODULE_ENABLED */
@@ -77,7 +77,7 @@ extern "C"
7777
/* #define HAL_SPI_MODULE_ENABLED */
7878
/* #define HAL_SWPMI_MODULE_ENABLED */
7979
#define HAL_TIM_MODULE_ENABLED
80-
#define HAL_UART_MODULE_ENABLED
80+
/* #define HAL_UART_MODULE_ENABLED */
8181
/* #define HAL_USART_MODULE_ENABLED */
8282
/* #define HAL_IRDA_MODULE_ENABLED */
8383
/* #define HAL_SMARTCARD_MODULE_ENABLED */

‎firmware/quintuna/VC/src/cubemx/Inc/stm32h7xx_it.h‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -54,25 +54,10 @@ extern "C"
5454
void UsageFault_Handler(void);
5555
void DebugMon_Handler(void);
5656
void ADC_IRQHandler(void);
57-
void FDCAN1_IT0_IRQHandler(void);
58-
void FDCAN2_IT0_IRQHandler(void);
59-
void FDCAN1_IT1_IRQHandler(void);
60-
void FDCAN2_IT1_IRQHandler(void);
6157
void EXTI9_5_IRQHandler(void);
6258
void TIM2_IRQHandler(void);
63-
void I2C2_EV_IRQHandler(void);
64-
void I2C2_ER_IRQHandler(void);
6559
void EXTI15_10_IRQHandler(void);
66-
void I2C3_EV_IRQHandler(void);
67-
void I2C3_ER_IRQHandler(void);
6860
void OTG_HS_IRQHandler(void);
69-
void UART8_IRQHandler(void);
70-
void I2C4_EV_IRQHandler(void);
71-
void I2C4_ER_IRQHandler(void);
72-
void I2C5_EV_IRQHandler(void);
73-
void I2C5_ER_IRQHandler(void);
74-
void FDCAN3_IT0_IRQHandler(void);
75-
void FDCAN3_IT1_IRQHandler(void);
7661
/* USER CODE BEGIN EFP */
7762

7863
/* USER CODE END EFP */

0 commit comments

Comments
 (0)