diff --git a/README.md b/README.md index 5b5b7c5..8cacc44 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,7 @@ The ESP-BOX is a new generation AIoT development platform released by Espressif | ESP-BOX | Dependent ESP-IDF | Branch Note | Support State | | :--------------: | :---------------: | :----------------------------------------------------: | -------------- | -| master | release/v4.4
commit id: c8ce38e60c
or
release/v5.0
commit id: 94d9c529f3 | Latest developing firmware
esp-sr version: dev/v2.0
commit id: c873a35 | New feature develop, compatible with ESP32-S3-BOX and ESP32-S3-BOX-Lite | +| master | release/v5.0
commit id: ef4b1b7704 | Latest developing firmware
esp-sr version: v1.1.0 | New feature develop, Support ESP32-S3-BOX only | | Tag 0.3.0 | release/v4.4
commit id: 2bdea81b2a | esp-sr version: dev/v2.0
commit id: c873a35 | Compatible with ESP32-S3-BOX and ESP32-S3-BOX-Lite | | Tag 0.2.1 | release/v4.4 with [patch](https://github.com/espressif/esp-box/tree/v0.2.1/idf_patch) | esp-sr version: close v1.0
commit id: 3ce34fe | Support ESP32-S3-BOX only | | Tag 0.1.1 | release/v4.4 with [patch](https://github.com/espressif/esp-box/tree/v0.1.1/idf_patch) | esp-sr version: v0.9.6
commit id: 3ce34fe | Support ESP32-S3-BOX only | diff --git a/README_cn.md b/README_cn.md index 70ae642..f69a0fd 100644 --- a/README_cn.md +++ b/README_cn.md @@ -32,7 +32,7 @@ ESP-BOX 是乐鑫信息科技发布的新一代 AIoT 应用开发平台。ESP32- | ESP-BOX | 依赖的 ESP-IDF | 分支信息 | 支持状态 | | :-------: | :----------------------------------------------------------: | :----------------------------------------------------------: | ------------------------------------------------------- | -| master | release/v4.4
commit id: c8ce38e60c
或者
release/v5.0
commit id: 94d9c529f3 | Latest developing firmware
esp-sr version: master
commit id: 1c1ecda | 新功能开发分支，兼容 ESP32-S3-BOX 和 ESP32-S3-BOX-Lite | +| master | release/v5.0
commit id: ef4b1b7704 | Latest developing firmware
esp-sr version: v1.1.0 | 新功能开发分支，支持 ESP32-S3-BOX | | Tag 0.3.0 | release/v4.4
commit id: 2bdea81b2a | esp-sr version: dev/v2.0
commit id: c873a35 | 兼容 ESP32-S3-BOX 和 ESP32-S3-BOX-Lite | | Tag 0.2.1 | release/v4.4 with [patch](https://github.com/espressif/esp-box/tree/v0.2.1/idf_patch) | esp-sr version: close v1.0
commit id: 3ce34fe | 仅支持 ESP32-S3-BOX | | Tag 0.1.1 | Release/v4.4 with [patch](https://github.com/espressif/esp-box/tree/v0.1.1/idf_patch) | esp-sr version: v0.9.6
commit id: 3ce34fe | 仅支持 ESP32-S3-BOX | diff --git a/components/bsp/include/bsp_board.h b/components/bsp/include/bsp_board.h index 847a560..35e8018 100644 --- a/components/bsp/include/bsp_board.h +++ b/components/bsp/include/bsp_board.h @@ -11,7 +11,6 @@ #include "driver/gpio.h" #include "driver/spi_master.h" #include "driver/i2s_std.h" -#include "esp_lcd_types.h" #include "bsp/esp-bsp.h" #include "iot_button.h" diff --git a/examples/factory_demo/CMakeLists.txt b/examples/factory_demo/CMakeLists.txt index c4e774c..dada960 100644 --- a/examples/factory_demo/CMakeLists.txt +++ b/examples/factory_demo/CMakeLists.txt @@ -6,7 +6,6 @@ include($ENV{IDF_PATH}/tools/cmake/project.cmake) set(EXTRA_COMPONENT_DIRS ../../components - $ENV{IDF_PATH}/examples/common_components/protocol_examples_common ) add_compile_options(-fdiagnostics-color=always) diff --git a/examples/factory_demo/main/idf_component.yml b/examples/factory_demo/main/idf_component.yml index bb0d612..ec82327 100644 --- a/examples/factory_demo/main/idf_component.yml +++ b/examples/factory_demo/main/idf_component.yml @@ -6,22 +6,22 @@ dependencies: chmorgan/esp-file-iterator: "1.0.0" chmorgan/esp-libhelix-mp3: "1.0.3" - espressif/esp-box: "~2.2.0" + espressif/esp-box: "2.3.*" espressif/esp_rainmaker: path: components/esp_rainmaker git: https://github.com/espressif/esp-rainmaker.git + version: "cc861bffc818c607e799f66c79923fd4e2d00447" espressif/esp_schedule: path: components/esp_schedule git: https://github.com/espressif/esp-rainmaker.git - espressif/esp-sr: =1.1.0 - espressif/led_strip: - version: "~2.0.0" - rules: - - if: "idf_version >=5.0" + version: "cc861bffc818c607e799f66c79923fd4e2d00447" + espressif/rmaker_common: + path: ./ + git: https://github.com/espressif/esp-rainmaker-common.git + version: "b5c21128fb9b37316cb38c8edf2facb63013cc74" + #espressif/rmaker_common: "1.3.0" + espressif/esp-sr: "1.1.0" + espressif/led_strip: "~2.0.0" espressif/json_generator: ^1 espressif/json_parser: =1.0.0 - espressif/qrcode: - version: ^0.1.0 - rules: - - if: "idf_version >=5.0" - espressif/rmaker_common: ^1 \ No newline at end of file + espressif/qrcode: ^0.1.0 \ No newline at end of file diff --git a/examples/image_display/main/idf_component.yml b/examples/image_display/main/idf_component.yml index 4a8c512..6d7342d 100644 --- a/examples/image_display/main/idf_component.yml +++ b/examples/image_display/main/idf_component.yml @@ -1,4 +1,4 @@ ## IDF Component Manager Manifest File dependencies: idf: ">=5.0" - espressif/esp-box: "2.*" \ No newline at end of file + espressif/esp-box: "2.3.*" diff --git a/examples/lv_demos/main/idf_component.yml b/examples/lv_demos/main/idf_component.yml index 4a8c512..6d7342d 100644 --- a/examples/lv_demos/main/idf_component.yml +++ b/examples/lv_demos/main/idf_component.yml @@ -1,4 +1,4 @@ ## IDF Component Manager Manifest File dependencies: idf: ">=5.0" - espressif/esp-box: "2.*" \ No newline at end of file + espressif/esp-box: "2.3.*" diff --git a/examples/mp3_demo/main/idf_component.yml b/examples/mp3_demo/main/idf_component.yml index f628bc9..5c71e33 100644 --- a/examples/mp3_demo/main/idf_component.yml +++ b/examples/mp3_demo/main/idf_component.yml @@ -4,4 +4,4 @@ dependencies: chmorgan/esp-libhelix-mp3: "1.0.3" chmorgan/esp-file-iterator: "1.0.0" chmorgan/esp-audio-player: "1.0.4" - espressif/esp-box: "2.*" \ No newline at end of file + espressif/esp-box: "2.3.*" \ No newline at end of file diff --git a/examples/usb_headset/main/idf_component.yml b/examples/usb_headset/main/idf_component.yml index 5cbc85d..bcb2b19 100644 --- a/examples/usb_headset/main/idf_component.yml +++ b/examples/usb_headset/main/idf_component.yml @@ -3,5 +3,5 @@ dependencies: idf: ">=5.0" espressif/es7210: "^1.0.1" espressif/esp-dsp: "^1.2.1" - espressif/esp-box: "2.*" + espressif/esp-box: "2.3.*" espressif/tinyusb: "^0.14.2" \ No newline at end of file diff --git a/examples/watering_demo/main/idf_component.yml b/examples/watering_demo/main/idf_component.yml index 2787db5..1c39a4e 100644 --- a/examples/watering_demo/main/idf_component.yml +++ b/examples/watering_demo/main/idf_component.yml @@ -4,12 +4,18 @@ dependencies: espressif/esp_rainmaker: path: components/esp_rainmaker git: https://github.com/espressif/esp-rainmaker.git + version: "cc861bffc818c607e799f66c79923fd4e2d00447" espressif/esp_schedule: path: components/esp_schedule git: https://github.com/espressif/esp-rainmaker.git - espressif/esp-sr: =1.1.0 + version: "cc861bffc818c607e799f66c79923fd4e2d00447" + espressif/rmaker_common: + path: ./ + git: https://github.com/espressif/esp-rainmaker-common.git + version: "b5c21128fb9b37316cb38c8edf2facb63013cc74" + #espressif/rmaker_common: "1.3.0" + espressif/esp-sr: "1.1.0" espressif/json_generator: ^1 espressif/json_parser: =1.0.0 espressif/qrcode: ^0.1.0 - espressif/rmaker_common: ^1 - espressif/esp-box: "~2.2.0" + espressif/esp-box: "2.3.*"