Skip to content

Commit 88bac27

Browse files
Vincent1-pythonVincent1-python
committed
esp32: Fix the mentioned information.
Signed-off-by: Vincent1-python <pywei201209@163.com> esp32: Modify the configuration of ESP32P4 basic edition. Signed-off-by: Vincent1-python <pywei201209@163.com> 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. Signed-off-by: Vincent1-python <pywei201209@163.com> esp32: Fix the mentioned information. Signed-off-by: Vincent1-python <pywei201209@163.com> esp32: Update sdkconfig.p4. Signed-off-by: Vincent1-python <pywei201209@163.com> esp32: Update machine_i2c.c. Signed-off-by: Vincent1-python <pywei201209@163.com> esp32: Update sdkconfig.board. Signed-off-by: Vincent1-python <pywei201209@163.com> esp32: Update mpconfigboard.cmake. Signed-off-by: Vincent1-python <pywei201209@163.com> esp32: Update sdkconfig.board. Signed-off-by: Vincent1-python <pywei201209@163.com> esp32: Delete ports/esp32/boards/ESP32_GENERIC_C6/sdkconfig.board. Signed-off-by: Vincent1-python <pywei201209@163.com> esp32: Update machine_sdcard.c. Signed-off-by: Vincent1-python <pywei201209@163.com> esp32: Update modesp32.c. Signed-off-by: Vincent1-python <pywei201209@163.com> esp32: Update machine_sdcard.c. Signed-off-by: Vincent1-python <pywei201209@163.com> esp32: Update machine_sdcard.c. Signed-off-by: Vincent1-python <pywei201209@163.com> esp32: Update machine_sdcard.c. Signed-off-by: Vincent1-python <pywei201209@163.com> esp32: Delete ports/esp32/partitions-4MiB.csv. Signed-off-by: Vincent1-python <pywei201209@163.com> Update modesp32.c Signed-off-by: Vincent1-python <pywei201209@163.com> Delete ports/esp32/boards/ESP32_GENERIC_P4_WIFI/board.json Signed-off-by: Vincent1-python <pywei201209@163.com> Delete ports/esp32/boards/ESP32_GENERIC_P4/sdkconfig.board Signed-off-by: Vincent1-python <pywei201209@163.com> Delete ports/esp32/boards/ESP32_GENERIC_P4/board.json Signed-off-by: Vincent1-python <pywei201209@163.com> Delete ports/esp32/boards/ESP32_GENERIC_P4/board.md Signed-off-by: Vincent1-python <pywei201209@163.com> Delete ports/esp32/boards/ESP32_GENERIC_P4/mpconfigboard.cmake Signed-off-by: Vincent1-python <pywei201209@163.com> Delete ports/esp32/boards/ESP32_GENERIC_P4/mpconfigboard.h Signed-off-by: Vincent1-python <pywei201209@163.com> Update board.md Signed-off-by: Vincent1-python <pywei201209@163.com> Update mpconfigboard.h Signed-off-by: Vincent1-python <pywei201209@163.com> esp32: Fix the mentioned information. Update tusb_config.h Signed-off-by: Vincent1-python <pywei201209@163.com> Update tusb_config.h Signed-off-by: Vincent1-python <pywei201209@163.com> Update tusb_config.h Signed-off-by: Vincent1-python <pywei201209@163.com> Update mpnimbleport.c Signed-off-by: Vincent1-python <pywei201209@163.com> Update machine_timer.c Signed-off-by: Vincent1-python <pywei201209@163.com> esp32: Fix the mentioned information. esp32: Update mpconfigboard.h. Signed-off-by: Vincent1-python <pywei201209@163.com> Update ports/esp32/boards/ESP32_GENERIC_P4/mpconfigboard.h Co-authored-by: Angus Gratton <gus@projectgus.com> Signed-off-by: Vincent1-python <pywei201209@163.com> esp32: Update machine_i2c.c. Signed-off-by: Vincent1-python <pywei201209@163.com> Update sdkconfig.base Signed-off-by: Vincent1-python <pywei201209@163.com> Update machine_i2c.c Signed-off-by: Vincent1-python <pywei201209@163.com> Update sdkconfig.base Signed-off-by: Vincent1-python <pywei201209@163.com> esp32: Update network_lan.c. Signed-off-by: Vincent1-python <pywei201209@163.com> esp32:Update idf_component.yml. Signed-off-by: Vincent1-python <pywei201209@163.com> esp32:Update idf_component.yml. Signed-off-by: Vincent1-python <pywei201209@163.com> esp32: Update idf_component.yml. Signed-off-by: Vincent1-python <pywei201209@163.com> Update idf_component.yml Signed-off-by: Vincent1-python <pywei201209@163.com> Update idf_component.yml Signed-off-by: Vincent1-python <pywei201209@163.com> esp32: Update dependencies.lock.esp32. Signed-off-by: Vincent1-python <pywei201209@163.com> esp32: Update dependencies.lock.esp32c2 Signed-off-by: Vincent1-python <pywei201209@163.com> esp32: Update lockfile.
1 parent 7a1b949 commit 88bac27

