to start with esp32P4

favnec5 · web-flow · commit 3452e5555d32 · 2025-05-25T09:59:22.000+02:00
Signed-off-by: Thomas Favennec &lt;48832470+favnec5@users.noreply.github.com&gt;
diff --git a/ports/esp32/adc.c b/ports/esp32/adc.c
@@ -25,6 +25,9 @@
  * THE SOFTWARE.
  */
 
+#if MICROPY_PY_MACHINE_ADC
+
+
 #include "py/mphal.h"
 #include "adc.h"
 #include "driver/adc.h"
@@ -106,3 +109,5 @@ mp_int_t madcblock_read_uv_helper(machine_adc_block_obj_t *self, adc_channel_t c
 
     return (mp_int_t)uv * 1000;
 }
+
+#endif // MICROPY_PY_MACHINE_ADC
diff --git a/ports/esp32/machine_adc.c b/ports/esp32/machine_adc.c
@@ -28,6 +28,7 @@
 // This file is never compiled standalone, it's included directly from
 // extmod/machine_adc.c via MICROPY_PY_MACHINE_ADC_INCLUDEFILE.
 
+
 #include "py/mphal.h"
 #include "adc.h"
 #include "driver/adc.h"
@@ -123,6 +124,21 @@ static const machine_adc_obj_t madc_obj[] = {
     {{&machine_adc_type}, ADCBLOCK2, ADC_CHANNEL_7, GPIO_NUM_18},
     {{&machine_adc_type}, ADCBLOCK2, ADC_CHANNEL_8, GPIO_NUM_19},
     {{&machine_adc_type}, ADCBLOCK2, ADC_CHANNEL_9, GPIO_NUM_20},
+	#elif CONFIG_IDF_TARGET_ESP32P4
+    {{&machine_adc_type}, ADCBLOCK1, ADC_CHANNEL_0, GPIO_NUM_16},
+    {{&machine_adc_type}, ADCBLOCK1, ADC_CHANNEL_1, GPIO_NUM_17},
+    {{&machine_adc_type}, ADCBLOCK1, ADC_CHANNEL_2, GPIO_NUM_18},
+    {{&machine_adc_type}, ADCBLOCK1, ADC_CHANNEL_3, GPIO_NUM_19},
+    {{&machine_adc_type}, ADCBLOCK1, ADC_CHANNEL_4, GPIO_NUM_20},
+    {{&machine_adc_type}, ADCBLOCK1, ADC_CHANNEL_5, GPIO_NUM_21},
+    {{&machine_adc_type}, ADCBLOCK1, ADC_CHANNEL_6, GPIO_NUM_22},
+    {{&machine_adc_type}, ADCBLOCK1, ADC_CHANNEL_7, GPIO_NUM_23},
+    {{&machine_adc_type}, ADCBLOCK1, ADC_CHANNEL_8, GPIO_NUM_49},
+    {{&machine_adc_type}, ADCBLOCK1, ADC_CHANNEL_9, GPIO_NUM_50},
+    {{&machine_adc_type}, ADCBLOCK1, ADC_CHANNEL_10, GPIO_NUM_51},
+    {{&machine_adc_type}, ADCBLOCK1, ADC_CHANNEL_11, GPIO_NUM_52},
+    {{&machine_adc_type}, ADCBLOCK1, ADC_CHANNEL_12, GPIO_NUM_53},
+    {{&machine_adc_type}, ADCBLOCK1, ADC_CHANNEL_13, GPIO_NUM_54},
     #endif
 };
 
diff --git a/ports/esp32/machine_adc_block.c b/ports/esp32/machine_adc_block.c
@@ -27,6 +27,8 @@
 // This file is never compiled standalone, it's included directly from
 // extmod/machine_adc_block.c via MICROPY_PY_MACHINE_ADC_BLOCK_INCLUDEFILE.
 
+
+
 #include "py/mphal.h"
 #include "adc.h"
 #include "driver/adc.h"
diff --git a/ports/esp32/machine_hw_spi.c b/ports/esp32/machine_hw_spi.c
@@ -73,6 +73,10 @@
 #define MICROPY_HW_SPI2_SCK (36)
 #define MICROPY_HW_SPI2_MOSI (35)
 #define MICROPY_HW_SPI2_MISO (37)
