diff --git a/.github/workflows/upload_component.yml b/.github/workflows/upload_component.yml index 105642a0..3616f476 100644 --- a/.github/workflows/upload_component.yml +++ b/.github/workflows/upload_component.yml @@ -17,7 +17,7 @@ jobs: uses: espressif/upload-components-ci-action@v1 with: directories: > - esp32_azure_iot_kit;esp32_s2_kaluga_kit;esp_wrover_kit;esp-box;esp32_s3_usb_otg;esp32_s3_eye;esp32_s3_lcd_ev_board;esp32_s3_korvo_2;esp-box-lite;esp32_lyrat;esp32_c3_lcdkit;esp-box-3; + bsp/esp32_azure_iot_kit;bsp/esp32_s2_kaluga_kit;bsp/esp_wrover_kit;bsp/esp-box;bsp/esp32_s3_usb_otg;bsp/esp32_s3_eye;bsp/esp32_s3_lcd_ev_board;bsp/esp32_s3_korvo_2;bsp/esp-box-lite;bsp/esp32_lyrat;bsp/esp32_c3_lcdkit;bsp/esp-box-3; components/bh1750;components/ds18b20;components/es8311;components/es7210;components/fbm320;components/hts221;components/mag3110;components/mpu6050;components/ssd1306;components/esp_lvgl_port;components/icm42670; components/lcd_touch/esp_lcd_touch;components/lcd_touch/esp_lcd_touch_ft5x06;components/lcd_touch/esp_lcd_touch_gt911;components/lcd_touch/esp_lcd_touch_tt21100;components/lcd_touch/esp_lcd_touch_gt1151;components/lcd_touch/esp_lcd_touch_cst816s; components/lcd/esp_lcd_gc9a01;components/lcd/esp_lcd_ili9341;components/lcd/esp_lcd_ra8875;components/lcd_touch/esp_lcd_touch_stmpe610;components/lcd/esp_lcd_sh1107;components/lcd/esp_lcd_st7796;components/lcd/esp_lcd_gc9503;components/lcd/esp_lcd_ssd1681; diff --git a/README.md b/README.md index d2236e5a..fbc5ad60 100644 --- a/README.md +++ b/README.md @@ -6,19 +6,19 @@ Board support packages for development boards using Espressif's SoCs, written in ## Supported boards | Board name | SoC | Features | Photo | |---|---|---|---| -| [ESP-WROVER-KIT](esp_wrover_kit) | ESP32 | LCD display, uSD card slot | | -| [ESP-BOX](esp-box) | ESP32-S3 | LCD display with touch, audio codec + power amplifier,
accelerometer and gyroscope | | -| [ESP-BOX-Lite](esp-box-lite) | ESP32-S3 | LCD display, audio codec + power amplifier | | -| [ESP32-Azure IoT Kit](esp32_azure_iot_kit) | ESP32 | OLED display, uSD card slot, accelerometer,
magnetometer, humidity, pressure, light
and temperature sensors | | -| [ESP32-S2-Kaluga Kit](esp32_s2_kaluga_kit) | ESP32-S2 | LCD display, audio codec + power amplifier,
smart LED and camera | | -| [ESP32-S3-USB-OTG](esp32_s3_usb_otg) | ESP32-S3 | LCD display, uSD card slot, USB-OTG | | -| [ESP32-S3-EYE](esp32_s3_eye) | ESP32-S3 | LCD display, camera, uSD card slot, microphone and accelerometer | | -| [ESP32-S3-LCD-EV-Board](esp32_s3_lcd_ev_board) | ESP32-S3 | LCD display with touch, audio codec + power amplifier | | -| [ESP32-S3-LCD-EV-Board-2](esp32_s3_lcd_ev_board) | ESP32-S3 | LCD display with touch, audio codec + power amplifier | | -| [ESP32-S3-Korvo-2](esp32_s3_korvo_2) | ESP32-S3 | LCD display, camera, uSD card slot, microphone, audio codec + power amplifier | | -| [ESP32-LyraT](esp32_lyrat) | ESP32 | uSD card slot, microphone, audio codec + power amplifier | | -| [ESP32-C3-LCDKit](esp32_c3_lcdkit) | ESP32-C3 | LCD display with encoder, IR, PDM audio| | -| [ESP-BOX-3](esp-box-3) | ESP32-S3 | LCD display with touch, audio codec + power amplifier,
accelerometer and gyroscope | | +| [ESP-WROVER-KIT](bsp/esp_wrover_kit) | ESP32 | LCD display, uSD card slot | | +| [ESP-BOX](bsp/esp-box) | ESP32-S3 | LCD display with touch, audio codec + power amplifier,
accelerometer and gyroscope | | +| [ESP-BOX-Lite](bsp/esp-box-lite) | ESP32-S3 | LCD display, audio codec + power amplifier | | +| [ESP32-Azure IoT Kit](bsp/esp32_azure_iot_kit) | ESP32 | OLED display, uSD card slot, accelerometer,
magnetometer, humidity, pressure, light
and temperature sensors | | +| [ESP32-S2-Kaluga Kit](bsp/esp32_s2_kaluga_kit) | ESP32-S2 | LCD display, audio codec + power amplifier,
smart LED and camera | | +| [ESP32-S3-USB-OTG](bsp/esp32_s3_usb_otg) | ESP32-S3 | LCD display, uSD card slot, USB-OTG | | +| [ESP32-S3-EYE](bsp/esp32_s3_eye) | ESP32-S3 | LCD display, camera, uSD card slot, microphone and accelerometer | | +| [ESP32-S3-LCD-EV-Board](bsp/esp32_s3_lcd_ev_board) | ESP32-S3 | LCD display with touch, audio codec + power amplifier | | +| [ESP32-S3-LCD-EV-Board-2](bsp/esp32_s3_lcd_ev_board) | ESP32-S3 | LCD display with touch, audio codec + power amplifier | | +| [ESP32-S3-Korvo-2](bsp/esp32_s3_korvo_2) | ESP32-S3 | LCD display, camera, uSD card slot, microphone, audio codec + power amplifier | | +| [ESP32-LyraT](bsp/esp32_lyrat) | ESP32 | uSD card slot, microphone, audio codec + power amplifier | | +| [ESP32-C3-LCDKit](bsp/esp32_c3_lcdkit) | ESP32-C3 | LCD display with encoder, IR, PDM audio| | +| [ESP-BOX-3](bsp/esp-box-3) | ESP32-S3 | LCD display with touch, audio codec + power amplifier,
accelerometer and gyroscope | | ## LCD displays and TOUCH | [LVGL port](components/esp_lvgl_port) | [LCD drivers](LCD.md) | diff --git a/esp-box-3/CMakeLists.txt b/bsp/esp-box-3/CMakeLists.txt similarity index 100% rename from esp-box-3/CMakeLists.txt rename to bsp/esp-box-3/CMakeLists.txt diff --git a/esp-box-3/Kconfig b/bsp/esp-box-3/Kconfig similarity index 100% rename from esp-box-3/Kconfig rename to bsp/esp-box-3/Kconfig diff --git a/esp-box-3/LICENSE b/bsp/esp-box-3/LICENSE similarity index 100% rename from esp-box-3/LICENSE rename to bsp/esp-box-3/LICENSE diff --git a/esp-box-3/README.md b/bsp/esp-box-3/README.md similarity index 100% rename from esp-box-3/README.md rename to bsp/esp-box-3/README.md diff --git a/esp-box-3/esp-box-3.c b/bsp/esp-box-3/esp-box-3.c similarity index 100% rename from esp-box-3/esp-box-3.c rename to bsp/esp-box-3/esp-box-3.c diff --git a/esp-box-3/esp-box-3_idf4.c b/bsp/esp-box-3/esp-box-3_idf4.c similarity index 100% rename from esp-box-3/esp-box-3_idf4.c rename to bsp/esp-box-3/esp-box-3_idf4.c diff --git a/esp-box-3/esp-box-3_idf5.c b/bsp/esp-box-3/esp-box-3_idf5.c similarity index 100% rename from esp-box-3/esp-box-3_idf5.c rename to bsp/esp-box-3/esp-box-3_idf5.c diff --git a/esp-box-3/idf_component.yml b/bsp/esp-box-3/idf_component.yml similarity index 69% rename from esp-box-3/idf_component.yml rename to bsp/esp-box-3/idf_component.yml index 257e2326..94a47c0a 100644 --- a/esp-box-3/idf_component.yml +++ b/bsp/esp-box-3/idf_component.yml @@ -1,7 +1,7 @@ -version: "1.1.1" +version: "1.1.1~1" description: Board Support Package for ESP32-S3-BOX-3 -url: https://github.com/espressif/esp-bsp/tree/master/esp-box-3 +url: https://github.com/espressif/esp-bsp/tree/master/bsp/esp-box-3 targets: - esp32s3 @@ -29,5 +29,5 @@ dependencies: public: true examples: - - path: ../examples/display_audio_photo - - path: ../examples/display_rotation + - path: ../../examples/display_audio_photo + - path: ../../examples/display_rotation diff --git a/esp-box-3/include/bsp/display.h b/bsp/esp-box-3/include/bsp/display.h similarity index 100% rename from esp-box-3/include/bsp/display.h rename to bsp/esp-box-3/include/bsp/display.h diff --git a/esp-box-3/include/bsp/esp-box-3.h b/bsp/esp-box-3/include/bsp/esp-box-3.h similarity index 100% rename from esp-box-3/include/bsp/esp-box-3.h rename to bsp/esp-box-3/include/bsp/esp-box-3.h diff --git a/esp-box-3/include/bsp/esp-bsp.h b/bsp/esp-box-3/include/bsp/esp-bsp.h similarity index 100% rename from esp-box-3/include/bsp/esp-bsp.h rename to bsp/esp-box-3/include/bsp/esp-bsp.h diff --git a/esp-box-3/include/bsp/touch.h b/bsp/esp-box-3/include/bsp/touch.h similarity index 100% rename from esp-box-3/include/bsp/touch.h rename to bsp/esp-box-3/include/bsp/touch.h diff --git a/esp-box-3/pic.png b/bsp/esp-box-3/pic.png similarity index 100% rename from esp-box-3/pic.png rename to bsp/esp-box-3/pic.png diff --git a/esp-box-3/priv_include/bsp_err_check.h b/bsp/esp-box-3/priv_include/bsp_err_check.h similarity index 100% rename from esp-box-3/priv_include/bsp_err_check.h rename to bsp/esp-box-3/priv_include/bsp_err_check.h diff --git a/esp-box-lite/CMakeLists.txt b/bsp/esp-box-lite/CMakeLists.txt similarity index 100% rename from esp-box-lite/CMakeLists.txt rename to bsp/esp-box-lite/CMakeLists.txt diff --git a/esp-box-lite/Kconfig b/bsp/esp-box-lite/Kconfig similarity index 100% rename from esp-box-lite/Kconfig rename to bsp/esp-box-lite/Kconfig diff --git a/esp-box-lite/LICENSE b/bsp/esp-box-lite/LICENSE similarity index 100% rename from esp-box-lite/LICENSE rename to bsp/esp-box-lite/LICENSE diff --git a/esp-box-lite/README.md b/bsp/esp-box-lite/README.md similarity index 100% rename from esp-box-lite/README.md rename to bsp/esp-box-lite/README.md diff --git a/esp-box-lite/esp-box-lite.c b/bsp/esp-box-lite/esp-box-lite.c similarity index 100% rename from esp-box-lite/esp-box-lite.c rename to bsp/esp-box-lite/esp-box-lite.c diff --git a/esp-box-lite/esp-box-lite_idf4.c b/bsp/esp-box-lite/esp-box-lite_idf4.c similarity index 100% rename from esp-box-lite/esp-box-lite_idf4.c rename to bsp/esp-box-lite/esp-box-lite_idf4.c diff --git a/esp-box-lite/esp-box-lite_idf5.c b/bsp/esp-box-lite/esp-box-lite_idf5.c similarity index 100% rename from esp-box-lite/esp-box-lite_idf5.c rename to bsp/esp-box-lite/esp-box-lite_idf5.c diff --git a/esp-box-lite/idf_component.yml b/bsp/esp-box-lite/idf_component.yml similarity index 74% rename from esp-box-lite/idf_component.yml rename to bsp/esp-box-lite/idf_component.yml index 1fd50cf8..38a1eec5 100644 --- a/esp-box-lite/idf_component.yml +++ b/bsp/esp-box-lite/idf_component.yml @@ -1,6 +1,6 @@ -version: "2.0.2" +version: "2.0.2~1" description: Board Support Package for ESP32-S3-BOX-Lite -url: https://github.com/espressif/esp-bsp/tree/master/esp-box-lite +url: https://github.com/espressif/esp-bsp/tree/master/bsp/esp-box-lite targets: - esp32s3 diff --git a/esp-box-lite/include/bsp/display.h b/bsp/esp-box-lite/include/bsp/display.h similarity index 100% rename from esp-box-lite/include/bsp/display.h rename to bsp/esp-box-lite/include/bsp/display.h diff --git a/esp-box-lite/include/bsp/esp-box-lite.h b/bsp/esp-box-lite/include/bsp/esp-box-lite.h similarity index 100% rename from esp-box-lite/include/bsp/esp-box-lite.h rename to bsp/esp-box-lite/include/bsp/esp-box-lite.h diff --git a/esp-box-lite/include/bsp/esp-bsp.h b/bsp/esp-box-lite/include/bsp/esp-bsp.h similarity index 100% rename from esp-box-lite/include/bsp/esp-bsp.h rename to bsp/esp-box-lite/include/bsp/esp-bsp.h diff --git a/esp-box-lite/pic.png b/bsp/esp-box-lite/pic.png similarity index 100% rename from esp-box-lite/pic.png rename to bsp/esp-box-lite/pic.png diff --git a/esp-box-lite/priv_include/bsp_err_check.h b/bsp/esp-box-lite/priv_include/bsp_err_check.h similarity index 100% rename from esp-box-lite/priv_include/bsp_err_check.h rename to bsp/esp-box-lite/priv_include/bsp_err_check.h diff --git a/esp-box/CMakeLists.txt b/bsp/esp-box/CMakeLists.txt similarity index 100% rename from esp-box/CMakeLists.txt rename to bsp/esp-box/CMakeLists.txt diff --git a/esp-box/Kconfig b/bsp/esp-box/Kconfig similarity index 100% rename from esp-box/Kconfig rename to bsp/esp-box/Kconfig diff --git a/esp-box/LICENSE b/bsp/esp-box/LICENSE similarity index 100% rename from esp-box/LICENSE rename to bsp/esp-box/LICENSE diff --git a/esp-box/README.md b/bsp/esp-box/README.md similarity index 100% rename from esp-box/README.md rename to bsp/esp-box/README.md diff --git a/esp-box/esp-box.c b/bsp/esp-box/esp-box.c similarity index 100% rename from esp-box/esp-box.c rename to bsp/esp-box/esp-box.c diff --git a/esp-box/esp-box_idf4.c b/bsp/esp-box/esp-box_idf4.c similarity index 100% rename from esp-box/esp-box_idf4.c rename to bsp/esp-box/esp-box_idf4.c diff --git a/esp-box/esp-box_idf5.c b/bsp/esp-box/esp-box_idf5.c similarity index 100% rename from esp-box/esp-box_idf5.c rename to bsp/esp-box/esp-box_idf5.c diff --git a/esp-box/idf_component.yml b/bsp/esp-box/idf_component.yml similarity index 66% rename from esp-box/idf_component.yml rename to bsp/esp-box/idf_component.yml index e187ff8e..1fbd2e1d 100644 --- a/esp-box/idf_component.yml +++ b/bsp/esp-box/idf_component.yml @@ -1,7 +1,7 @@ -version: "3.0.3" +version: "3.0.3~1" description: Board Support Package for ESP-BOX -url: https://github.com/espressif/esp-bsp/tree/master/esp-box +url: https://github.com/espressif/esp-bsp/tree/master/bsp/esp-box targets: - esp32s3 @@ -27,5 +27,5 @@ dependencies: public: true examples: - - path: ../examples/display_audio_photo - - path: ../examples/display_rotation + - path: ../../examples/display_audio_photo + - path: ../../examples/display_rotation diff --git a/esp-box/include/bsp/display.h b/bsp/esp-box/include/bsp/display.h similarity index 100% rename from esp-box/include/bsp/display.h rename to bsp/esp-box/include/bsp/display.h diff --git a/esp-box/include/bsp/esp-box.h b/bsp/esp-box/include/bsp/esp-box.h similarity index 100% rename from esp-box/include/bsp/esp-box.h rename to bsp/esp-box/include/bsp/esp-box.h diff --git a/esp-box/include/bsp/esp-bsp.h b/bsp/esp-box/include/bsp/esp-bsp.h similarity index 100% rename from esp-box/include/bsp/esp-bsp.h rename to bsp/esp-box/include/bsp/esp-bsp.h diff --git a/esp-box/include/bsp/touch.h b/bsp/esp-box/include/bsp/touch.h similarity index 100% rename from esp-box/include/bsp/touch.h rename to bsp/esp-box/include/bsp/touch.h diff --git a/esp-box/pic.png b/bsp/esp-box/pic.png similarity index 100% rename from esp-box/pic.png rename to bsp/esp-box/pic.png diff --git a/esp-box/priv_include/bsp_err_check.h b/bsp/esp-box/priv_include/bsp_err_check.h similarity index 100% rename from esp-box/priv_include/bsp_err_check.h rename to bsp/esp-box/priv_include/bsp_err_check.h diff --git a/esp32_azure_iot_kit/CMakeLists.txt b/bsp/esp32_azure_iot_kit/CMakeLists.txt similarity index 100% rename from esp32_azure_iot_kit/CMakeLists.txt rename to bsp/esp32_azure_iot_kit/CMakeLists.txt diff --git a/esp32_azure_iot_kit/Kconfig b/bsp/esp32_azure_iot_kit/Kconfig similarity index 100% rename from esp32_azure_iot_kit/Kconfig rename to bsp/esp32_azure_iot_kit/Kconfig diff --git a/esp32_azure_iot_kit/LICENSE b/bsp/esp32_azure_iot_kit/LICENSE similarity index 100% rename from esp32_azure_iot_kit/LICENSE rename to bsp/esp32_azure_iot_kit/LICENSE diff --git a/esp32_azure_iot_kit/README.md b/bsp/esp32_azure_iot_kit/README.md similarity index 100% rename from esp32_azure_iot_kit/README.md rename to bsp/esp32_azure_iot_kit/README.md diff --git a/esp32_azure_iot_kit/esp32_azure_iot_kit.c b/bsp/esp32_azure_iot_kit/esp32_azure_iot_kit.c similarity index 100% rename from esp32_azure_iot_kit/esp32_azure_iot_kit.c rename to bsp/esp32_azure_iot_kit/esp32_azure_iot_kit.c diff --git a/esp32_azure_iot_kit/idf_component.yml b/bsp/esp32_azure_iot_kit/idf_component.yml similarity index 73% rename from esp32_azure_iot_kit/idf_component.yml rename to bsp/esp32_azure_iot_kit/idf_component.yml index 5c6ccedd..c03d42a1 100644 --- a/esp32_azure_iot_kit/idf_component.yml +++ b/bsp/esp32_azure_iot_kit/idf_component.yml @@ -1,6 +1,6 @@ -version: "2.0.0" +version: "2.0.0~1" description: Board Support Package for ESP32-Azure-IoT-Kit -url: https://github.com/espressif/esp-bsp/tree/master/esp32_azure_iot_kit +url: https://github.com/espressif/esp-bsp/tree/master/bsp/esp32_azure_iot_kit targets: - esp32 @@ -37,5 +37,5 @@ dependencies: public: true examples: - - path: ../examples/mqtt_example - - path: ../examples/display_sensors + - path: ../../examples/mqtt_example + - path: ../../examples/display_sensors diff --git a/esp32_azure_iot_kit/include/bsp/display.h b/bsp/esp32_azure_iot_kit/include/bsp/display.h similarity index 100% rename from esp32_azure_iot_kit/include/bsp/display.h rename to bsp/esp32_azure_iot_kit/include/bsp/display.h diff --git a/esp32_azure_iot_kit/include/bsp/esp-bsp.h b/bsp/esp32_azure_iot_kit/include/bsp/esp-bsp.h similarity index 100% rename from esp32_azure_iot_kit/include/bsp/esp-bsp.h rename to bsp/esp32_azure_iot_kit/include/bsp/esp-bsp.h diff --git a/esp32_azure_iot_kit/include/bsp/esp32_azure_iot_kit.h b/bsp/esp32_azure_iot_kit/include/bsp/esp32_azure_iot_kit.h similarity index 100% rename from esp32_azure_iot_kit/include/bsp/esp32_azure_iot_kit.h rename to bsp/esp32_azure_iot_kit/include/bsp/esp32_azure_iot_kit.h diff --git a/esp32_azure_iot_kit/priv_include/bsp_err_check.h b/bsp/esp32_azure_iot_kit/priv_include/bsp_err_check.h similarity index 100% rename from esp32_azure_iot_kit/priv_include/bsp_err_check.h rename to bsp/esp32_azure_iot_kit/priv_include/bsp_err_check.h diff --git a/esp32_c3_lcdkit/CMakeLists.txt b/bsp/esp32_c3_lcdkit/CMakeLists.txt similarity index 100% rename from esp32_c3_lcdkit/CMakeLists.txt rename to bsp/esp32_c3_lcdkit/CMakeLists.txt diff --git a/esp32_c3_lcdkit/Kconfig b/bsp/esp32_c3_lcdkit/Kconfig similarity index 100% rename from esp32_c3_lcdkit/Kconfig rename to bsp/esp32_c3_lcdkit/Kconfig diff --git a/esp32_c3_lcdkit/LICENSE b/bsp/esp32_c3_lcdkit/LICENSE similarity index 100% rename from esp32_c3_lcdkit/LICENSE rename to bsp/esp32_c3_lcdkit/LICENSE diff --git a/esp32_c3_lcdkit/README.md b/bsp/esp32_c3_lcdkit/README.md similarity index 100% rename from esp32_c3_lcdkit/README.md rename to bsp/esp32_c3_lcdkit/README.md diff --git a/esp32_c3_lcdkit/esp32_c3_lcdkit.c b/bsp/esp32_c3_lcdkit/esp32_c3_lcdkit.c similarity index 100% rename from esp32_c3_lcdkit/esp32_c3_lcdkit.c rename to bsp/esp32_c3_lcdkit/esp32_c3_lcdkit.c diff --git a/esp32_c3_lcdkit/idf_component.yml b/bsp/esp32_c3_lcdkit/idf_component.yml similarity index 81% rename from esp32_c3_lcdkit/idf_component.yml rename to bsp/esp32_c3_lcdkit/idf_component.yml index 8a1afe74..e707dd29 100644 --- a/esp32_c3_lcdkit/idf_component.yml +++ b/bsp/esp32_c3_lcdkit/idf_component.yml @@ -1,6 +1,6 @@ -version: "1.0.0" +version: "1.0.0~1" description: Board Support Package for esp32_c3_lcdkit -url: https://github.com/espressif/esp-bsp/tree/master/esp32_c3_lcdkit +url: https://github.com/espressif/esp-bsp/tree/master/bsp/esp32_c3_lcdkit targets: - esp32c3 diff --git a/esp32_c3_lcdkit/include/bsp/display.h b/bsp/esp32_c3_lcdkit/include/bsp/display.h similarity index 100% rename from esp32_c3_lcdkit/include/bsp/display.h rename to bsp/esp32_c3_lcdkit/include/bsp/display.h diff --git a/esp32_c3_lcdkit/include/bsp/esp-bsp.h b/bsp/esp32_c3_lcdkit/include/bsp/esp-bsp.h similarity index 100% rename from esp32_c3_lcdkit/include/bsp/esp-bsp.h rename to bsp/esp32_c3_lcdkit/include/bsp/esp-bsp.h diff --git a/esp32_c3_lcdkit/include/bsp/esp32_c3_lcdkit.h b/bsp/esp32_c3_lcdkit/include/bsp/esp32_c3_lcdkit.h similarity index 100% rename from esp32_c3_lcdkit/include/bsp/esp32_c3_lcdkit.h rename to bsp/esp32_c3_lcdkit/include/bsp/esp32_c3_lcdkit.h diff --git a/esp32_c3_lcdkit/pic.png b/bsp/esp32_c3_lcdkit/pic.png similarity index 100% rename from esp32_c3_lcdkit/pic.png rename to bsp/esp32_c3_lcdkit/pic.png diff --git a/esp32_c3_lcdkit/priv_include/bsp_err_check.h b/bsp/esp32_c3_lcdkit/priv_include/bsp_err_check.h similarity index 100% rename from esp32_c3_lcdkit/priv_include/bsp_err_check.h rename to bsp/esp32_c3_lcdkit/priv_include/bsp_err_check.h diff --git a/esp32_lyrat/CMakeLists.txt b/bsp/esp32_lyrat/CMakeLists.txt similarity index 100% rename from esp32_lyrat/CMakeLists.txt rename to bsp/esp32_lyrat/CMakeLists.txt diff --git a/esp32_lyrat/Kconfig b/bsp/esp32_lyrat/Kconfig similarity index 100% rename from esp32_lyrat/Kconfig rename to bsp/esp32_lyrat/Kconfig diff --git a/esp32_lyrat/LICENSE b/bsp/esp32_lyrat/LICENSE similarity index 100% rename from esp32_lyrat/LICENSE rename to bsp/esp32_lyrat/LICENSE diff --git a/esp32_lyrat/README.md b/bsp/esp32_lyrat/README.md similarity index 100% rename from esp32_lyrat/README.md rename to bsp/esp32_lyrat/README.md diff --git a/esp32_lyrat/esp32_lyrat.c b/bsp/esp32_lyrat/esp32_lyrat.c similarity index 100% rename from esp32_lyrat/esp32_lyrat.c rename to bsp/esp32_lyrat/esp32_lyrat.c diff --git a/esp32_lyrat/esp32_lyrat_idf4.c b/bsp/esp32_lyrat/esp32_lyrat_idf4.c similarity index 100% rename from esp32_lyrat/esp32_lyrat_idf4.c rename to bsp/esp32_lyrat/esp32_lyrat_idf4.c diff --git a/esp32_lyrat/esp32_lyrat_idf5.c b/bsp/esp32_lyrat/esp32_lyrat_idf5.c similarity index 100% rename from esp32_lyrat/esp32_lyrat_idf5.c rename to bsp/esp32_lyrat/esp32_lyrat_idf5.c diff --git a/esp32_lyrat/idf_component.yml b/bsp/esp32_lyrat/idf_component.yml similarity index 69% rename from esp32_lyrat/idf_component.yml rename to bsp/esp32_lyrat/idf_component.yml index e2839b70..51bbeeaa 100644 --- a/esp32_lyrat/idf_component.yml +++ b/bsp/esp32_lyrat/idf_component.yml @@ -1,6 +1,6 @@ -version: "1.0.0" +version: "1.0.0~1" description: Board Support Package for ESP32-LyraT -url: https://github.com/espressif/esp-bsp/tree/master/esp32_lyrat +url: https://github.com/espressif/esp-bsp/tree/master/bsp/esp32_lyrat targets: - esp32 diff --git a/esp32_lyrat/include/bsp/esp-bsp.h b/bsp/esp32_lyrat/include/bsp/esp-bsp.h similarity index 100% rename from esp32_lyrat/include/bsp/esp-bsp.h rename to bsp/esp32_lyrat/include/bsp/esp-bsp.h diff --git a/esp32_lyrat/include/bsp/esp32_lyrat.h b/bsp/esp32_lyrat/include/bsp/esp32_lyrat.h similarity index 100% rename from esp32_lyrat/include/bsp/esp32_lyrat.h rename to bsp/esp32_lyrat/include/bsp/esp32_lyrat.h diff --git a/esp32_lyrat/pic.jpg b/bsp/esp32_lyrat/pic.jpg similarity index 100% rename from esp32_lyrat/pic.jpg rename to bsp/esp32_lyrat/pic.jpg diff --git a/esp32_lyrat/priv_include/bsp_err_check.h b/bsp/esp32_lyrat/priv_include/bsp_err_check.h similarity index 100% rename from esp32_lyrat/priv_include/bsp_err_check.h rename to bsp/esp32_lyrat/priv_include/bsp_err_check.h diff --git a/esp32_s2_kaluga_kit/CMakeLists.txt b/bsp/esp32_s2_kaluga_kit/CMakeLists.txt similarity index 100% rename from esp32_s2_kaluga_kit/CMakeLists.txt rename to bsp/esp32_s2_kaluga_kit/CMakeLists.txt diff --git a/esp32_s2_kaluga_kit/Kconfig b/bsp/esp32_s2_kaluga_kit/Kconfig similarity index 100% rename from esp32_s2_kaluga_kit/Kconfig rename to bsp/esp32_s2_kaluga_kit/Kconfig diff --git a/esp32_s2_kaluga_kit/LICENSE b/bsp/esp32_s2_kaluga_kit/LICENSE similarity index 100% rename from esp32_s2_kaluga_kit/LICENSE rename to bsp/esp32_s2_kaluga_kit/LICENSE diff --git a/esp32_s2_kaluga_kit/README.md b/bsp/esp32_s2_kaluga_kit/README.md similarity index 100% rename from esp32_s2_kaluga_kit/README.md rename to bsp/esp32_s2_kaluga_kit/README.md diff --git a/esp32_s2_kaluga_kit/esp32_s2_kaluga_kit.c b/bsp/esp32_s2_kaluga_kit/esp32_s2_kaluga_kit.c similarity index 100% rename from esp32_s2_kaluga_kit/esp32_s2_kaluga_kit.c rename to bsp/esp32_s2_kaluga_kit/esp32_s2_kaluga_kit.c diff --git a/esp32_s2_kaluga_kit/esp32_s2_kaluga_kit_idf4.c b/bsp/esp32_s2_kaluga_kit/esp32_s2_kaluga_kit_idf4.c similarity index 100% rename from esp32_s2_kaluga_kit/esp32_s2_kaluga_kit_idf4.c rename to bsp/esp32_s2_kaluga_kit/esp32_s2_kaluga_kit_idf4.c diff --git a/esp32_s2_kaluga_kit/esp32_s2_kaluga_kit_idf5.c b/bsp/esp32_s2_kaluga_kit/esp32_s2_kaluga_kit_idf5.c similarity index 100% rename from esp32_s2_kaluga_kit/esp32_s2_kaluga_kit_idf5.c rename to bsp/esp32_s2_kaluga_kit/esp32_s2_kaluga_kit_idf5.c diff --git a/esp32_s2_kaluga_kit/idf_component.yml b/bsp/esp32_s2_kaluga_kit/idf_component.yml similarity index 75% rename from esp32_s2_kaluga_kit/idf_component.yml rename to bsp/esp32_s2_kaluga_kit/idf_component.yml index 69c529aa..7d3894e4 100644 --- a/esp32_s2_kaluga_kit/idf_component.yml +++ b/bsp/esp32_s2_kaluga_kit/idf_component.yml @@ -1,6 +1,6 @@ -version: "3.0.0" +version: "3.0.0~1" description: Board Support Package for ESP32-S2-Kaluga kit -url: https://github.com/espressif/esp-bsp/tree/master/esp32_s2_kaluga_kit +url: https://github.com/espressif/esp-bsp/tree/master/bsp/esp32_s2_kaluga_kit targets: - esp32s2 @@ -31,4 +31,4 @@ dependencies: public: true examples: - - path: ../examples/display_camera + - path: ../../examples/display_camera diff --git a/esp32_s2_kaluga_kit/include/bsp/display.h b/bsp/esp32_s2_kaluga_kit/include/bsp/display.h similarity index 100% rename from esp32_s2_kaluga_kit/include/bsp/display.h rename to bsp/esp32_s2_kaluga_kit/include/bsp/display.h diff --git a/esp32_s2_kaluga_kit/include/bsp/esp-bsp.h b/bsp/esp32_s2_kaluga_kit/include/bsp/esp-bsp.h similarity index 100% rename from esp32_s2_kaluga_kit/include/bsp/esp-bsp.h rename to bsp/esp32_s2_kaluga_kit/include/bsp/esp-bsp.h diff --git a/esp32_s2_kaluga_kit/include/bsp/esp32_s2_kaluga_kit.h b/bsp/esp32_s2_kaluga_kit/include/bsp/esp32_s2_kaluga_kit.h similarity index 100% rename from esp32_s2_kaluga_kit/include/bsp/esp32_s2_kaluga_kit.h rename to bsp/esp32_s2_kaluga_kit/include/bsp/esp32_s2_kaluga_kit.h diff --git a/esp32_s2_kaluga_kit/priv_include/bsp_err_check.h b/bsp/esp32_s2_kaluga_kit/priv_include/bsp_err_check.h similarity index 100% rename from esp32_s2_kaluga_kit/priv_include/bsp_err_check.h rename to bsp/esp32_s2_kaluga_kit/priv_include/bsp_err_check.h diff --git a/esp32_s3_eye/CMakeLists.txt b/bsp/esp32_s3_eye/CMakeLists.txt similarity index 100% rename from esp32_s3_eye/CMakeLists.txt rename to bsp/esp32_s3_eye/CMakeLists.txt diff --git a/esp32_s3_eye/Kconfig b/bsp/esp32_s3_eye/Kconfig similarity index 100% rename from esp32_s3_eye/Kconfig rename to bsp/esp32_s3_eye/Kconfig diff --git a/esp32_s3_eye/LICENSE b/bsp/esp32_s3_eye/LICENSE similarity index 100% rename from esp32_s3_eye/LICENSE rename to bsp/esp32_s3_eye/LICENSE diff --git a/esp32_s3_eye/README.md b/bsp/esp32_s3_eye/README.md similarity index 100% rename from esp32_s3_eye/README.md rename to bsp/esp32_s3_eye/README.md diff --git a/esp32_s3_eye/esp32_s3_eye.c b/bsp/esp32_s3_eye/esp32_s3_eye.c similarity index 100% rename from esp32_s3_eye/esp32_s3_eye.c rename to bsp/esp32_s3_eye/esp32_s3_eye.c diff --git a/esp32_s3_eye/esp32_s3_eye_idf4.c b/bsp/esp32_s3_eye/esp32_s3_eye_idf4.c similarity index 100% rename from esp32_s3_eye/esp32_s3_eye_idf4.c rename to bsp/esp32_s3_eye/esp32_s3_eye_idf4.c diff --git a/esp32_s3_eye/esp32_s3_eye_idf5.c b/bsp/esp32_s3_eye/esp32_s3_eye_idf5.c similarity index 100% rename from esp32_s3_eye/esp32_s3_eye_idf5.c rename to bsp/esp32_s3_eye/esp32_s3_eye_idf5.c diff --git a/esp32_s3_eye/idf_component.yml b/bsp/esp32_s3_eye/idf_component.yml similarity index 76% rename from esp32_s3_eye/idf_component.yml rename to bsp/esp32_s3_eye/idf_component.yml index d195b596..91e7899d 100644 --- a/esp32_s3_eye/idf_component.yml +++ b/bsp/esp32_s3_eye/idf_component.yml @@ -1,6 +1,6 @@ -version: "3.0.2" +version: "3.0.2~1" description: Board Support Package for ESP32-S3-EYE -url: https://github.com/espressif/esp-bsp/tree/master/esp32_s3_eye +url: https://github.com/espressif/esp-bsp/tree/master/bsp/esp32_s3_eye targets: - esp32s3 diff --git a/esp32_s3_eye/include/bsp/display.h b/bsp/esp32_s3_eye/include/bsp/display.h similarity index 100% rename from esp32_s3_eye/include/bsp/display.h rename to bsp/esp32_s3_eye/include/bsp/display.h diff --git a/esp32_s3_eye/include/bsp/esp-bsp.h b/bsp/esp32_s3_eye/include/bsp/esp-bsp.h similarity index 100% rename from esp32_s3_eye/include/bsp/esp-bsp.h rename to bsp/esp32_s3_eye/include/bsp/esp-bsp.h diff --git a/esp32_s3_eye/include/bsp/esp32_s3_eye.h b/bsp/esp32_s3_eye/include/bsp/esp32_s3_eye.h similarity index 100% rename from esp32_s3_eye/include/bsp/esp32_s3_eye.h rename to bsp/esp32_s3_eye/include/bsp/esp32_s3_eye.h diff --git a/esp32_s3_eye/priv_include/bsp_err_check.h b/bsp/esp32_s3_eye/priv_include/bsp_err_check.h similarity index 100% rename from esp32_s3_eye/priv_include/bsp_err_check.h rename to bsp/esp32_s3_eye/priv_include/bsp_err_check.h diff --git a/esp32_s3_korvo_2/CMakeLists.txt b/bsp/esp32_s3_korvo_2/CMakeLists.txt similarity index 100% rename from esp32_s3_korvo_2/CMakeLists.txt rename to bsp/esp32_s3_korvo_2/CMakeLists.txt diff --git a/esp32_s3_korvo_2/Kconfig b/bsp/esp32_s3_korvo_2/Kconfig similarity index 100% rename from esp32_s3_korvo_2/Kconfig rename to bsp/esp32_s3_korvo_2/Kconfig diff --git a/esp32_s3_korvo_2/LICENSE b/bsp/esp32_s3_korvo_2/LICENSE similarity index 100% rename from esp32_s3_korvo_2/LICENSE rename to bsp/esp32_s3_korvo_2/LICENSE diff --git a/esp32_s3_korvo_2/README.md b/bsp/esp32_s3_korvo_2/README.md similarity index 100% rename from esp32_s3_korvo_2/README.md rename to bsp/esp32_s3_korvo_2/README.md diff --git a/esp32_s3_korvo_2/esp32_s3_korvo_2.c b/bsp/esp32_s3_korvo_2/esp32_s3_korvo_2.c similarity index 100% rename from esp32_s3_korvo_2/esp32_s3_korvo_2.c rename to bsp/esp32_s3_korvo_2/esp32_s3_korvo_2.c diff --git a/esp32_s3_korvo_2/esp32_s3_korvo_2_idf4.c b/bsp/esp32_s3_korvo_2/esp32_s3_korvo_2_idf4.c similarity index 100% rename from esp32_s3_korvo_2/esp32_s3_korvo_2_idf4.c rename to bsp/esp32_s3_korvo_2/esp32_s3_korvo_2_idf4.c diff --git a/esp32_s3_korvo_2/esp32_s3_korvo_2_idf5.c b/bsp/esp32_s3_korvo_2/esp32_s3_korvo_2_idf5.c similarity index 100% rename from esp32_s3_korvo_2/esp32_s3_korvo_2_idf5.c rename to bsp/esp32_s3_korvo_2/esp32_s3_korvo_2_idf5.c diff --git a/esp32_s3_korvo_2/idf_component.yml b/bsp/esp32_s3_korvo_2/idf_component.yml similarity index 82% rename from esp32_s3_korvo_2/idf_component.yml rename to bsp/esp32_s3_korvo_2/idf_component.yml index 212370a6..81bd42e6 100644 --- a/esp32_s3_korvo_2/idf_component.yml +++ b/bsp/esp32_s3_korvo_2/idf_component.yml @@ -1,6 +1,6 @@ -version: "2.1.1" +version: "2.1.1~1" description: Board Support Package for ESP32-S3-Korvo-2 -url: https://github.com/espressif/esp-bsp/tree/master/esp32_s3_korvo_2 +url: https://github.com/espressif/esp-bsp/tree/master/bsp/esp32_s3_korvo_2 targets: - esp32s3 diff --git a/esp32_s3_korvo_2/include/bsp/display.h b/bsp/esp32_s3_korvo_2/include/bsp/display.h similarity index 100% rename from esp32_s3_korvo_2/include/bsp/display.h rename to bsp/esp32_s3_korvo_2/include/bsp/display.h diff --git a/esp32_s3_korvo_2/include/bsp/esp-bsp.h b/bsp/esp32_s3_korvo_2/include/bsp/esp-bsp.h similarity index 100% rename from esp32_s3_korvo_2/include/bsp/esp-bsp.h rename to bsp/esp32_s3_korvo_2/include/bsp/esp-bsp.h diff --git a/esp32_s3_korvo_2/include/bsp/esp32_s3_korvo_2.h b/bsp/esp32_s3_korvo_2/include/bsp/esp32_s3_korvo_2.h similarity index 100% rename from esp32_s3_korvo_2/include/bsp/esp32_s3_korvo_2.h rename to bsp/esp32_s3_korvo_2/include/bsp/esp32_s3_korvo_2.h diff --git a/esp32_s3_korvo_2/include/bsp/touch.h b/bsp/esp32_s3_korvo_2/include/bsp/touch.h similarity index 100% rename from esp32_s3_korvo_2/include/bsp/touch.h rename to bsp/esp32_s3_korvo_2/include/bsp/touch.h diff --git a/esp32_s3_korvo_2/pic.png b/bsp/esp32_s3_korvo_2/pic.png similarity index 100% rename from esp32_s3_korvo_2/pic.png rename to bsp/esp32_s3_korvo_2/pic.png diff --git a/esp32_s3_korvo_2/priv_include/bsp_err_check.h b/bsp/esp32_s3_korvo_2/priv_include/bsp_err_check.h similarity index 100% rename from esp32_s3_korvo_2/priv_include/bsp_err_check.h rename to bsp/esp32_s3_korvo_2/priv_include/bsp_err_check.h diff --git a/esp32_s3_lcd_ev_board/CHANGELOG.md b/bsp/esp32_s3_lcd_ev_board/CHANGELOG.md similarity index 100% rename from esp32_s3_lcd_ev_board/CHANGELOG.md rename to bsp/esp32_s3_lcd_ev_board/CHANGELOG.md diff --git a/esp32_s3_lcd_ev_board/CMakeLists.txt b/bsp/esp32_s3_lcd_ev_board/CMakeLists.txt similarity index 100% rename from esp32_s3_lcd_ev_board/CMakeLists.txt rename to bsp/esp32_s3_lcd_ev_board/CMakeLists.txt diff --git a/esp32_s3_lcd_ev_board/Kconfig b/bsp/esp32_s3_lcd_ev_board/Kconfig similarity index 100% rename from esp32_s3_lcd_ev_board/Kconfig rename to bsp/esp32_s3_lcd_ev_board/Kconfig diff --git a/esp32_s3_lcd_ev_board/LICENSE b/bsp/esp32_s3_lcd_ev_board/LICENSE similarity index 100% rename from esp32_s3_lcd_ev_board/LICENSE rename to bsp/esp32_s3_lcd_ev_board/LICENSE diff --git a/esp32_s3_lcd_ev_board/README.md b/bsp/esp32_s3_lcd_ev_board/README.md similarity index 100% rename from esp32_s3_lcd_ev_board/README.md rename to bsp/esp32_s3_lcd_ev_board/README.md diff --git a/esp32_s3_lcd_ev_board/idf_component.yml b/bsp/esp32_s3_lcd_ev_board/idf_component.yml similarity index 80% rename from esp32_s3_lcd_ev_board/idf_component.yml rename to bsp/esp32_s3_lcd_ev_board/idf_component.yml index 3a053a4d..ed616d75 100644 --- a/esp32_s3_lcd_ev_board/idf_component.yml +++ b/bsp/esp32_s3_lcd_ev_board/idf_component.yml @@ -1,6 +1,6 @@ -version: "2.0.0" +version: "2.0.0~1" description: Board Support Package for ESP32-S3-LCD-EV-Board -url: https://github.com/espressif/esp-bsp/tree/master/esp32_s3_lcd_ev_board +url: https://github.com/espressif/esp-bsp/tree/master/bsp/esp32_s3_lcd_ev_board targets: - esp32s3 @@ -41,4 +41,4 @@ dependencies: public: true examples: - - path: ../examples/display_lvgl_demos + - path: ../../examples/display_lvgl_demos diff --git a/esp32_s3_lcd_ev_board/include/bsp/display.h b/bsp/esp32_s3_lcd_ev_board/include/bsp/display.h similarity index 100% rename from esp32_s3_lcd_ev_board/include/bsp/display.h rename to bsp/esp32_s3_lcd_ev_board/include/bsp/display.h diff --git a/esp32_s3_lcd_ev_board/include/bsp/esp-bsp.h b/bsp/esp32_s3_lcd_ev_board/include/bsp/esp-bsp.h similarity index 100% rename from esp32_s3_lcd_ev_board/include/bsp/esp-bsp.h rename to bsp/esp32_s3_lcd_ev_board/include/bsp/esp-bsp.h diff --git a/esp32_s3_lcd_ev_board/include/bsp/esp32_s3_lcd_ev_board.h b/bsp/esp32_s3_lcd_ev_board/include/bsp/esp32_s3_lcd_ev_board.h similarity index 100% rename from esp32_s3_lcd_ev_board/include/bsp/esp32_s3_lcd_ev_board.h rename to bsp/esp32_s3_lcd_ev_board/include/bsp/esp32_s3_lcd_ev_board.h diff --git a/esp32_s3_lcd_ev_board/include/bsp/touch.h b/bsp/esp32_s3_lcd_ev_board/include/bsp/touch.h similarity index 100% rename from esp32_s3_lcd_ev_board/include/bsp/touch.h rename to bsp/esp32_s3_lcd_ev_board/include/bsp/touch.h diff --git a/esp32_s3_lcd_ev_board/priv_include/bsp_err_check.h b/bsp/esp32_s3_lcd_ev_board/priv_include/bsp_err_check.h similarity index 100% rename from esp32_s3_lcd_ev_board/priv_include/bsp_err_check.h rename to bsp/esp32_s3_lcd_ev_board/priv_include/bsp_err_check.h diff --git a/esp32_s3_lcd_ev_board/priv_include/bsp_lvgl_port.h b/bsp/esp32_s3_lcd_ev_board/priv_include/bsp_lvgl_port.h similarity index 100% rename from esp32_s3_lcd_ev_board/priv_include/bsp_lvgl_port.h rename to bsp/esp32_s3_lcd_ev_board/priv_include/bsp_lvgl_port.h diff --git a/esp32_s3_lcd_ev_board/priv_include/bsp_sub_board.h b/bsp/esp32_s3_lcd_ev_board/priv_include/bsp_sub_board.h similarity index 100% rename from esp32_s3_lcd_ev_board/priv_include/bsp_sub_board.h rename to bsp/esp32_s3_lcd_ev_board/priv_include/bsp_sub_board.h diff --git a/esp32_s3_lcd_ev_board/src/bsp_lvgl_port.c b/bsp/esp32_s3_lcd_ev_board/src/bsp_lvgl_port.c similarity index 100% rename from esp32_s3_lcd_ev_board/src/bsp_lvgl_port.c rename to bsp/esp32_s3_lcd_ev_board/src/bsp_lvgl_port.c diff --git a/esp32_s3_lcd_ev_board/src/bsp_sub_board.c b/bsp/esp32_s3_lcd_ev_board/src/bsp_sub_board.c similarity index 100% rename from esp32_s3_lcd_ev_board/src/bsp_sub_board.c rename to bsp/esp32_s3_lcd_ev_board/src/bsp_sub_board.c diff --git a/esp32_s3_lcd_ev_board/src/esp32_s3_lcd_ev_board.c b/bsp/esp32_s3_lcd_ev_board/src/esp32_s3_lcd_ev_board.c similarity index 100% rename from esp32_s3_lcd_ev_board/src/esp32_s3_lcd_ev_board.c rename to bsp/esp32_s3_lcd_ev_board/src/esp32_s3_lcd_ev_board.c diff --git a/esp32_s3_usb_otg/CMakeLists.txt b/bsp/esp32_s3_usb_otg/CMakeLists.txt similarity index 100% rename from esp32_s3_usb_otg/CMakeLists.txt rename to bsp/esp32_s3_usb_otg/CMakeLists.txt diff --git a/esp32_s3_usb_otg/Kconfig b/bsp/esp32_s3_usb_otg/Kconfig similarity index 100% rename from esp32_s3_usb_otg/Kconfig rename to bsp/esp32_s3_usb_otg/Kconfig diff --git a/esp32_s3_usb_otg/LICENSE b/bsp/esp32_s3_usb_otg/LICENSE similarity index 100% rename from esp32_s3_usb_otg/LICENSE rename to bsp/esp32_s3_usb_otg/LICENSE diff --git a/esp32_s3_usb_otg/README.md b/bsp/esp32_s3_usb_otg/README.md similarity index 100% rename from esp32_s3_usb_otg/README.md rename to bsp/esp32_s3_usb_otg/README.md diff --git a/esp32_s3_usb_otg/esp32_s3_usb_otg.c b/bsp/esp32_s3_usb_otg/esp32_s3_usb_otg.c similarity index 100% rename from esp32_s3_usb_otg/esp32_s3_usb_otg.c rename to bsp/esp32_s3_usb_otg/esp32_s3_usb_otg.c diff --git a/esp32_s3_usb_otg/idf_component.yml b/bsp/esp32_s3_usb_otg/idf_component.yml similarity index 62% rename from esp32_s3_usb_otg/idf_component.yml rename to bsp/esp32_s3_usb_otg/idf_component.yml index 3eeb12bd..251021ca 100644 --- a/esp32_s3_usb_otg/idf_component.yml +++ b/bsp/esp32_s3_usb_otg/idf_component.yml @@ -1,6 +1,6 @@ -version: "1.4.4" +version: "1.4.4~1" description: Board Support Package for ESP32-S3-USB-OTG -url: https://github.com/espressif/esp-bsp/tree/master/esp32_s3_usb_otg +url: https://github.com/espressif/esp-bsp/tree/master/bsp/esp32_s3_usb_otg targets: - esp32s3 diff --git a/esp32_s3_usb_otg/include/bsp/display.h b/bsp/esp32_s3_usb_otg/include/bsp/display.h similarity index 100% rename from esp32_s3_usb_otg/include/bsp/display.h rename to bsp/esp32_s3_usb_otg/include/bsp/display.h diff --git a/esp32_s3_usb_otg/include/bsp/esp-bsp.h b/bsp/esp32_s3_usb_otg/include/bsp/esp-bsp.h similarity index 100% rename from esp32_s3_usb_otg/include/bsp/esp-bsp.h rename to bsp/esp32_s3_usb_otg/include/bsp/esp-bsp.h diff --git a/esp32_s3_usb_otg/include/bsp/esp32_s3_usb_otg.h b/bsp/esp32_s3_usb_otg/include/bsp/esp32_s3_usb_otg.h similarity index 100% rename from esp32_s3_usb_otg/include/bsp/esp32_s3_usb_otg.h rename to bsp/esp32_s3_usb_otg/include/bsp/esp32_s3_usb_otg.h diff --git a/esp32_s3_usb_otg/priv_include/bsp_err_check.h b/bsp/esp32_s3_usb_otg/priv_include/bsp_err_check.h similarity index 100% rename from esp32_s3_usb_otg/priv_include/bsp_err_check.h rename to bsp/esp32_s3_usb_otg/priv_include/bsp_err_check.h diff --git a/esp_wrover_kit/CMakeLists.txt b/bsp/esp_wrover_kit/CMakeLists.txt similarity index 100% rename from esp_wrover_kit/CMakeLists.txt rename to bsp/esp_wrover_kit/CMakeLists.txt diff --git a/esp_wrover_kit/Kconfig b/bsp/esp_wrover_kit/Kconfig similarity index 100% rename from esp_wrover_kit/Kconfig rename to bsp/esp_wrover_kit/Kconfig diff --git a/esp_wrover_kit/LICENSE b/bsp/esp_wrover_kit/LICENSE similarity index 100% rename from esp_wrover_kit/LICENSE rename to bsp/esp_wrover_kit/LICENSE diff --git a/esp_wrover_kit/README.md b/bsp/esp_wrover_kit/README.md similarity index 100% rename from esp_wrover_kit/README.md rename to bsp/esp_wrover_kit/README.md diff --git a/esp_wrover_kit/esp_wrover_kit.c b/bsp/esp_wrover_kit/esp_wrover_kit.c similarity index 100% rename from esp_wrover_kit/esp_wrover_kit.c rename to bsp/esp_wrover_kit/esp_wrover_kit.c diff --git a/esp_wrover_kit/idf_component.yml b/bsp/esp_wrover_kit/idf_component.yml similarity index 63% rename from esp_wrover_kit/idf_component.yml rename to bsp/esp_wrover_kit/idf_component.yml index a2710eb5..a0cdcea4 100644 --- a/esp_wrover_kit/idf_component.yml +++ b/bsp/esp_wrover_kit/idf_component.yml @@ -1,6 +1,6 @@ -version: "1.5.0" +version: "1.5.0~1" description: Board Support Package for ESP-WROVER-KIT -url: https://github.com/espressif/esp-bsp/tree/master/esp_wrover_kit +url: https://github.com/espressif/esp-bsp/tree/master/bsp/esp_wrover_kit targets: - esp32 @@ -17,4 +17,4 @@ dependencies: public: true examples: - - path: ../examples/display + - path: ../../examples/display diff --git a/esp_wrover_kit/include/bsp/display.h b/bsp/esp_wrover_kit/include/bsp/display.h similarity index 100% rename from esp_wrover_kit/include/bsp/display.h rename to bsp/esp_wrover_kit/include/bsp/display.h diff --git a/esp_wrover_kit/include/bsp/esp-bsp.h b/bsp/esp_wrover_kit/include/bsp/esp-bsp.h similarity index 100% rename from esp_wrover_kit/include/bsp/esp-bsp.h rename to bsp/esp_wrover_kit/include/bsp/esp-bsp.h diff --git a/esp_wrover_kit/include/bsp/esp_wrover_kit.h b/bsp/esp_wrover_kit/include/bsp/esp_wrover_kit.h similarity index 100% rename from esp_wrover_kit/include/bsp/esp_wrover_kit.h rename to bsp/esp_wrover_kit/include/bsp/esp_wrover_kit.h diff --git a/esp_wrover_kit/priv_include/bsp_err_check.h b/bsp/esp_wrover_kit/priv_include/bsp_err_check.h similarity index 100% rename from esp_wrover_kit/priv_include/bsp_err_check.h rename to bsp/esp_wrover_kit/priv_include/bsp_err_check.h diff --git a/check_copyright_config.yaml b/check_copyright_config.yaml index 45bcb548..c32520ad 100644 --- a/check_copyright_config.yaml +++ b/check_copyright_config.yaml @@ -28,6 +28,7 @@ DEFAULT: # You can create your own rules for files or group of files examples_and_unit_tests: include: + - 'bsp/' - 'examples/' - 'components/**/test/**' - 'components/**/test_apps/**' diff --git a/examples/audio/main/idf_component.yml b/examples/audio/main/idf_component.yml index 870df710..67a30ea2 100644 --- a/examples/audio/main/idf_component.yml +++ b/examples/audio/main/idf_component.yml @@ -3,4 +3,4 @@ description: BSP Audio example dependencies: esp32_s3_korvo_2: version: ">=0.1" - override_path: "../../../esp32_s3_korvo_2" + override_path: "../../../bsp/esp32_s3_korvo_2" diff --git a/examples/bsp_ext.py b/examples/bsp_ext.py index c51e6665..55af58a6 100644 --- a/examples/bsp_ext.py +++ b/examples/bsp_ext.py @@ -73,7 +73,7 @@ def set_bsp_callback(action: str, ctx: Context, args: PropertyDict, **kwargs: st del manifest['dependencies'][dep] # Add the one we need - manifest['dependencies'].insert(0, bsp, {'version': '*', 'override_path': ('../../../' + bsp_short_name(bsp))}) + manifest['dependencies'].insert(0, bsp, {'version': '*', 'override_path': ('../../../bsp/' + bsp_short_name(bsp))}) yaml.dump(manifest, manifest_path) extensions = { diff --git a/examples/display/main/idf_component.yml b/examples/display/main/idf_component.yml index 612020f4..a7d00507 100644 --- a/examples/display/main/idf_component.yml +++ b/examples/display/main/idf_component.yml @@ -3,4 +3,4 @@ description: BSP Display example dependencies: esp_wrover_kit: version: "^1.0.0" - override_path: "../../../esp_wrover_kit" + override_path: "../../../bsp/esp_wrover_kit" diff --git a/examples/display_audio_photo/main/idf_component.yml b/examples/display_audio_photo/main/idf_component.yml index 1a9a668d..6f55073e 100644 --- a/examples/display_audio_photo/main/idf_component.yml +++ b/examples/display_audio_photo/main/idf_component.yml @@ -3,4 +3,4 @@ dependencies: esp_jpeg: "*" esp-box: version: ">=3.0.0" - override_path: "../../../esp-box" + override_path: "../../../bsp/esp-box" diff --git a/examples/display_camera/main/idf_component.yml b/examples/display_camera/main/idf_component.yml index 4587d9c8..b1c93a57 100644 --- a/examples/display_camera/main/idf_component.yml +++ b/examples/display_camera/main/idf_component.yml @@ -3,4 +3,4 @@ description: BSP Display and camera example dependencies: esp32_s2_kaluga_kit: version: "*" - override_path: "../../../esp32_s2_kaluga_kit" + override_path: "../../../bsp/esp32_s2_kaluga_kit" diff --git a/examples/display_lvgl_demos/main/idf_component.yml b/examples/display_lvgl_demos/main/idf_component.yml index 5b30e40c..a82eeb89 100644 --- a/examples/display_lvgl_demos/main/idf_component.yml +++ b/examples/display_lvgl_demos/main/idf_component.yml @@ -2,4 +2,4 @@ description: BSP Display rotation example dependencies: esp32_s3_lcd_ev_board: version: "*" - override_path: "../../../esp32_s3_lcd_ev_board" + override_path: "../../../bsp/esp32_s3_lcd_ev_board" diff --git a/examples/display_rotation/main/idf_component.yml b/examples/display_rotation/main/idf_component.yml index 5bd7b86c..621521bc 100644 --- a/examples/display_rotation/main/idf_component.yml +++ b/examples/display_rotation/main/idf_component.yml @@ -2,4 +2,4 @@ description: BSP Display rotation example dependencies: esp-box: version: "*" - override_path: "../../../esp-box" + override_path: "../../../bsp/esp-box" diff --git a/examples/display_sensors/main/idf_component.yml b/examples/display_sensors/main/idf_component.yml index 45b4edfd..13f96808 100644 --- a/examples/display_sensors/main/idf_component.yml +++ b/examples/display_sensors/main/idf_component.yml @@ -2,4 +2,4 @@ description: BSP ESP32-Azure-IoT-Kit sensor example dependencies: esp32_azure_iot_kit: version: ">=2.0.0" - override_path: "../../../esp32_azure_iot_kit" + override_path: "../../../bsp/esp32_azure_iot_kit" diff --git a/examples/mqtt_example/main/idf_component.yml b/examples/mqtt_example/main/idf_component.yml index 45b4edfd..13f96808 100644 --- a/examples/mqtt_example/main/idf_component.yml +++ b/examples/mqtt_example/main/idf_component.yml @@ -2,4 +2,4 @@ description: BSP ESP32-Azure-IoT-Kit sensor example dependencies: esp32_azure_iot_kit: version: ">=2.0.0" - override_path: "../../../esp32_azure_iot_kit" + override_path: "../../../bsp/esp32_azure_iot_kit"