Skip to content

Commit

Permalink
Add ESP32_S3_ALL build with octal psram support (#2933)
Browse files Browse the repository at this point in the history
  • Loading branch information
AdrianSoundy authored May 15, 2024
1 parent b9f167f commit 2302b54
Show file tree
Hide file tree
Showing 8 changed files with 136 additions and 2 deletions.
10 changes: 10 additions & 0 deletions .vscode/tasks.TEMPLATE.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,16 @@
},
"problemMatcher": []
},
{
"label": "Decode ESP32 (riscv32 series) backtrace",
"type": "shell",
"command": "riscv32-esp-elf-addr2line -apsfCire \"${input:espBacktraceElfFile}\" \"${input:espBacktrace}\"",
"presentation": {
"reveal": "always",
"panel": "shared"
},
"problemMatcher": []
},
{
"label": "Flash MIMXRT1060",
"type": "shell",
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ We also have a [Community Targets](https://github.com/nanoframework/nf-Community
| ESP32_PSRAM_BLE_GenericGraphic_REV3 | [![Latest Version @ Cloudsmith](https://api-prd.cloudsmith.io/v1/badges/version/net-nanoframework/nanoframework-images/raw/ESP32_PSRAM_BLE_GenericGraphic_REV3/latest/x/?render=true)](https://cloudsmith.io/~net-nanoframework/repos/nanoframework-images/packages/detail/raw/ESP32_PSRAM_BLE_GenericGraphic_REV3/latest/) |
| ESP32_S3 | [![Latest Version @ Cloudsmith](https://api-prd.cloudsmith.io/v1/badges/version/net-nanoframework/nanoframework-images/raw/ESP32_S3/latest/x/?render=true)](https://cloudsmith.io/~net-nanoframework/repos/nanoframework-images/packages/detail/raw/ESP32_S3/latest/) |
| ESP32_S3_BLE | [![Latest Version @ Cloudsmith](https://api-prd.cloudsmith.io/v1/badges/version/net-nanoframework/nanoframework-images/raw/ESP32_S3_BLE/latest/x/?render=true)](https://cloudsmith.io/~net-nanoframework/repos/nanoframework-images/packages/detail/raw/ESP32_S3_BLE/latest/) |
| ESP32_S3_ALL | [![Latest Version @ Cloudsmith](https://api-prd.cloudsmith.io/v1/badges/version/net-nanoframework/nanoframework-images/raw/ESP32_S3_ALL/latest/x/?render=true)](https://cloudsmith.io/~net-nanoframework/repos/nanoframework-images/packages/detail/raw/ESP32_S3_ALL/latest/) |

### M5Stack

Expand Down
1 change: 1 addition & 0 deletions README.zh-cn.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
| ESP32_PSRAM_BLE_GenericGraphic_REV3 | [![Latest Version @ Cloudsmith](https://api-prd.cloudsmith.io/v1/badges/version/net-nanoframework/nanoframework-images/raw/ESP32_PSRAM_BLE_GenericGraphic_REV3/latest/x/?render=true)](https://cloudsmith.io/~net-nanoframework/repos/nanoframework-images/packages/detail/raw/ESP32_PSRAM_BLE_GenericGraphic_REV3/latest/) |
| ESP32_S3 | [![Latest Version @ Cloudsmith](https://api-prd.cloudsmith.io/v1/badges/version/net-nanoframework/nanoframework-images/raw/ESP32_S3/latest/x/?render=true)](https://cloudsmith.io/~net-nanoframework/repos/nanoframework-images/packages/detail/raw/ESP32_S3/latest/) |
| ESP32_S3_BLE | [![Latest Version @ Cloudsmith](https://api-prd.cloudsmith.io/v1/badges/version/net-nanoframework/nanoframework-images/raw/ESP32_S3_BLE/latest/x/?render=true)](https://cloudsmith.io/~net-nanoframework/repos/nanoframework-images/packages/detail/raw/ESP32_S3_BLE/latest/) |
| ESP32_S3_ALL | [![Latest Version @ Cloudsmith](https://api-prd.cloudsmith.io/v1/badges/version/net-nanoframework/nanoframework-images/raw/ESP32_S3_ALL/latest/x/?render=true)](https://cloudsmith.io/~net-nanoframework/repos/nanoframework-images/packages/detail/raw/ESP32_S3_ALL/latest/) |

### M5Stack

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

ESP32_S3_ALL:
TargetBoard: ESP32_S3
TargetSeries: 'esp32s3'
BuildOptions:
IDF_Target: esp32s3
TargetName: ESP32_S3_ALL
PackageName: ESP32_S3_ALL
CMakePreset: ESP32_S3_ALL

ESP32_ETHERNET_KIT_1.2:
TargetBoard: ESP32
TargetSeries: 'esp32'
Expand Down
32 changes: 32 additions & 0 deletions targets/ESP32/CMakePresets.json
Original file line number Diff line number Diff line change
Expand Up @@ -379,6 +379,32 @@
"ESP32_RESERVED_RAM_FOR_IDF_ALLOCATION": "100"
}
},
{
"name": "ESP32_S3_ALL",
"inherits": [
"xtensa-esp32s3-preset",
"user-tools-repos",
"user-prefs"
],
"hidden": false,
"cacheVariables": {
"TARGET_NAME": "${presetName}",
"SDK_CONFIG_FILE": "sdkconfig.default_octal_ble.esp32s3",
"NF_BUILD_RTM": "OFF",
"NF_FEATURE_DEBUGGER": "ON",
"NF_FEATURE_RTC": "ON",
"NF_FEATURE_HAS_SDCARD": "ON",
"ESP32_USB_CDC": "ON",
"API_nanoFramework.Device.Bluetooth": "ON",
"API_System.Device.I2c.Slave": "ON",
"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": "XIAO_ESP32C3",
"inherits": [
Expand Down Expand Up @@ -925,6 +951,12 @@
"displayName": "ESP32_S3_BLE",
"configurePreset": "ESP32_S3_BLE"
},
{
"inherits": "base-user",
"name": "ESP32_S3_ALL",
"displayName": "ESP32_S3_ALL",
"configurePreset": "ESP32_S3_ALL"
},
{
"inherits": "base-user",
"name": "XIAO_ESP32C3",
Expand Down
2 changes: 1 addition & 1 deletion targets/ESP32/_IDF/sdkconfig.default.esp32s3
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ CONFIG_UART_ISR_IN_IRAM=y
CONFIG_PM_ENABLE=y

CONFIG_SPIRAM=y
CONFIG_SPIRAM_MODE_OCT=y
CONFIG_SPIRAM_MODE_QUAD=y
CONFIG_SPIRAM_TYPE_AUTO=y
CONFIG_SPIRAM_IGNORE_NOTFOUND=y

Expand Down
2 changes: 1 addition & 1 deletion targets/ESP32/_IDF/sdkconfig.default_ble.esp32s3
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ CONFIG_UART_ISR_IN_IRAM=y
CONFIG_PM_ENABLE=y

CONFIG_SPIRAM=y
CONFIG_SPIRAM_MODE_OCT=y
CONFIG_SPIRAM_MODE_QUAD=y
CONFIG_SPIRAM_TYPE_AUTO=y
CONFIG_SPIRAM_IGNORE_NOTFOUND=y

Expand Down
81 changes: 81 additions & 0 deletions targets/ESP32/_IDF/sdkconfig.default_octal_ble.esp32s3
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
# This file was generated using idf.py save-defconfig. It can be edited manually.
# Espressif IoT Development Framework (ESP-IDF) Project Minimal Configuration
#
CONFIG_IDF_CMAKE=y
CONFIG_IDF_TARGET_ARCH_XTENSA=y
CONFIG_IDF_TARGET="esp32s3"

# Deprecated drivers, disable warnings on build
CONFIG_ADC_SUPPRESS_DEPRECATE_WARN=y
CONFIG_ADC_CALI_SUPPRESS_DEPRECATE_WARN=y
CONFIG_UART_ISR_IN_IRAM=y
CONFIG_PCNT_SUPPRESS_DEPRECATE_WARN=y
CONFIG_RMT_SUPPRESS_DEPRECATE_WARN=y
CONFIG_I2S_SUPPRESS_DEPRECATE_WARN=y

CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
CONFIG_ESPTOOLPY_HEADER_FLASHSIZE_UPDATE=y

CONFIG_PARTITION_TABLE_CUSTOM=y
CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="targets/ESP32/_IDF/esp32s3/partitions_nanoclr_4mb.csv"

CONFIG_COMPILER_OPTIMIZATION_SIZE=y
CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_DISABLE=y

CONFIG_BT_ENABLED=y
CONFIG_BT_NIMBLE_ENABLED=y
CONFIG_BT_NIMBLE_SVC_GAP_DEVICE_NAME="nanoBLE"
CONFIG_BT_NIMBLE_TRANSPORT_ACL_FROM_LL_COUNT=10
CONFIG_BT_NIMBLE_TRANSPORT_EVT_COUNT=20
CONFIG_BT_NIMBLE_HS_FLOW_CTRL=y
CONFIG_BT_CTRL_BLE_MAX_ACT=10

CONFIG_UART_ISR_IN_IRAM=y

CONFIG_PM_ENABLE=y

CONFIG_SPIRAM=y
CONFIG_SPIRAM_MODE_OCT=y
CONFIG_SPIRAM_TYPE_AUTO=y
CONFIG_SPIRAM_IGNORE_NOTFOUND=y

CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_240=y

CONFIG_ESP_TASK_WDT_INIT=n

CONFIG_ESP_IPC_TASK_STACK_SIZE=1024

CONFIG_ESP_WIFI_STATIC_RX_BUFFER_NUM=10
CONFIG_ESP_WIFI_RX_BA_WIN=6

CONFIG_FATFS_LFN_HEAP=y

CONFIG_FREERTOS_IDLE_TASK_STACKSIZE=2304
CONFIG_FREERTOS_TIMER_TASK_PRIORITY=5
CONFIG_FREERTOS_USE_TICKLESS_IDLE=y

CONFIG_LOG_DEFAULT_LEVEL_NONE=y

CONFIG_LWIP_LOCAL_HOSTNAME="nanodevice"
CONFIG_LWIP_MAX_SOCKETS=16
CONFIG_LWIP_SO_LINGER=y
CONFIG_LWIP_SO_RCVBUF=y
CONFIG_LWIP_DHCP_OPTIONS_LEN=80
CONFIG_LWIP_DHCPS=n
CONFIG_LWIP_IPV6=n
CONFIG_LWIP_MAX_LISTENING_TCP=8
CONFIG_LWIP_SNTP_MAX_SERVERS=2

CONFIG_MBEDTLS_DEFAULT_MEM_ALLOC=y
CONFIG_MBEDTLS_SSL_VARIABLE_BUFFER_LENGTH=y
CONFIG_MBEDTLS_SSL_KEEP_PEER_CERTIFICATE=n
CONFIG_MBEDTLS_CERTIFICATE_BUNDLE=n
CONFIG_MBEDTLS_HAVE_TIME_DATE=y
CONFIG_MBEDTLS_SSL_PROTO_DTLS=y
CONFIG_MBEDTLS_CLIENT_SSL_SESSION_TICKETS=n
CONFIG_MBEDTLS_DES_C=y
CONFIG_MBEDTLS_XTEA_C=y
CONFIG_MBEDTLS_PEM_WRITE_C=n

CONFIG_SPIFFS_PAGE_SIZE=512
CONFIG_SPIFFS_OBJ_NAME_LEN=256

0 comments on commit 2302b54

Please sign in to comment.