esp32/machine_i2c: Correct commit errors and add default pins for S2.

This addresses issue micropython#17103.

The default I2C init does not require setting SCL or SDA but
the default pins for C3, S3, and S2 conflict with the espressif
GPIO usage.

For the C3, pins 18/19 are for USB/JTAG. If used for
I2C() they will cause the REPL to hang on initialization of the I2C.

For the S3 pin 19 is allocated for USB/JTAG also but the
defaults do not seem to affect the REPL.  Also the default pins for
I2C(2) were 25/26 which are invalid for S3 and S2.

This pull request updates pin settings for C3, S3 and S2 I2C defaults
if not specified during the build.

See PR micropython#16956
See Issue micropython#17103

Signed-off-by: Rick Sorensen <[email protected]>

Author: ricksorensen

ports/esp32/machine_i2c.c

@@ -35,7 +35,7 @@
 #if MICROPY_PY_MACHINE_I2C || MICROPY_PY_MACHINE_SOFTI2C
 
 #ifndef MICROPY_HW_I2C0_SCL
-#if CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32S3 
+#if CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32S3
 #define MICROPY_HW_I2C0_SCL (GPIO_NUM_9)
 #define MICROPY_HW_I2C0_SDA (GPIO_NUM_8)
 #else
@@ -46,7 +46,7 @@
 
 #ifndef MICROPY_HW_I2C1_SCL
 
-#if CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32S3
+#if CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32S3 || CONFIG_IDF_TARGET_ESP32S2
 #define MICROPY_HW_I2C1_SCL (GPIO_NUM_15)
 #define MICROPY_HW_I2C1_SDA (GPIO_NUM_16)
 #else
@@ -189,8 +189,7 @@ mp_obj_t machine_hw_i2c_make_new(const mp_obj_type_t *type, size_t n_args, size_
         if (self->port == I2C_NUM_0) {
             self->scl = MICROPY_HW_I2C0_SCL;
             self->sda = MICROPY_HW_I2C0_SDA;
-        }
-	else {
+        } else {
             self->scl = MICROPY_HW_I2C1_SCL;
             self->sda = MICROPY_HW_I2C1_SDA;
         }