forked from xiaozhi/xiaozhi-esp32
[优化]-jiuchuan-s3-优化电源管理架构 (#875)
* 添加 jiuchuang-s3 开发板支持 * 增加编译指南 * 优开发板支持包文件目录,更新README.md 删除了多余板载文件 [* ]README.md -> 更新了编译指南和烧录指南 * 修改板级支持包名 * 使用乐鑫提供的电源监测 * 修复部分代码格式问题 * 解决合并冲突 * 解决部分合并内容 * 完善合并内容 * 修复电量映射表错误 * 优化电源管理架构-使用rtc-io电源保持 --------- Co-authored-by: unknown <jake12355> Co-authored-by: Hangon66 <2630612613@qq.com>
This commit is contained in:
@@ -4,8 +4,10 @@
|
||||
|
||||
#include <esp_timer.h>
|
||||
#include <driver/gpio.h>
|
||||
#include <esp_adc/adc_oneshot.h>
|
||||
#include "adc_battery_estimation.h"
|
||||
#include "power_controller.h"
|
||||
#include <driver/rtc_io.h>
|
||||
#include <esp_sleep.h>
|
||||
|
||||
#define JIUCHUAN_ADC_UNIT (ADC_UNIT_1)
|
||||
#define JIUCHUAN_ADC_BITWIDTH (ADC_BITWIDTH_12)
|
||||
@@ -14,23 +16,28 @@
|
||||
#define JIUCHUAN_RESISTOR_UPPER (200000)
|
||||
#define JIUCHUAN_RESISTOR_LOWER (100000)
|
||||
|
||||
#undef TAG
|
||||
#define TAG "PowerManager"
|
||||
class PowerManager {
|
||||
private:
|
||||
esp_timer_handle_t timer_handle_;
|
||||
std::function<void(bool)> on_charging_status_changed_;
|
||||
std::function<void(bool)> on_low_battery_status_changed_;
|
||||
|
||||
gpio_num_t charging_pin_ = GPIO_NUM_NC;
|
||||
std::vector<uint16_t> adc_values_;
|
||||
uint32_t battery_level_ = 0;
|
||||
int32_t battery_level_ = 100;
|
||||
bool is_charging_ = false;
|
||||
bool is_low_battery_ = false;
|
||||
bool is_empty_battery_ = false;
|
||||
int ticks_ = 0;
|
||||
const int kBatteryAdcInterval = 60;
|
||||
const int kBatteryAdcDataCount = 3;
|
||||
const int kLowBatteryLevel = 20;
|
||||
|
||||
adc_battery_estimation_handle_t adc_battery_estimation_handle;
|
||||
PowerController* power_controller_;
|
||||
|
||||
|
||||
|
||||
void CheckBatteryStatus() {
|
||||
// Get charging status
|
||||
@@ -61,11 +68,16 @@ private:
|
||||
float battery_capacity_temp = 0;
|
||||
adc_battery_estimation_get_capacity(adc_battery_estimation_handle, &battery_capacity_temp);
|
||||
ESP_LOGI("PowerManager", "Battery level: %.1f%%", battery_capacity_temp);
|
||||
battery_level_ = battery_capacity_temp;
|
||||
if(battery_capacity_temp > -10 && battery_capacity_temp <= 0){
|
||||
battery_level_ = 0;
|
||||
}else{
|
||||
battery_level_ = battery_capacity_temp;
|
||||
}
|
||||
}
|
||||
|
||||
public:
|
||||
PowerManager(gpio_num_t pin) : charging_pin_(pin) {
|
||||
power_controller_ = &PowerController::Instance();
|
||||
// 初始化充电引脚
|
||||
gpio_config_t io_conf = {};
|
||||
io_conf.intr_type = GPIO_INTR_DISABLE;
|
||||
@@ -89,14 +101,14 @@ public:
|
||||
ESP_ERROR_CHECK(esp_timer_create(&timer_args, &timer_handle_));
|
||||
ESP_ERROR_CHECK(esp_timer_start_periodic(timer_handle_, 1000000));
|
||||
|
||||
// 初始化 ADC
|
||||
static const battery_point_t battery_ponint_table[]={
|
||||
{ 4.2 , 100},
|
||||
{ 4.06 , 80},
|
||||
{ 3.82 , 60},
|
||||
{ 3.58 , 40},
|
||||
{ 3.34 , 20},
|
||||
{ 3.1 , 0}
|
||||
{ 3.1 , 0},
|
||||
{ 3.0 , -10}
|
||||
};
|
||||
|
||||
adc_battery_estimation_t config = {
|
||||
@@ -113,6 +125,8 @@ public:
|
||||
};
|
||||
|
||||
adc_battery_estimation_handle = adc_battery_estimation_create(&config);
|
||||
|
||||
RegisterAllCallbacks();
|
||||
}
|
||||
|
||||
~PowerManager() {
|
||||
@@ -120,11 +134,15 @@ public:
|
||||
esp_timer_stop(timer_handle_);
|
||||
esp_timer_delete(timer_handle_);
|
||||
}
|
||||
if (adc_battery_estimation_handle) {
|
||||
adc_battery_estimation_destroy(adc_battery_estimation_handle);
|
||||
}
|
||||
}
|
||||
|
||||
bool IsCharging() {
|
||||
// 如果电量已经满了,则不再显示充电中
|
||||
if (battery_level_ == 100) {
|
||||
//ESP_LOGI(TAG, "电量已满,不再显示充电中");
|
||||
return false;
|
||||
}
|
||||
return is_charging_;
|
||||
@@ -135,10 +153,44 @@ public:
|
||||
return !is_charging_;
|
||||
}
|
||||
|
||||
uint8_t GetBatteryLevel() {
|
||||
int32_t GetBatteryLevel() {
|
||||
return battery_level_;
|
||||
}
|
||||
|
||||
void RegisterAllCallbacks() {
|
||||
//注册电源状态变更回调函数(优化版)
|
||||
power_controller_->OnStateChange([this](PowerState newState) {
|
||||
switch(newState) {
|
||||
case PowerState::SHUTDOWN: {
|
||||
|
||||
ESP_LOGD(TAG, "关机");
|
||||
|
||||
//取消 PWR_EN 使能
|
||||
/* 防止关机后误唤醒 */
|
||||
ESP_ERROR_CHECK(esp_sleep_enable_ext0_wakeup(PWR_BUTTON_GPIO, 0));
|
||||
ESP_ERROR_CHECK(rtc_gpio_pulldown_en(PWR_BUTTON_GPIO)); // 内部下拉
|
||||
ESP_ERROR_CHECK(rtc_gpio_pullup_dis(PWR_BUTTON_GPIO));
|
||||
/* 关闭电源使能 */
|
||||
rtc_gpio_set_level(PWR_EN_GPIO, 0);
|
||||
rtc_gpio_hold_dis(PWR_EN_GPIO);
|
||||
|
||||
// 确保所有外设已关闭
|
||||
vTaskDelay(200 / portTICK_PERIOD_MS);
|
||||
ESP_LOGI(TAG, "Initiating deep sleep");
|
||||
|
||||
esp_deep_sleep_start();
|
||||
break;
|
||||
}
|
||||
default:
|
||||
ESP_LOGD(TAG, "State changed to %d", static_cast<int>(newState));
|
||||
break;
|
||||
}
|
||||
});
|
||||
}
|
||||
void SetPowerState(PowerState newState) {
|
||||
power_controller_->SetState(newState);
|
||||
}
|
||||
|
||||
void OnLowBatteryStatusChanged(std::function<void(bool)> callback) {
|
||||
on_low_battery_status_changed_ = callback;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user