Skip to content

Optimise ESP32_S2 targets #3053

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@ We also have a [Community Targets](https://github.com/nanoframework/nf-Community
### ESP32_S2 boards
| Target | Note | Version |
|:---|---|---|
| FEATHER_S2 | Adafruit | [![Latest Version @ Cloudsmith](https://api-prd.cloudsmith.io/v1/badges/version/net-nanoframework/nanoframework-images/raw/FEATHER_S2/latest/x/?render=true)](https://cloudsmith.io/~net-nanoframework/repos/nanoframework-images/packages/detail/raw/FEATHER_S2/latest/) |
| KALUGA_1 | Espressif | [![Latest Version @ Cloudsmith](https://api-prd.cloudsmith.io/v1/badges/version/net-nanoframework/nanoframework-images/raw/KALUGA_1/latest/x/?render=true)](https://cloudsmith.io/~net-nanoframework/repos/nanoframework-images/packages/detail/raw/KALUGA_1/latest/) |
| ESP32_S2_USB | S2 boards with direct USB connection to chip. Including Adafruit Feather_S2 | [![Latest Version @ Cloudsmith](https://api-prd.cloudsmith.io/v1/badges/version/net-nanoframework/nanoframework-images/raw/ESP32_S2_UART/latest/x/?render=true)](https://cloudsmith.io/~net-nanoframework/repos/nanoframework-images/packages/detail/raw/ESP32_S2_USB/latest/) |
| ESP32_S2_UART | S2 boards with onboard USB->UART. This includes the Kaluga dev. board from Espressif | [![Latest Version @ Cloudsmith](https://api-prd.cloudsmith.io/v1/badges/version/net-nanoframework/nanoframework-images/raw/ESP32_S2_UART/latest/x/?render=true)](https://cloudsmith.io/~net-nanoframework/repos/nanoframework-images/packages/detail/raw/ESP32_S2_UART/latest/) |

### ESP32_S3 boards
| Target | Note | Version |
Expand Down Expand Up @@ -141,8 +141,8 @@ The above .NET nanoFramework interpreter builds include support for the class li
| ESP_WROVER_KIT | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | | :heavy_check_mark: | | :heavy_check_mark: | :heavy_check_mark: |
| ESP32_PICO | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | | :heavy_check_mark: | | | |
| ESP32_LILYGO | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | | :heavy_check_mark: Wi-Fi + Ethernet | | | |
| FEATHER_S2 | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | | :heavy_check_mark: | | | |
| KALUGA_1 | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | | :heavy_check_mark: | | | :heavy_check_mark: |
| ESP32_S2_USB | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | | :heavy_check_mark: | | | |
| ESP32_S2_UART | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | | :heavy_check_mark: | | | :heavy_check_mark: |
| ESP32_C3 | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | | :heavy_check_mark: | | | |
| XIAO_ESP32C3 | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | | :heavy_check_mark: | | | |
| ESP32_C6 | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | | :heavy_check_mark: | | | |
Expand Down
8 changes: 4 additions & 4 deletions README.zh-cn.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@
| ESP_WROVER_KIT | [![Latest Version @ Cloudsmith](https://api-prd.cloudsmith.io/v1/badges/version/net-nanoframework/nanoframework-images/raw/ESP_WROVER_KIT/latest/x/?render=true)](https://cloudsmith.io/~net-nanoframework/repos/nanoframework-images/packages/detail/raw/ESP_WROVER_KIT/latest/) |
| ESP32_PICO | [![Latest Version @ Cloudsmith](https://api-prd.cloudsmith.io/v1/badges/version/net-nanoframework/nanoframework-images/raw/ESP32_PICO/latest/x/?render=true)](https://cloudsmith.io/~net-nanoframework/repos/nanoframework-images/packages/detail/raw/ESP32_PICO/latest/) |
| ESP32_LILYGO | [![Latest Version @ Cloudsmith](https://api-prd.cloudsmith.io/v1/badges/version/net-nanoframework/nanoframework-images/raw/ESP32_LILYGO/latest/x/?render=true)](https://cloudsmith.io/~net-nanoframework/repos/nanoframework-images/packages/detail/raw/ESP32_LILYGO/latest/) |
| FEATHER_S2 | [![Latest Version @ Cloudsmith](https://api-prd.cloudsmith.io/v1/badges/version/net-nanoframework/nanoframework-images/raw/FEATHER_S2/latest/x/?render=true)](https://cloudsmith.io/~net-nanoframework/repos/nanoframework-images/packages/detail/raw/FEATHER_S2/latest/) |
| KALUGA_1 | [![Latest Version @ Cloudsmith](https://api-prd.cloudsmith.io/v1/badges/version/net-nanoframework/nanoframework-images/raw/KALUGA_1/latest/x/?render=true)](https://cloudsmith.io/~net-nanoframework/repos/nanoframework-images/packages/detail/raw/KALUGA_1/latest/) |
| ESP32_S2_USB | [![Latest Version @ Cloudsmith](https://api-prd.cloudsmith.io/v1/badges/version/net-nanoframework/nanoframework-images/raw/ESP32_S2_USB/latest/x/?render=true)](https://cloudsmith.io/~net-nanoframework/repos/nanoframework-images/packages/detail/raw/ESP32_S2_USB/latest/) |
| ESP32_S2_UART | [![Latest Version @ Cloudsmith](https://api-prd.cloudsmith.io/v1/badges/version/net-nanoframework/nanoframework-images/raw/ESP32_S2_UART/latest/x/?render=true)](https://cloudsmith.io/~net-nanoframework/repos/nanoframework-images/packages/detail/raw/ESP32_S2_UART/latest/) |
| ESP32_C3 | [![Latest Version @ Cloudsmith](https://api-prd.cloudsmith.io/v1/badges/version/net-nanoframework/nanoframework-images/raw/ESP32_C3/latest/x/?render=true)](https://cloudsmith.io/~net-nanoframework/repos/nanoframework-images/packages/detail/raw/ESP32_C3/latest/) |
| ESP32_C3_REV3 | [![Latest Version @ Cloudsmith](https://api-prd.cloudsmith.io/v1/badges/version/net-nanoframework/nanoframework-images/raw/ESP32_C3_REV3/latest/x/?render=true)](https://cloudsmith.io/~net-nanoframework/repos/nanoframework-images/packages/detail/raw/ESP32_C3_REV3/latest/) |
| XIAO_ESP32C3 | [![Latest Version @ Cloudsmith](https://api-prd.cloudsmith.io/v1/badges/version/net-nanoframework/nanoframework-images/raw/XIAO_ESP32C3/latest/x/?render=true)](https://cloudsmith.io/~net-nanoframework/repos/nanoframework-images/packages/detail/raw/XIAO_ESP32C3/latest/) |
Expand Down Expand Up @@ -108,8 +108,8 @@
| ESP_WROVER_KIT | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | | :heavy_check_mark: | | :heavy_check_mark: | :heavy_check_mark: |
| ESP32_PICO | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | | :heavy_check_mark: | | | |
| ESP32_LILYGO | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | | :heavy_check_mark: Wi-Fi + Ethernet | | | |
| FEATHER_S2 | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | | :heavy_check_mark: | | | |
| KALUGA_1 | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | | :heavy_check_mark: | | | :heavy_check_mark: |
| ESP32_S2_USB | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | | :heavy_check_mark: | | | |
| ESP32_S2_UART | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | | :heavy_check_mark: | | | :heavy_check_mark: |
| ESP32_C3 | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | | :heavy_check_mark: | | | |
| XIAO_ESP32C3 | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | | :heavy_check_mark: | | | |
| ESP32_OLIMEX | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | | :heavy_check_mark: | :heavy_check_mark: Wi-Fi + Ethernet | | :heavy_check_mark: | |
Expand Down
17 changes: 13 additions & 4 deletions azure-pipelines-nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -381,14 +381,23 @@ jobs:
PackageName: ESP32_PICO
CMakePreset: ESP32_PICO

KALUGA_1:
ESP32_S2_UART:
TargetBoard: ESP32_S2
TargetSeries: "esp32_s2"
BuildOptions:
IDF_Target: esp32s2
TargetName: KALUGA_1
PackageName: KALUGA_1
CMakePreset: KALUGA_1
TargetName: ESP32_S2_UART
PackageName: ESP32_S2_UART
CMakePreset: ESP32_S2_UART

ESP32_S2_USB:
TargetBoard: ESP32_S2
TargetSeries: "esp32_s2"
BuildOptions:
IDF_Target: esp32s2
TargetName: ESP32_S2_USB
PackageName: ESP32_S2_USB
CMakePreset: ESP32_S2_USB

ESP32_BLE_REV3:
TargetBoard: ESP32
Expand Down
9 changes: 0 additions & 9 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -496,15 +496,6 @@ jobs:
PackageName: ESP32_LILYGO
CMakePreset: ESP32_LILYGO

FEATHER_S2:
TargetBoard: ESP32_S2
TargetSeries: "esp32_s2"
BuildOptions:
IDF_Target: esp32s2
TargetName: FEATHER_S2
PackageName: FEATHER_S2
CMakePreset: FEATHER_S2

ESP32_C3:
TargetBoard: ESP32_C3
TargetSeries: "esp32c3"
Expand Down
29 changes: 18 additions & 11 deletions targets/ESP32/CMakePresets.json
Original file line number Diff line number Diff line change
Expand Up @@ -803,7 +803,7 @@
}
},
{
"name": "FEATHER_S2",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was brought in partnership with the Feather creator and they are advertising it on their docs, therefore I would like to keep distributing a firmware with this name. I understand that this will be the same, still...

"name": "ESP32_S2_USB",
"inherits": [
"xtensa-esp32s2-preset",
"user-tools-repos",
Expand All @@ -821,11 +821,17 @@
"ESP32_CONFIG_PIN_PHY_POWER": "",
"ESP32_CONFIG_PHY_CLOCK_MODE": "",
"ESP32_USB_CDC": "ON",
"API_nanoFramework.Device.OneWire": "OFF"
"API_nanoFramework.Device.OneWire": "OFF",
"API_nanoFramework.Graphics": "ON",
"GRAPHICS_DISPLAY": "Generic_SPI.cpp",
"TOUCHPANEL_DEVICE": "XPT2046.cpp",
"GRAPHICS_DISPLAY_INTERFACE": "Spi_To_Display.cpp",
"TOUCHPANEL_INTERFACE": "Spi_To_TouchPanel.cpp",
"ESP32_SPIRAM_FOR_IDF_ALLOCATION": "1024 * 1024"
}
},
{
"name": "KALUGA_1",
"name": "ESP32_S2_UART",
"inherits": [
"xtensa-esp32s2-preset",
"user-tools-repos",
Expand All @@ -839,10 +845,11 @@
"NF_FEATURE_DEBUGGER": "ON",
"NF_FEATURE_RTC": "ON",
"API_nanoFramework.Graphics": "ON",
"GRAPHICS_DISPLAY": "ILI9341_240x320_SPI.cpp",
"GRAPHICS_DISPLAY": "Generic_SPI.cpp",
"TOUCHPANEL_DEVICE": "XPT2046.cpp",
"GRAPHICS_DISPLAY_INTERFACE": "Spi_To_Display.cpp",
"TOUCHPANEL_INTERFACE": "Spi_To_TouchPanel.cpp"
"TOUCHPANEL_INTERFACE": "Spi_To_TouchPanel.cpp",
"ESP32_SPIRAM_FOR_IDF_ALLOCATION": "1024 * 1024"
}
}
],
Expand Down Expand Up @@ -1053,15 +1060,15 @@
},
{
"inherits": "base-user",
"name": "FEATHER_S2",
"displayName": "FEATHER_S2",
"configurePreset": "FEATHER_S2"
"name": "ESP32_S2_USB",
"displayName": "ESP32_S2_USB",
"configurePreset": "ESP32_S2_USB"
},
{
"inherits": "base-user",
"name": "KALUGA_1",
"displayName": "KALUGA_1",
"configurePreset": "KALUGA_1"
"name": "ESP32_S2_UART",
"displayName": "ESP32_S2_UART",
"configurePreset": "ESP32_S2_UART"
}
]
}