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

rename St7789 to LCD

Browse Source
This commit is contained in:
Terrence
2025-01-05 21:20:30 +08:00
parent c7c5b74d37
commit b94c8a6e8b
12 changed files with 105 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
main/boards/magiclick-2p4/magiclick_2p4_board.cc
View File

@@ -1,9 +1,9 @@
#include "wifi_board.h"
#include "display/st7789_display.h"
#include "display/lcd_display.h"
#include "audio_codecs/es8311_audio_codec.h"
#include "application.h"
#include "button.h"
#include "led.h"
#include "led/single_led.h"
#include "config.h"
#include <esp_lcd_panel_vendor.h>
#include <wifi_station.h>
@@ -17,7 +17,7 @@ class magiclick_2p4 : public WifiBoard {
private:
i2c_master_bus_handle_t codec_i2c_bus_;
Button boot_button_;
St7789Display* display_;
LcdDisplay* display_;
void InitializeCodecI2c() {
// Initialize I2C peripheral
@@ -39,7 +39,7 @@ private:
void InitializeButtons() {
boot_button_.OnClick([this]() {
auto& app = Application::GetInstance();
if (app.GetChatState() == kChatStateUnknown && !WifiStation::GetInstance().IsConnected()) {
if (app.GetDeviceState() == kDeviceStateUnknown && !WifiStation::GetInstance().IsConnected()) {
ResetWifiConfiguration();
}
});
@@ -57,6 +57,7 @@ private:
gpio_set_direction(BUILTIN_LED_POWER, GPIO_MODE_OUTPUT);
gpio_set_level(BUILTIN_LED_POWER, BUILTIN_LED_POWER_OUTPUT_INVERT ? 0 : 1);
}
void InitializeSpi() {
spi_bus_config_t buscfg = {};
buscfg.mosi_io_num = DISPLAY_SDA_PIN;
@@ -68,7 +69,7 @@ private:
ESP_ERROR_CHECK(spi_bus_initialize(SPI3_HOST, &buscfg, SPI_DMA_CH_AUTO));
}
void InitializeSt7789Display(){
void InitializeNv3023Display(){
esp_lcd_panel_io_handle_t panel_io = nullptr;
esp_lcd_panel_handle_t panel = nullptr;
// 液晶屏控制IO初始化
@@ -83,7 +84,7 @@ private:
io_config.lcd_param_bits = 8;
ESP_ERROR_CHECK(esp_lcd_new_panel_io_spi(SPI3_HOST, &io_config, &panel_io));
// 初始化液晶屏驱动芯片ST7789
// 初始化液晶屏驱动芯片NV3023
ESP_LOGD(TAG, "Install LCD driver");
esp_lcd_panel_dev_config_t panel_config = {};
panel_config.reset_gpio_num = DISPLAY_RST_PIN;
@@ -99,7 +100,7 @@ private:
esp_lcd_panel_swap_xy(panel, DISPLAY_SWAP_XY);
esp_lcd_panel_mirror(panel, DISPLAY_MIRROR_X, DISPLAY_MIRROR_Y);
ESP_ERROR_CHECK(esp_lcd_panel_disp_on_off(panel, true));
display_ = new St7789Display(panel_io, panel, DISPLAY_BACKLIGHT_PIN, DISPLAY_BACKLIGHT_OUTPUT_INVERT,
display_ = new LcdDisplay(panel_io, panel, DISPLAY_BACKLIGHT_PIN, DISPLAY_BACKLIGHT_OUTPUT_INVERT,
DISPLAY_WIDTH, DISPLAY_HEIGHT, DISPLAY_OFFSET_X, DISPLAY_OFFSET_Y, DISPLAY_MIRROR_X, DISPLAY_MIRROR_Y, DISPLAY_SWAP_XY);
}
@@ -110,13 +111,11 @@ public:
InitializeButtons();
InitializeLedPower();
InitializeSpi();
InitializeSt7789Display();
InitializeNv3023Display();
}
virtual Led* GetBuiltinLed() override {
// static Led led(BUILTIN_LED_GPIO,BUILTIN_LED_NUM);
static Led led(BUILTIN_LED_GPIO);
virtual Led* GetLed() override {
static SingleLed led(BUILTIN_LED_GPIO);
return &led;
}