Merge branch '78:main' into waveshare-s3-epaper-1.54

Author: DrayxR3X

main/CMakeLists.txt

@@ -283,6 +283,16 @@ elseif(CONFIG_BOARD_TYPE_WAVESHARE_C6_TOUCH_AMOLED_1_43)
     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_C6_TOUCH_AMOLED_1_32)
+    set(BOARD_TYPE "waveshare-c6-touch-amoled-1.32")
+    set(BUILTIN_TEXT_FONT font_puhui_basic_20_4)
+    set(BUILTIN_ICON_FONT font_awesome_20_4)
+    set(DEFAULT_EMOJI_COLLECTION twemoji_32)
+elseif(CONFIG_BOARD_TYPE_WAVESHARE_S3_TOUCH_AMOLED_1_32)
+    set(BOARD_TYPE "waveshare-s3-touch-amoled-1.32")
+    set(BUILTIN_TEXT_FONT font_puhui_basic_20_4)
+    set(BUILTIN_ICON_FONT font_awesome_20_4)
+    set(DEFAULT_EMOJI_COLLECTION twemoji_32)
 elseif(CONFIG_BOARD_TYPE_WAVESHARE_P4_NANO)
     set(BOARD_TYPE "waveshare-p4-nano")
     set(BUILTIN_TEXT_FONT font_puhui_basic_30_4)

main/Kconfig.projbuild

@@ -270,6 +270,12 @@ choice BOARD_TYPE
     config BOARD_TYPE_WAVESHARE_C6_TOUCH_AMOLED_1_43
         bool "Waveshare ESP32-C6-Touch-AMOLOED-1.43"
         depends on IDF_TARGET_ESP32C6
+    config BOARD_TYPE_WAVESHARE_C6_TOUCH_AMOLED_1_32
+        bool "Waveshare ESP32-C6-Touch-AMOLOED-1.32"
+        depends on IDF_TARGET_ESP32C6
+    config BOARD_TYPE_WAVESHARE_S3_TOUCH_AMOLED_1_32
+        bool "Waveshare ESP32-S3-Touch-AMOLOED-1.32"
+        depends on IDF_TARGET_ESP32S3
     config BOARD_TYPE_WAVESHARE_S3_TOUCH_LCD_3_49
         bool "Waveshare ESP32-S3-Touch-LCD-3.49"
         depends on IDF_TARGET_ESP32S3

main/boards/otto-robot/otto_controller.cc