+#elif CONFIG_IDF_TARGET_ESP32P4
+#define MICROPY_HW_SPI2_SCK (43)
+#define MICROPY_HW_SPI2_MOSI (44)
+#define MICROPY_HW_SPI2_MISO (39)
 #endif
 #endif
 
diff --git a/ports/esp32/machine_pin.c b/ports/esp32/machine_pin.c
@@ -55,6 +55,8 @@
 #define GPIO_FIRST_NON_OUTPUT (34)
 #elif CONFIG_IDF_TARGET_ESP32S2
 #define GPIO_FIRST_NON_OUTPUT (46)
+#elif CONFIG_IDF_TARGET_ESP32P4
+#define GPIO_FIRST_NON_OUTPUT (49)
 #endif
 
 // Return the gpio_num_t index for a given machine_pin_obj_t pointer.
diff --git a/ports/esp32/machine_pin.h b/ports/esp32/machine_pin.h
@@ -174,6 +174,58 @@
 #define MICROPY_HW_ENABLE_GPIO48 (1)
 #endif
 
+#elif CONFIG_IDF_TARGET_ESP32P4
+
+#define MICROPY_HW_ENABLE_GPIO0 (1)
+#define MICROPY_HW_ENABLE_GPIO1 (1)
+#define MICROPY_HW_ENABLE_GPIO2 (1)
+#define MICROPY_HW_ENABLE_GPIO3 (1)
+#define MICROPY_HW_ENABLE_GPIO4 (1)
+#define MICROPY_HW_ENABLE_GPIO5 (1)
+#define MICROPY_HW_ENABLE_GPIO6 (1)
+#define MICROPY_HW_ENABLE_GPIO7 (1)
+#define MICROPY_HW_ENABLE_GPIO8 (1)
+#define MICROPY_HW_ENABLE_GPIO9 (1)
+#define MICROPY_HW_ENABLE_GPIO10 (1)
+#define MICROPY_HW_ENABLE_GPIO11 (1)
+#define MICROPY_HW_ENABLE_GPIO12 (1)
+#define MICROPY_HW_ENABLE_GPIO13 (1)
+#define MICROPY_HW_ENABLE_GPIO14 (1)
+#define MICROPY_HW_ENABLE_GPIO15 (1)
+#define MICROPY_HW_ENABLE_GPIO16 (1)
+#define MICROPY_HW_ENABLE_GPIO17 (1)
+#define MICROPY_HW_ENABLE_GPIO18 (1)
+#define MICROPY_HW_ENABLE_GPIO19 (1)
+#define MICROPY_HW_ENABLE_GPIO20 (1)
+#define MICROPY_HW_ENABLE_GPIO21 (1)
+#define MICROPY_HW_ENABLE_GPIO22 (1)
+#define MICROPY_HW_ENABLE_GPIO23 (1)
+#define MICROPY_HW_ENABLE_GPIO24 (1)
+#define MICROPY_HW_ENABLE_GPIO25 (1)
+#define MICROPY_HW_ENABLE_GPIO26 (1)
+#define MICROPY_HW_ENABLE_GPIO27 (1)
+#define MICROPY_HW_ENABLE_GPIO28 (1)
+#define MICROPY_HW_ENABLE_GPIO29 (1)
+#define MICROPY_HW_ENABLE_GPIO30 (1)
+#define MICROPY_HW_ENABLE_GPIO31 (1)
+#define MICROPY_HW_ENABLE_GPIO32 (1)
+#define MICROPY_HW_ENABLE_GPIO33 (1)
+#define MICROPY_HW_ENABLE_GPIO34 (1)
+#define MICROPY_HW_ENABLE_GPIO35 (1)
+#define MICROPY_HW_ENABLE_GPIO36 (1)
+#define MICROPY_HW_ENABLE_GPIO37 (1)
+#define MICROPY_HW_ENABLE_GPIO38 (1)
+#define MICROPY_HW_ENABLE_GPIO39 (1)
+#define MICROPY_HW_ENABLE_GPIO40 (1)
+#define MICROPY_HW_ENABLE_GPIO41 (1)
+#define MICROPY_HW_ENABLE_GPIO42 (1)
+#define MICROPY_HW_ENABLE_GPIO43 (1)
+#define MICROPY_HW_ENABLE_GPIO44 (1)
+#define MICROPY_HW_ENABLE_GPIO45 (1)
+#define MICROPY_HW_ENABLE_GPIO46 (1)
+#define MICROPY_HW_ENABLE_GPIO47 (1)
+#define MICROPY_HW_ENABLE_GPIO48 (1)
+
 #endif
 
 typedef struct _machine_pin_irq_obj_t {
diff --git a/ports/esp32/machine_pwm.c b/ports/esp32/machine_pwm.c
@@ -785,4 +785,4 @@ static mp_obj_t mp_machine_pwm_duty_get_ns(machine_pwm_obj_t *self) {
 
 static void mp_machine_pwm_duty_set_ns(machine_pwm_obj_t *self, mp_int_t duty_ns) {
     set_duty_ns(self, duty_ns);
-}
+}
diff --git a/ports/esp32/machine_timer.c b/ports/esp32/machine_timer.c
@@ -47,6 +47,12 @@
 
 #define TIMER_FLAGS    0
 
+
+#if CONFIG_IDF_TARGET_ESP32P4
+static uint8_t __DECLARE_RCC_ATOMIC_ENV __attribute__ ((unused));;
+#endif
+
+
 const mp_obj_type_t machine_timer_type;
 
 static mp_obj_t machine_timer_init_helper(machine_timer_obj_t *self, mp_uint_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args);
diff --git a/ports/esp32/machine_touchpad.c b/ports/esp32/machine_touchpad.c
@@ -29,7 +29,7 @@
 #include "modmachine.h"
 #include "driver/gpio.h"
 
-#if SOC_TOUCH_SENSOR_SUPPORTED
+#if SOC_TOUCH_SENSOR_SUPPORTED && !CONFIG_IDF_TARGET_ESP32P4
 
 #if ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 3, 0)
 #if SOC_TOUCH_VERSION_1
@@ -80,6 +80,21 @@ static const mtp_obj_t touchpad_obj[] = {
     {{&machine_touchpad_type}, GPIO_NUM_12, TOUCH_PAD_NUM12},
     {{&machine_touchpad_type}, GPIO_NUM_13, TOUCH_PAD_NUM13},
     {{&machine_touchpad_type}, GPIO_NUM_14, TOUCH_PAD_NUM14},
+    #elif CONFIG_IDF_TARGET_ESP32P4
+    {{&machine_touchpad_type}, GPIO_NUM_2, TOUCH_PAD_NUM0},
+    {{&machine_touchpad_type}, GPIO_NUM_3, TOUCH_PAD_NUM1},
+    {{&machine_touchpad_type}, GPIO_NUM_4, TOUCH_PAD_NUM2},
+    {{&machine_touchpad_type}, GPIO_NUM_5, TOUCH_PAD_NUM3},
+    {{&machine_touchpad_type}, GPIO_NUM_6, TOUCH_PAD_NUM4},
+    {{&machine_touchpad_type}, GPIO_NUM_7, TOUCH_PAD_NUM5},
+    {{&machine_touchpad_type}, GPIO_NUM_8, TOUCH_PAD_NUM6},
+    {{&machine_touchpad_type}, GPIO_NUM_9, TOUCH_PAD_NUM7},
+    {{&machine_touchpad_type}, GPIO_NUM_10, TOUCH_PAD_NUM8},
+    {{&machine_touchpad_type}, GPIO_NUM_11, TOUCH_PAD_NUM9},
+    {{&machine_touchpad_type}, GPIO_NUM_12, TOUCH_PAD_NUM10},
+    {{&machine_touchpad_type}, GPIO_NUM_13, TOUCH_PAD_NUM11},
+    {{&machine_touchpad_type}, GPIO_NUM_14, TOUCH_PAD_NUM12},
+    {{&machine_touchpad_type}, GPIO_NUM_15, TOUCH_PAD_NUM13},	
     #else
     #error "Please add GPIO mapping for this SoC"
     #endif
@@ -168,4 +183,4 @@ MP_DEFINE_CONST_OBJ_TYPE(
     locals_dict, &mtp_locals_dict
     );
 
-#endif // SOC_TOUCH_SENSOR_SUPPORTED
+#endif // SOC_TOUCH_SENSOR_SUPPORTED
diff --git a/ports/esp32/modesp32.c b/ports/esp32/modesp32.c
@@ -136,7 +136,7 @@ static mp_obj_t esp32_wake_on_ulp(const mp_obj_t wake) {
 }
 static MP_DEFINE_CONST_FUN_OBJ_1(esp32_wake_on_ulp_obj, esp32_wake_on_ulp);
 
-#if !SOC_GPIO_SUPPORT_HOLD_SINGLE_IO_IN_DSLP
+#if !SOC_GPIO_SUPPORT_HOLD_SINGLE_IO_IN_DSLP && !CONFIG_IDF_TARGET_ESP32P4
 static mp_obj_t esp32_gpio_deep_sleep_hold(const mp_obj_t enable) {
     if (mp_obj_is_true(enable)) {
         gpio_deep_sleep_hold_en();
@@ -262,7 +262,7 @@ static const mp_rom_map_elem_t esp32_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_wake_on_ext0), MP_ROM_PTR(&esp32_wake_on_ext0_obj) },
     { MP_ROM_QSTR(MP_QSTR_wake_on_ext1), MP_ROM_PTR(&esp32_wake_on_ext1_obj) },
     { MP_ROM_QSTR(MP_QSTR_wake_on_ulp), MP_ROM_PTR(&esp32_wake_on_ulp_obj) },
-    #if !SOC_GPIO_SUPPORT_HOLD_SINGLE_IO_IN_DSLP
+    #if !SOC_GPIO_SUPPORT_HOLD_SINGLE_IO_IN_DSLP && !CONFIG_IDF_TARGET_ESP32P4
     { MP_ROM_QSTR(MP_QSTR_gpio_deep_sleep_hold), MP_ROM_PTR(&esp32_gpio_deep_sleep_hold_obj) },
     #endif
     #if CONFIG_IDF_TARGET_ESP32
@@ -296,4 +296,4 @@ const mp_obj_module_t esp32_module = {
     .globals = (mp_obj_dict_t *)&esp32_module_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_esp32, esp32_module);
+MP_REGISTER_MODULE(MP_QSTR_esp32, esp32_module);
diff --git a/ports/esp32/modmachine.c b/ports/esp32/modmachine.c
@@ -45,12 +45,13 @@
 #define MICROPY_PY_MACHINE_SDCARD_ENTRY
 #endif
 
-#if SOC_TOUCH_SENSOR_SUPPORTED
+#if SOC_TOUCH_SENSOR_SUPPORTED &&  !CONFIG_IDF_TARGET_ESP32P4
 #define MICROPY_PY_MACHINE_TOUCH_PAD_ENTRY { MP_ROM_QSTR(MP_QSTR_TouchPad), MP_ROM_PTR(&machine_touchpad_type) },
 #else
 #define MICROPY_PY_MACHINE_TOUCH_PAD_ENTRY
 #endif
 
+
 #define MICROPY_PY_MACHINE_EXTRA_GLOBALS \
     { MP_ROM_QSTR(MP_QSTR_sleep), MP_ROM_PTR(&machine_lightsleep_obj) }, \
     \
@@ -148,13 +149,15 @@ static void machine_sleep_helper(wake_type_t wake_type, size_t n_args, const mp_
     }
     #endif
 
-    #if SOC_TOUCH_SENSOR_SUPPORTED
+    /*
+	#if SOC_TOUCH_SENSOR_SUPPORTED
     if (machine_rtc_config.wake_on_touch) {
         if (esp_sleep_enable_touchpad_wakeup() != ESP_OK) {
             mp_raise_msg(&mp_type_RuntimeError, MP_ERROR_TEXT("esp_sleep_enable_touchpad_wakeup() failed"));
         }
     }
     #endif
+	*/
 
     #if SOC_ULP_SUPPORTED
     if (machine_rtc_config.wake_on_ulp) {
diff --git a/ports/esp32/modmachine.h b/ports/esp32/modmachine.h
@@ -9,7 +9,9 @@ typedef enum {
     MACHINE_WAKE_DEEPSLEEP=0x04
 } wake_type_t;
 
+#if !CONFIG_IDF_TARGET_ESP32P4
 extern const mp_obj_type_t machine_touchpad_type;
+#endif
 extern const mp_obj_type_t machine_dac_type;
 extern const mp_obj_type_t machine_sdcard_type;
 
diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h
@@ -120,13 +120,17 @@
 #define MICROPY_PY_MACHINE_RESET            (1)
 #define MICROPY_PY_MACHINE_BARE_METAL_FUNCS (1)
 #define MICROPY_PY_MACHINE_DISABLE_IRQ_ENABLE_IRQ (1)
+
+#ifndef CONFIG_IDF_TARGET_ESP32P4
 #define MICROPY_PY_MACHINE_ADC              (1)
 #define MICROPY_PY_MACHINE_ADC_INCLUDEFILE  "ports/esp32/machine_adc.c"
 #define MICROPY_PY_MACHINE_ADC_ATTEN_WIDTH  (1)
 #define MICROPY_PY_MACHINE_ADC_INIT         (1)
 #define MICROPY_PY_MACHINE_ADC_READ         (1)
 #define MICROPY_PY_MACHINE_ADC_READ_UV      (1)
 #define MICROPY_PY_MACHINE_ADC_BLOCK        (1)
+#endif
+
 #define MICROPY_PY_MACHINE_ADC_BLOCK_INCLUDEFILE "ports/esp32/machine_adc_block.c"
 #define MICROPY_PY_MACHINE_PIN_MAKE_NEW     mp_pin_make_new
 #define MICROPY_PY_MACHINE_BITSTREAM        (1)
@@ -168,6 +172,8 @@
 #define MICROPY_PY_NETWORK_HOSTNAME_DEFAULT "mpy-esp32c3"
 #elif CONFIG_IDF_TARGET_ESP32C6
 #define MICROPY_PY_NETWORK_HOSTNAME_DEFAULT "mpy-esp32c6"
+#elif CONFIG_IDF_TARGET_ESP32P4
+#define MICROPY_PY_NETWORK_HOSTNAME_DEFAULT "mpy-esp32p4"
 #endif
 #endif
 #define MICROPY_PY_NETWORK_INCLUDEFILE      "ports/esp32/modnetwork.h"
diff --git a/ports/esp32/mpnimbleport.c b/ports/esp32/mpnimbleport.c
@@ -37,6 +37,19 @@
 
 #include "extmod/nimble/modbluetooth_nimble.h"
 
+
+
+#if CONFIG_ESP_HOSTED_ENABLED
+//extern ble_transport_ll_deinit(void);
+extern void ble_transport_ll_deinit(void)
+{
+    // https://github.com/espressif/esp-hosted-mcu/issues/27
+	DEBUG_printf("deinit avoided (hosted ble)\n");
+}
+#endif
+
+
+
 static void ble_host_task(void *param) {
     DEBUG_printf("ble_host_task\n");
     nimble_port_run(); // This function will return only when nimble_port_stop() is executed.
diff --git a/ports/esp32/uart.c b/ports/esp32/uart.c
@@ -40,6 +40,12 @@
 
 static void uart_irq_handler(void *arg);
 
+
+#if CONFIG_IDF_TARGET_ESP32P4
+static uint8_t __DECLARE_RCC_ATOMIC_ENV __attribute__ ((unused));
+#endif
+
+
 // Declaring the HAL structure on the stack saves a tiny amount of static RAM
 #define REPL_HAL_DEFN() { .dev = UART_LL_GET_HW(MICROPY_HW_UART_REPL) }
 
diff --git a/ports/esp32/usb.c b/ports/esp32/usb.c
@@ -57,7 +57,7 @@ void usb_init(void) {
 
 }
 
-#if CONFIG_IDF_TARGET_ESP32S3
+#if CONFIG_IDF_TARGET_ESP32S3 || CONFIG_IDF_TARGET_ESP32P4
 void usb_usj_mode(void) {
     // Switch the USB PHY back to Serial/Jtag mode, disabling OTG support
     // This should be run before jumping to bootloader.