39 files changed

+440
-563
lines changed

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

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,19 @@
33
"../deploy.md"
44
],
55
"deploy_options": {
6-
"flash_offset": "0x1000"
6+
"flash_offset": "0x2000"
77
},
88
"docs": "",
99
"features": [
1010
"BLE",
11-
"External Flash",
1211
"WiFi"
1312
],
1413
"images": [
15-
""
14+
"esp32p4_devkitmini.jpg"
1615
],
1716
"mcu": "esp32p4",
18-
"product": "Expressif ESP32P4",
17+
"product": "ESP32-P4",
1918
"thumbnail": "",
2019
"url": "https://www.espressif.com/en/products/modules",
21-
"variants": {
22-
},
2320
"vendor": "Espressif"
2421
}

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

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1 @@
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).
1+
The following firmware is applicable to most development boards based on ESP32-P4, and the development boards must be equipped with at least 16 MiB external SPI Flash.

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

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

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

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

Lines changed: 3 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -9,38 +9,15 @@
99
#define MICROPY_HW_MCU_NAME "ESP32P4"
1010
#endif
1111

12+
#define MICROPY_PY_ESPNOW (0)
1213

13-
// not fixed in mpy 1.26.0
14-
#define MICROPY_PY_MACHINE_DAC (0)
15-
16-
#define MICROPY_HW_ENABLE_USB_RUNTIME_DEVICE (0)
17-
#define MICROPY_HW_ENABLE_USBDEV (0)
18-
#define MICROPY_PY_TINYUSB (0)
19-
#define MICROPY_PY_ESPNOW (0)
20-
21-
#define MICROPY_PY_MACHINE_ADC (0)
22-
#define MICROPY_PY_MACHINE_ADC_ATTEN_WIDTH (0)
23-
#define MICROPY_PY_MACHINE_ADC_INIT (0)
24-
#define MICROPY_PY_MACHINE_ADC_READ (0)
25-
#define MICROPY_PY_MACHINE_ADC_READ_UV (0)
26-
#define MICROPY_PY_MACHINE_ADC_BLOCK (0)
27-
28-
14+
#define MICROPY_HW_ENABLE_SDCARD (1)
2915

3016
#ifndef USB_SERIAL_JTAG_PACKET_SZ_BYTES
3117
#define USB_SERIAL_JTAG_PACKET_SZ_BYTES (64)
3218
#endif
3319

3420
// Enable UART REPL for modules that have an external USB-UART and don't use native USB.
35-
#define MICROPY_HW_ENABLE_UART_REPL (1)
21+
#define MICROPY_HW_ENABLE_UART_REPL (1)
3622

3723
#define MICROPY_PY_MACHINE_I2S (1)
38-
39-
/*
40-
#define MICROPY_HW_I2C0_SCL (32)
41-
#define MICROPY_HW_I2C0_SDA (31)
42-
43-
#define MICROPY_HW_SPI1_MOSI (44)
44-
#define MICROPY_HW_SPI1_MISO (39)
45-
#define MICROPY_HW_SPI1_SCK (43)
46-
*/

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
set(IDF_TARGET esp32p4)
2+
3+
set(SDKCONFIG_DEFAULTS
4+
boards/sdkconfig.base
5+
boards/sdkconfig.p4
6+
boards/sdkconfig.p4usb
7+
boards/sdkconfig.p4_c2_wifi
8+
)
9+
10+
list(APPEND MICROPY_DEF_BOARD
11+
MICROPY_HW_BOARD_NAME="Generic ESP32P4 module with WIFI module of external ESP32C2"
12+
)

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
set(IDF_TARGET esp32p4)
2+
3+
set(SDKCONFIG_DEFAULTS
4+
boards/sdkconfig.base
5+
boards/sdkconfig.p4
6+
boards/sdkconfig.p4usb
7+
boards/sdkconfig.p4_c5_wifi
8+
)
9+
10+
list(APPEND MICROPY_DEF_BOARD
11+
MICROPY_HW_BOARD_NAME="Generic ESP32P4 module with WIFI module of external ESP32C5"
12+
)

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
set(IDF_TARGET esp32p4)
2+
3+
set(SDKCONFIG_DEFAULTS
4+
boards/sdkconfig.base
5+
boards/sdkconfig.p4
6+
boards/sdkconfig.p4usb
7+
boards/sdkconfig.p4_c6_wifi
8+
)
9+
10+
list(APPEND MICROPY_DEF_BOARD
11+
MICROPY_HW_BOARD_NAME="Generic ESP32P4 module with WIFI module of external ESP32C6"
12+
)

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

Lines changed: 0 additions & 60 deletions
This file was deleted.

‎ports/esp32/boards/FireBeetle_2_ESP32_P4/board.json‎

Lines changed: 0 additions & 24 deletions
This file was deleted.

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

Lines changed: 0 additions & 18 deletions
This file was deleted.

0 commit comments

Comments
 (0)