Skip to content

Commit

Permalink
Merge pull request #236 from espressif/folder_restructuring
Browse files Browse the repository at this point in the history
bsp: Restructuring BSP folders.
  • Loading branch information
espzav authored Oct 23, 2023
2 parents 162d138 + 37b4b86 commit 414f696
Show file tree
Hide file tree
Showing 160 changed files with 57 additions and 56 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/upload_component.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
26 changes: 13 additions & 13 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 | <img src="docu/pics/wrover.png" width="150"> |
| [ESP-BOX](esp-box) | ESP32-S3 | LCD display with touch, audio codec + power amplifier,<br>accelerometer and gyroscope | <img src="docu/pics/esp32_s3_box.png" width="150"> |
| [ESP-BOX-Lite](esp-box-lite) | ESP32-S3 | LCD display, audio codec + power amplifier | <img src="docu/pics/esp32_s3_box_lite.png" width="150"> |
| [ESP32-Azure IoT Kit](esp32_azure_iot_kit) | ESP32 | OLED display, uSD card slot, accelerometer,<br>magnetometer, humidity, pressure, light<br>and temperature sensors | <img src="docu/pics/azure.png" width="150"> |
| [ESP32-S2-Kaluga Kit](esp32_s2_kaluga_kit) | ESP32-S2 | LCD display, audio codec + power amplifier,<br>smart LED and camera | <img src="docu/pics/kaluga.png" width="150"> |
| [ESP32-S3-USB-OTG](esp32_s3_usb_otg) | ESP32-S3 | LCD display, uSD card slot, USB-OTG | <img src="docu/pics/esp32_s3_otg.png" width="150"> |
| [ESP32-S3-EYE](esp32_s3_eye) | ESP32-S3 | LCD display, camera, uSD card slot, microphone and accelerometer | <img src="docu/pics/s3-eye.webp" width="150"> |
| [ESP32-S3-LCD-EV-Board](esp32_s3_lcd_ev_board) | ESP32-S3 | LCD display with touch, audio codec + power amplifier | <img src="docu/pics/esp32-s3-lcd-ev-board_480x480.png" width="150"> |
| [ESP32-S3-LCD-EV-Board-2](esp32_s3_lcd_ev_board) | ESP32-S3 | LCD display with touch, audio codec + power amplifier | <img src="docu/pics/esp32-s3-lcd-ev-board_800x480.png" width="150"> |
| [ESP32-S3-Korvo-2](esp32_s3_korvo_2) | ESP32-S3 | LCD display, camera, uSD card slot, microphone, audio codec + power amplifier | <img src="docu/pics/korvo-2.png" width="150"> |
| [ESP32-LyraT](esp32_lyrat) | ESP32 | uSD card slot, microphone, audio codec + power amplifier | <img src="docu/pics/lyrat.png" width="150"> |
| [ESP32-C3-LCDKit](esp32_c3_lcdkit) | ESP32-C3 | LCD display with encoder, IR, PDM audio| <img src="docu/pics/esp32_c3_lcdkit.png" width="150"> |
| [ESP-BOX-3](esp-box-3) | ESP32-S3 | LCD display with touch, audio codec + power amplifier,<br>accelerometer and gyroscope | <img src="docu/pics/esp32_s3_box_3.png" width="150"> |
| [ESP-WROVER-KIT](bsp/esp_wrover_kit) | ESP32 | LCD display, uSD card slot | <img src="docu/pics/wrover.png" width="150"> |
| [ESP-BOX](bsp/esp-box) | ESP32-S3 | LCD display with touch, audio codec + power amplifier,<br>accelerometer and gyroscope | <img src="docu/pics/esp32_s3_box.png" width="150"> |
| [ESP-BOX-Lite](bsp/esp-box-lite) | ESP32-S3 | LCD display, audio codec + power amplifier | <img src="docu/pics/esp32_s3_box_lite.png" width="150"> |
| [ESP32-Azure IoT Kit](bsp/esp32_azure_iot_kit) | ESP32 | OLED display, uSD card slot, accelerometer,<br>magnetometer, humidity, pressure, light<br>and temperature sensors | <img src="docu/pics/azure.png" width="150"> |
| [ESP32-S2-Kaluga Kit](bsp/esp32_s2_kaluga_kit) | ESP32-S2 | LCD display, audio codec + power amplifier,<br>smart LED and camera | <img src="docu/pics/kaluga.png" width="150"> |
| [ESP32-S3-USB-OTG](bsp/esp32_s3_usb_otg) | ESP32-S3 | LCD display, uSD card slot, USB-OTG | <img src="docu/pics/esp32_s3_otg.png" width="150"> |
| [ESP32-S3-EYE](bsp/esp32_s3_eye) | ESP32-S3 | LCD display, camera, uSD card slot, microphone and accelerometer | <img src="docu/pics/s3-eye.webp" width="150"> |
| [ESP32-S3-LCD-EV-Board](bsp/esp32_s3_lcd_ev_board) | ESP32-S3 | LCD display with touch, audio codec + power amplifier | <img src="docu/pics/esp32-s3-lcd-ev-board_480x480.png" width="150"> |
| [ESP32-S3-LCD-EV-Board-2](bsp/esp32_s3_lcd_ev_board) | ESP32-S3 | LCD display with touch, audio codec + power amplifier | <img src="docu/pics/esp32-s3-lcd-ev-board_800x480.png" width="150"> |
| [ESP32-S3-Korvo-2](bsp/esp32_s3_korvo_2) | ESP32-S3 | LCD display, camera, uSD card slot, microphone, audio codec + power amplifier | <img src="docu/pics/korvo-2.png" width="150"> |
| [ESP32-LyraT](bsp/esp32_lyrat) | ESP32 | uSD card slot, microphone, audio codec + power amplifier | <img src="docu/pics/lyrat.png" width="150"> |
| [ESP32-C3-LCDKit](bsp/esp32_c3_lcdkit) | ESP32-C3 | LCD display with encoder, IR, PDM audio| <img src="docu/pics/esp32_c3_lcdkit.png" width="150"> |
| [ESP-BOX-3](bsp/esp-box-3) | ESP32-S3 | LCD display with touch, audio codec + power amplifier,<br>accelerometer and gyroscope | <img src="docu/pics/esp32_s3_box_3.png" width="150"> |
## LCD displays and TOUCH

