diff --git a/main/CMakeLists.txt b/main/CMakeLists.txt
index 8c52c04e..b324e222 100644
--- a/main/CMakeLists.txt
+++ b/main/CMakeLists.txt
@@ -308,6 +308,12 @@ elseif(CONFIG_BOARD_TYPE_WAVESHARE_ESP32_S3_TOUCH_AMOLED_1_8)
     set(BUILTIN_TEXT_FONT font_puhui_basic_30_4)
     set(BUILTIN_ICON_FONT font_awesome_30_4)
     set(DEFAULT_EMOJI_COLLECTION twemoji_64)
+elseif(CONFIG_BOARD_TYPE_WAVESHARE_ESP32_S3_TOUCH_AMOLED_1_8_v2)
+    set(MANUFACTURER "waveshare")
+    set(BOARD_TYPE "esp32-s3-touch-amoled-1.8-v2")
+    set(BUILTIN_TEXT_FONT font_puhui_basic_30_4)
+    set(BUILTIN_ICON_FONT font_awesome_30_4)
+    set(DEFAULT_EMOJI_COLLECTION twemoji_64)
 elseif(CONFIG_BOARD_TYPE_WAVESHARE_ESP32_C6_TOUCH_AMOLED_1_8)
     set(MANUFACTURER "waveshare")
     set(BOARD_TYPE "esp32-c6-touch-amoled-1.8")
diff --git a/main/Kconfig.projbuild b/main/Kconfig.projbuild
index 7207f9d3..75e1eaf5 100644
--- a/main/Kconfig.projbuild
+++ b/main/Kconfig.projbuild
@@ -287,6 +287,9 @@ choice BOARD_TYPE
     config BOARD_TYPE_WAVESHARE_ESP32_S3_TOUCH_AMOLED_1_8
         bool "Waveshare ESP32-S3-Touch-AMOLED-1.8"
         depends on IDF_TARGET_ESP32S3
+    config BOARD_TYPE_WAVESHARE_ESP32_S3_TOUCH_AMOLED_1_8_v2
+        bool "Waveshare ESP32-S3-Touch-AMOLED-1.8-v2"
+        depends on IDF_TARGET_ESP32S3
     config BOARD_TYPE_WAVESHARE_ESP32_S3_TOUCH_AMOLED_1_43C
         bool "Waveshare ESP32-S3-Touch-AMOLED-1.43C"
         depends on IDF_TARGET_ESP32S3
