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

Add support for EchoEar V1.2 version PCB. (#891)

Browse Source 
Co-authored-by: NingYuxiang <ningyuxiang@espressif.com>
This commit is contained in:
ning yuxiang
2025-07-09 03:10:43 +08:00
committed by GitHub
parent f002a1185b
commit 2cdec25162
2 changed files with 67 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
main/boards/echoear/EchoEar.cc
View File

@@ -216,6 +216,12 @@ static const st77916_lcd_init_cmd_t vendor_specific_init_yysj[] = {
{0x00, (uint8_t []){}, 0, 120},
};
float tsens_value;
gpio_num_t AUDIO_I2S_GPIO_DIN = AUDIO_I2S_GPIO_DIN_1;
gpio_num_t AUDIO_CODEC_PA_PIN = AUDIO_CODEC_PA_PIN_1;
gpio_num_t QSPI_PIN_NUM_LCD_RST = QSPI_PIN_NUM_LCD_RST_1;
gpio_num_t TOUCH_PAD2 = TOUCH_PAD2_1;
gpio_num_t UART1_TX = UART1_TX_1;
gpio_num_t UART1_RX = UART1_RX_1;
class Charge : public I2cDevice {
public:
@@ -312,6 +318,41 @@ private:
ESP_ERROR_CHECK(temperature_sensor_enable(temp_sensor));
}
uint8_t DetectPcbVersion() {
esp_err_t ret = i2c_master_probe(i2c_bus_, 0x18, 100);
uint8_t pcb_verison = 0;
if (ret == ESP_OK) {
ESP_LOGI(TAG, "PCB verison V1.0");
pcb_verison = 0;
} else {
gpio_config_t gpio_conf = {
.pin_bit_mask = (1ULL << GPIO_NUM_48),
.mode = GPIO_MODE_OUTPUT,
.pull_up_en = GPIO_PULLUP_DISABLE,
.pull_down_en = GPIO_PULLDOWN_DISABLE,
.intr_type = GPIO_INTR_DISABLE
};
ESP_ERROR_CHECK(gpio_config(&gpio_conf));
ESP_ERROR_CHECK(gpio_set_level(GPIO_NUM_48, 1));
vTaskDelay(pdMS_TO_TICKS(100));
ret = i2c_master_probe(i2c_bus_, 0x18, 100);
if (ret == ESP_OK) {
ESP_LOGI(TAG, "PCB verison V1.2");
pcb_verison = 1;
AUDIO_I2S_GPIO_DIN = AUDIO_I2S_GPIO_DIN_2;
AUDIO_CODEC_PA_PIN = AUDIO_CODEC_PA_PIN_2;
QSPI_PIN_NUM_LCD_RST = QSPI_PIN_NUM_LCD_RST_2;
TOUCH_PAD2 = TOUCH_PAD2_2;
UART1_TX = UART1_TX_2;
UART1_RX = UART1_RX_2;
} else {
ESP_LOGE(TAG, "PCB version detection error");
}
}
return pcb_verison;
}
static void touchpad_timer_callback(void* arg) {
auto& board = (EspS3Cat&)Board::GetInstance();
@@ -440,7 +481,7 @@ private:
ESP_ERROR_CHECK(spi_bus_initialize(QSPI_LCD_HOST, &bus_config, SPI_DMA_CH_AUTO));
}
void Initializest77916Display() {
void Initializest77916Display(uint8_t pcb_verison) {
esp_lcd_panel_io_handle_t panel_io = nullptr;
esp_lcd_panel_handle_t panel = nullptr;
@@ -458,6 +499,9 @@ private:
.reset_gpio_num = QSPI_PIN_NUM_LCD_RST,
.rgb_ele_order = LCD_RGB_ELEMENT_ORDER_RGB,
.bits_per_pixel = QSPI_LCD_BIT_PER_PIXEL,
.flags = {
.reset_active_high = pcb_verison,
},
.vendor_config = &vendor_config,
};
ESP_ERROR_CHECK(esp_lcd_new_panel_st77916(panel_io, &panel_config, &panel));
@@ -500,11 +544,12 @@ private:
public:
EspS3Cat() : boot_button_(BOOT_BUTTON_GPIO) {
InitializeI2c();
uint8_t pcb_verison = DetectPcbVersion();
InitializeCharge();
InitializeCst816sTouchPad();
InitializeSpi();
Initializest77916Display();
Initializest77916Display(pcb_verison);
InitializeButtons();
}

27
main/boards/echoear/config.h
View File

@@ -9,19 +9,23 @@
#define AUDIO_OUTPUT_SAMPLE_RATE 24000
#define AUDIO_INPUT_REFERENCE true
#define CORDEC_POWER_CTRL GPIO_NUM_48
#define POWER_CTRL GPIO_NUM_9
#define LED_G GPIO_NUM_43
#define SD_MISO GPIO_NUM_17
#define SD_SCK GPIO_NUM_16
#define SD_MOSI GPIO_NUM_38
#define AUDIO_I2S_GPIO_MCLK GPIO_NUM_42
#define AUDIO_I2S_GPIO_WS GPIO_NUM_39
#define AUDIO_I2S_GPIO_BCLK GPIO_NUM_40
#define AUDIO_I2S_GPIO_DIN GPIO_NUM_15
#define AUDIO_I2S_GPIO_DOUT GPIO_NUM_41
#define AUDIO_I2S_GPIO_MCLK GPIO_NUM_42
#define AUDIO_I2S_GPIO_WS GPIO_NUM_39
#define AUDIO_I2S_GPIO_BCLK GPIO_NUM_40
#define AUDIO_I2S_GPIO_DIN_1 GPIO_NUM_15
#define AUDIO_I2S_GPIO_DIN_2 GPIO_NUM_3
#define AUDIO_I2S_GPIO_DOUT GPIO_NUM_41
#define AUDIO_CODEC_PA_PIN GPIO_NUM_4
#define AUDIO_CODEC_PA_PIN_1 GPIO_NUM_4
#define AUDIO_CODEC_PA_PIN_2 GPIO_NUM_15
#define AUDIO_CODEC_I2C_SDA_PIN GPIO_NUM_2
#define AUDIO_CODEC_I2C_SCL_PIN GPIO_NUM_1
#define AUDIO_CODEC_ES8311_ADDR ES8311_CODEC_DEFAULT_ADDR
@@ -49,9 +53,18 @@
#define QSPI_PIN_NUM_LCD_DATA1 GPIO_NUM_13
#define QSPI_PIN_NUM_LCD_DATA2 GPIO_NUM_11
#define QSPI_PIN_NUM_LCD_DATA3 GPIO_NUM_12
#define QSPI_PIN_NUM_LCD_RST GPIO_NUM_3
#define QSPI_PIN_NUM_LCD_RST_1 GPIO_NUM_3
#define QSPI_PIN_NUM_LCD_RST_2 GPIO_NUM_47
#define QSPI_PIN_NUM_LCD_BL GPIO_NUM_44
#define UART1_TX_1 GPIO_NUM_6
#define UART1_TX_2 GPIO_NUM_5
#define UART1_RX_1 GPIO_NUM_5
#define UART1_RX_2 GPIO_NUM_4
#define TOUCH_PAD2_1 GPIO_NUM_NC
#define TOUCH_PAD2_2 GPIO_NUM_6
#define TOUCH_PAD1 GPIO_NUM_7
#define DISPLAY_OFFSET_X 0
#define DISPLAY_OFFSET_Y 0