devttl/xiaozhi-esp32
1
0
Fork 0
forked from xiaozhi/xiaozhi-esp32
Code Pull Requests Activity

waveshare-c6-lcd-1.69 新增电池电量显示功能及电池供电状态下的PWR按键开关机功能。 (#1020)

Browse Source 
* 新增电池电量显示功能及电池供电状态下的PWR按键开关机功能。

* 代码风格优化

---------

Co-authored-by: flyingtjy <flyingtjy@gmail.com>
This commit is contained in:
flying1425
2025-08-04 22:38:13 +08:00
committed by GitHub
parent b2e1c5bb5c
commit 90602d3802
4 changed files with 296 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

127
main/boards/waveshare-c6-lcd-1.69/esp32-c6-lcd-1.69.cc
View File

@@ -5,7 +5,6 @@
#include "application.h"
#include "button.h"
#include "config.h"
#include <esp_log.h>
#include "i2c_device.h"
#include <driver/i2c_master.h>
@@ -14,14 +13,13 @@
#include <esp_lcd_panel_vendor.h>
#include <esp_lcd_panel_io.h>
#include <esp_lcd_panel_ops.h>
#include <esp_timer.h>
#include "iot_button.h"
#include "power_manager.h"
#include "power_save_timer.h"
#define TAG "waveshare_lcd_1_69"
LV_FONT_DECLARE(font_puhui_20_4);
LV_FONT_DECLARE(font_awesome_20_4);
@@ -55,11 +53,52 @@ public:
};
class CustomButton: public Button {
public:
void OnPressDownDel(void) {
if (button_handle_ == nullptr) {
return;
}
on_press_down_ = NULL;
iot_button_unregister_cb(button_handle_, BUTTON_PRESS_DOWN, nullptr);
}
void OnPressUpDel(void) {
if (button_handle_ == nullptr) {
return;
}
on_press_up_ = NULL;
iot_button_unregister_cb(button_handle_, BUTTON_PRESS_UP, nullptr);
}
};
class CustomBoard : public WifiBoard {
private:
Button boot_button_;
CustomButton boot_button_;
CustomButton pwr_button_;
i2c_master_bus_handle_t i2c_bus_;
LcdDisplay* display_;
PowerManager* power_manager_ = nullptr;
PowerSaveTimer* power_save_timer_ = nullptr;
void InitializePowerManager() {
power_manager_ = new PowerManager(BATTERY_CHARGING_PIN, BATTERY_ADC_PIN, BATTERY_EN_PIN);
power_manager_->PowerON();
}
void InitializePowerSaveTimer() {
power_save_timer_ = new PowerSaveTimer(-1, 60, 300);
power_save_timer_->OnEnterSleepMode([this]() {
GetDisplay()->SetPowerSaveMode(true);
});
power_save_timer_->OnExitSleepMode([this]() {
GetDisplay()->SetPowerSaveMode(false);
});
power_save_timer_->OnShutdownRequest([this]() {
power_manager_->PowerOff();
});
power_save_timer_->SetEnabled(true);
}
void InitializeI2c() {
// Initialize I2C peripheral
@@ -93,6 +132,7 @@ private:
void InitializeLcdDisplay() {
esp_lcd_panel_io_handle_t panel_io = nullptr;
esp_lcd_panel_handle_t panel = nullptr;
// 液晶屏控制IO初始化
ESP_LOGI(TAG, "Install panel IO");
esp_lcd_panel_io_spi_config_t io_config = {};
@@ -105,26 +145,19 @@ private:
io_config.lcd_param_bits = 8;
ESP_ERROR_CHECK(esp_lcd_new_panel_io_spi(SPI2_HOST, &io_config, &panel_io));
// 初始化液晶屏驱动芯片
ESP_LOGI(TAG, "Install LCD driver");
esp_lcd_panel_dev_config_t panel_config = {};
panel_config.reset_gpio_num = DISPLAY_RST_PIN;
panel_config.rgb_ele_order = DISPLAY_RGB_ORDER;
panel_config.bits_per_pixel = 16;
// panel_config.vendor_config = &st7796_vendor_config;
ESP_ERROR_CHECK(esp_lcd_new_panel_st7789(panel_io, &panel_config, &panel));
ESP_ERROR_CHECK(esp_lcd_new_panel_st7789(panel_io, &panel_config, &panel));
esp_lcd_panel_reset(panel);
esp_lcd_panel_init(panel);
esp_lcd_panel_invert_color(panel, DISPLAY_INVERT_COLOR);
esp_lcd_panel_swap_xy(panel, DISPLAY_SWAP_XY);
esp_lcd_panel_mirror(panel, DISPLAY_MIRROR_X, DISPLAY_MIRROR_Y);
display_ = new CustomLcdDisplay(
panel_io,
panel,
@@ -146,11 +179,40 @@ private:
}
app.ToggleChatState();
});
pwr_button_.OnPressUp([this]() {
pwr_button_.OnDoubleClick([this]() {
static uint8_t brightness_last = 0;
auto backlight = Board::GetInstance().GetBacklight();
if (backlight->brightness() == 0) {
brightness_last = 0;
if (brightness_last == 0) {
backlight->SetBrightness(50, true);
} else {
backlight->SetBrightness(brightness_last, true);
}
} else {
brightness_last = backlight->brightness();
backlight->SetBrightness(0);
}
});
pwr_button_.OnLongPress([this]() {
// printf("Power button long press\n");
if (power_manager_ != nullptr){
power_manager_->PowerOff();
}
});
pwr_button_.OnPressUpDel();
});
}
public:
CustomBoard() :
boot_button_(BOOT_BUTTON_GPIO) {
boot_button_(BOOT_BUTTON_GPIO), pwr_button_(PWR_BUTTON_GPIO) {
InitializePowerManager();
InitializePowerSaveTimer();
InitializeI2c();
InitializeSpi();
InitializeLcdDisplay();
@@ -159,9 +221,19 @@ public:
}
virtual AudioCodec* GetAudioCodec() override {
static Es8311AudioCodec audio_codec(i2c_bus_, I2C_NUM_0, AUDIO_INPUT_SAMPLE_RATE, AUDIO_OUTPUT_SAMPLE_RATE,
AUDIO_I2S_GPIO_MCLK, AUDIO_I2S_GPIO_BCLK, AUDIO_I2S_GPIO_WS, AUDIO_I2S_GPIO_DOUT, AUDIO_I2S_GPIO_DIN,
AUDIO_CODEC_PA_PIN, AUDIO_CODEC_ES8311_ADDR);
static Es8311AudioCodec audio_codec(
i2c_bus_,
I2C_NUM_0,
AUDIO_INPUT_SAMPLE_RATE,
AUDIO_OUTPUT_SAMPLE_RATE,
AUDIO_I2S_GPIO_MCLK,
AUDIO_I2S_GPIO_BCLK,
AUDIO_I2S_GPIO_WS,
AUDIO_I2S_GPIO_DOUT,
AUDIO_I2S_GPIO_DIN,
AUDIO_CODEC_PA_PIN,
AUDIO_CODEC_ES8311_ADDR
);
return &audio_codec;
}
@@ -173,6 +245,25 @@ public:
static PwmBacklight backlight(DISPLAY_BACKLIGHT_PIN, DISPLAY_BACKLIGHT_OUTPUT_INVERT);
return &backlight;
}
virtual bool GetBatteryLevel(int &level, bool& charging, bool& discharging) override {
static bool last_discharging = false;
charging = power_manager_->IsCharging();
discharging = power_manager_->IsDischarging();
if (discharging != last_discharging) {
power_save_timer_->SetEnabled(discharging);
last_discharging = discharging;
}
level = power_manager_->GetBatteryLevel();
return true;
}
virtual void SetPowerSaveMode(bool enabled) override {
if (!enabled) {
power_save_timer_->WakeUp();
}
WifiBoard::SetPowerSaveMode(enabled);
}
};
DECLARE_BOARD(CustomBoard);