diff --git a/main/boards/atoms3r-cam-m12-echo-base/README.md b/main/boards/atoms3r-cam-m12-echo-base/README.md index f21f6e06..c1dd731e 100644 --- a/main/boards/atoms3r-cam-m12-echo-base/README.md +++ b/main/boards/atoms3r-cam-m12-echo-base/README.md @@ -31,6 +31,7 @@ idf.py menuconfig 分别配置如下选项: - `Xiaozhi Assistant` → `Board Type` → 选择 `AtomS3R CAM/M12 + Echo Base` +- `Xiaozhi Assistant` → `IoT Protocol` → 选择 `MCP协议` 可开启摄像头识别功能 - `Partition Table` → `Custom partition CSV file` → 删除原有内容,输入 `partitions_8M.csv` - `Serial flasher config` → `Flash size` → 选择 `8 MB` diff --git a/main/boards/atoms3r-cam-m12-echo-base/atoms3r_cam_m12_echo_base.cc b/main/boards/atoms3r-cam-m12-echo-base/atoms3r_cam_m12_echo_base.cc index 48898d64..e26a9470 100644 --- a/main/boards/atoms3r-cam-m12-echo-base/atoms3r_cam_m12_echo_base.cc +++ b/main/boards/atoms3r-cam-m12-echo-base/atoms3r_cam_m12_echo_base.cc @@ -10,8 +10,9 @@ #include #include #include +#include "esp32_camera.h" -#define TAG "AtomS3R M12+EchoBase" +#define TAG "AtomS3R CAM/M12 + EchoBase" #define PI4IOE_ADDR 0x43 #define PI4IOE_REG_CTRL 0x00 @@ -39,6 +40,7 @@ private: i2c_master_bus_handle_t i2c_bus_; Pi4ioe* pi4ioe_ = nullptr; bool is_echo_base_connected_ = false; + Esp32Camera* camera_; void InitializeI2c() { // Initialize I2C peripheral @@ -122,7 +124,37 @@ private: ESP_LOGI(TAG, "Camera Power Enabled"); - vTaskDelay(pdMS_TO_TICKS(200)); + vTaskDelay(pdMS_TO_TICKS(300)); + } + + void InitializeCamera() { + camera_config_t config = {}; + config.pin_d0 = CAMERA_PIN_D0; + config.pin_d1 = CAMERA_PIN_D1; + config.pin_d2 = CAMERA_PIN_D2; + config.pin_d3 = CAMERA_PIN_D3; + config.pin_d4 = CAMERA_PIN_D4; + config.pin_d5 = CAMERA_PIN_D5; + config.pin_d6 = CAMERA_PIN_D6; + config.pin_d7 = CAMERA_PIN_D7; + config.pin_xclk = CAMERA_PIN_XCLK; + config.pin_pclk = CAMERA_PIN_PCLK; + config.pin_vsync = CAMERA_PIN_VSYNC; + config.pin_href = CAMERA_PIN_HREF; + config.pin_sccb_sda = CAMERA_PIN_SIOD; + config.pin_sccb_scl = CAMERA_PIN_SIOC; + config.sccb_i2c_port = 1; + config.pin_pwdn = CAMERA_PIN_PWDN; + config.pin_reset = CAMERA_PIN_RESET; + config.xclk_freq_hz = XCLK_FREQ_HZ; + config.pixel_format = PIXFORMAT_RGB565; + config.frame_size = FRAMESIZE_QVGA; + config.jpeg_quality = 12; + config.fb_count = 1; + config.fb_location = CAMERA_FB_IN_PSRAM; + config.grab_mode = CAMERA_GRAB_WHEN_EMPTY; + camera_ = new Esp32Camera(config); + camera_->SetHMirror(false); } // 物联网初始化,添加对 AI 可见设备 @@ -131,9 +163,13 @@ private: thing_manager.AddThing(iot::CreateThing("Speaker")); } + virtual Camera* GetCamera() override { + return camera_; + } public: AtomS3rCamM12EchoBaseBoard() { EnableCameraPower(); // IO18 还会控制指示灯 + InitializeCamera(); InitializeI2c(); I2cDetect(); CheckEchoBaseConnection(); diff --git a/main/boards/atoms3r-cam-m12-echo-base/config.h b/main/boards/atoms3r-cam-m12-echo-base/config.h index 6876dbc7..61fef498 100644 --- a/main/boards/atoms3r-cam-m12-echo-base/config.h +++ b/main/boards/atoms3r-cam-m12-echo-base/config.h @@ -25,27 +25,25 @@ #define VOLUME_UP_BUTTON_GPIO GPIO_NUM_NC #define VOLUME_DOWN_BUTTON_GPIO GPIO_NUM_NC -#define CAMERA_PIN_PWDN (-1) -#define CAMERA_PIN_RESET (-1) - -#define CAMERA_PIN_VSYNC (10) -#define CAMERA_PIN_HREF (14) -#define CAMERA_PIN_PCLK (40) -#define CAMERA_PIN_XCLK (21) - -#define CAMERA_PIN_SIOD (12) -#define CAMERA_PIN_SIOC ( 9) - -#define CAMERA_PIN_D0 ( 3) -#define CAMERA_PIN_D1 (42) -#define CAMERA_PIN_D2 (46) -#define CAMERA_PIN_D3 (48) -#define CAMERA_PIN_D4 ( 4) -#define CAMERA_PIN_D5 (17) -#define CAMERA_PIN_D6 (11) -#define CAMERA_PIN_D7 (13) +#define CAMERA_PIN_PWDN GPIO_NUM_NC +#define CAMERA_PIN_RESET GPIO_NUM_NC +#define CAMERA_PIN_VSYNC GPIO_NUM_10 +#define CAMERA_PIN_HREF GPIO_NUM_14 +#define CAMERA_PIN_PCLK GPIO_NUM_40 +#define CAMERA_PIN_XCLK GPIO_NUM_21 +#define CAMERA_PIN_SIOD GPIO_NUM_12 +#define CAMERA_PIN_SIOC GPIO_NUM_9 +#define CAMERA_PIN_D0 GPIO_NUM_3 +#define CAMERA_PIN_D1 GPIO_NUM_42 +#define CAMERA_PIN_D2 GPIO_NUM_46 +#define CAMERA_PIN_D3 GPIO_NUM_48 +#define CAMERA_PIN_D4 GPIO_NUM_4 +#define CAMERA_PIN_D5 GPIO_NUM_17 +#define CAMERA_PIN_D6 GPIO_NUM_11 +#define CAMERA_PIN_D7 GPIO_NUM_13 #define CAMERA_XCLK_FREQ (20000000) +#define XCLK_FREQ_HZ CAMERA_XCLK_FREQ #endif // _BOARD_CONFIG_H_