Skip to content

修复charging_pin为NC充电时Battery Level不更新的问题 #1316

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 21, 2025
Merged

修复charging_pin为NC充电时Battery Level不更新的问题 #1316

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 22 additions & 25 deletions main/boards/common/adc_battery_monitor.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,19 @@ AdcBatteryMonitor::AdcBatteryMonitor(adc_unit_t adc_unit, adc_channel_t adc_chan
.upper_resistor = upper_resistor,
.lower_resistor = lower_resistor
};
adc_cfg.charging_detect_cb = [](void *user_data) -> bool {
AdcBatteryMonitor *self = (AdcBatteryMonitor *)user_data;
if(self->charging_pin_ == GPIO_NUM_NC)
return false;
else

// 在ADC配置部分进行条件设置
if (charging_pin_ != GPIO_NUM_NC) {
adc_cfg.charging_detect_cb = [](void *user_data) -> bool {
AdcBatteryMonitor *self = (AdcBatteryMonitor *)user_data;
return gpio_get_level(self->charging_pin_) == 1;
};
adc_cfg.charging_detect_user_data = this;
};
adc_cfg.charging_detect_user_data = this;
} else {
// 不设置回调，让adc_battery_estimation库使用软件估算
adc_cfg.charging_detect_cb = nullptr;
adc_cfg.charging_detect_user_data = nullptr;
}
adc_battery_estimation_handle_ = adc_battery_estimation_create(&adc_cfg);

// Initialize timer
Expand Down Expand Up @@ -61,24 +66,21 @@ AdcBatteryMonitor::~AdcBatteryMonitor() {
}

bool AdcBatteryMonitor::IsCharging() {
// 如果没有充电检测引脚，直接返回false
if (charging_pin_ == GPIO_NUM_NC) {
return false;
// 优先使用adc_battery_estimation库的功能
if (adc_battery_estimation_handle_ != nullptr) {
bool is_charging = false;
esp_err_t err = adc_battery_estimation_get_charging_state(adc_battery_estimation_handle_, &is_charging);
if (err == ESP_OK) {
return is_charging;
}
}

// 如果句柄无效，回退到直接读取GPIO
if (adc_battery_estimation_handle_ == nullptr) {
// 回退到GPIO读取或返回默认值
if (charging_pin_ != GPIO_NUM_NC) {
return gpio_get_level(charging_pin_) == 1;
}

// 尝试通过adc_battery_estimation获取状态
bool is_charging = false;
esp_err_t err = adc_battery_estimation_get_charging_state(adc_battery_estimation_handle_, &is_charging);
if (err != ESP_OK) {
// 如果调用失败，回退到直接读取GPIO引脚状态
return gpio_get_level(charging_pin_) == 1;
}
return is_charging;
return false;
}

bool AdcBatteryMonitor::IsDischarging() {
Expand All @@ -104,11 +106,6 @@ void AdcBatteryMonitor::OnChargingStatusChanged(std::function<void(bool)> callba
}

void AdcBatteryMonitor::CheckBatteryStatus() {
// 避免在GPIO_NUM_NC情况下进行检查
if (charging_pin_ == GPIO_NUM_NC) {
return;
}

bool new_charging_status = IsCharging();
if (new_charging_status != is_charging_) {
is_charging_ = new_charging_status;
Expand Down