Skip to content

Commit af34d15

Browse files
esp32: Fix the mentioned information.
1 parent a3120c0 commit af34d15

File tree

12 files changed

+43
-18
lines changed

12 files changed

+43
-18
lines changed
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
{
2+
"deploy": [
3+
"../deploy.md"
4+
],
5+
"deploy_options": {
6+
"flash_offset": "0x2000"
7+
},
8+
"docs": "",
9+
"features": [
10+
"BLE",
11+
"WiFi"
12+
],
13+
"images": [
14+
"esp32p4_devkitmini.jpg"
15+
],
16+
"mcu": "esp32p4",
17+
"product": "ESP32-P4",
18+
"thumbnail": "",
19+
"url": "https://www.espressif.com/en/products/modules",
20+
"vendor": "Espressif"
21+
}
File renamed without changes.

ports/esp32/boards/ESP32_GENERIC_P4_WIFI/mpconfigboard.cmake renamed to ports/esp32/boards/ESP32_GENERIC_P4/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.p4
66
boards/sdkconfig.p4usb
7-
boards/ESP32_GENERIC_P4_WIFI/sdkconfig.board
7+
boards/ESP32_GENERIC_P4/sdkconfig.board
88
)

ports/esp32/boards/ESP32_GENERIC_P4_WIFI/mpconfigboard.h renamed to ports/esp32/boards/ESP32_GENERIC_P4/mpconfigboard.h

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

12-
#define MICROPY_PY_ESPNOW (0)
12+
#define MICROPY_PY_ESPNOW (0)
1313

14+
#define MICROPY_HW_ENABLE_SDCARD (0)
1415

1516
#ifndef USB_SERIAL_JTAG_PACKET_SZ_BYTES
1617
#define USB_SERIAL_JTAG_PACKET_SZ_BYTES (64)
1718
#endif
1819

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

2223
#define MICROPY_PY_MACHINE_I2S (1)
2324

ports/esp32/boards/ESP32_GENERIC_P4_WIFI/sdkconfig.board renamed to ports/esp32/boards/ESP32_GENERIC_P4/sdkconfig.board

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ CONFIG_LWIP_TCPIP_RECVMBOX_SIZE=64
1717

1818
CONFIG_LWIP_TCP_SACK_OUT=y
1919
# Bluetooth Support
20+
CONFIG_ESP_HOSTED_ENABLE_BT_BLUEDROID=y
2021
CONFIG_ESP_HOSTED_ENABLE_BT_NIMBLE=y
2122
CONFIG_ESP_HOSTED_NIMBLE_HCI_VHCI=y
2223
CONFIG_ESP_WIFI_REMOTE_ENABLED=y

ports/esp32/boards/sdkconfig.p4usb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
CONFIG_USB_OTG_SUPPORTED=y
22
CONFIG_TINYUSB_CDC_ENABLED=y
3+
CONFIG_TINYUSB_MODE_SLAVE=y

ports/esp32/machine_timer.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,8 @@
4848
#define TIMER_FLAGS 0
4949

5050
#if CONFIG_IDF_TARGET_ESP32P4
51-
static uint8_t __DECLARE_RCC_ATOMIC_ENV __attribute__ ((unused));;
51+
static uint8_t __DECLARE_RCC_ATOMIC_ENV __attribute__ ((unused));
52+
;
5253
#endif
5354

5455
const mp_obj_type_t machine_timer_type;

ports/esp32/machine_touchpad.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,11 @@
5252
typedef struct _mtp_obj_t {
5353
mp_obj_base_t base;
5454
gpio_num_t gpio_id;
55-
#if SOC_TOUCH_SENSOR_VERSION == 1 || SOC_TOUCH_SENSOR_VERSION == 2
55+
#if SOC_TOUCH_SENSOR_VERSION == 1 || SOC_TOUCH_SENSOR_VERSION == 2
5656
touch_pad_t touchpad_id;
57-
#elif SOC_TOUCH_SENSOR_VERSION == 3
57+
#elif SOC_TOUCH_SENSOR_VERSION == 3
5858
int touchpad_id;
59-
touch_sensor_handle_t s_sens_handle;
59+
touch_sensor_handle_t s_sens_handle;
6060
touch_channel_handle_t s_chan_handle[15];
6161
uint32_t benchmark[14];
6262
#endif

ports/esp32/main.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,8 @@ void mp_task(void *pvParameter) {
106106
#endif
107107
#if MICROPY_HW_ESP_USB_SERIAL_JTAG
108108
usb_serial_jtag_init();
109-
#elif MICROPY_HW_ENABLE_USBDEV
109+
#endif
110+
#if MICROPY_HW_ENABLE_USBDEV
110111
usb_init();
111112
#endif
112113
#if MICROPY_HW_ENABLE_UART_REPL

ports/esp32/main/idf_component.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ dependencies:
44
espressif/esp_tinyusb:
55
rules:
66
- if: "target in [esp32s2, esp32s3, esp32p4]"
7-
version: "1.7.6~1"
7+
version: "1.7.6"
88
espressif/esp_hosted:
99
rules:
1010
- if: "target == esp32p4"

0 commit comments

Comments
 (0)