esp32: Add initial support for ESP32S2 SoCs.

Builds against IDF v4.3-beta2.

Signed-off-by: Damien George <[email protected]>

Author: dpgeorge

ports/esp32/boards/sdkconfig.base

@@ -1,7 +1,6 @@
 # MicroPython on ESP32, ESP IDF configuration
 # The following options override the defaults
 
-CONFIG_IDF_TARGET="esp32"
 CONFIG_IDF_FIRMWARE_CHIP_ID=0x0000
 
 # Compiler options: use -Os to reduce size, but keep full assertions

ports/esp32/esp32_ulp.c

@@ -26,6 +26,8 @@
 
 #include "py/runtime.h"
 
+#if CONFIG_IDF_TARGET_ESP32
+
 #include "esp32/ulp.h"
 #include "esp_err.h"
 
@@ -95,3 +97,5 @@ const mp_obj_type_t esp32_ulp_type = {
     .make_new = esp32_ulp_make_new,
     .locals_dict = (mp_obj_t)&esp32_ulp_locals_dict,
 };
+
+#endif // CONFIG_IDF_TARGET_ESP32

ports/esp32/machine_adc.c

@@ -60,7 +60,11 @@ STATIC mp_obj_t madc_make_new(const mp_obj_type_t *type, size_t n_args, size_t n
 
     static int initialized = 0;
     if (!initialized) {
-        adc1_config_width(ADC_WIDTH_12Bit);
+        #if CONFIG_IDF_TARGET_ESP32S2
+        adc1_config_width(ADC_WIDTH_BIT_13);
+        #else
+        adc1_config_width(ADC_WIDTH_BIT_12);
+        #endif
         adc_bit_width = 12;
         initialized = 1;
     }
@@ -128,6 +132,7 @@ STATIC mp_obj_t madc_width(mp_obj_t cls_in, mp_obj_t width_in) {
         mp_raise_ValueError(MP_ERROR_TEXT("parameter error"));
     }
     switch (width) {
+        #if CONFIG_IDF_TARGET_ESP32
         case ADC_WIDTH_9Bit:
             adc_bit_width = 9;
             break;
@@ -140,6 +145,11 @@ STATIC mp_obj_t madc_width(mp_obj_t cls_in, mp_obj_t width_in) {
         case ADC_WIDTH_12Bit:
             adc_bit_width = 12;
             break;
+        #elif CONFIG_IDF_TARGET_ESP32S2
+        case ADC_WIDTH_BIT_13:
+            adc_bit_width = 13;
+            break;
+            #endif
         default:
             break;
     }
@@ -160,10 +170,14 @@ STATIC const mp_rom_map_elem_t madc_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_ATTN_6DB), MP_ROM_INT(ADC_ATTEN_6db) },
     { MP_ROM_QSTR(MP_QSTR_ATTN_11DB), MP_ROM_INT(ADC_ATTEN_11db) },
 
+    #if CONFIG_IDF_TARGET_ESP32
     { MP_ROM_QSTR(MP_QSTR_WIDTH_9BIT), MP_ROM_INT(ADC_WIDTH_9Bit) },
     { MP_ROM_QSTR(MP_QSTR_WIDTH_10BIT), MP_ROM_INT(ADC_WIDTH_10Bit) },
     { MP_ROM_QSTR(MP_QSTR_WIDTH_11BIT), MP_ROM_INT(ADC_WIDTH_11Bit) },
     { MP_ROM_QSTR(MP_QSTR_WIDTH_12BIT), MP_ROM_INT(ADC_WIDTH_12Bit) },
+    #elif CONFIG_IDF_TARGET_ESP32S2
+    { MP_ROM_QSTR(MP_QSTR_WIDTH_13BIT), MP_ROM_INT(ADC_WIDTH_BIT_13) },
+    #endif
 };
 
 STATIC MP_DEFINE_CONST_DICT(madc_locals_dict, madc_locals_dict_table);

ports/esp32/machine_dac.c

@@ -43,8 +43,13 @@ typedef struct _mdac_obj_t {
 } mdac_obj_t;
 
 STATIC const mdac_obj_t mdac_obj[] = {
+    #if CONFIG_IDF_TARGET_ESP32
     {{&machine_dac_type}, GPIO_NUM_25, DAC_CHANNEL_1},
     {{&machine_dac_type}, GPIO_NUM_26, DAC_CHANNEL_2},
+    #else
+    {{&machine_dac_type}, GPIO_NUM_17, DAC_CHANNEL_1},
+    {{&machine_dac_type}, GPIO_NUM_18, DAC_CHANNEL_2},
+    #endif
 };
 
 STATIC mp_obj_t mdac_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw,

ports/esp32/machine_hw_spi.c

@@ -184,8 +184,12 @@ STATIC void machine_hw_spi_init_internal(
         changed = true;
     }
 