diff --git a/main/boards/waveshare/esp32-s3-touch-amoled-1.8-v2/config.h b/main/boards/waveshare/esp32-s3-touch-amoled-1.8-v2/config.h
new file mode 100644
index 00000000..77a46081
--- /dev/null
+++ b/main/boards/waveshare/esp32-s3-touch-amoled-1.8-v2/config.h
@@ -0,0 +1,41 @@
+#ifndef _BOARD_CONFIG_H_
+#define _BOARD_CONFIG_H_
+
+#include <driver/gpio.h>
+
+#define AUDIO_INPUT_SAMPLE_RATE 24000
+#define AUDIO_OUTPUT_SAMPLE_RATE 24000
+
+#define AUDIO_I2S_GPIO_MCLK GPIO_NUM_16
+#define AUDIO_I2S_GPIO_WS GPIO_NUM_45
+#define AUDIO_I2S_GPIO_BCLK GPIO_NUM_9
+#define AUDIO_I2S_GPIO_DIN GPIO_NUM_10
+#define AUDIO_I2S_GPIO_DOUT GPIO_NUM_8
+
+#define AUDIO_CODEC_PA_PIN GPIO_NUM_46
+#define AUDIO_CODEC_I2C_SDA_PIN GPIO_NUM_15
+#define AUDIO_CODEC_I2C_SCL_PIN GPIO_NUM_14
+#define AUDIO_CODEC_ES8311_ADDR ES8311_CODEC_DEFAULT_ADDR
+
+#define I2C_ADDRESS         ESP_IO_EXPANDER_I2C_TCA9554_ADDRESS_000
+#define BOOT_BUTTON_GPIO GPIO_NUM_0
+
+#define EXAMPLE_PIN_NUM_LCD_CS GPIO_NUM_12
+#define EXAMPLE_PIN_NUM_LCD_PCLK GPIO_NUM_11
+#define EXAMPLE_PIN_NUM_LCD_DATA0 GPIO_NUM_4
+#define EXAMPLE_PIN_NUM_LCD_DATA1 GPIO_NUM_5
+#define EXAMPLE_PIN_NUM_LCD_DATA2 GPIO_NUM_6
+#define EXAMPLE_PIN_NUM_LCD_DATA3 GPIO_NUM_7
+#define EXAMPLE_PIN_NUM_LCD_RST GPIO_NUM_NC
+#define DISPLAY_WIDTH 368
+#define DISPLAY_HEIGHT 448
+#define DISPLAY_MIRROR_X false
+#define DISPLAY_MIRROR_Y false
+#define DISPLAY_SWAP_XY false
+
+#define DISPLAY_OFFSET_X  16
+#define DISPLAY_OFFSET_Y  0
+
+#define DISPLAY_BACKLIGHT_PIN GPIO_NUM_NC
+#define DISPLAY_BACKLIGHT_OUTPUT_INVERT false
+#endif // _BOARD_CONFIG_H_
diff --git a/main/boards/waveshare/esp32-s3-touch-amoled-1.8-v2/config.json b/main/boards/waveshare/esp32-s3-touch-amoled-1.8-v2/config.json
new file mode 100644
index 00000000..b9b9a301
--- /dev/null
+++ b/main/boards/waveshare/esp32-s3-touch-amoled-1.8-v2/config.json
@@ -0,0 +1,12 @@
+{
+    "manufacturer": "waveshare",
+    "target": "esp32s3",
+    "builds": [
+        {
+            "name": "esp32-s3-touch-amoled-1.8-v2",
+            "sdkconfig_append": [
+                "CONFIG_USE_WECHAT_MESSAGE_STYLE=y"
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/main/boards/waveshare/esp32-s3-touch-amoled-1.8-v2/esp32-s3-touch-amoled-1.8-v2.cc b/main/boards/waveshare/esp32-s3-touch-amoled-1.8-v2/esp32-s3-touch-amoled-1.8-v2.cc
new file mode 100644
index 00000000..9329eafd
--- /dev/null
+++ b/main/boards/waveshare/esp32-s3-touch-amoled-1.8-v2/esp32-s3-touch-amoled-1.8-v2.cc
@@ -0,0 +1,429 @@
+#include "wifi_board.h"
+#include "display/lcd_display.h"
+#include "esp_lcd_co5300.h"
+
+#include "codecs/es8311_audio_codec.h"
+#include "application.h"
+#include "button.h"
+#include "led/single_led.h"
+#include "mcp_server.h"
+#include "config.h"
+#include "power_save_timer.h"
+#include "axp2101.h"
+#include "i2c_device.h"
+
+#include <esp_log.h>
+#include <esp_lcd_panel_vendor.h>
+#include <esp_ota_ops.h>
+#include <esp_partition.h>
+#include <esp_system.h>
+#include <driver/i2c_master.h>
+#include <driver/spi_master.h>
+#include "esp_io_expander_tca9554.h"
+#include "settings.h"
+
+#include <esp_lcd_touch_cst816s.h>
+#include <esp_lvgl_port.h>
+#include <lvgl.h>
+
+#define TAG "WaveshareEsp32s3TouchAMOLED1inch8"
+
+class Pmic : public Axp2101 {
+public:
+    Pmic(i2c_master_bus_handle_t i2c_bus, uint8_t addr) : Axp2101(i2c_bus, addr) {
+        WriteReg(0x22, 0b110); // PWRON > OFFLEVEL as POWEROFF Source enable
+        WriteReg(0x27, 0x10);  // hold 4s to power off
+
+        // Disable All DCs but DC1
+        WriteReg(0x80, 0x01);
+        // Disable All LDOs
+        WriteReg(0x90, 0x00);
+        WriteReg(0x91, 0x00);
+
+        // Set DC1 to 3.3V
+        WriteReg(0x82, (3300 - 1500) / 100);
+
+        // Set ALDO1 to 3.3V
+        WriteReg(0x92, (3300 - 500) / 100);
+
+        // Enable ALDO1(MIC)
+        WriteReg(0x90, 0x01);
+    
+        WriteReg(0x64, 0x02); // CV charger voltage setting to 4.1V
+        
+        WriteReg(0x61, 0x02); // set Main battery precharge current to 50mA
+        WriteReg(0x62, 0x08); // set Main battery charger current to 400mA ( 0x08-200mA, 0x09-300mA, 0x0A-400mA )
+        WriteReg(0x63, 0x01); // set Main battery term charge current to 25mA
+    }
+
+    void EnablePowerButtonShortPressIrq() {
+        ClearIrqStatus();
+        WriteReg(0x41, ReadReg(0x41) | 0x08); // Enable AXP2101 PWRON short press IRQ
+    }
+
+    bool ConsumePowerButtonShortPressIrq() {
+        uint8_t status = ReadReg(0x49);
+        if (status != 0) {
+            WriteReg(0x49, status);
+        }
+        return (status & 0x08) != 0;
+    }
+
+    void ClearIrqStatus() {
+        WriteReg(0x48, 0xff);
+        WriteReg(0x49, 0xff);
+        WriteReg(0x4a, 0xff);
+    }
+};
+
+#define LCD_OPCODE_WRITE_CMD (0x02ULL)
+#define LCD_OPCODE_READ_CMD (0x03ULL)
+#define LCD_OPCODE_WRITE_COLOR (0x32ULL)
+
+static const co5300_lcd_init_cmd_t vendor_specific_init[] = {
+    {0x11, (uint8_t[]){0x00}, 0, 600}, // Sleep out
+
+    {0xFE, (uint8_t[]){0x20}, 1, 0},
+    {0x19, (uint8_t[]){0x10}, 1, 0},
+    {0x1C, (uint8_t[]){0xA0}, 1, 0},
+
+    {0xFE, (uint8_t[]){0x00}, 1, 0},
+    {0xC4, (uint8_t[]){0x80}, 1, 0},
+    {0x3A, (uint8_t[]){0x55}, 1, 0},
+    {0x35, (uint8_t[]){0x00}, 1, 0},
+    {0x53, (uint8_t[]){0x20}, 1, 0},
+    {0x51, (uint8_t[]){0xFF}, 1, 0},
+    {0x63, (uint8_t[]){0xFF}, 1, 0},
+    {0x2A, (uint8_t[]){0x00, 0x00, 0x01, 0xDF}, 4, 0},
+    {0x2B, (uint8_t[]){0x00, 0x00, 0x01, 0xDF}, 4, 0},
+    {0x36, (uint8_t[]){0x00}, 1, 0},
+    {0x29, (uint8_t[]){0x00}, 0, 600},
+};
+
+// 在waveshare_amoled_1_8类之前添加新的显示类
+class CustomLcdDisplay : public SpiLcdDisplay {
+public:
+    CustomLcdDisplay(esp_lcd_panel_io_handle_t io_handle,
+                    esp_lcd_panel_handle_t panel_handle,
+                    int width,
+                    int height,
+                    int offset_x,
+                    int offset_y,
+                    bool mirror_x,
+                    bool mirror_y,
+                    bool swap_xy)
+        : SpiLcdDisplay(io_handle, panel_handle,
+                    width, height, offset_x, offset_y, mirror_x, mirror_y, swap_xy) {
+        // Note: UI customization should be done in SetupUI(), not in constructor
+        // to ensure lvgl objects are created before accessing them
+    }
+
+    virtual void SetupUI() override {
+        // Call parent SetupUI() first to create all lvgl objects
+        SpiLcdDisplay::SetupUI();
+
+        DisplayLockGuard lock(this);
+        lv_obj_set_style_pad_left(status_bar_, LV_HOR_RES * 0.1, 0);
+        lv_obj_set_style_pad_right(status_bar_, LV_HOR_RES * 0.1, 0);
+    }
+};
+
+class CustomBacklight : public Backlight {
+public:
+    CustomBacklight(esp_lcd_panel_io_handle_t panel_io) : Backlight(), panel_io_(panel_io) {}
+
+protected:
+    esp_lcd_panel_io_handle_t panel_io_;
+
+    virtual void SetBrightnessImpl(uint8_t brightness) override {
+        auto display = Board::GetInstance().GetDisplay();
+        DisplayLockGuard lock(display);
+        uint8_t data[1] = {((uint8_t)((255 * brightness) / 100))};
+        int lcd_cmd = 0x51;
+        lcd_cmd &= 0xff;
+        lcd_cmd <<= 8;
+        lcd_cmd |= LCD_OPCODE_WRITE_CMD << 24;
+        esp_lcd_panel_io_tx_param(panel_io_, lcd_cmd, &data, sizeof(data));
+    }
+};
+
+class WaveshareEsp32s3TouchAMOLED1inch8 : public WifiBoard {
+private:
+    i2c_master_bus_handle_t codec_i2c_bus_;
+    Pmic* pmic_ = nullptr;
+    Button boot_button_;
+    CustomLcdDisplay* display_;
+    CustomBacklight* backlight_;
+    esp_io_expander_handle_t io_expander = NULL;
+    PowerSaveTimer* power_save_timer_;
+    TaskHandle_t power_button_task_handle_ = nullptr;
+    bool returning_to_brookesia_ = false;
+
+    static void PowerButtonTask(void* arg) {
+        auto* self = static_cast<WaveshareEsp32s3TouchAMOLED1inch8*>(arg);
+        while (true) {
+            if (self->pmic_ != nullptr && self->pmic_->ConsumePowerButtonShortPressIrq()) {
+                self->ReturnToBrookesia();
+                break;
+            }
+            vTaskDelay(pdMS_TO_TICKS(100));
+        }
+        self->power_button_task_handle_ = nullptr;
+        vTaskDelete(nullptr);
+    }
+
+    void ReturnToBrookesia() {
+        if (returning_to_brookesia_) {
+            return;
+        }
+        returning_to_brookesia_ = true;
+
+        const esp_partition_t *factory = esp_partition_find_first(
+            ESP_PARTITION_TYPE_APP,
+            ESP_PARTITION_SUBTYPE_APP_FACTORY,
+            nullptr
+        );
+        if (factory == nullptr) {
+            ESP_LOGE(TAG, "Factory partition not found");
+            returning_to_brookesia_ = false;
+            return;
+        }
+
+        esp_err_t err = esp_ota_set_boot_partition(factory);
+        if (err != ESP_OK) {
+            ESP_LOGE(TAG, "Set boot partition failed: %s", esp_err_to_name(err));
+            returning_to_brookesia_ = false;
+            return;
+        }
+
+        ESP_LOGI(TAG, "PWR short press: return to Brookesia factory partition");
+        vTaskDelay(pdMS_TO_TICKS(100));
+        esp_restart();
+    }
+
+    void InitializePowerSaveTimer() {
+        power_save_timer_ = new PowerSaveTimer(-1, 60, 300);
+        power_save_timer_->OnEnterSleepMode([this]() {
+            GetDisplay()->SetPowerSaveMode(true);
+            GetBacklight()->SetBrightness(20);
+        });
+        power_save_timer_->OnExitSleepMode([this]() {
+            GetDisplay()->SetPowerSaveMode(false);
+            GetBacklight()->RestoreBrightness();
+        });
+        power_save_timer_->OnShutdownRequest([this]() {
+            pmic_->PowerOff();
+        });
+        power_save_timer_->SetEnabled(true);
+    }
+
+    void InitializeCodecI2c() {
+        // Initialize I2C peripheral
+        i2c_master_bus_config_t i2c_bus_cfg = {
+            .i2c_port = I2C_NUM_0,
+            .sda_io_num = AUDIO_CODEC_I2C_SDA_PIN,
+            .scl_io_num = AUDIO_CODEC_I2C_SCL_PIN,
+            .clk_source = I2C_CLK_SRC_DEFAULT,
+            .glitch_ignore_cnt = 7,
+            .intr_priority = 0,
+            .trans_queue_depth = 0,
+            .flags = {
+                .enable_internal_pullup = 1,
+            },
+        };
+        ESP_ERROR_CHECK(i2c_new_master_bus(&i2c_bus_cfg, &codec_i2c_bus_));
+    }
+
+    void InitializeTca9554(void) {
+        esp_err_t ret = esp_io_expander_new_i2c_tca9554(codec_i2c_bus_, I2C_ADDRESS, &io_expander);
+        if(ret != ESP_OK)
+            ESP_LOGE(TAG, "TCA9554 create returned error");
+        ret = esp_io_expander_set_dir(io_expander, IO_EXPANDER_PIN_NUM_0 | IO_EXPANDER_PIN_NUM_1 |IO_EXPANDER_PIN_NUM_2, IO_EXPANDER_OUTPUT);
+        ret |= esp_io_expander_set_dir(io_expander, IO_EXPANDER_PIN_NUM_4, IO_EXPANDER_INPUT);
+        ESP_ERROR_CHECK(ret);
+        ret = esp_io_expander_set_level(io_expander, IO_EXPANDER_PIN_NUM_0 | IO_EXPANDER_PIN_NUM_1|IO_EXPANDER_PIN_NUM_2, 1);
+        ESP_ERROR_CHECK(ret);
+        vTaskDelay(pdMS_TO_TICKS(100));
+        ret = esp_io_expander_set_level(io_expander, IO_EXPANDER_PIN_NUM_0 | IO_EXPANDER_PIN_NUM_1|IO_EXPANDER_PIN_NUM_2, 0);
+        ESP_ERROR_CHECK(ret);
+        vTaskDelay(pdMS_TO_TICKS(300));
+        ret = esp_io_expander_set_level(io_expander, IO_EXPANDER_PIN_NUM_0 | IO_EXPANDER_PIN_NUM_1|IO_EXPANDER_PIN_NUM_2, 1);
+        ESP_ERROR_CHECK(ret);
+    }
+
+    void InitializeAxp2101() {
+        ESP_LOGI(TAG, "Init AXP2101");
+        pmic_ = new Pmic(codec_i2c_bus_, 0x34);
+        pmic_->EnablePowerButtonShortPressIrq();
+    }
+
+    void InitializeSpi() {
+        spi_bus_config_t buscfg = {};
+        buscfg.sclk_io_num = GPIO_NUM_11;
+        buscfg.data0_io_num = GPIO_NUM_4;
+        buscfg.data1_io_num = GPIO_NUM_5;
+        buscfg.data2_io_num = GPIO_NUM_6;
+        buscfg.data3_io_num = GPIO_NUM_7;
+        buscfg.max_transfer_sz = DISPLAY_WIDTH * DISPLAY_HEIGHT * sizeof(uint16_t);
+        buscfg.flags = SPICOMMON_BUSFLAG_QUAD;
+        ESP_ERROR_CHECK(spi_bus_initialize(SPI2_HOST, &buscfg, SPI_DMA_CH_AUTO));
+    }
+
+    void InitializeButtons() {
+        boot_button_.OnClick([this]() {
+            auto& app = Application::GetInstance();
+            if (app.GetDeviceState() == kDeviceStateStarting) {
+                EnterWifiConfigMode();
+                return;
+            }
+            app.ToggleChatState();
+        });
+
+        xTaskCreate(PowerButtonTask, "pwr_button", 4096, this, 5, &power_button_task_handle_);
+    }
+
+    void InitializeDisplay() {
+        esp_lcd_panel_io_handle_t panel_io = nullptr;
+        esp_lcd_panel_handle_t panel = nullptr;
+
+        // 液晶屏控制IO初始化
+        ESP_LOGD(TAG, "Install panel IO");
+        esp_lcd_panel_io_spi_config_t io_config = CO5300_PANEL_IO_QSPI_CONFIG(
+            EXAMPLE_PIN_NUM_LCD_CS,
+            nullptr,
+            nullptr);
+        ESP_ERROR_CHECK(esp_lcd_new_panel_io_spi(SPI2_HOST, &io_config, &panel_io));
+
+        // 初始化液晶屏驱动芯片
+        ESP_LOGD(TAG, "Install LCD driver");
+        const co5300_vendor_config_t vendor_config = {
+            .init_cmds = &vendor_specific_init[0],
+            .init_cmds_size = sizeof(vendor_specific_init) / sizeof(co5300_lcd_init_cmd_t),
+            .flags = {
+                .use_qspi_interface = 1,
+            }};
+
+        esp_lcd_panel_dev_config_t panel_config = {};
+        panel_config.reset_gpio_num = EXAMPLE_PIN_NUM_LCD_RST;
+        panel_config.rgb_ele_order = LCD_RGB_ELEMENT_ORDER_RGB;
+        panel_config.bits_per_pixel = 16;
+        panel_config.vendor_config = (void* )&vendor_config;
+        ESP_ERROR_CHECK(esp_lcd_new_panel_co5300(panel_io, &panel_config, &panel));
+        esp_lcd_panel_reset(panel);
+        esp_lcd_panel_init(panel);
+        esp_lcd_panel_invert_color(panel, false);
+        esp_lcd_panel_mirror(panel, DISPLAY_MIRROR_X, DISPLAY_MIRROR_Y);
+        esp_lcd_panel_disp_on_off(panel, true);
+        display_ = new CustomLcdDisplay(panel_io, panel,
+                                        DISPLAY_WIDTH, DISPLAY_HEIGHT, DISPLAY_OFFSET_X, DISPLAY_OFFSET_Y, DISPLAY_MIRROR_X, DISPLAY_MIRROR_Y, DISPLAY_SWAP_XY);
+        backlight_ = new CustomBacklight(panel_io);
+        backlight_->RestoreBrightness();
+    }
+
+    void InitializeTouch() {
+        esp_lcd_touch_handle_t tp;
+        esp_lcd_touch_config_t tp_cfg = {
+            .x_max = DISPLAY_WIDTH - 1,
+            .y_max = DISPLAY_HEIGHT - 1,
+            .rst_gpio_num = GPIO_NUM_39,
+            .int_gpio_num = GPIO_NUM_13,
+            .levels = {
+                .reset = 0,
+                .interrupt = 0,
+            },
+            .flags = {
+                .swap_xy = 0,
+                .mirror_x = 0,
+                .mirror_y = 0,
+            },
+        };
+        esp_lcd_panel_io_handle_t tp_io_handle = NULL;
+        esp_lcd_panel_io_i2c_config_t tp_io_config = {
+            .dev_addr = ESP_LCD_TOUCH_IO_I2C_CST816S_ADDRESS,
+            .on_color_trans_done = 0,
+            .user_ctx = 0,
+            .control_phase_bytes = 1,
+            .dc_bit_offset = 0,
+            .lcd_cmd_bits = 8,
+            .lcd_param_bits = 0,
+            .flags =
+            {
+                .dc_low_on_data = 0,
+                .disable_control_phase = 1,
+            },
+        };
+        tp_io_config.scl_speed_hz = 400*  1000;
+        ESP_ERROR_CHECK(esp_lcd_new_panel_io_i2c(codec_i2c_bus_, &tp_io_config, &tp_io_handle));
+        ESP_LOGI(TAG, "Initialize touch controller");
+        ESP_ERROR_CHECK(esp_lcd_touch_new_i2c_cst816s(tp_io_handle, &tp_cfg, &tp));
+        const lvgl_port_touch_cfg_t touch_cfg = {
+            .disp = lv_display_get_default(),
+            .handle = tp,
+        };
+        lvgl_port_add_touch(&touch_cfg);
+        ESP_LOGI(TAG, "Touch panel initialized successfully");
+    }
+
+    // 初始化工具
+    void InitializeTools() {
+        auto &mcp_server = McpServer::GetInstance();
+        mcp_server.AddTool("self.system.reconfigure_wifi",
+            "End this conversation and enter WiFi configuration mode.\n"
+            "**CAUTION** You must ask the user to confirm this action.",
+            PropertyList(), [this](const PropertyList& properties) {
+                EnterWifiConfigMode();
+                return true;
+            });
+    }
+
+public:
+    WaveshareEsp32s3TouchAMOLED1inch8() :
+        boot_button_(BOOT_BUTTON_GPIO) {
+        InitializePowerSaveTimer();
+        InitializeCodecI2c();
+        InitializeTca9554();
+        InitializeAxp2101();
+        InitializeSpi();
+        InitializeDisplay();
+         InitializeTouch();
+        InitializeButtons();
+        InitializeTools();
+    }
+
+    virtual AudioCodec* GetAudioCodec() override {
+        static Es8311AudioCodec audio_codec(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;
+    }
+
+    virtual Display* GetDisplay() override {
+        return display_;
+    }
+
+    virtual Backlight* GetBacklight() override {
+        return backlight_;
+    }
+
+    virtual bool GetBatteryLevel(int &level, bool& charging, bool& discharging) override {
+        static bool last_discharging = false;
+        charging = pmic_->IsCharging();
+        discharging = pmic_->IsDischarging();
+        if (discharging != last_discharging) {
+            power_save_timer_->SetEnabled(discharging);
+            last_discharging = discharging;
+        }
+
+        level = pmic_->GetBatteryLevel();
+        return true;
+    }
+
+    virtual void SetPowerSaveLevel(PowerSaveLevel level) override {
+        if (level != PowerSaveLevel::LOW_POWER) {
+            power_save_timer_->WakeUp();
+        }
+        WifiBoard::SetPowerSaveLevel(level);
+    }
+};
+
+DECLARE_BOARD(WaveshareEsp32s3TouchAMOLED1inch8);