Skip to content

Commit 12e8a4b

Browse files
Vincent1-pythonVincent1-python
committed
esp32: Fix the mentioned information.
esp32 :Fix i2c esp32: Fix. esp32: Fix. esp32: Fix. esp32: Fix. esp32: Fix. esp32: Fix. esp32: Fix. esp32: Fix. esp32: Fix. esp32: Fix. esp32: Fix.
1 parent 9e959cf commit 12e8a4b

23 files changed

+127
-303
lines changed

‎ports/esp32/boards/ESP32_GENERIC_C6/mpconfigboard.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ set(SDKCONFIG_DEFAULTS
44
boards/sdkconfig.base
55
boards/sdkconfig.c6
66
boards/sdkconfig.ble
7-
boards/ESP32_GENERIC_C6/sdkconfig.board
7+
boards/ESP32_GENERIC_C6/sdkconfig.board
88
)

‎ports/esp32/boards/ESP32_GENERIC_P4/board.md

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +0,0 @@
1-
The following files are firmware that should work on most ESP32-based boards
2-
with 4MiB of flash, including WROOM WROVER, SOLO, PICO, and MINI modules.
3-
4-
This board has multiple variants available:
5-
6-
* If your board is based on a WROVER module, or otherwise has SPIRAM (also known
7-
as PSRAM) then it's recommended to use the "spiram" variant. Look for heading
8-
**Support for SPIRAM / WROVER)**.
9-
* If your board has a ESP32-D2WD chip (with only 2MiB flash) then use the "d2wd"
10-
variant. Look for heading **ESP32 D2WD**.
11-
* If your board has a single-core ESP32 (e.g. the "SOLO" modules) then choose
12-
the "unicore" variant. Look for heading **ESP32 Unicore**.
13-
* If you'd like to perform Over-the-Air updates of the MicroPython firmware,
14-
then choose the "ota" variant. This variant has less room in the flash for
15-
Python files as a result of supporting OTA. Look for heading **Support for
16-
OTA**.
17-
18-
Otherwise, download the generic variant (under the first heading below).

‎ports/esp32/boards/ESP32_GENERIC_P4/mpconfigboard.cmake

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,7 @@ set(IDF_TARGET esp32p4)
22

33
set(SDKCONFIG_DEFAULTS
44
boards/sdkconfig.base
5+
boards/sdkconfig.p4
6+
boards/sdkconfig.p4usb
57
boards/ESP32_GENERIC_P4/sdkconfig.board
68
)

‎ports/esp32/boards/ESP32_GENERIC_P4/mpconfigboard.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#endif
1111

1212
#define MICROPY_PY_ESPNOW (0)
13-
13+
#define MICROPY_PY_NETWORK_WLAN (0)
1414

1515
#ifndef USB_SERIAL_JTAG_PACKET_SZ_BYTES
1616
#define USB_SERIAL_JTAG_PACKET_SZ_BYTES (64)

‎ports/esp32/boards/ESP32_GENERIC_P4/sdkconfig.board

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,3 @@
1-
2-
# Flash
3-
CONFIG_FLASHMODE_QIO=y
4-
#CONFIG_ESPTOOLPY_FLASHMODE_QIO=y
5-
CONFIG_ESPTOOLPY_FLASHMODE="dio"
6-
CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
7-
CONFIG_ESPTOOLPY_AFTER_NORESET=y
8-
CONFIG_ESPTOOLPY_FLASHSIZE_4MB=
9-
CONFIG_ESPTOOLPY_FLASHSIZE_8MB=
10-
CONFIG_ESPTOOLPY_FLASHSIZE_16MB=y
11-
12-
# Memory
13-
CONFIG_SPIRAM=y
14-
CONFIG_IDF_EXPERIMENTAL_FEATURES=y
15-
CONFIG_SPIRAM_MODE_HEX=y
16-
CONFIG_SPIRAM_SPEED_200M=y
17-
CONFIG_SPIRAM_MEMTEST=
18-
CONFIG_SPIRAM_IGNORE_NOTFOUND=y
19-
CONFIG_MBEDTLS_DEFAULT_MEM_ALLOC=y
20-
CONFIG_SPIRAM_MALLOC_RESERVE_INTERNAL=50768
21-
22-
23-
# ULP : not fixed
24-
CONFIG_SOC_ULP_SUPPORTED=n
25-
CONFIG_ULP_COPROC_ENABLED=n
26-
CONFIG_ULP_COPROC_TYPE_FSM=n
27-
28-
# Touchpad : not fixed
29-
CONFIG_SOC_TOUCH_SENSOR_SUPPORTED=y
30-
SOC_TOUCH_SENSOR_SUPPORTED=y
31-
CONFIG_SOC_TOUCH_SENSOR_SUPPORTED=y
32-
33-
341
# Wifi
352
#CONFIG_ESP_HOSTED_ENABLED=n
363
CONFIG_ESP_HOST_WIFI_ENABLED=y

