From 6cb025859f6531683d521bdb66e8d4f46edadf3b Mon Sep 17 00:00:00 2001
From: yusuhua <57382265+yusuhua@users.noreply.github.com>
Date: Fri, 30 May 2025 10:13:18 +0800
Subject: [PATCH] =?UTF-8?q?LilyGo=20T-CameraPlus-S3=E4=BD=8E=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E5=8F=91=E5=B8=83=E5=8F=8A=E5=A2=9E=E5=8A=A0=E6=8B=8D?=
 =?UTF-8?q?=E7=85=A7=E9=94=AE=20(#720)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* set camera HMirror to true

* change key1 to camera button

* change key1 to camera button

* change key1 to camera button
---
 main/boards/lilygo-t-cameraplus-s3/README.md         |  2 +-
 main/boards/lilygo-t-cameraplus-s3/config.h          |  1 +
 main/boards/lilygo-t-cameraplus-s3/config.json       | 12 +++++++++++-
 .../lilygo-t-cameraplus-s3/lilygo-t-cameraplus-s3.cc | 10 ++++++++--
 4 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/main/boards/lilygo-t-cameraplus-s3/README.md b/main/boards/lilygo-t-cameraplus-s3/README.md
index a3a53997..7d9815a1 100644
--- a/main/boards/lilygo-t-cameraplus-s3/README.md
+++ b/main/boards/lilygo-t-cameraplus-s3/README.md
@@ -15,7 +15,7 @@ idf.py menuconfig
 **选择板子：**
 
 ```
-Xiaozhi Assistant -> Board Type -> LILYGO T-CameraPlus-S3
+Xiaozhi Assistant -> Board Type -> LILYGO T-CameraPlus-S3_V1_0_V1_1或LILYGO T-CameraPlus-S3_V1_2
 ```
 
 **修改 psram 配置：**
diff --git a/main/boards/lilygo-t-cameraplus-s3/config.h b/main/boards/lilygo-t-cameraplus-s3/config.h
index 81f5c9f1..c8a586e6 100644
--- a/main/boards/lilygo-t-cameraplus-s3/config.h
+++ b/main/boards/lilygo-t-cameraplus-s3/config.h
@@ -28,6 +28,7 @@
 #define TOUCH_I2C_SCL_PIN static_cast<gpio_num_t>(TP_SCL)
 
 #define BUILTIN_LED_GPIO GPIO_NUM_NC
+#define BOOT_BUTTON_GPIO GPIO_NUM_0
 #define KEY1_BUTTON_GPIO static_cast<gpio_num_t>(KEY1)
 #define VOLUME_UP_BUTTON_GPIO GPIO_NUM_NC
 #define VOLUME_DOWN_BUTTON_GPIO GPIO_NUM_NC
diff --git a/main/boards/lilygo-t-cameraplus-s3/config.json b/main/boards/lilygo-t-cameraplus-s3/config.json
index 2b216f02..c13e7b50 100644
--- a/main/boards/lilygo-t-cameraplus-s3/config.json
+++ b/main/boards/lilygo-t-cameraplus-s3/config.json
@@ -3,7 +3,17 @@
     "builds": [
         {
             "name": "lilygo-t-cameraplus-s3",
-            "sdkconfig_append": ["CONFIG_SPIRAM_MODE_QUAD=y"]
+            "sdkconfig_append": [
+                "CONFIG_SPIRAM_MODE_QUAD=y",
+                "CONFIG_BOARD_TYPE_LILYGO_T_CAMERAPLUS_S3_V1_0_V1_1=y"
+            ]
+        },
+        {
+            "name": "lilygo-t-cameraplus-s3_v1_2",
+            "sdkconfig_append": [
+                "CONFIG_SPIRAM_MODE_QUAD=y",
+                "CONFIG_BOARD_TYPE_LILYGO_T_CAMERAPLUS_S3_V1_2=y"
+            ]
         }
     ]
 }
\ No newline at end of file
diff --git a/main/boards/lilygo-t-cameraplus-s3/lilygo-t-cameraplus-s3.cc b/main/boards/lilygo-t-cameraplus-s3/lilygo-t-cameraplus-s3.cc
index a205a171..9b84dc03 100644
--- a/main/boards/lilygo-t-cameraplus-s3/lilygo-t-cameraplus-s3.cc
+++ b/main/boards/lilygo-t-cameraplus-s3/lilygo-t-cameraplus-s3.cc
@@ -74,6 +74,7 @@ private:
     Cst816x *cst816d_;
     Pmic* pmic_;
     LcdDisplay *display_;
+    Button boot_button_;
     Button key1_button_;
     PowerSaveTimer* power_save_timer_;
     Esp32Camera* camera_;
@@ -220,7 +221,7 @@ private:
     }
 
     void InitializeButtons() {
-        key1_button_.OnClick([this]() {
+        boot_button_.OnClick([this]() {
             auto& app = Application::GetInstance();
             if (app.GetDeviceState() == kDeviceStateStarting && !WifiStation::GetInstance().IsConnected()) {
                 ResetWifiConfiguration();
@@ -228,6 +229,11 @@ private:
             power_save_timer_->WakeUp();
             app.ToggleChatState();
         });
+        key1_button_.OnClick([this]() {
+            if (camera_) {
+                camera_->Capture();
+            }
+        });
     }
 
     void InitializeCamera() {
@@ -265,7 +271,7 @@ private:
     }
 
 public:
-    LilygoTCameraPlusS3Board() : key1_button_(KEY1_BUTTON_GPIO) {
+    LilygoTCameraPlusS3Board() : boot_button_(BOOT_BUTTON_GPIO), key1_button_(KEY1_BUTTON_GPIO) {
         InitializePowerSaveTimer();
         InitI2c();
         InitSy6970();