esp32/machine_pin: Fix availability of USB Serial/JTAG pins on ESP32-C6.

projectgus · dpgeorge · commit 1d5dc723b40d · 2025-03-13T13:08:05.000+11:00
Similar to parent commit, allow using USB Serial/JTAG pins for other
purposes but only if this feature is disabled in the build config.

Signed-off-by: Angus Gratton &lt;angus@redyak.com.au&gt;
diff --git a/ports/esp32/machine_pin.c b/ports/esp32/machine_pin.c
@@ -163,7 +163,7 @@ static mp_obj_t machine_pin_obj_init_helper(const machine_pin_obj_t *self, size_
         CLEAR_PERI_REG_MASK(USB_SERIAL_JTAG_CONF0_REG, USB_SERIAL_JTAG_USB_PAD_ENABLE);
     }
     #endif
-    #if CONFIG_IDF_TARGET_ESP32C6 && !CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG_ENABLED
+    #if CONFIG_IDF_TARGET_ESP32C6 && !MICROPY_HW_ESP_USB_SERIAL_JTAG
     if (index == 12 || index == 13) {
         CLEAR_PERI_REG_MASK(USB_SERIAL_JTAG_CONF0_REG, USB_SERIAL_JTAG_USB_PAD_ENABLE);
     }
diff --git a/ports/esp32/machine_pin.h b/ports/esp32/machine_pin.h
@@ -108,7 +108,7 @@
 #define MICROPY_HW_ENABLE_GPIO9 (1)
 #define MICROPY_HW_ENABLE_GPIO10 (1)
 #define MICROPY_HW_ENABLE_GPIO11 (1)
-#if !CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG
+#if !MICROPY_HW_ESP_USB_SERIAL_JTAG
 #define MICROPY_HW_ENABLE_GPIO12 (1)
 #define MICROPY_HW_ENABLE_GPIO13 (1)
 #endif

Original file line number	Diff line number	Diff line change
`@@ -163,7 +163,7 @@ static mp_obj_t machine_pin_obj_init_helper(const machine_pin_obj_t *self, size_`
`163`	`163`	`CLEAR_PERI_REG_MASK(USB_SERIAL_JTAG_CONF0_REG, USB_SERIAL_JTAG_USB_PAD_ENABLE);`
`164`	`164`	`}`
`165`	`165`	`#endif`
`166`		`- #if CONFIG_IDF_TARGET_ESP32C6 && !CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG_ENABLED`
	`166`	`+ #if CONFIG_IDF_TARGET_ESP32C6 && !MICROPY_HW_ESP_USB_SERIAL_JTAG`
`167`	`167`	`if (index == 12 \|\| index == 13) {`
`168`	`168`	`CLEAR_PERI_REG_MASK(USB_SERIAL_JTAG_CONF0_REG, USB_SERIAL_JTAG_USB_PAD_ENABLE);`
`169`	`169`	`}`