‎ports/esp32/boards/FireBeetle_2_ESP32_P4/board.json renamed to ‎ports/esp32/boards/ESP32_GENERIC_P4_WIFI/board.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
""
1616
],
1717
"mcu": "esp32p4",
18-
"product": "M5STACK TAB5",
18+
"product": "Expressif ESP32P4",
1919
"thumbnail": "",
20-
"url": "https://docs.m5stack.com/en/core/Tab5",
20+
"url": "https://www.espressif.com/en/products/modules",
2121
"variants": {
2222
},
2323
"vendor": "Espressif"

‎ports/esp32/boards/ESP32_GENERIC_P4_WIFI/board.md

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
The following files are firmware that should work on most ESP32-based boards
2+
with 4MiB of flash, including WROOM WROVER, SOLO, PICO, and MINI modules.
3+
4+
This board has multiple variants available:
5+
6+
* If your board is based on a WROVER module, or otherwise has SPIRAM (also known
7+
as PSRAM) then it's recommended to use the "spiram" variant. Look for heading
8+
**Support for SPIRAM / WROVER)**.
9+
* If your board has a ESP32-D2WD chip (with only 2MiB flash) then use the "d2wd"
10+
variant. Look for heading **ESP32 D2WD**.
11+
* If your board has a single-core ESP32 (e.g. the "SOLO" modules) then choose
12+
the "unicore" variant. Look for heading **ESP32 Unicore**.
13+
* If you'd like to perform Over-the-Air updates of the MicroPython firmware,
14+
then choose the "ota" variant. This variant has less room in the flash for
15+
Python files as a result of supporting OTA. Look for heading **Support for
16+
OTA**.
17+
18+
Otherwise, download the generic variant (under the first heading below).

‎ports/esp32/boards/FireBeetle_2_ESP32_P4/mpconfigboard.cmake renamed to ‎ports/esp32/boards/ESP32_GENERIC_P4_WIFI/mpconfigboard.cmake

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ set(IDF_TARGET esp32p4)
22

33
set(SDKCONFIG_DEFAULTS
44
boards/sdkconfig.base
5+
boards/sdkconfig.p4
56
boards/sdkconfig.p4usb
6-
boards/FireBeetle_2_ESP32_P4/sdkconfig.board
7+
boards/ESP32_GENERIC_P4_WIFI/sdkconfig.board
78
)

‎ports/esp32/boards/FireBeetle_2_ESP32_P4/mpconfigboard.h renamed to ‎ports/esp32/boards/ESP32_GENERIC_P4_WIFI/mpconfigboard.h

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,16 @@
22
// specified.
33

44
#ifndef MICROPY_HW_BOARD_NAME
5-
#define MICROPY_HW_BOARD_NAME "FireBeetle 2 ESP32 P4"
5+
#define MICROPY_HW_BOARD_NAME "Generic ESP32P4 module (wifi) "
66
#endif
77

88
#ifndef MICROPY_HW_MCU_NAME
99
#define MICROPY_HW_MCU_NAME "ESP32P4"
1010
#endif
1111

12-
#define MICROPY_HW_ENABLE_USB_RUNTIME_DEVICE (1)
13-
#define MICROPY_HW_ENABLE_USBDEV (1)
1412
#define MICROPY_PY_ESPNOW (0)
15-
#define MP_SD_LDO (1)
13+
14+
1615
#ifndef USB_SERIAL_JTAG_PACKET_SZ_BYTES
1716
#define USB_SERIAL_JTAG_PACKET_SZ_BYTES (64)
1817
#endif

‎ports/esp32/boards/FireBeetle_2_ESP32_P4/sdkconfig.board renamed to ‎ports/esp32/boards/ESP32_GENERIC_P4_WIFI/sdkconfig.board

