Skip to content

Commit e320df3

Browse files
committed
Merge branch 'main' into gi/lvpdb-can
2 parents 120f596 + 895ffae commit e320df3

28 files changed

Lines changed: 1027 additions & 2864 deletions

File tree

.cubemx-manifest.json

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"boards": {
55
"BMS": {
66
"ioc_checksum": "08670b75875f2feedea3280eecc4821f36b742ccf7680976ae6f87bc3937ebfc",
7-
"generated_at": "2026-05-03T23:38:05Z",
7+
"generated_at": "2026-05-07T06:22:28Z",
88
"files": {
99
"Core/Inc/FreeRTOSConfig.h": "363755b7a21dd5a790f0bafbfd68f00abe141fd8691720b3604bc84b7dbaa81b",
1010
"Core/Inc/adc.h": "0ac97025a4065f07b7b65a906bd0c45ea800215434ed43c287c1685507f3f612",
@@ -75,7 +75,7 @@
7575
},
7676
"DASH": {
7777
"ioc_checksum": "6a1107c7b14166a666108bc4a87f26c99e19d25fb6f62b9fbcdd016db4457371",
78-
"generated_at": "2026-05-03T23:38:07Z",
78+
"generated_at": "2026-05-07T06:22:30Z",
7979
"files": {
8080
"Core/Inc/FreeRTOSConfig.h": "692168cbc9c915133ce3f329cec850c5372c1759ec0412ced61fc14741de14be",
8181
"Core/Inc/can.h": "d9c82c8382c196a76d472a6b82a292a0384a086536ca280ce701ebbba9f5c682",
@@ -177,7 +177,7 @@
177177
},
178178
"DART": {
179179
"ioc_checksum": "5e40a62867a13bf2ccbc21a8343b896b2979b658d024cb6721e46e05b32b5a45",
180-
"generated_at": "2026-05-03T23:38:08Z",
180+
"generated_at": "2026-05-07T06:22:30Z",
181181
"files": {
182182
"Core/Inc/can.h": "8bb6621564cd436d9b9697bc86bc4c6f6ae0492b84673344dfa5a3a2d0ee06cb",
183183
"Core/Inc/dma.h": "7cf6f7450a29d26303cbba5a3ca8c6cb24a02635d6a5ba4d05141fdfc75c4c49",
@@ -190,7 +190,7 @@
190190
"Core/Src/can.c": "fe91754e41e401ef588b6e3c555856c93817d276283e0fb802b6accc61615c3f",
191191
"Core/Src/dma.c": "7d6d5fdd82bde4349b5576d14554f25923e8315561470c3757fe176cecf4e76c",
192192
"Core/Src/gpio.c": "a8650cd2e645196e0d3afc1b2fae7bbb371eb5284489a5395c461d2b178532f7",
193-
"Core/Src/main.c": "832c3583ea7571224f66c683cabe3ee52cbe4be3990cf739e4f59492dca14b5b",
193+
"Core/Src/main.c": "d765501c114a8f6d26470108c5ff9118725e6a4e3f9226a1559c055c8a4b4e8e",
194194
"Core/Src/stm32f0xx_hal_msp.c": "0ddaa325d6d31b243899be32b857caaed2b4d3b89ddf3bfc6bc83e26779a9d3e",
195195
"Core/Src/stm32f0xx_it.c": "d067db284465695a7319eadf13ae8ba615e75ac86c5b0115a1e2d17755c32ece",
196196
"Core/Src/syscalls.c": "ab00c3df1417d6249b5c9c13c4e7b926f1fec9cd10961861d3f3c8d34983b913",
@@ -203,7 +203,7 @@
203203
},
204204
"DCU": {
205205
"ioc_checksum": "75f4a1174af99a72596dd7f739c38e22b0459b215bc0ddb3e22a6cfd49a8e736",
206-
"generated_at": "2026-05-03T23:38:08Z",
206+
"generated_at": "2026-05-07T06:22:30Z",
207207
"files": {
208208
"Core/Inc/gpio.h": "e2d62f964a0b7f238384ed6a20a181d09df9647240a268dc547acf5b35099f74",
209209
"Core/Inc/main.h": "e07a43ebc634ce451e2f80884378d112e048e06235fb49fdc2d9a2b5057d28c5",
@@ -222,8 +222,8 @@
222222
}
223223
},
224224
"LVPDB": {
225-
"ioc_checksum": "35fab767f9e0e1027a136ca482edf00568850e7bd941f793ae156215fec1ca33",
226-
"generated_at": "2026-05-03T23:38:08Z",
225+
"ioc_checksum": "aad83d2888e50c4498ca882150e6cc94c6266554b55da81220b3a142c5b5e4b2",
226+
"generated_at": "2026-05-07T06:22:31Z",
227227
"files": {
228228
"Core/Inc/can.h": "17611aeff90b90e352bc2ace2749644663492ecb10c71539567ef9b1441fd5d9",
229229
"Core/Inc/dma.h": "7cf6f7450a29d26303cbba5a3ca8c6cb24a02635d6a5ba4d05141fdfc75c4c49",
@@ -251,7 +251,7 @@
251251
},
252252
"PCU": {
253253
"ioc_checksum": "dce88e9916056d652c3fdf3d09dd8a7ad066bc7c7b6af576218e9be7277811b8",
254-
"generated_at": "2026-05-03T23:38:09Z",
254+
"generated_at": "2026-05-07T06:22:32Z",
255255
"files": {
256256
"Core/Inc/adc.h": "e36acfe1b822eff1de7e9f93073b8da32c94dd5b09484b716e190c6aa63eb3d0",
257257
"Core/Inc/can.h": "98925d7f4010f054e17d240116244377377c15248a5413a09ff811cdc23084e5",
@@ -281,7 +281,7 @@
281281
},
282282
"Sensor_Nodes": {
283283
"ioc_checksum": "be12ff3a8379f17c1b0a08bbdaf4953fb8f1c19bc8888a1df18d8395bb5a58f1",
284-
"generated_at": "2026-05-03T23:38:09Z",
284+
"generated_at": "2026-05-07T06:22:32Z",
285285
"files": {
286286
"Core/Inc/adc.h": "0ac97025a4065f07b7b65a906bd0c45ea800215434ed43c287c1685507f3f612",
287287
"Core/Inc/can.h": "98925d7f4010f054e17d240116244377377c15248a5413a09ff811cdc23084e5",
@@ -311,7 +311,7 @@
311311
},
312312
"UART": {
313313
"ioc_checksum": "9ff281c674a516d9870dbee5d60587351e97884ecd27127e2d1464987bf16a17",
314-
"generated_at": "2026-05-03T23:38:10Z",
314+
"generated_at": "2026-05-07T06:22:33Z",
315315
"files": {
316316
"Core/Inc/FreeRTOSConfig.h": "2a0e6022391d5ec198a77021ec3bf284583e245f9ce20c420fb7608f638330d6",
317317
"Core/Inc/dma.h": "7cf6f7450a29d26303cbba5a3ca8c6cb24a02635d6a5ba4d05141fdfc75c4c49",
@@ -371,7 +371,7 @@
371371
},
372372
"UART_TEST": {
373373
"ioc_checksum": "06c9618835096e44e3f73cd158bbc2e3fcf76e65dc9a29db68fe607180843efd",
374-
"generated_at": "2026-05-03T23:38:12Z",
374+
"generated_at": "2026-05-07T06:22:34Z",
375375
"files": {
376376
"Core/Inc/FreeRTOSConfig.h": "773dad076864ff18d5d85603d348d4931d29dde9925486e58f95a97ac98b8404",
377377
"Core/Inc/app_freertos.h": "6229601c2ebf192d40ceef377f3c1785571eaf6407f10bc87be5b06357dd3515",

BMS/Core/User/Src/FEB_Task_TPS.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@
1616
#define TAG_TPS "[TPS]"
1717

1818
/* ========================== External FreeRTOS handles (from CubeMX) ========================== */
19-
/* NOTE: These are created in CubeMX .ioc and defined in freertos.c */
20-
extern osMutexId_t tpsDataMutexHandle;
19+
/* NOTE: Created in CubeMX .ioc and defined in freertos.c */
2120
extern osMutexId_t tpsI2cMutexHandle;
2221

2322
/* TPS2482 configuration */
@@ -78,9 +77,7 @@ void StartTPSTask(void *argument)
7877
.log_func = tps_log_callback,
7978
.log_level = FEB_TPS_LOG_INFO,
8079
#if FEB_TPS_USE_FREERTOS
81-
.data_mutex = tpsDataMutexHandle,
8280
.i2c_mutex = tpsI2cMutexHandle,
83-
.poll_interval_ms = 100,
8481
#endif
8582
};
8683
FEB_TPS_Status_t init_status = FEB_TPS_Init(&lib_cfg);

BMS/VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.5.2
1+
1.5.3

DART/Core/Src/main.c

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,9 @@ void SystemClock_Config(void);
6464
/* USER CODE END 0 */
6565

6666
/**
67-
* @brief The application entry point.
68-
* @retval int
69-
*/
67+
* @brief The application entry point.
68+
* @retval int
69+
*/
7070
int main(void)
7171
{
7272

@@ -103,6 +103,8 @@ int main(void)
103103
MX_TIM17_Init();
104104
/* USER CODE BEGIN 2 */
105105

106+
// HAL_UART_Transmit(&huart2, (uint8_t *)"Hello World!\r\n", 15, 100);
107+
106108
// HAL_GPIO_WritePin(PWM1_GPIO_Port, PWM1_Pin, GPIO_PIN_SET);
107109
// HAL_GPIO_WritePin(PWM2_GPIO_Port, PWM2_Pin, GPIO_PIN_SET);
108110
// HAL_GPIO_WritePin(PWM3_GPIO_Port, PWM3_Pin, GPIO_PIN_SET);
@@ -127,17 +129,17 @@ int main(void)
127129
}
128130

129131
/**
130-
* @brief System Clock Configuration
131-
* @retval None
132-
*/
132+
* @brief System Clock Configuration
133+
* @retval None
134+
*/
133135
void SystemClock_Config(void)
134136
{
135137
RCC_OscInitTypeDef RCC_OscInitStruct = {0};
136138
RCC_ClkInitTypeDef RCC_ClkInitStruct = {0};
137139

138140
/** Initializes the RCC Oscillators according to the specified parameters
139-
* in the RCC_OscInitTypeDef structure.
140-
*/
141+
* in the RCC_OscInitTypeDef structure.
142+
*/
141143
RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_HSI48;
142144
RCC_OscInitStruct.HSI48State = RCC_HSI48_ON;
143145
RCC_OscInitStruct.PLL.PLLState = RCC_PLL_NONE;
@@ -147,9 +149,8 @@ void SystemClock_Config(void)
147149
}
148150

149151
/** Initializes the CPU, AHB and APB buses clocks
150-
*/
151-
RCC_ClkInitStruct.ClockType = RCC_CLOCKTYPE_HCLK|RCC_CLOCKTYPE_SYSCLK
152-
|RCC_CLOCKTYPE_PCLK1;
152+
*/
153+
RCC_ClkInitStruct.ClockType = RCC_CLOCKTYPE_HCLK | RCC_CLOCKTYPE_SYSCLK | RCC_CLOCKTYPE_PCLK1;
153154
RCC_ClkInitStruct.SYSCLKSource = RCC_SYSCLKSOURCE_HSI48;
154155
RCC_ClkInitStruct.AHBCLKDivider = RCC_SYSCLK_DIV1;
155156
RCC_ClkInitStruct.APB1CLKDivider = RCC_HCLK_DIV1;
@@ -169,9 +170,9 @@ void HAL_TIM_IC_CaptureCallback(TIM_HandleTypeDef *htim)
169170
/* USER CODE END 4 */
170171

171172
/**
172-
* @brief This function is executed in case of error occurrence.
173-
* @retval None
174-
*/
173+
* @brief This function is executed in case of error occurrence.
174+
* @retval None
175+
*/
175176
void Error_Handler(void)
176177
{
177178
/* USER CODE BEGIN Error_Handler_Debug */
@@ -185,12 +186,12 @@ void Error_Handler(void)
185186
}
186187
#ifdef USE_FULL_ASSERT
187188
/**
188-
* @brief Reports the name of the source file and the source line number
189-
* where the assert_param error has occurred.
190-
* @param file: pointer to the source file name
191-
* @param line: assert_param error line source number
192-
* @retval None
193-
*/
189+
* @brief Reports the name of the source file and the source line number
190+
* where the assert_param error has occurred.
191+
* @param file: pointer to the source file name
192+
* @param line: assert_param error line source number
193+
* @retval None
194+
*/
194195
void assert_failed(uint8_t *file, uint32_t line)
195196
{
196197
/* USER CODE BEGIN 6 */

DART/VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.5.2
1+
1.5.3

DASH/Core/User/Inc/FEB_CAN_BMS.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ typedef enum
3333

3434
void FEB_CAN_BMS_Init(void);
3535
BMS_State_t FEB_CAN_BMS_GetLastState(void);
36+
bool FEB_CAN_BMS_GetLastHVState(void);
3637
int16_t FEB_CAN_BMS_GetLastCellMaxTemperature(void);
3738
uint16_t FEB_CAN_BMS_GetLastAccumulatorTotalVoltage(void);
3839
bool FEB_CAN_BMS_IsDataFresh(uint32_t timeout_ms);

DASH/Core/User/Inc/TPS2482.h

Lines changed: 0 additions & 179 deletions
This file was deleted.

0 commit comments

Comments
 (0)