esp32: Fix.

Author: Vincent1-python

ports/esp32/machine_touchpad.c

@@ -29,7 +29,7 @@
 #include "modmachine.h"
 #include "driver/gpio.h"
 
-#if SOC_TOUCH_SENSOR_SUPPORTED //&& !CONFIG_IDF_TARGET_ESP32P4
+#if SOC_TOUCH_SENSOR_SUPPORTED
 
 #if ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 3, 0)
 #if SOC_TOUCH_VERSION_1
@@ -41,9 +41,9 @@
 
 #if SOC_TOUCH_SENSOR_VERSION == 1 // ESP32 only
 #include "driver/touch_pad.h"
-#elif SOC_TOUCH_SENSOR_VERSION == 2 // All other SoCs with touch, to date
+#elif SOC_TOUCH_SENSOR_VERSION == 2 // most ESP32
 #include "driver/touch_sensor.h"
-#elif SOC_TOUCH_SENSOR_VERSION == 3 // All other SoCs with touch, to date
+#elif SOC_TOUCH_SENSOR_VERSION == 3 // At present, it can only be used on ESP32P4.
 #include "driver/touch_sens.h"
 #else
 #error "Unknown touch hardware version"
@@ -140,13 +140,13 @@ static mp_obj_t mtp_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_
 	touch_sensor_config_t sens_cfg = TOUCH_SENSOR_DEFAULT_BASIC_CONFIG(3, sample_cfg);
         esp_err_t err = touch_sensor_new_controller(&sens_cfg, &s_sens_handle);
 	if (err != ESP_OK) {
-    	   mp_raise_ValueError(MP_ERROR_TEXT("Touch pad error 1"));
+    	   mp_raise_ValueError(MP_ERROR_TEXT("Touch pad error"));
     	}
         /* Configure the touch sensor filter */
         touch_sensor_filter_config_t filter_cfg = TOUCH_SENSOR_DEFAULT_FILTER_CONFIG();
         err = touch_sensor_config_filter(s_sens_handle, &filter_cfg);
         if (err != ESP_OK) {
-    	   mp_raise_ValueError(MP_ERROR_TEXT("Touch pad error 2"));
+    	   mp_raise_ValueError(MP_ERROR_TEXT("Touch pad error"));
     	}
         touch_channel_config_t chan_cfg = {
         .active_thresh = {1000, 2500, 5000},
@@ -156,15 +156,15 @@ static mp_obj_t mtp_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_
         	err = touch_sensor_new_channel(s_sens_handle, i, &chan_cfg, &s_chan_handle[i]);
     	};
     	if (err != ESP_OK) {
-    	   mp_raise_ValueError(MP_ERROR_TEXT("Touch pad error 3"));
+    	   mp_raise_ValueError(MP_ERROR_TEXT("Touch pad error"));
     	}
     	err = touch_sensor_enable(s_sens_handle);
     	if (err != ESP_OK) {
-    	   mp_raise_ValueError(MP_ERROR_TEXT("Touch pad error 4"));
+    	   mp_raise_ValueError(MP_ERROR_TEXT("Touch pad error"));
     	}
     	err = touch_sensor_start_continuous_scanning(s_sens_handle);
     	if (err != ESP_OK) {
-    	   mp_raise_ValueError(MP_ERROR_TEXT("Touch pad error 5"));
+    	   mp_raise_ValueError(MP_ERROR_TEXT("Touch pad error"));
     	}
     #endif
         initialized = 1;
@@ -183,7 +183,7 @@ static mp_obj_t mtp_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_
 
         return MP_OBJ_FROM_PTR(self);
     }
-    mp_raise_ValueError(MP_ERROR_TEXT("Touch pad error 6"));
+    mp_raise_ValueError(MP_ERROR_TEXT("Touch pad error"));
 }
 
 static mp_obj_t mtp_config(mp_obj_t self_in, mp_obj_t value_in) {
@@ -199,7 +199,7 @@ static mp_obj_t mtp_config(mp_obj_t self_in, mp_obj_t value_in) {
     if (err == ESP_OK) {
         return mp_const_none;
     }
-    mp_raise_ValueError(MP_ERROR_TEXT("Touch pad error 7"));
+    mp_raise_ValueError(MP_ERROR_TEXT("Touch pad error"));
 }
 MP_DEFINE_CONST_FUN_OBJ_2(mtp_config_obj, mtp_config);
 
@@ -219,7 +219,7 @@ static mp_obj_t mtp_read(mp_obj_t self_in) {
     if (err == ESP_OK) {
         return MP_OBJ_NEW_SMALL_INT(value);
     }
-    mp_raise_ValueError(MP_ERROR_TEXT("Touch pad error 8"));
+    mp_raise_ValueError(MP_ERROR_TEXT("Touch pad error"));
 }
 MP_DEFINE_CONST_FUN_OBJ_1(mtp_read_obj, mtp_read);
 

ports/esp32/mpconfigport.h

@@ -276,11 +276,6 @@
 #define MICROPY_HW_USB_CDC                  (MICROPY_HW_ENABLE_USBDEV)
 #endif
 
-// Enable stdio over native USB peripheral HID via TinyUSB
-#ifndef MICROPY_HW_USB_HID
-#define MICROPY_HW_USB_HID                  (MICROPY_HW_USB_CDC)
-#endif
-
 // Enable stdio over USB Serial/JTAG peripheral
 #ifndef MICROPY_HW_ESP_USB_SERIAL_JTAG
 #if !CONFIG_IDF_TARGET_ESP32P4