Lines changed: 2 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,6 @@
1-
2-
# Flash
3-
CONFIG_FLASHMODE_QIO=y
4-
#CONFIG_ESPTOOLPY_FLASHMODE_QIO=y
5-
CONFIG_ESPTOOLPY_FLASHMODE="dio"
6-
CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
7-
CONFIG_ESPTOOLPY_AFTER_NORESET=y
8-
CONFIG_ESPTOOLPY_FLASHSIZE_4MB=
9-
CONFIG_ESPTOOLPY_FLASHSIZE_8MB=
10-
CONFIG_ESPTOOLPY_FLASHSIZE_16MB=y
11-
#CONFIG_PARTITION_TABLE_CUSTOM=y
12-
#CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions-16MiB_espdl.csv"
13-
14-
# Memory
15-
CONFIG_SPIRAM=y
16-
CONFIG_IDF_EXPERIMENTAL_FEATURES=y
17-
CONFIG_SPIRAM_MODE_HEX=y
18-
CONFIG_SPIRAM_SPEED_200M=y
19-
CONFIG_SPIRAM_MEMTEST=
20-
CONFIG_SPIRAM_IGNORE_NOTFOUND=y
21-
CONFIG_MBEDTLS_DEFAULT_MEM_ALLOC=y
22-
CONFIG_SPIRAM_MALLOC_RESERVE_INTERNAL=50768
23-
24-
25-
# ULP : not fixed
26-
CONFIG_SOC_ULP_SUPPORTED=n
27-
CONFIG_ULP_COPROC_ENABLED=n
28-
CONFIG_ULP_COPROC_TYPE_FSM=n
29-
30-
# Touchpad : not fixed
31-
CONFIG_SOC_TOUCH_SENSOR_SUPPORTED=n
32-
SOC_TOUCH_SENSOR_SUPPORTED=n
33-
CONFIG_SOC_TOUCH_SENSOR_SUPPORTED=n
34-
35-
361
# Wifi
372
CONFIG_ESP_HOSTED_ENABLED=y
38-
#CONFIG_ESP_HOST_WIFI_ENABLED=y
3+
#CONFIG_ESP_HOST_WIFI_ENABLED=n
394
CONFIG_ESP_WIFI_STATIC_RX_BUFFER_NUM=16
405
CONFIG_ESP_WIFI_DYNAMIC_RX_BUFFER_NUM=64
416
CONFIG_ESP_WIFI_DYNAMIC_TX_BUFFER_NUM=64
@@ -70,8 +35,7 @@ CONFIG_SLAVE_SOC_WIFI_HE_SUPPORT=y
7035
CONFIG_SLAVE_SOC_WIFI_MAC_VERSION_NUM=2
7136
CONFIG_ESP_WIFI_REMOTE_LIBRARY_HOSTED=y
7237

73-
CONFIG_ESP32_P4_EV_BOARD=y
74-
38+
CONFIG_ESP_HOSTED_P4_DEV_BOARD_FUNC_BOARD=y
7539
# Ble
7640
CONFIG_ESP_ENABLE_BT=y
7741
CONFIG_BT_ENABLED=y
@@ -86,16 +50,7 @@ CONFIG_BT_NIMBLE_MAX_CONNECTIONS=4
8650

8751
CONFIG_BT_HCI_LOG_DEBUG_EN=y
8852

89-
# Put NimBLE on core 1, and for synchronisation
90-
# with the ringbuffer and scheduler MP needs to be on the same core.
91-
# MP on core 1 prevents interference with WiFi for time sensitive operations.
92-
# Only on: ESP32, ESP32S2, ESP32S3
93-
#CONFIG_BT_NIMBLE_PINNED_TO_CORE_0=n
94-
#CONFIG_BT_NIMBLE_PINNED_TO_CORE_1=y
95-
#CONFIG_BT_NIMBLE_PINNED_TO_CORE=1
9653

9754
# Increase NimBLE task stack size from the default, because Python code
9855
# (BLE IRQ handlers) will most likely run on this task.
9956
CONFIG_BT_NIMBLE_TASK_STACK_SIZE=6144
100-
CONFIG_USB_OTG_SUPPORTED=y
101-
CONFIG_TINYUSB_CDC_ENABLED=y

0 commit comments

Comments
 (0)