Merge achamaikin/CCSModuleSW30Web upstream with fire alarm retained.
Take upstream board rev2, heater, and project cleanup; preserve fire alarm latch, CMD_FIRE_ALARM, and ESTOP maintenance logic. Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
raduet
Vendored
BIN
Binary file not shown.
Binary file not shown.
Executable
BIN
Binary file not shown.
File diff suppressed because it is too large
Load Diff
+23387
-23385
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
+4076
-3581
File diff suppressed because it is too large
Load Diff
@@ -1,5 +1,5 @@
|
||||
../Core/Src/adc.c:29:6:ADC_ScanStart 2
|
||||
../Core/Src/adc.c:37:15:HAL_ADC_ConvCpltCallback 2
|
||||
../Core/Src/adc.c:59:6:MX_ADC1_Init 8
|
||||
../Core/Src/adc.c:146:6:HAL_ADC_MspInit 3
|
||||
../Core/Src/adc.c:200:6:HAL_ADC_MspDeInit 2
|
||||
../Core/Src/adc.c:13:6:ADC_ScanStart 2
|
||||
../Core/Src/adc.c:21:15:HAL_ADC_ConvCpltCallback 2
|
||||
../Core/Src/adc.c:43:6:MX_ADC1_Init 8
|
||||
../Core/Src/adc.c:130:6:HAL_ADC_MspInit 3
|
||||
../Core/Src/adc.c:184:6:HAL_ADC_MspDeInit 2
|
||||
|
||||
+14
-13
@@ -1,13 +1,14 @@
|
||||
../Core/Src/board.c:18:6:RELAY_Write 9
|
||||
../Core/Src/board.c:51:9:RELAY_Read 1
|
||||
../Core/Src/board.c:56:9:IN_ReadInput 8
|
||||
../Core/Src/board.c:77:9:GetBoardTemp 1
|
||||
../Core/Src/board.c:89:6:Init_Peripheral 1
|
||||
../Core/Src/board.c:106:7:pt1000_to_temperature 1
|
||||
../Core/Src/board.c:117:7:calculate_NTC_resistance 2
|
||||
../Core/Src/board.c:132:9:CONN_ReadTemp 4
|
||||
../Core/Src/board.c:152:9:GBT_ReadTemp 1
|
||||
../Core/Src/board.c:156:6:ADC_Select_Channel 2
|
||||
../Core/Src/board.c:167:9:ADC_TryLock 4
|
||||
../Core/Src/board.c:183:6:ADC_LockBlocking 2
|
||||
../Core/Src/board.c:189:6:ADC_Unlock 2
|
||||
../Core/Src/board.c:14:6:RELAY_Write 9
|
||||
../Core/Src/board.c:47:9:RELAY_Read 1
|
||||
../Core/Src/board.c:52:9:IN_ReadInput 8
|
||||
../Core/Src/board.c:74:9:GetBoardTemp 1
|
||||
../Core/Src/board.c:82:13:Heater_PinForceOutput 1
|
||||
../Core/Src/board.c:95:6:Init_Peripheral 1
|
||||
../Core/Src/board.c:114:7:pt1000_to_temperature 1
|
||||
../Core/Src/board.c:125:7:calculate_NTC_resistance 2
|
||||
../Core/Src/board.c:140:9:CONN_ReadTemp 4
|
||||
../Core/Src/board.c:159:9:GBT_ReadTemp 1
|
||||
../Core/Src/board.c:163:6:ADC_Select_Channel 2
|
||||
../Core/Src/board.c:174:9:ADC_TryLock 4
|
||||
../Core/Src/board.c:190:6:ADC_LockBlocking 2
|
||||
../Core/Src/board.c:196:6:ADC_Unlock 2
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
../Core/Src/can.c:31:6:MX_CAN1_Init 2
|
||||
../Core/Src/can.c:63:6:MX_CAN2_Init 2
|
||||
../Core/Src/can.c:97:6:HAL_CAN_MspInit 5
|
||||
../Core/Src/can.c:176:6:HAL_CAN_MspDeInit 5
|
||||
../Core/Src/can.c:15:6:MX_CAN1_Init 2
|
||||
../Core/Src/can.c:47:6:MX_CAN2_Init 2
|
||||
../Core/Src/can.c:81:6:HAL_CAN_MspInit 5
|
||||
../Core/Src/can.c:160:6:HAL_CAN_MspDeInit 5
|
||||
|
||||
@@ -1,5 +1,3 @@
|
||||
../Core/Src/charger_control.c:13:6:CONN_Init 1
|
||||
../Core/Src/charger_control.c:21:6:CONN_Loop 7
|
||||
../Core/Src/charger_control.c:50:6:CONN_Task 1
|
||||
../Core/Src/charger_control.c:57:6:CONN_SetState 16
|
||||
../Core/Src/charger_control.c:83:6:CONN_PrintChargingTotal 1
|
||||
../Core/Src/charger_control.c:10:6:CONN_Init 1
|
||||
../Core/Src/charger_control.c:18:6:CONN_Loop 6
|
||||
../Core/Src/charger_control.c:39:6:CONN_SetState 16
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
../Core/Src/cp.c:19:16:CP_ReadVoltageMv 1
|
||||
../Core/Src/cp.c:36:6:CP_Init 1
|
||||
../Core/Src/cp.c:53:6:CP_SetDuty 1
|
||||
../Core/Src/cp.c:66:9:CP_GetDuty 1
|
||||
../Core/Src/cp.c:70:9:CP_GetVoltage 1
|
||||
../Core/Src/cp.c:75:12:CP_GetState 12
|
||||
../Core/Src/cp.c:99:12:CP_GetFilteredState 1
|
||||
../Core/Src/cp.c:103:6:CP_FilterState 5
|
||||
../Core/Src/cp.c:131:6:CP_Loop 5
|
||||
../Core/Src/cp.c:20:16:CP_ReadVoltageMv 1
|
||||
../Core/Src/cp.c:37:6:CP_Init 1
|
||||
../Core/Src/cp.c:54:6:CP_SetDuty 1
|
||||
../Core/Src/cp.c:67:9:CP_GetDuty 1
|
||||
../Core/Src/cp.c:71:9:CP_GetVoltage 1
|
||||
../Core/Src/cp.c:76:12:CP_GetState 12
|
||||
../Core/Src/cp.c:100:12:CP_GetFilteredState 1
|
||||
../Core/Src/cp.c:104:6:CP_FilterState 5
|
||||
../Core/Src/cp.c:132:6:CP_Loop 5
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
../Core/Src/crc.c:30:6:MX_CRC_Init 2
|
||||
../Core/Src/crc.c:51:6:HAL_CRC_MspInit 2
|
||||
../Core/Src/crc.c:67:6:HAL_CRC_MspDeInit 2
|
||||
../Core/Src/crc.c:14:6:MX_CRC_Init 2
|
||||
../Core/Src/crc.c:35:6:HAL_CRC_MspInit 2
|
||||
../Core/Src/crc.c:51:6:HAL_CRC_MspDeInit 2
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
../Core/Src/debug.c:42:5:_write 1
|
||||
../Core/Src/debug.c:50:6:debug_buffer_add 3
|
||||
../Core/Src/debug.c:70:10:debug_buffer_available 1
|
||||
../Core/Src/debug.c:79:6:debug_buffer_send 5
|
||||
../Core/Src/debug.c:119:5:log_printf 3
|
||||
../Core/Src/debug.c:35:5:_write 1
|
||||
../Core/Src/debug.c:43:6:debug_buffer_add 3
|
||||
../Core/Src/debug.c:63:10:debug_buffer_available 1
|
||||
../Core/Src/debug.c:72:6:debug_buffer_send 5
|
||||
../Core/Src/debug.c:112:5:log_printf 3
|
||||
|
||||
@@ -1 +1 @@
|
||||
../Core/Src/dma.c:39:6:MX_DMA_Init 1
|
||||
../Core/Src/dma.c:23:6:MX_DMA_Init 1
|
||||
|
||||
@@ -1 +1 @@
|
||||
../Core/Src/gpio.c:44:6:MX_GPIO_Init 1
|
||||
../Core/Src/gpio.c:28:6:MX_GPIO_Init 1
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
../Drivers/CMSIS/Include/core_cm3.h:1762:34:__NVIC_SystemReset 1
|
||||
../Core/Src/main.c:65:13:VectorBase_Config 1
|
||||
../Core/Src/main.c:76:9:ED_TraceWarning 3
|
||||
../Core/Src/main.c:88:6:ED_Delay 3
|
||||
../Core/Src/main.c:108:6:StopButtonControl 8
|
||||
../Core/Src/main.c:151:13:CAN1_MinimalReInit 3
|
||||
../Core/Src/main.c:169:5:main 1
|
||||
../Core/Src/main.c:250:6:SystemClock_Config 4
|
||||
../Core/Src/main.c:310:6:Error_Handler 1
|
||||
../Core/Src/main.c:69:13:VectorBase_Config 1
|
||||
../Core/Src/main.c:80:9:ED_TraceWarning 3
|
||||
../Core/Src/main.c:92:6:ED_Delay 3
|
||||
../Core/Src/main.c:111:13:StopButtonControl 8
|
||||
../Core/Src/main.c:152:13:CAN1_MinimalReInit 3
|
||||
../Core/Src/main.c:170:5:main 1
|
||||
../Core/Src/main.c:251:6:SystemClock_Config 4
|
||||
../Core/Src/main.c:311:6:Error_Handler 1
|
||||
|
||||
@@ -1 +1 @@
|
||||
../Core/Src/meter.c:17:6:METER_CalculateEnergy 3
|
||||
../Core/Src/meter.c:9:6:METER_CalculateEnergy 3
|
||||
|
||||
@@ -1,12 +1,11 @@
|
||||
../Core/Src/psu_control.c:34:13:PSU_SwitchState 1
|
||||
../Core/Src/psu_control.c:39:17:PSU_StateTime 1
|
||||
../Core/Src/psu_control.c:43:15:HAL_CAN_RxFifo1MsgPendingCallback 9
|
||||
../Core/Src/psu_control.c:117:6:PSU_CAN_FilterInit 2
|
||||
../Core/Src/psu_control.c:140:6:PSU_Init 1
|
||||
../Core/Src/psu_control.c:158:6:PSU_Enable 3
|
||||
../Core/Src/psu_control.c:170:6:PSU_SetHVMode 2
|
||||
../Core/Src/psu_control.c:177:6:PSU_SetVoltageCurrent 5
|
||||
../Core/Src/psu_control.c:204:6:PSU_SendCmd 4
|
||||
../Core/Src/psu_control.c:240:10:max 2
|
||||
../Core/Src/psu_control.c:245:6:PSU_ReadWrite 8
|
||||
../Core/Src/psu_control.c:289:6:PSU_Task 41
|
||||
../Core/Src/psu_control.c:35:13:PSU_SwitchState 1
|
||||
../Core/Src/psu_control.c:40:17:PSU_StateTime 1
|
||||
../Core/Src/psu_control.c:44:15:HAL_CAN_RxFifo1MsgPendingCallback 9
|
||||
../Core/Src/psu_control.c:118:6:PSU_CAN_FilterInit 2
|
||||
../Core/Src/psu_control.c:141:6:PSU_Init 1
|
||||
../Core/Src/psu_control.c:159:6:PSU_Enable 3
|
||||
../Core/Src/psu_control.c:171:6:PSU_SetHVMode 2
|
||||
../Core/Src/psu_control.c:178:6:PSU_SetVoltageCurrent 5
|
||||
../Core/Src/psu_control.c:205:6:PSU_SendCmd 4
|
||||
../Core/Src/psu_control.c:240:6:PSU_ReadWrite 8
|
||||
../Core/Src/psu_control.c:284:6:PSU_Task 41
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
../Core/Src/rgb_controller.c:103:6:LED_Write 20
|
||||
../Core/Src/rgb_controller.c:169:6:interpolateColors 3
|
||||
../Core/Src/rgb_controller.c:187:6:RGB_SetColor 1
|
||||
../Core/Src/rgb_controller.c:193:6:LED_SetColor 1
|
||||
../Core/Src/rgb_controller.c:198:6:LED_Init 1
|
||||
../Core/Src/rgb_controller.c:230:6:LED_Task 10
|
||||
../Core/Src/rgb_controller.c:102:6:LED_Write 18
|
||||
../Core/Src/rgb_controller.c:164:6:interpolateColors 3
|
||||
../Core/Src/rgb_controller.c:182:6:RGB_SetColor 1
|
||||
../Core/Src/rgb_controller.c:188:6:LED_SetColor 1
|
||||
../Core/Src/rgb_controller.c:193:6:LED_Init 1
|
||||
../Core/Src/rgb_controller.c:201:6:LED_Task 10
|
||||
|
||||
+20
-20
@@ -1,20 +1,20 @@
|
||||
../Core/Src/serial.c:71:22:uart3_log_hal_error 3
|
||||
../Core/Src/serial.c:91:22:uart3_arm_rx_or_log 3
|
||||
../Core/Src/serial.c:107:15:CCS_RxEventCallback 4
|
||||
../Core/Src/serial.c:130:15:HAL_UART_ErrorCallback 5
|
||||
../Core/Src/serial.c:150:6:CCS_TxCpltCallback 4
|
||||
../Core/Src/serial.c:166:6:CCS_SerialLoop 72
|
||||
../Core/Src/serial.c:394:6:CCS_Init 1
|
||||
../Core/Src/serial.c:409:26:crc16_ibm 3
|
||||
../Core/Src/serial.c:424:17:CCS_BuildPacket 4
|
||||
../Core/Src/serial.c:440:13:CCS_SendPacket 4
|
||||
../Core/Src/serial.c:457:13:CCS_SendResetReason 1
|
||||
../Core/Src/serial.c:461:6:CCS_SendEmergencyStop 1
|
||||
../Core/Src/serial.c:465:6:CCS_SendStart 1
|
||||
../Core/Src/serial.c:469:13:CCS_CalculateEnergy 2
|
||||
../Core/Src/serial.c:484:13:send_state 3
|
||||
../Core/Src/serial.c:514:26:expected_payload_len 2
|
||||
../Core/Src/serial.c:530:22:apply_command 15
|
||||
../Core/Src/serial.c:612:25:process_received_packet 8
|
||||
../Core/Src/serial.c:665:13:CCS_UART3_Watchdog 4
|
||||
../Core/Src/serial.c:678:13:CCS_LogUart3Error 1
|
||||
../Core/Src/serial.c:65:22:uart3_log_hal_error 3
|
||||
../Core/Src/serial.c:85:22:uart3_arm_rx_or_log 3
|
||||
../Core/Src/serial.c:101:15:CCS_RxEventCallback 4
|
||||
../Core/Src/serial.c:124:15:HAL_UART_ErrorCallback 5
|
||||
../Core/Src/serial.c:144:6:CCS_TxCpltCallback 4
|
||||
../Core/Src/serial.c:160:6:CCS_SerialLoop 62
|
||||
../Core/Src/serial.c:360:6:CCS_Init 1
|
||||
../Core/Src/serial.c:375:26:crc16_ibm 3
|
||||
../Core/Src/serial.c:390:17:CCS_BuildPacket 4
|
||||
../Core/Src/serial.c:406:13:CCS_SendPacket 4
|
||||
../Core/Src/serial.c:423:13:CCS_SendResetReason 1
|
||||
../Core/Src/serial.c:427:6:CCS_SendEmergencyStop 1
|
||||
../Core/Src/serial.c:431:6:CCS_SendStart 1
|
||||
../Core/Src/serial.c:435:13:CCS_CalculateEnergy 2
|
||||
../Core/Src/serial.c:450:13:send_state 3
|
||||
../Core/Src/serial.c:480:26:expected_payload_len 2
|
||||
../Core/Src/serial.c:496:22:apply_command 15
|
||||
../Core/Src/serial.c:578:25:process_received_packet 8
|
||||
../Core/Src/serial.c:631:13:CCS_UART3_Watchdog 4
|
||||
../Core/Src/serial.c:644:13:CCS_LogUart3Error 1
|
||||
|
||||
@@ -1,15 +1,15 @@
|
||||
../Core/Src/serial_control.c:71:6:ReadVersion 1
|
||||
../Core/Src/serial_control.c:83:6:SC_Init 1
|
||||
../Core/Src/serial_control.c:94:6:SC_Task 7
|
||||
../Core/Src/serial_control.c:122:15:HAL_UARTEx_RxEventCallback 8
|
||||
../Core/Src/serial_control.c:152:15:HAL_UART_TxCpltCallback 3
|
||||
../Core/Src/serial_control.c:163:26:calculate_crc32 3
|
||||
../Core/Src/serial_control.c:180:26:encode_packet 5
|
||||
../Core/Src/serial_control.c:213:15:SC_SendPacket 4
|
||||
../Core/Src/serial_control.c:230:25:parse_packet 3
|
||||
../Core/Src/serial_control.c:263:25:process_received_packet 2
|
||||
../Core/Src/serial_control.c:272:13:SC_UART2_Watchdog 5
|
||||
../Core/Src/serial_control.c:293:13:SC_ArmUart2RxDma 4
|
||||
../Core/Src/serial_control.c:301:13:SC_ArmUart5RxDma 3
|
||||
../Core/Src/serial_control.c:310:6:SC_RecoverUartDma 3
|
||||
../Core/Src/serial_control.c:325:13:SC_LogUartError 3
|
||||
../Core/Src/serial_control.c:72:6:ReadVersion 1
|
||||
../Core/Src/serial_control.c:84:6:SC_Init 1
|
||||
../Core/Src/serial_control.c:95:6:SC_Task 7
|
||||
../Core/Src/serial_control.c:123:15:HAL_UARTEx_RxEventCallback 8
|
||||
../Core/Src/serial_control.c:153:15:HAL_UART_TxCpltCallback 3
|
||||
../Core/Src/serial_control.c:164:26:calculate_crc32 3
|
||||
../Core/Src/serial_control.c:181:26:encode_packet 5
|
||||
../Core/Src/serial_control.c:214:15:SC_SendPacket 4
|
||||
../Core/Src/serial_control.c:231:25:parse_packet 3
|
||||
../Core/Src/serial_control.c:264:25:process_received_packet 2
|
||||
../Core/Src/serial_control.c:273:13:SC_UART2_Watchdog 5
|
||||
../Core/Src/serial_control.c:294:13:SC_ArmUart2RxDma 4
|
||||
../Core/Src/serial_control.c:302:13:SC_ArmUart5RxDma 3
|
||||
../Core/Src/serial_control.c:311:6:SC_RecoverUartDma 3
|
||||
../Core/Src/serial_control.c:326:13:SC_LogUartError 3
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
../Drivers/CMSIS/Include/core_cm3.h:1762:34:__NVIC_SystemReset 1
|
||||
../Core/Src/serial_handler.c:27:6:SC_CommandHandler 21
|
||||
../Core/Src/serial_handler.c:136:6:monitoring_data_callback 1
|
||||
../Core/Src/serial_handler.c:26:6:SC_CommandHandler 19
|
||||
../Core/Src/serial_handler.c:125:13:monitoring_data_callback 1
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
../Core/Src/soft_rtc.c:22:10:get_Current_Time 1
|
||||
../Core/Src/soft_rtc.c:26:6:set_Time 1
|
||||
../Core/Src/soft_rtc.c:30:9:to_bcd 1
|
||||
../Core/Src/soft_rtc.c:34:6:unix_to_bcd 1
|
||||
../Core/Src/soft_rtc.c:48:6:writeTimeReg 2
|
||||
../Core/Src/soft_rtc.c:53:9:getTimeReg 5
|
||||
../Core/Src/soft_rtc.c:87:17:RTC1_ReadTimeCounter 2
|
||||
../Core/Src/soft_rtc.c:119:26:RTC1_WriteTimeCounter 3
|
||||
../Core/Src/soft_rtc.c:151:26:RTC1_EnterInitMode 3
|
||||
../Core/Src/soft_rtc.c:178:26:RTC1_ExitInitMode 3
|
||||
../Core/Src/soft_rtc.c:15:10:get_Current_Time 1
|
||||
../Core/Src/soft_rtc.c:19:6:set_Time 1
|
||||
../Core/Src/soft_rtc.c:23:9:to_bcd 1
|
||||
../Core/Src/soft_rtc.c:27:6:unix_to_bcd 1
|
||||
../Core/Src/soft_rtc.c:41:6:writeTimeReg 2
|
||||
../Core/Src/soft_rtc.c:46:9:getTimeReg 5
|
||||
../Core/Src/soft_rtc.c:67:17:RTC1_ReadTimeCounter 2
|
||||
../Core/Src/soft_rtc.c:99:26:RTC1_WriteTimeCounter 3
|
||||
../Core/Src/soft_rtc.c:131:26:RTC1_EnterInitMode 3
|
||||
../Core/Src/soft_rtc.c:158:26:RTC1_ExitInitMode 3
|
||||
|
||||
@@ -1 +1 @@
|
||||
../Core/Src/stm32f1xx_hal_msp.c:63:6:HAL_MspInit 1
|
||||
../Core/Src/stm32f1xx_hal_msp.c:47:6:HAL_MspInit 1
|
||||
|
||||
@@ -1,23 +1,23 @@
|
||||
../Core/Src/stm32f1xx_it.c:84:6:NMI_Handler 1
|
||||
../Core/Src/stm32f1xx_it.c:99:6:HardFault_Handler 1
|
||||
../Core/Src/stm32f1xx_it.c:114:6:MemManage_Handler 1
|
||||
../Core/Src/stm32f1xx_it.c:129:6:BusFault_Handler 1
|
||||
../Core/Src/stm32f1xx_it.c:144:6:UsageFault_Handler 1
|
||||
../Core/Src/stm32f1xx_it.c:159:6:SVC_Handler 1
|
||||
../Core/Src/stm32f1xx_it.c:172:6:DebugMon_Handler 1
|
||||
../Core/Src/stm32f1xx_it.c:185:6:PendSV_Handler 1
|
||||
../Core/Src/stm32f1xx_it.c:198:6:SysTick_Handler 1
|
||||
../Core/Src/stm32f1xx_it.c:219:6:DMA1_Channel1_IRQHandler 1
|
||||
../Core/Src/stm32f1xx_it.c:233:6:DMA1_Channel2_IRQHandler 1
|
||||
../Core/Src/stm32f1xx_it.c:247:6:DMA1_Channel3_IRQHandler 1
|
||||
../Core/Src/stm32f1xx_it.c:261:6:DMA1_Channel6_IRQHandler 1
|
||||
../Core/Src/stm32f1xx_it.c:275:6:DMA1_Channel7_IRQHandler 1
|
||||
../Core/Src/stm32f1xx_it.c:289:6:ADC1_2_IRQHandler 1
|
||||
../Core/Src/stm32f1xx_it.c:303:6:CAN1_RX0_IRQHandler 1
|
||||
../Core/Src/stm32f1xx_it.c:317:6:TIM3_IRQHandler 1
|
||||
../Core/Src/stm32f1xx_it.c:331:6:USART1_IRQHandler 1
|
||||
../Core/Src/stm32f1xx_it.c:345:6:USART2_IRQHandler 1
|
||||
../Core/Src/stm32f1xx_it.c:359:6:USART3_IRQHandler 1
|
||||
../Core/Src/stm32f1xx_it.c:373:6:UART5_IRQHandler 1
|
||||
../Core/Src/stm32f1xx_it.c:387:6:CAN2_TX_IRQHandler 1
|
||||
../Core/Src/stm32f1xx_it.c:401:6:CAN2_RX1_IRQHandler 1
|
||||
../Core/Src/stm32f1xx_it.c:69:6:NMI_Handler 1
|
||||
../Core/Src/stm32f1xx_it.c:84:6:HardFault_Handler 1
|
||||
../Core/Src/stm32f1xx_it.c:99:6:MemManage_Handler 1
|
||||
../Core/Src/stm32f1xx_it.c:114:6:BusFault_Handler 1
|
||||
../Core/Src/stm32f1xx_it.c:129:6:UsageFault_Handler 1
|
||||
../Core/Src/stm32f1xx_it.c:144:6:SVC_Handler 1
|
||||
../Core/Src/stm32f1xx_it.c:157:6:DebugMon_Handler 1
|
||||
../Core/Src/stm32f1xx_it.c:170:6:PendSV_Handler 1
|
||||
../Core/Src/stm32f1xx_it.c:183:6:SysTick_Handler 1
|
||||
../Core/Src/stm32f1xx_it.c:204:6:DMA1_Channel1_IRQHandler 1
|
||||
../Core/Src/stm32f1xx_it.c:218:6:DMA1_Channel2_IRQHandler 1
|
||||
../Core/Src/stm32f1xx_it.c:232:6:DMA1_Channel3_IRQHandler 1
|
||||
../Core/Src/stm32f1xx_it.c:246:6:DMA1_Channel6_IRQHandler 1
|
||||
../Core/Src/stm32f1xx_it.c:260:6:DMA1_Channel7_IRQHandler 1
|
||||
../Core/Src/stm32f1xx_it.c:274:6:ADC1_2_IRQHandler 1
|
||||
../Core/Src/stm32f1xx_it.c:288:6:CAN1_RX0_IRQHandler 1
|
||||
../Core/Src/stm32f1xx_it.c:302:6:TIM3_IRQHandler 1
|
||||
../Core/Src/stm32f1xx_it.c:316:6:USART1_IRQHandler 1
|
||||
../Core/Src/stm32f1xx_it.c:330:6:USART2_IRQHandler 1
|
||||
../Core/Src/stm32f1xx_it.c:344:6:USART3_IRQHandler 1
|
||||
../Core/Src/stm32f1xx_it.c:358:6:UART5_IRQHandler 1
|
||||
../Core/Src/stm32f1xx_it.c:372:6:CAN2_TX_IRQHandler 1
|
||||
../Core/Src/stm32f1xx_it.c:386:6:CAN2_RX1_IRQHandler 1
|
||||
|
||||
@@ -71,7 +71,6 @@ OBJS += \
|
||||
./Core/Src/crc.o \
|
||||
./Core/Src/debug.o \
|
||||
./Core/Src/dma.o \
|
||||
./Core/Src/fire_alarm.o \
|
||||
./Core/Src/gpio.o \
|
||||
./Core/Src/main.o \
|
||||
./Core/Src/meter.o \
|
||||
@@ -99,7 +98,7 @@ Core/Src/%.o Core/Src/%.su Core/Src/%.cyclo: ../Core/Src/%.c Core/Src/subdir.mk
|
||||
clean: clean-Core-2f-Src
|
||||
|
||||
clean-Core-2f-Src:
|
||||
-$(RM) ./Core/Src/adc.cyclo ./Core/Src/adc.d ./Core/Src/adc.o ./Core/Src/adc.su ./Core/Src/board.cyclo ./Core/Src/board.d ./Core/Src/board.o ./Core/Src/board.su ./Core/Src/can.cyclo ./Core/Src/can.d ./Core/Src/can.o ./Core/Src/can.su ./Core/Src/charger_control.cyclo ./Core/Src/charger_control.d ./Core/Src/charger_control.o ./Core/Src/charger_control.su ./Core/Src/cp.cyclo ./Core/Src/cp.d ./Core/Src/cp.o ./Core/Src/cp.su ./Core/Src/crc.cyclo ./Core/Src/crc.d ./Core/Src/crc.o ./Core/Src/crc.su ./Core/Src/debug.cyclo ./Core/Src/debug.d ./Core/Src/debug.o ./Core/Src/debug.su ./Core/Src/dma.cyclo ./Core/Src/dma.d ./Core/Src/dma.o ./Core/Src/dma.su ./Core/Src/fire_alarm.cyclo ./Core/Src/fire_alarm.d ./Core/Src/fire_alarm.o ./Core/Src/fire_alarm.su ./Core/Src/gpio.cyclo ./Core/Src/gpio.d ./Core/Src/gpio.o ./Core/Src/gpio.su ./Core/Src/main.cyclo ./Core/Src/main.d ./Core/Src/main.o ./Core/Src/main.su ./Core/Src/meter.cyclo ./Core/Src/meter.d ./Core/Src/meter.o ./Core/Src/meter.su ./Core/Src/psu_control.cyclo ./Core/Src/psu_control.d ./Core/Src/psu_control.o ./Core/Src/psu_control.su ./Core/Src/rgb_controller.cyclo ./Core/Src/rgb_controller.d ./Core/Src/rgb_controller.o ./Core/Src/rgb_controller.su ./Core/Src/rtc.cyclo ./Core/Src/rtc.d ./Core/Src/rtc.o ./Core/Src/rtc.su ./Core/Src/serial.cyclo ./Core/Src/serial.d ./Core/Src/serial.o ./Core/Src/serial.su ./Core/Src/serial_control.cyclo ./Core/Src/serial_control.d ./Core/Src/serial_control.o ./Core/Src/serial_control.su ./Core/Src/serial_handler.cyclo ./Core/Src/serial_handler.d ./Core/Src/serial_handler.o ./Core/Src/serial_handler.su ./Core/Src/sma_filter.cyclo ./Core/Src/sma_filter.d ./Core/Src/sma_filter.o ./Core/Src/sma_filter.su ./Core/Src/soft_rtc.cyclo ./Core/Src/soft_rtc.d ./Core/Src/soft_rtc.o ./Core/Src/soft_rtc.su ./Core/Src/stm32f1xx_hal_msp.cyclo ./Core/Src/stm32f1xx_hal_msp.d ./Core/Src/stm32f1xx_hal_msp.o ./Core/Src/stm32f1xx_hal_msp.su ./Core/Src/stm32f1xx_it.cyclo ./Core/Src/stm32f1xx_it.d ./Core/Src/stm32f1xx_it.o ./Core/Src/stm32f1xx_it.su ./Core/Src/syscalls.cyclo ./Core/Src/syscalls.d ./Core/Src/syscalls.o ./Core/Src/syscalls.su ./Core/Src/sysmem.cyclo ./Core/Src/sysmem.d ./Core/Src/sysmem.o ./Core/Src/sysmem.su ./Core/Src/system_stm32f1xx.cyclo ./Core/Src/system_stm32f1xx.d ./Core/Src/system_stm32f1xx.o ./Core/Src/system_stm32f1xx.su ./Core/Src/tim.cyclo ./Core/Src/tim.d ./Core/Src/tim.o ./Core/Src/tim.su ./Core/Src/usart.cyclo ./Core/Src/usart.d ./Core/Src/usart.o ./Core/Src/usart.su
|
||||
-$(RM) ./Core/Src/adc.cyclo ./Core/Src/adc.d ./Core/Src/adc.o ./Core/Src/adc.su ./Core/Src/board.cyclo ./Core/Src/board.d ./Core/Src/board.o ./Core/Src/board.su ./Core/Src/can.cyclo ./Core/Src/can.d ./Core/Src/can.o ./Core/Src/can.su ./Core/Src/charger_control.cyclo ./Core/Src/charger_control.d ./Core/Src/charger_control.o ./Core/Src/charger_control.su ./Core/Src/cp.cyclo ./Core/Src/cp.d ./Core/Src/cp.o ./Core/Src/cp.su ./Core/Src/crc.cyclo ./Core/Src/crc.d ./Core/Src/crc.o ./Core/Src/crc.su ./Core/Src/debug.cyclo ./Core/Src/debug.d ./Core/Src/debug.o ./Core/Src/debug.su ./Core/Src/dma.cyclo ./Core/Src/dma.d ./Core/Src/dma.o ./Core/Src/dma.su ./Core/Src/gpio.cyclo ./Core/Src/gpio.d ./Core/Src/gpio.o ./Core/Src/gpio.su ./Core/Src/main.cyclo ./Core/Src/main.d ./Core/Src/main.o ./Core/Src/main.su ./Core/Src/meter.cyclo ./Core/Src/meter.d ./Core/Src/meter.o ./Core/Src/meter.su ./Core/Src/psu_control.cyclo ./Core/Src/psu_control.d ./Core/Src/psu_control.o ./Core/Src/psu_control.su ./Core/Src/rgb_controller.cyclo ./Core/Src/rgb_controller.d ./Core/Src/rgb_controller.o ./Core/Src/rgb_controller.su ./Core/Src/rtc.cyclo ./Core/Src/rtc.d ./Core/Src/rtc.o ./Core/Src/rtc.su ./Core/Src/serial.cyclo ./Core/Src/serial.d ./Core/Src/serial.o ./Core/Src/serial.su ./Core/Src/serial_control.cyclo ./Core/Src/serial_control.d ./Core/Src/serial_control.o ./Core/Src/serial_control.su ./Core/Src/serial_handler.cyclo ./Core/Src/serial_handler.d ./Core/Src/serial_handler.o ./Core/Src/serial_handler.su ./Core/Src/sma_filter.cyclo ./Core/Src/sma_filter.d ./Core/Src/sma_filter.o ./Core/Src/sma_filter.su ./Core/Src/soft_rtc.cyclo ./Core/Src/soft_rtc.d ./Core/Src/soft_rtc.o ./Core/Src/soft_rtc.su ./Core/Src/stm32f1xx_hal_msp.cyclo ./Core/Src/stm32f1xx_hal_msp.d ./Core/Src/stm32f1xx_hal_msp.o ./Core/Src/stm32f1xx_hal_msp.su ./Core/Src/stm32f1xx_it.cyclo ./Core/Src/stm32f1xx_it.d ./Core/Src/stm32f1xx_it.o ./Core/Src/stm32f1xx_it.su ./Core/Src/syscalls.cyclo ./Core/Src/syscalls.d ./Core/Src/syscalls.o ./Core/Src/syscalls.su ./Core/Src/sysmem.cyclo ./Core/Src/sysmem.d ./Core/Src/sysmem.o ./Core/Src/sysmem.su ./Core/Src/system_stm32f1xx.cyclo ./Core/Src/system_stm32f1xx.d ./Core/Src/system_stm32f1xx.o ./Core/Src/system_stm32f1xx.su ./Core/Src/tim.cyclo ./Core/Src/tim.d ./Core/Src/tim.o ./Core/Src/tim.su ./Core/Src/usart.cyclo ./Core/Src/usart.d ./Core/Src/usart.o ./Core/Src/usart.su
|
||||
|
||||
.PHONY: clean-Core-2f-Src
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
../Core/Src/tim.c:31:6:MX_TIM3_Init 8
|
||||
../Core/Src/tim.c:95:6:MX_TIM4_Init 8
|
||||
../Core/Src/tim.c:157:6:HAL_TIM_Base_MspInit 3
|
||||
../Core/Src/tim.c:187:6:HAL_TIM_MspPostInit 3
|
||||
../Core/Src/tim.c:235:6:HAL_TIM_Base_MspDeInit 3
|
||||
../Core/Src/tim.c:15:6:MX_TIM3_Init 8
|
||||
../Core/Src/tim.c:79:6:MX_TIM4_Init 8
|
||||
../Core/Src/tim.c:141:6:HAL_TIM_Base_MspInit 3
|
||||
../Core/Src/tim.c:171:6:HAL_TIM_MspPostInit 3
|
||||
../Core/Src/tim.c:219:6:HAL_TIM_Base_MspDeInit 3
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
../Core/Src/usart.c:37:6:MX_UART5_Init 2
|
||||
../Core/Src/usart.c:66:6:MX_USART1_UART_Init 2
|
||||
../Core/Src/usart.c:95:6:MX_USART2_UART_Init 2
|
||||
../Core/Src/usart.c:124:6:MX_USART3_UART_Init 2
|
||||
../Core/Src/usart.c:152:6:HAL_UART_MspInit 9
|
||||
../Core/Src/usart.c:349:6:HAL_UART_MspDeInit 5
|
||||
../Core/Src/usart.c:21:6:MX_UART5_Init 2
|
||||
../Core/Src/usart.c:50:6:MX_USART1_UART_Init 2
|
||||
../Core/Src/usart.c:79:6:MX_USART2_UART_Init 2
|
||||
../Core/Src/usart.c:108:6:MX_USART3_UART_Init 2
|
||||
../Core/Src/usart.c:136:6:HAL_UART_MspInit 9
|
||||
../Core/Src/usart.c:333:6:HAL_UART_MspDeInit 5
|
||||
|
||||
+118
@@ -0,0 +1,118 @@
|
||||
################################################################################
|
||||
# Automatically-generated file. Do not edit!
|
||||
# Toolchain: GNU Tools for STM32 (13.3.rel1)
|
||||
################################################################################
|
||||
|
||||
-include ../makefile.init
|
||||
|
||||
RM := rm -rf
|
||||
|
||||
# All of the sources participating in the build are defined here
|
||||
-include sources.mk
|
||||
-include Drivers/STM32F1xx_HAL_Driver/Src/subdir.mk
|
||||
-include Core/Startup/subdir.mk
|
||||
-include Core/Src/subdir.mk
|
||||
-include objects.mk
|
||||
|
||||
ifneq ($(MAKECMDGOALS),clean)
|
||||
ifneq ($(strip $(S_DEPS)),)
|
||||
-include $(S_DEPS)
|
||||
endif
|
||||
ifneq ($(strip $(S_UPPER_DEPS)),)
|
||||
-include $(S_UPPER_DEPS)
|
||||
endif
|
||||
ifneq ($(strip $(C_DEPS)),)
|
||||
-include $(C_DEPS)
|
||||
endif
|
||||
endif
|
||||
|
||||
-include ../makefile.defs
|
||||
|
||||
OPTIONAL_TOOL_DEPS := \
|
||||
$(wildcard ../makefile.defs) \
|
||||
$(wildcard ../makefile.init) \
|
||||
$(wildcard ../makefile.targets) \
|
||||
|
||||
|
||||
BUILD_ARTIFACT_NAME := CCSModuleSW30Web
|
||||
BUILD_ARTIFACT_EXTENSION := elf
|
||||
BUILD_ARTIFACT_PREFIX :=
|
||||
BUILD_ARTIFACT := $(BUILD_ARTIFACT_PREFIX)$(BUILD_ARTIFACT_NAME)$(if $(BUILD_ARTIFACT_EXTENSION),.$(BUILD_ARTIFACT_EXTENSION),)
|
||||
|
||||
# Add inputs and outputs from these tool invocations to the build variables
|
||||
EXECUTABLES += \
|
||||
CCSModuleSW30Web.elf \
|
||||
|
||||
MAP_FILES += \
|
||||
CCSModuleSW30Web.map \
|
||||
|
||||
SIZE_OUTPUT += \
|
||||
default.size.stdout \
|
||||
|
||||
OBJDUMP_LIST += \
|
||||
CCSModuleSW30Web.list \
|
||||
|
||||
OBJCOPY_HEX += \
|
||||
CCSModuleSW30Web.hex \
|
||||
|
||||
OBJCOPY_BIN += \
|
||||
CCSModuleSW30Web.bin \
|
||||
|
||||
OBJCOPY_SREC += \
|
||||
CCSModuleSW30Web.srec \
|
||||
|
||||
|
||||
# All Target
|
||||
all: main-build
|
||||
|
||||
# Main-build Target
|
||||
main-build: CCSModuleSW30Web.elf secondary-outputs
|
||||
|
||||
# Tool invocations
|
||||
CCSModuleSW30Web.elf CCSModuleSW30Web.map: $(OBJS) $(USER_OBJS) /Users/colorbass/STM32CubeIDE/workspace_1.12.0/CCSModuleSW30Web/STM32F107VCTX_FLASH.ld makefile objects.list $(OPTIONAL_TOOL_DEPS)
|
||||
arm-none-eabi-gcc -o "CCSModuleSW30Web.elf" @"objects.list" $(USER_OBJS) $(LIBS) -mcpu=cortex-m3 -T"/Users/colorbass/STM32CubeIDE/workspace_1.12.0/CCSModuleSW30Web/STM32F107VCTX_FLASH.ld" --specs=nosys.specs -Wl,-Map="CCSModuleSW30Web.map" -Wl,--gc-sections -static --specs=nano.specs -mfloat-abi=soft -mthumb -u _printf_float -Wl,--start-group -lc -lm -Wl,--end-group
|
||||
@echo 'Finished building target: $@'
|
||||
@echo ' '
|
||||
|
||||
default.size.stdout: $(EXECUTABLES) makefile objects.list $(OPTIONAL_TOOL_DEPS)
|
||||
arm-none-eabi-size $(EXECUTABLES)
|
||||
@echo 'Finished building: $@'
|
||||
@echo ' '
|
||||
|
||||
CCSModuleSW30Web.list: $(EXECUTABLES) makefile objects.list $(OPTIONAL_TOOL_DEPS)
|
||||
arm-none-eabi-objdump -h -S $(EXECUTABLES) > "CCSModuleSW30Web.list"
|
||||
@echo 'Finished building: $@'
|
||||
@echo ' '
|
||||
|
||||
CCSModuleSW30Web.hex: $(EXECUTABLES) makefile objects.list $(OPTIONAL_TOOL_DEPS)
|
||||
arm-none-eabi-objcopy -O ihex $(EXECUTABLES) "CCSModuleSW30Web.hex"
|
||||
@echo 'Finished building: $@'
|
||||
@echo ' '
|
||||
|
||||
CCSModuleSW30Web.bin: $(EXECUTABLES) makefile objects.list $(OPTIONAL_TOOL_DEPS)
|
||||
arm-none-eabi-objcopy -O binary $(EXECUTABLES) "CCSModuleSW30Web.bin"
|
||||
@echo 'Finished building: $@'
|
||||
@echo ' '
|
||||
|
||||
CCSModuleSW30Web.srec: $(EXECUTABLES) makefile objects.list $(OPTIONAL_TOOL_DEPS)
|
||||
arm-none-eabi-objcopy -O srec $(EXECUTABLES) "CCSModuleSW30Web.srec"
|
||||
@echo 'Finished building: $@'
|
||||
@echo ' '
|
||||
|
||||
# Other Targets
|
||||
clean:
|
||||
-$(RM) CCSModuleSW30Web.bin CCSModuleSW30Web.elf CCSModuleSW30Web.hex CCSModuleSW30Web.list CCSModuleSW30Web.map CCSModuleSW30Web.srec default.size.stdout
|
||||
-@echo ' '
|
||||
|
||||
secondary-outputs: $(SIZE_OUTPUT) $(OBJDUMP_LIST) $(OBJCOPY_HEX) $(OBJCOPY_BIN) $(OBJCOPY_SREC)
|
||||
|
||||
fail-specified-linker-script-missing:
|
||||
@echo 'Error: Cannot find the specified linker script. Check the linker settings in the build configuration.'
|
||||
@exit 2
|
||||
|
||||
warn-no-linker-script-specified:
|
||||
@echo 'Warning: No linker script specified. Check the linker settings in the build configuration.'
|
||||
|
||||
.PHONY: all clean dependents main-build fail-specified-linker-script-missing warn-no-linker-script-specified
|
||||
|
||||
-include ../makefile.targets
|
||||
Reference in New Issue
Block a user