latest version before merge

This commit is contained in:
2026-05-05 12:25:24 +03:00
parent 01c43840a5
commit 92c33b2f46
45 changed files with 33450 additions and 27415 deletions
Binary file not shown.
+24361 -22819
View File
File diff suppressed because it is too large Load Diff
+3603 -3385
View File
File diff suppressed because it is too large Load Diff
Binary file not shown.
+5 -3
View File
@@ -1,3 +1,5 @@
../Core/Src/adc.c:30:6:MX_ADC1_Init 3
../Core/Src/adc.c:72:6:HAL_ADC_MspInit 2
../Core/Src/adc.c:106:6:HAL_ADC_MspDeInit 2
../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
+10 -10
View File
@@ -1,13 +1,13 @@
../Core/Src/board.c:19:6:RELAY_Write 9
../Core/Src/board.c:52:9:RELAY_Read 1
../Core/Src/board.c:57:9:IN_ReadInput 8
../Core/Src/board.c:78:9:GetBoardTemp 1
../Core/Src/board.c:90:6:Init_Peripheral 1
../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:169:9:GBT_ReadTemp 1
../Core/Src/board.c:173:6:ADC_Select_Channel 2
../Core/Src/board.c:184:9:ADC_TryLock 4
../Core/Src/board.c:200:6:ADC_LockBlocking 2
../Core/Src/board.c:206:6:ADC_Unlock 2
../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
+7 -13
View File
@@ -1,13 +1,7 @@
../Core/Src/cp.c:50:17:CP_ReadAdcChannel 1
../Core/Src/cp.c:63:16:CP_IsInRange 3
../Core/Src/cp.c:67:16:CP_ApplyEma 3
../Core/Src/cp.c:78:19:CP_ClassifyWithHysteresis 19
../Core/Src/cp.c:111:17:CP_GetDebounceMs 3
../Core/Src/cp.c:121:16:CP_ReadVoltageMv 1
../Core/Src/cp.c:134:6:CP_Init 1
../Core/Src/cp.c:151:6:CP_SetDuty 1
../Core/Src/cp.c:164:9:CP_GetDuty 1
../Core/Src/cp.c:168:9:CP_GetVoltage 1
../Core/Src/cp.c:172:12:CP_GetState 5
../Core/Src/cp.c:197:6:CP_Loop 1
../Core/Src/cp.c:201:6:HAL_TIM_OC_DelayElapsedCallback 4
../Core/Src/cp.c:16:16:CP_ReadVoltageMv 1
../Core/Src/cp.c:33:6:CP_Init 1
../Core/Src/cp.c:50:6:CP_SetDuty 1
../Core/Src/cp.c:63:9:CP_GetDuty 1
../Core/Src/cp.c:67:9:CP_GetVoltage 1
../Core/Src/cp.c:72:12:CP_GetState 12
../Core/Src/cp.c:96:6:CP_Loop 1
+1
View File
@@ -0,0 +1 @@
../Core/Src/dma.c:39:6:MX_DMA_Init 1
+8 -8
View File
@@ -1,8 +1,8 @@
../Core/Src/main.c:64:13:VectorBase_Config 1
../Core/Src/main.c:75:9:ED_TraceWarning 3
../Core/Src/main.c:87:6:ED_Delay 3
../Core/Src/main.c:106:6:StopButtonControl 2
../Core/Src/main.c:117:13:CAN1_MinimalReInit 3
../Core/Src/main.c:135:5:main 1
../Core/Src/main.c:216:6:SystemClock_Config 4
../Core/Src/main.c:276:6:Error_Handler 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:107:6:StopButtonControl 2
../Core/Src/main.c:118:13:CAN1_MinimalReInit 3
../Core/Src/main.c:136:5:main 1
../Core/Src/main.c:219:6:SystemClock_Config 4
../Core/Src/main.c:279:6:Error_Handler 1
+12 -12
View File
@@ -1,12 +1,12 @@
../Core/Src/psu_control.c:33:13:PSU_SwitchState 1
../Core/Src/psu_control.c:38:17:PSU_StateTime 1
../Core/Src/psu_control.c:42:6:HAL_CAN_RxFifo1MsgPendingCallback 9
../Core/Src/psu_control.c:116:6:PSU_CAN_FilterInit 2
../Core/Src/psu_control.c:139:6:PSU_Init 1
../Core/Src/psu_control.c:156:6:PSU_Enable 3
../Core/Src/psu_control.c:168:6:PSU_SetHVMode 2
../Core/Src/psu_control.c:175:6:PSU_SetVoltageCurrent 5
../Core/Src/psu_control.c:202:6:PSU_SendCmd 4
../Core/Src/psu_control.c:238:10:max 2
../Core/Src/psu_control.c:243:6:PSU_ReadWrite 6
../Core/Src/psu_control.c:279:6:PSU_Task 41
../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:157:6:PSU_Enable 3
../Core/Src/psu_control.c:169:6:PSU_SetHVMode 2
../Core/Src/psu_control.c:176:6:PSU_SetVoltageCurrent 5
../Core/Src/psu_control.c:203:6:PSU_SendCmd 4
../Core/Src/psu_control.c:239:10:max 2
../Core/Src/psu_control.c:244:6:PSU_ReadWrite 6
../Core/Src/psu_control.c:280:6:PSU_Task 41
+18 -15
View File
@@ -1,15 +1,18 @@
../Drivers/CMSIS/Include/core_cm3.h:1762:34:__NVIC_SystemReset 1
../Core/Src/serial.c:54:6:CCS_RxEventCallback 4
../Core/Src/serial.c:63:6:CCS_SerialLoop 43
../Core/Src/serial.c:227:6:CCS_Init 1
../Core/Src/serial.c:239:17:crc16_ibm 4
../Core/Src/serial.c:254:17:CCS_BuildPacket 4
../Core/Src/serial.c:270:13:CCS_SendPacket 2
../Core/Src/serial.c:278:13:CCS_SendResetReason 1
../Core/Src/serial.c:282:6:CCS_SendEmergencyStop 1
../Core/Src/serial.c:286:6:CCS_SendStart 1
../Core/Src/serial.c:290:13:CCS_CalculateEnergy 2
../Core/Src/serial.c:305:13:send_state 3
../Core/Src/serial.c:333:17:expected_payload_len 11
../Core/Src/serial.c:349:13:apply_command 13
../Core/Src/serial.c:418:16:process_received_packet 6
../Core/Src/serial.c:59:22:uart3_log_hal_error 3
../Core/Src/serial.c:79:22:uart3_arm_rx_or_log 3
../Core/Src/serial.c:94:15:CCS_RxEventCallback 4
../Core/Src/serial.c:117:15:HAL_UART_ErrorCallback 5
../Core/Src/serial.c:135:6:CCS_SerialLoop 43
../Core/Src/serial.c:301:6:CCS_Init 1
../Core/Src/serial.c:315:26:crc16_ibm 3
../Core/Src/serial.c:330:17:CCS_BuildPacket 4
../Core/Src/serial.c:346:13:CCS_SendPacket 2
../Core/Src/serial.c:354:13:CCS_SendResetReason 1
../Core/Src/serial.c:358:6:CCS_SendEmergencyStop 1
../Core/Src/serial.c:362:6:CCS_SendStart 1
../Core/Src/serial.c:366:13:CCS_CalculateEnergy 2
../Core/Src/serial.c:381:13:send_state 3
../Core/Src/serial.c:409:26:expected_payload_len 2
../Core/Src/serial.c:425:22:apply_command 13
../Core/Src/serial.c:497:25:process_received_packet 8
../Core/Src/serial.c:550:13:CCS_UART3_Watchdog 3
+11 -10
View File
@@ -1,10 +1,11 @@
../Core/Src/serial_control.c:59:6:ReadVersion 1
../Core/Src/serial_control.c:71:6:SC_Init 1
../Core/Src/serial_control.c:77:6:SC_Task 9
../Core/Src/serial_control.c:102:6:HAL_UARTEx_RxEventCallback 6
../Core/Src/serial_control.c:120:6:HAL_UART_TxCpltCallback 2
../Core/Src/serial_control.c:130:17:calculate_crc32 4
../Core/Src/serial_control.c:147:17:encode_packet 6
../Core/Src/serial_control.c:180:6:SC_SendPacket 3
../Core/Src/serial_control.c:197:16:parse_packet 4
../Core/Src/serial_control.c:230:16:process_received_packet 2
../Core/Src/serial_control.c:70:6:ReadVersion 1
../Core/Src/serial_control.c:82:6:SC_Init 1
../Core/Src/serial_control.c:92:6:SC_Task 15
../Core/Src/serial_control.c:132:15:HAL_UARTEx_RxEventCallback 7
../Core/Src/serial_control.c:156:15:HAL_UART_TxCpltCallback 2
../Core/Src/serial_control.c:166:26:calculate_crc32 3
../Core/Src/serial_control.c:183:26:encode_packet 5
../Core/Src/serial_control.c:216:15:SC_SendPacket 3
../Core/Src/serial_control.c:235:25:parse_packet 3
../Core/Src/serial_control.c:268:25:process_received_packet 2
../Core/Src/serial_control.c:277:13:SC_UART2_Watchdog 7
+19 -17
View File
@@ -1,17 +1,19 @@
../Core/Src/stm32f1xx_it.c:75:6:NMI_Handler 1
../Core/Src/stm32f1xx_it.c:90:6:HardFault_Handler 1
../Core/Src/stm32f1xx_it.c:105:6:MemManage_Handler 1
../Core/Src/stm32f1xx_it.c:120:6:BusFault_Handler 1
../Core/Src/stm32f1xx_it.c:135:6:UsageFault_Handler 1
../Core/Src/stm32f1xx_it.c:150:6:SVC_Handler 1
../Core/Src/stm32f1xx_it.c:163:6:DebugMon_Handler 1
../Core/Src/stm32f1xx_it.c:176:6:PendSV_Handler 1
../Core/Src/stm32f1xx_it.c:189:6:SysTick_Handler 1
../Core/Src/stm32f1xx_it.c:210:6:CAN1_RX0_IRQHandler 1
../Core/Src/stm32f1xx_it.c:224:6:TIM3_IRQHandler 1
../Core/Src/stm32f1xx_it.c:238:6:USART1_IRQHandler 1
../Core/Src/stm32f1xx_it.c:252:6:USART2_IRQHandler 1
../Core/Src/stm32f1xx_it.c:266:6:USART3_IRQHandler 1
../Core/Src/stm32f1xx_it.c:280:6:UART5_IRQHandler 1
../Core/Src/stm32f1xx_it.c:294:6:CAN2_TX_IRQHandler 1
../Core/Src/stm32f1xx_it.c:308:6:CAN2_RX1_IRQHandler 1
../Core/Src/stm32f1xx_it.c:80:6:NMI_Handler 1
../Core/Src/stm32f1xx_it.c:95:6:HardFault_Handler 1
../Core/Src/stm32f1xx_it.c:110:6:MemManage_Handler 1
../Core/Src/stm32f1xx_it.c:125:6:BusFault_Handler 1
../Core/Src/stm32f1xx_it.c:140:6:UsageFault_Handler 1
../Core/Src/stm32f1xx_it.c:155:6:SVC_Handler 1
../Core/Src/stm32f1xx_it.c:168:6:DebugMon_Handler 1
../Core/Src/stm32f1xx_it.c:181:6:PendSV_Handler 1
../Core/Src/stm32f1xx_it.c:194:6:SysTick_Handler 1
../Core/Src/stm32f1xx_it.c:215:6:DMA1_Channel1_IRQHandler 1
../Core/Src/stm32f1xx_it.c:229:6:ADC1_2_IRQHandler 1
../Core/Src/stm32f1xx_it.c:243:6:CAN1_RX0_IRQHandler 1
../Core/Src/stm32f1xx_it.c:257:6:TIM3_IRQHandler 1
../Core/Src/stm32f1xx_it.c:271:6:USART1_IRQHandler 1
../Core/Src/stm32f1xx_it.c:285:6:USART2_IRQHandler 1
../Core/Src/stm32f1xx_it.c:299:6:USART3_IRQHandler 1
../Core/Src/stm32f1xx_it.c:313:6:UART5_IRQHandler 1
../Core/Src/stm32f1xx_it.c:327:6:CAN2_TX_IRQHandler 1
../Core/Src/stm32f1xx_it.c:341:6:CAN2_RX1_IRQHandler 1
+4 -1
View File
@@ -12,6 +12,7 @@ C_SRCS += \
../Core/Src/cp.c \
../Core/Src/crc.c \
../Core/Src/debug.c \
../Core/Src/dma.c \
../Core/Src/gpio.c \
../Core/Src/main.c \
../Core/Src/meter.c \
@@ -39,6 +40,7 @@ C_DEPS += \
./Core/Src/cp.d \
./Core/Src/crc.d \
./Core/Src/debug.d \
./Core/Src/dma.d \
./Core/Src/gpio.d \
./Core/Src/main.d \
./Core/Src/meter.d \
@@ -66,6 +68,7 @@ OBJS += \
./Core/Src/cp.o \
./Core/Src/crc.o \
./Core/Src/debug.o \
./Core/Src/dma.o \
./Core/Src/gpio.o \
./Core/Src/main.o \
./Core/Src/meter.o \
@@ -93,7 +96,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/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
+5 -5
View File
@@ -1,5 +1,5 @@
../Core/Src/tim.c:31:6:MX_TIM3_Init 6
../Core/Src/tim.c:85:6:MX_TIM4_Init 8
../Core/Src/tim.c:147:6:HAL_TIM_Base_MspInit 3
../Core/Src/tim.c:177:6:HAL_TIM_MspPostInit 3
../Core/Src/tim.c:225:6:HAL_TIM_Base_MspDeInit 3
../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
+1
View File
@@ -5,6 +5,7 @@
"./Core/Src/cp.o"
"./Core/Src/crc.o"
"./Core/Src/debug.o"
"./Core/Src/dma.o"
"./Core/Src/gpio.o"
"./Core/Src/main.o"
"./Core/Src/meter.o"