@@ -15,6 +15,12 @@ OttoEmojiDisplay::OttoEmojiDisplay(esp_lcd_panel_io_handle_t panel_io, esp_lcd_p
     : SpiLcdDisplay(panel_io, panel, width, height, offset_x, offset_y, mirror_x, mirror_y, swap_xy) {
     InitializeOttoEmojis();
     SetupChatLabel();
+    SetupPreviewImage();
+}
+
+void OttoEmojiDisplay::SetupPreviewImage() {
+    DisplayLockGuard lock(this);
+    lv_obj_set_size(preview_image_, width_ , height_ );
 }
 
 void OttoEmojiDisplay::InitializeOttoEmojis() {
@@ -135,4 +141,42 @@ void OttoEmojiDisplay::SetStatus(const char* status) {
     lv_obj_clear_flag(status_label_, LV_OBJ_FLAG_HIDDEN);
     lv_obj_clear_flag(network_label_, LV_OBJ_FLAG_HIDDEN);
     lv_obj_clear_flag(battery_label_, LV_OBJ_FLAG_HIDDEN);
+}
+
+void OttoEmojiDisplay::SetPreviewImage(std::unique_ptr<LvglImage> image) {
+    DisplayLockGuard lock(this);
+    if (preview_image_ == nullptr) {
+        ESP_LOGE(TAG, "Preview image is not initialized");
+        return;
+    }
+
+    if (image == nullptr) {
+        esp_timer_stop(preview_timer_);
+        lv_obj_remove_flag(emoji_box_, LV_OBJ_FLAG_HIDDEN);
+        lv_obj_add_flag(preview_image_, LV_OBJ_FLAG_HIDDEN);
+        preview_image_cached_.reset();
+        if (gif_controller_) {
+            gif_controller_->Start();
+        }
+        return;
+    }
+
+    preview_image_cached_ = std::move(image);
+    auto img_dsc = preview_image_cached_->image_dsc();
+    // 设置图片源并显示预览图片
+    lv_image_set_src(preview_image_, img_dsc);
+    lv_image_set_rotation(preview_image_, -900);
+    if (img_dsc->header.w > 0 && img_dsc->header.h > 0) {
+        // zoom factor 1.0
+        lv_image_set_scale(preview_image_, 256 * width_ / img_dsc->header.w);
+    }
+
+    // Hide emoji_box_
+    if (gif_controller_) {
+        gif_controller_->Stop();
+    }
+    lv_obj_add_flag(emoji_box_, LV_OBJ_FLAG_HIDDEN);
+    lv_obj_remove_flag(preview_image_, LV_OBJ_FLAG_HIDDEN);
+    esp_timer_stop(preview_timer_);
+    ESP_ERROR_CHECK(esp_timer_start_once(preview_timer_, PREVIEW_IMAGE_DURATION_MS * 1000));
 }

main/boards/otto-robot/otto_emoji_display.cc

@@ -15,8 +15,10 @@ class OttoEmojiDisplay : public SpiLcdDisplay {
 
     virtual ~OttoEmojiDisplay() = default;
     virtual void SetStatus(const char* status) override;
+    virtual void SetPreviewImage(std::unique_ptr<LvglImage> image) override;
 
    private:
     void InitializeOttoEmojis();
     void SetupChatLabel();
+    void SetupPreviewImage();
 };

main/boards/otto-robot/otto_emoji_display.h

@@ -0,0 +1,48 @@
+# 产品链接
+
+[微雪电子 ESP32-C6-Touch-AMOLED-1.32](https://www.waveshare.net/shop/ESP32-C6-Touch-AMOLED-1.32.htm)
+
+# 编译配置命令
+
+**克隆工程**
+
+```bash
+git clone https://github.com/78/xiaozhi-esp32.git
+```
+
+**进入工程**
+
+```bash
+cd xiaozhi-esp32
+```
+
+**配置编译目标为 ESP32C6**
+
+```bash
+idf.py set-target esp32c6
+```
+
+**打开 menuconfig**
+
+```bash
+idf.py menuconfig
+```
+
+**选择板子**
+
+```bash
+Xiaozhi Assistant -> Board Type -> Waveshare ESP32-C6-Touch-AMOLED-1.32
+```
+
+**编译**
+
+```ba
+idf.py build
+```
+
+**下载并打开串口终端**
+
+```bash
+idf.py build flash monitor
+```
+

main/boards/waveshare-c6-touch-amoled-1.32/README.md

@@ -0,0 +1,44 @@
+#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_15
+#define AUDIO_I2S_GPIO_WS    GPIO_NUM_5
+#define AUDIO_I2S_GPIO_BCLK  GPIO_NUM_3
+#define AUDIO_I2S_GPIO_DIN   GPIO_NUM_4
+#define AUDIO_I2S_GPIO_DOUT  GPIO_NUM_6
+
+#define AUDIO_CODEC_PA_PIN       GPIO_NUM_23
+#define AUDIO_CODEC_I2C_SDA_PIN  GPIO_NUM_8
+#define AUDIO_CODEC_I2C_SCL_PIN  GPIO_NUM_7
+#define AUDIO_CODEC_ES8311_ADDR  ES8311_CODEC_DEFAULT_ADDR
+
+#define BOOT_BUTTON_GPIO        GPIO_NUM_9
+
+
+#define LCD_CS       GPIO_NUM_22
+#define LCD_PCLK     GPIO_NUM_18
+#define LCD_D0       GPIO_NUM_19
+#define LCD_D1       GPIO_NUM_20
+#define LCD_D2       GPIO_NUM_10
+#define LCD_D3       GPIO_NUM_11
+#define LCD_RST      GPIO_NUM_21
+
+#define EXAMPLE_LCD_H_RES 466
+#define EXAMPLE_LCD_V_RES 466
+ 
+#define DISPLAY_MIRROR_X false
+#define DISPLAY_MIRROR_Y false
+#define DISPLAY_SWAP_XY  false
+
+#define DISPLAY_OFFSET_X  0
+#define DISPLAY_OFFSET_Y  0
+
+#define SYS_POWER_IO_PIN GPIO_NUM_2
+#define PWR_KEY_GPIO     GPIO_NUM_1
+
+#endif // _BOARD_CONFIG_H_

main/boards/waveshare-c6-touch-amoled-1.32/config.h

@@ -0,0 +1,11 @@
+{
+    "target": "esp32c6",
+    "builds": [
+        {
+            "name": "waveshare-c6-touch-amoled-1.32",
+            "sdkconfig_append": [
+                "CONFIG_USE_ESP_WAKE_WORD=y"
+            ]
+        }
+    ]
+}