Update version to 1.0.3. Everest timeout changed to 2000ms. CP Line improved, added hysteresis, debounce and EMA filtering

2026-03-25 11:09:55 +03:00
parent 14b4f0595f
commit 317e418111
14 changed files with 20844 additions and 23690 deletions
--- a/Debug/CCSModuleSW30Web.list
+++ b/Debug/CCSModuleSW30Web.list
--- a/Debug/Core/Src/cp.cyclo
+++ b/Debug/Core/Src/cp.cyclo
@@ -1,9 +1,13 @@
-../Core/Src/cp.c:13:17:CP_ReadAdcChannel	1
-../Core/Src/cp.c:26:16:CP_ReadVoltageMv	1
-../Core/Src/cp.c:39:6:CP_Init	1
-../Core/Src/cp.c:56:6:CP_SetDuty	1
-../Core/Src/cp.c:69:9:CP_GetDuty	1
-../Core/Src/cp.c:73:9:CP_GetVoltage	1
-../Core/Src/cp.c:77:12:CP_GetState	12
-../Core/Src/cp.c:101:6:CP_Loop	1
-../Core/Src/cp.c:105:6:HAL_TIM_OC_DelayElapsedCallback	4
+../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
--- a/Debug/Core/Src/serial.cyclo
+++ b/Debug/Core/Src/serial.cyclo
@@ -1,15 +1,15 @@
 ../Drivers/CMSIS/Include/core_cm3.h:1762:34:__NVIC_SystemReset	1
-../Core/Src/serial.c:51:6:CCS_RxEventCallback	4
-../Core/Src/serial.c:61:6:CCS_SerialLoop	41
-../Core/Src/serial.c:206:6:CCS_Init	1
-../Core/Src/serial.c:218:17:crc16_ibm	4
-../Core/Src/serial.c:233:17:CCS_BuildPacket	4
-../Core/Src/serial.c:249:13:CCS_SendPacket	2
-../Core/Src/serial.c:257:13:CCS_SendResetReason	1
-../Core/Src/serial.c:261:6:CCS_SendEmergencyStop	1
-../Core/Src/serial.c:265:6:CCS_SendStart	1
-../Core/Src/serial.c:269:13:CCS_CalculateEnergy	2
-../Core/Src/serial.c:284:13:send_state	2
-../Core/Src/serial.c:311:17:expected_payload_len	11
-../Core/Src/serial.c:327:13:apply_command	13
-../Core/Src/serial.c:394:16:process_received_packet	6
+../Core/Src/serial.c:52:6:CCS_RxEventCallback	4
+../Core/Src/serial.c:62:6:CCS_SerialLoop	41
+../Core/Src/serial.c:207:6:CCS_Init	1
+../Core/Src/serial.c:219:17:crc16_ibm	4
+../Core/Src/serial.c:234:17:CCS_BuildPacket	4
+../Core/Src/serial.c:250:13:CCS_SendPacket	2
+../Core/Src/serial.c:258:13:CCS_SendResetReason	1
+../Core/Src/serial.c:262:6:CCS_SendEmergencyStop	1
+../Core/Src/serial.c:266:6:CCS_SendStart	1
+../Core/Src/serial.c:270:13:CCS_CalculateEnergy	2
+../Core/Src/serial.c:285:13:send_state	2
+../Core/Src/serial.c:312:17:expected_payload_len	11
+../Core/Src/serial.c:328:13:apply_command	13
+../Core/Src/serial.c:395:16:process_received_packet	6
--- a/Debug/Core/Src/subdir.mk
+++ b/Debug/Core/Src/subdir.mk
@@ -31,33 +31,6 @@ C_SRCS += \
 ../Core/Src/tim.c \
 ../Core/Src/usart.c 

-C_DEPS += \
-./Core/Src/adc.d \
-./Core/Src/board.d \
-./Core/Src/can.d \
-./Core/Src/charger_control.d \
-./Core/Src/cp.d \
-./Core/Src/crc.d \
-./Core/Src/debug.d \
-./Core/Src/gpio.d \
-./Core/Src/main.d \
-./Core/Src/meter.d \
-./Core/Src/psu_control.d \
-./Core/Src/rgb_controller.d \
-./Core/Src/rtc.d \
-./Core/Src/serial.d \
-./Core/Src/serial_control.d \
-./Core/Src/serial_handler.d \
-./Core/Src/sma_filter.d \
-./Core/Src/soft_rtc.d \
-./Core/Src/stm32f1xx_hal_msp.d \
-./Core/Src/stm32f1xx_it.d \
-./Core/Src/syscalls.d \
-./Core/Src/sysmem.d \
-./Core/Src/system_stm32f1xx.d \
-./Core/Src/tim.d \
-./Core/Src/usart.d 
-
 OBJS += \
 ./Core/Src/adc.o \
 ./Core/Src/board.o \
@@ -85,6 +58,33 @@ OBJS += \
 ./Core/Src/tim.o \
 ./Core/Src/usart.o 

