diff --git a/ql-application/threadx/interface/custom_app/battery.c b/ql-application/threadx/interface/custom_app/battery.c index 0beccdd..8f21275 100644 --- a/ql-application/threadx/interface/custom_app/battery.c +++ b/ql-application/threadx/interface/custom_app/battery.c @@ -21,6 +21,7 @@ #include "ql_uart.h" #include "ql_application.h" #include "ql_log.h" +#include "ql_adc.h" #include "ql_power.h" #include "hal_api.h" @@ -43,6 +44,16 @@ #define BAT_VALID_MIN_MV 2500 #define BAT_VALID_MAX_MV 5000 #define BAT_SHUTDOWN_CONFIRM_COUNT 3 + +/* + * 原理图中电池负极经 R28(0.33R) 接地，电池侧通过 R35 接 ADC0。 + * 充电电流流过 R28 时 ADC0 出现正向压降；放电时 ADC0 接近 0mV。 + * 8mV 约对应 24mA，3mV 作为退出阈值，滞回可避免零点噪声抖动。 + */ +#define BAT_CHARGE_ADC_ENTER_MV 8 +#define BAT_CHARGE_ADC_EXIT_MV 3 +#define BAT_CHARGE_CONFIRM_COUNT 3 +#define BAT_CHARGE_ADC_FAIL_COUNT 3 unsigned short g_vbat_vol = 0; unsigned short vbat_sample[6] = {0}; // 修改：样本数改为6 @@ -55,6 +66,10 @@ static unsigned char g_low_voltage_count = 0; static unsigned char g_low_probe_active = 0; static unsigned char g_low_power_warned = 0; static int g_vbus_last_state = -1; +static int g_charge_adc_state = 0; +static unsigned char g_charge_adc_enter_count = 0; +static unsigned char g_charge_adc_exit_count = 0; +static unsigned char g_charge_adc_fail_count = 0; bat_level_t calc_battery_level(uint16_t voltage_mv) { @@ -76,23 +91,80 @@ bat_level_t battery_get_level(void) return g_bat_level_valid ? g_bat_level_last : calc_battery_level(g_vbat_vol); } -static int update_vbus_state(void) +static int update_external_power_state(void) { int vbus_state = ql_get_vbus_state() ? 1 : 0; + int adc_valid = 0; + unsigned short adc0_mv = 0; if (vbus_state != g_vbus_last_state) { printf("[BAT][VBUS] state changed: %d -> %d\r\n", g_vbus_last_state, vbus_state); g_vbus_last_state = vbus_state; + } - if (vbus_state) { + if (ql_adc_read(ADC_CHANNEL_ADC0, &adc0_mv) == ADC_READ_SUCCESS) { + adc_valid = 1; + g_charge_adc_fail_count = 0; + + if (!g_charge_adc_state) { + g_charge_adc_exit_count = 0; + if (adc0_mv >= BAT_CHARGE_ADC_ENTER_MV) { + if (g_charge_adc_enter_count < BAT_CHARGE_CONFIRM_COUNT) { + g_charge_adc_enter_count++; + } + if (g_charge_adc_enter_count >= BAT_CHARGE_CONFIRM_COUNT) { + g_charge_adc_state = 1; + g_charge_adc_enter_count = 0; + printf("[BAT][CHARGE] ADC0 charging detected: %dmV\r\n", + adc0_mv); + } + } else { + g_charge_adc_enter_count = 0; + } + } else { + g_charge_adc_enter_count = 0; + if (adc0_mv <= BAT_CHARGE_ADC_EXIT_MV) { + if (g_charge_adc_exit_count < BAT_CHARGE_CONFIRM_COUNT) { + g_charge_adc_exit_count++; + } + if (g_charge_adc_exit_count >= BAT_CHARGE_CONFIRM_COUNT) { + g_charge_adc_state = 0; + g_charge_adc_exit_count = 0; + printf("[BAT][CHARGE] ADC0 charging removed: %dmV\r\n", + adc0_mv); + } + } else { + g_charge_adc_exit_count = 0; + } + } + } else { + g_charge_adc_enter_count = 0; + g_charge_adc_exit_count = 0; + if (g_charge_adc_fail_count < BAT_CHARGE_ADC_FAIL_COUNT) { + g_charge_adc_fail_count++; + } + if (g_charge_adc_fail_count >= BAT_CHARGE_ADC_FAIL_COUNT) { + g_charge_adc_state = 0; + } + } + + { + int external_power = vbus_state || g_charge_adc_state; + + printf("[BAT][POWER] vbus=%d, adc0=%d, adc_valid=%d, " + "adc_charge=%d, external=%d\r\n", + vbus_state, adc0_mv, adc_valid, + g_charge_adc_state, external_power); + + if (external_power) { g_low_voltage_count = 0; g_low_probe_active = 0; g_low_power_warned = 0; } - } - return vbus_state; + return external_power; + } } static bat_level_t limit_level_jump(bat_level_t raw_level, int external_power) @@ -120,7 +192,7 @@ static bat_level_t limit_level_jump(bat_level_t raw_level, int external_power) } } - printf("[BAT] level update: last=%d raw=%d result=%d vbus=%d\r\n", + printf("[BAT] level update: last=%d raw=%d result=%d external=%d\r\n", g_bat_level_last, raw_level, result, external_power); g_bat_level_last = result; return result; @@ -166,7 +238,7 @@ void battery_check(void) static unsigned char sample_idx = 0; // 当前已采集样本数 (0~5) static unsigned short sample_buf[6] = {0}; // 本地缓冲（也可用全局 vbat_sample，此处直接用局部） - int external_power = update_vbus_state(); + int external_power = update_external_power_state(); call_count++; @@ -194,7 +266,7 @@ void battery_check(void) ql_adc_onff(0); vbat_vol = ql_get_battery_vol(); - printf("[BAT][SAMPLE] voltage=%d, vbus=%d, low_probe=%d\r\n", + printf("[BAT][SAMPLE] voltage=%d, external=%d, low_probe=%d\r\n", vbat_vol, external_power, g_low_probe_active); if (vbat_vol < BAT_VALID_MIN_MV || vbat_vol > BAT_VALID_MAX_MV) { @@ -226,7 +298,7 @@ void battery_check(void) /* 非接电状态下，电压不允许上升 */ if (!external_power) { if (g_vbat_vol_last > 0 && vbat_vol > g_vbat_vol_last) { - printf("[BAT] voltage rise blocked: %d -> %d (vbus=0)\r\n", + printf("[BAT] voltage rise blocked: %d -> %d (external=0)\r\n", g_vbat_vol_last, vbat_vol); vbat_vol = g_vbat_vol_last; } @@ -234,13 +306,13 @@ void battery_check(void) g_vbat_vol = vbat_vol; g_vbat_vol_last = vbat_vol; - printf("vbat_vol:%d, vbus:%d\r\n", g_vbat_vol, external_power); + printf("vbat_vol:%d, external:%d\r\n", g_vbat_vol, external_power); /* 计算电量等级并限制跳变 */ bat_level_t raw_level = calc_battery_level(g_vbat_vol); bat_level_t level = limit_level_jump(raw_level, external_power); - printf("[BAT] raw_level:%d, limited_level:%d, vbus:%d\r\n", + printf("[BAT] raw_level:%d, limited_level:%d, external:%d\r\n", raw_level, level, external_power); if (battery_first_update_flag == 0) {