-    if (self->host != HSPI_HOST && self->host != VSPI_HOST) {
-        mp_raise_ValueError(MP_ERROR_TEXT("SPI ID must be either HSPI(1) or VSPI(2)"));
+    if (self->host != HSPI_HOST
+        #ifdef VSPI_HOST
+        && self->host != VSPI_HOST
+        #endif
+        ) {
+        mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("SPI(%d) doesn't exist"), self->host);
     }
 
     if (changed) {
@@ -220,8 +224,10 @@ STATIC void machine_hw_spi_init_internal(
     int dma_chan = 0;
     if (self->host == HSPI_HOST) {
         dma_chan = 1;
+    #ifdef VSPI_HOST
     } else if (self->host == VSPI_HOST) {
         dma_chan = 2;
+    #endif
     }
 
     ret = spi_bus_initialize(self->host, &buscfg, dma_chan);

ports/esp32/machine_i2c.c

@@ -34,8 +34,13 @@
 
 #define I2C_0_DEFAULT_SCL (GPIO_NUM_18)
 #define I2C_0_DEFAULT_SDA (GPIO_NUM_19)
+#if CONFIG_IDF_TARGET_ESP32
 #define I2C_1_DEFAULT_SCL (GPIO_NUM_25)
 #define I2C_1_DEFAULT_SDA (GPIO_NUM_26)
+#else
+#define I2C_1_DEFAULT_SCL (GPIO_NUM_9)
+#define I2C_1_DEFAULT_SDA (GPIO_NUM_8)
+#endif
 
 #define I2C_DEFAULT_TIMEOUT_US (10000) // 10ms
 

ports/esp32/machine_pin.c

@@ -77,10 +77,17 @@ STATIC const machine_pin_obj_t machine_pin_obj[] = {
     {{&machine_pin_type}, GPIO_NUM_19},
     {{NULL}, -1},
     {{&machine_pin_type}, GPIO_NUM_21},
+    #if CONFIG_IDF_TARGET_ESP32
     {{&machine_pin_type}, GPIO_NUM_22},
     {{&machine_pin_type}, GPIO_NUM_23},
     {{NULL}, -1},
     {{&machine_pin_type}, GPIO_NUM_25},
+    #else
+    {{NULL}, -1},
+    {{NULL}, -1},
+    {{NULL}, -1},
+    {{NULL}, -1},
+    #endif
     {{&machine_pin_type}, GPIO_NUM_26},
     {{&machine_pin_type}, GPIO_NUM_27},
     {{NULL}, -1},
@@ -411,10 +418,17 @@ STATIC const machine_pin_irq_obj_t machine_pin_irq_object[] = {
     {{&machine_pin_irq_type}, GPIO_NUM_19},
     {{NULL}, -1},
     {{&machine_pin_irq_type}, GPIO_NUM_21},
+    #if CONFIG_IDF_TARGET_ESP32
     {{&machine_pin_irq_type}, GPIO_NUM_22},
     {{&machine_pin_irq_type}, GPIO_NUM_23},
     {{NULL}, -1},
     {{&machine_pin_irq_type}, GPIO_NUM_25},
+    #else
+    {{NULL}, -1},
+    {{NULL}, -1},
+    {{NULL}, -1},
+    {{NULL}, -1},
+    #endif
     {{&machine_pin_irq_type}, GPIO_NUM_26},
     {{&machine_pin_irq_type}, GPIO_NUM_27},
     {{NULL}, -1},

ports/esp32/machine_pwm.c

@@ -50,7 +50,11 @@ STATIC int chan_gpio[LEDC_CHANNEL_MAX];
 // 5khz
 #define PWFREQ (5000)
 // High speed mode
+#if CONFIG_IDF_TARGET_ESP32
 #define PWMODE (LEDC_HIGH_SPEED_MODE)
+#else
+#define PWMODE (LEDC_LOW_SPEED_MODE)
+#endif
 // 10-bit resolution (compatible with esp8266 PWM)
 #define PWRES (LEDC_TIMER_10_BIT)
 // Timer 1

ports/esp32/machine_sdcard.c

@@ -31,6 +31,8 @@
 #include "py/mperrno.h"
 #include "extmod/vfs_fat.h"
 
+#if MICROPY_HW_ENABLE_SDCARD
+
 #include "driver/sdmmc_host.h"
 #include "driver/sdspi_host.h"
 #include "sdmmc_cmd.h"
@@ -50,10 +52,6 @@
 // Hosts are de-inited in __del__. Slots do not need de-initing.
 //
 
-// Currently the ESP32 Library doesn't support MMC cards, so
-// we don't enable on MICROPY_HW_ENABLE_MMCARD.
-#if MICROPY_HW_ENABLE_SDCARD
-
 // Forward declaration
 const mp_obj_type_t machine_sdcard_type;
 

ports/esp32/machine_timer.c

@@ -30,12 +30,17 @@
 #include <stdint.h>
 #include <stdio.h>
 
-#include "driver/timer.h"
 #include "py/obj.h"
 #include "py/runtime.h"
 #include "modmachine.h"
 #include "mphalport.h"
 
+#include "driver/timer.h"
+#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(4, 1, 1)
+#include "hal/timer_ll.h"
+#define HAVE_TIMER_LL (1)
+#endif
+
 #define TIMER_INTR_SEL TIMER_INTR_LEVEL
 #define TIMER_DIVIDER  8
 
@@ -127,6 +132,18 @@ STATIC void machine_timer_isr(void *self_in) {
     machine_timer_obj_t *self = self_in;
     timg_dev_t *device = self->group ? &(TIMERG1) : &(TIMERG0);
 
+    #if HAVE_TIMER_LL
+
+    #if CONFIG_IDF_TARGET_ESP32
+    device->hw_timer[self->index].update = 1;
+    #else
+    device->hw_timer[self->index].update.update = 1;
+    #endif
+    timer_ll_clear_intr_status(device, self->index);
+    timer_ll_set_alarm_enable(device, self->index, self->repeat);
+
+    #else
+
     device->hw_timer[self->index].update = 1;
     if (self->index) {
         device->int_clr_timers.t1 = 1;
@@ -135,6 +152,8 @@ STATIC void machine_timer_isr(void *self_in) {
     }
     device->hw_timer[self->index].config.alarm_en = self->repeat;
 
+    #endif
+
     mp_sched_schedule(self->callback, self);
     mp_hal_wake_main_task_from_isr();
 }