| [LVGL port](components/esp_lvgl_port) | [LCD drivers](LCD.md) |
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -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
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
8 changes: 4 additions & 4 deletions esp-box/idf_component.yml → bsp/esp-box/idf_component.yml
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -37,5 +37,5 @@ dependencies:
public: true

examples:
- path: ../examples/mqtt_example
- path: ../examples/display_sensors
- path: ../../examples/mqtt_example
- path: ../../examples/display_sensors
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -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
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -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
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -31,4 +31,4 @@ dependencies:
public: true

examples:
- path: ../examples/display_camera
- path: ../../examples/display_camera
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -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
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -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
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -41,4 +41,4 @@ dependencies:
public: true

examples:
- path: ../examples/display_lvgl_demos
- path: ../../examples/display_lvgl_demos
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -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
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -17,4 +17,4 @@ dependencies:
public: true

examples:
- path: ../examples/display
- path: ../../examples/display
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
1 change: 1 addition & 0 deletions check_copyright_config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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/**'
Expand Down
2 changes: 1 addition & 1 deletion examples/audio/main/idf_component.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
2 changes: 1 addition & 1 deletion examples/bsp_ext.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down
2 changes: 1 addition & 1 deletion examples/display/main/idf_component.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
2 changes: 1 addition & 1 deletion examples/display_audio_photo/main/idf_component.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ dependencies:
esp_jpeg: "*"
esp-box:
version: ">=3.0.0"
override_path: "../../../esp-box"
override_path: "../../../bsp/esp-box"
2 changes: 1 addition & 1 deletion examples/display_camera/main/idf_component.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
2 changes: 1 addition & 1 deletion examples/display_lvgl_demos/main/idf_component.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
2 changes: 1 addition & 1 deletion examples/display_rotation/main/idf_component.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ description: BSP Display rotation example
dependencies:
esp-box:
version: "*"
override_path: "../../../esp-box"
override_path: "../../../bsp/esp-box"
2 changes: 1 addition & 1 deletion examples/display_sensors/main/idf_component.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
2 changes: 1 addition & 1 deletion examples/mqtt_example/main/idf_component.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"

0 comments on commit 414f696

Please sign in to comment.