+C_DEPS += \
+./Core/Src/adc.d \
+./Core/Src/board.d \
+./Core/Src/can.d \
+./Core/Src/charger_control.d \
+./Core/Src/cp.d \
+./Core/Src/crc.d \
+./Core/Src/debug.d \
+./Core/Src/gpio.d \
+./Core/Src/main.d \
+./Core/Src/meter.d \
+./Core/Src/psu_control.d \
+./Core/Src/rgb_controller.d \
+./Core/Src/rtc.d \
+./Core/Src/serial.d \
+./Core/Src/serial_control.d \
+./Core/Src/serial_handler.d \
+./Core/Src/sma_filter.d \
+./Core/Src/soft_rtc.d \
+./Core/Src/stm32f1xx_hal_msp.d \
+./Core/Src/stm32f1xx_it.d \
+./Core/Src/syscalls.d \
+./Core/Src/sysmem.d \
+./Core/Src/system_stm32f1xx.d \
+./Core/Src/tim.d \
+./Core/Src/usart.d 
+

 # Each subdirectory must supply rules for building sources it contributes
 Core/Src/%.o Core/Src/%.su Core/Src/%.cyclo: ../Core/Src/%.c Core/Src/subdir.mk
--- a/Debug/Core/Src/tim.cyclo
+++ b/Debug/Core/Src/tim.cyclo
@@ -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: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
--- a/Debug/Core/Startup/subdir.mk
+++ b/Debug/Core/Startup/subdir.mk
@@ -7,16 +7,16 @@
 S_SRCS += \
 ../Core/Startup/startup_stm32f107vctx.s 

-S_DEPS += \
-./Core/Startup/startup_stm32f107vctx.d 
-
 OBJS += \
 ./Core/Startup/startup_stm32f107vctx.o 

+S_DEPS += \
+./Core/Startup/startup_stm32f107vctx.d 
+

 # Each subdirectory must supply rules for building sources it contributes
 Core/Startup/%.o: ../Core/Startup/%.s Core/Startup/subdir.mk
-	arm-none-eabi-gcc -mcpu=cortex-m3 -g3 -DDEBUG -c -I/Users/colorbass/STM32CubeIDE/workspace_1.12.0/lib_EDCAN -x assembler-with-cpp -MMD -MP -MF"$(@:%.o=%.d)" -MT"$@" --specs=nano.specs -mfloat-abi=soft -mthumb -o "$@" "$<"
+	arm-none-eabi-gcc -mcpu=cortex-m3 -g3 -DDEBUG -c -x assembler-with-cpp -MMD -MP -MF"$(@:%.o=%.d)" -MT"$@" --specs=nano.specs -mfloat-abi=soft -mthumb -o "$@" "$<"

 clean: clean-Core-2f-Startup

--- a/Debug/Drivers/STM32F1xx_HAL_Driver/Src/subdir.mk
+++ b/Debug/Drivers/STM32F1xx_HAL_Driver/Src/subdir.mk
@@ -26,28 +26,6 @@ C_SRCS += \
 ../Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_tim_ex.c \
 ../Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_uart.c 

-C_DEPS += \
-./Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal.d \
-./Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_adc.d \
-./Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_adc_ex.d \
-./Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_can.d \
-./Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_cortex.d \
-./Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_crc.d \
-./Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_dma.d \
-./Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_exti.d \
-./Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_flash.d \
-./Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_flash_ex.d \
-./Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_gpio.d \
-./Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_gpio_ex.d \
-./Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_pwr.d \
-./Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_rcc.d \
-./Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_rcc_ex.d \
-./Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_rtc.d \
-./Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_rtc_ex.d \
-./Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_tim.d \
-./Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_tim_ex.d \
-./Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_uart.d 
-
 OBJS += \
 ./Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal.o \
 ./Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_adc.o \
@@ -70,6 +48,28 @@ OBJS += \
 ./Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_tim_ex.o \
 ./Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_uart.o 

+C_DEPS += \
+./Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal.d \
+./Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_adc.d \
+./Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_adc_ex.d \
+./Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_can.d \
+./Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_cortex.d \
+./Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_crc.d \
+./Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_dma.d \
+./Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_exti.d \
+./Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_flash.d \
+./Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_flash_ex.d \
+./Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_gpio.d \
+./Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_gpio_ex.d \
+./Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_pwr.d \
+./Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_rcc.d \
+./Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_rcc_ex.d \
+./Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_rtc.d \
+./Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_rtc_ex.d \
+./Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_tim.d \
+./Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_tim_ex.d \
+./Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_uart.d 
+

 # Each subdirectory must supply rules for building sources it contributes
 Drivers/STM32F1xx_HAL_Driver/Src/%.o Drivers/STM32F1xx_HAL_Driver/Src/%.su Drivers/STM32F1xx_HAL_Driver/Src/%.cyclo: ../Drivers/STM32F1xx_HAL_Driver/Src/%.c Drivers/STM32F1xx_HAL_Driver/Src/subdir.mk
--- a/Debug/sources.mk
+++ b/Debug/sources.mk
@@ -10,18 +10,15 @@ C_SRCS :=
 S_UPPER_SRCS := 
 O_SRCS := 
 CYCLO_FILES := 
-OBJDUMP_LIST := 
-S_DEPS := 
-OBJCOPY_SREC := 
-C_DEPS := 
-OBJCOPY_BIN := 
-OBJCOPY_HEX := 
 SIZE_OUTPUT := 
+OBJDUMP_LIST := 
 SU_FILES := 
 EXECUTABLES := 
 OBJS := 
 MAP_FILES := 
+S_DEPS := 
 S_UPPER_DEPS := 
+C_DEPS := 

 # Every subdirectory with source files must be described here
 SUBDIRS := \