kanshan/xiaozhi-esp32
1
0
Fork 0
mirror of https://github.com/78/xiaozhi-esp32.git synced 2026-01-14 01:07:30 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

修复charging_pin为NC充电时Battery Level不更新的问题 (#1316)
Some checks failed
Build Boards / Determine variants to build (push) Has been cancelled
Details
Build Boards / Build ${{ matrix.name }} (push) Has been cancelled
Details

Browse Source 
Co-authored-by: Yuv Zhao <admin@yuvcloud.com>
This commit is contained in:
konglingboy 2025-10-21 13:03:26 +08:00 committed by GitHub
parent 3176a45ebe
commit e8ed16bb42
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 22 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
main/boards/common/adc_battery_monitor.cc
View File

@ -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
@ -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() {
@ -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;