diff --git a/boards.txt b/boards.txt index 5d133d147e6..ced2f5c396d 100644 --- a/boards.txt +++ b/boards.txt @@ -3794,6 +3794,13 @@ adafruit_metro_esp32s2.menu.DFUOnBoot.default.build.dfu_on_boot=0 adafruit_metro_esp32s2.menu.DFUOnBoot.dfu=Enabled adafruit_metro_esp32s2.menu.DFUOnBoot.dfu.build.dfu_on_boot=1 +adafruit_metro_esp32s2.menu.UploadMode.cdc=Internal USB +adafruit_metro_esp32s2.menu.UploadMode.cdc.upload.use_1200bps_touch=true +adafruit_metro_esp32s2.menu.UploadMode.cdc.upload.wait_for_upload_port=true +adafruit_metro_esp32s2.menu.UploadMode.default=UART0 +adafruit_metro_esp32s2.menu.UploadMode.default.upload.use_1200bps_touch=false +adafruit_metro_esp32s2.menu.UploadMode.default.upload.wait_for_upload_port=false + adafruit_metro_esp32s2.menu.PSRAM.enabled=Enabled adafruit_metro_esp32s2.menu.PSRAM.enabled.build.defines=-DBOARD_HAS_PSRAM adafruit_metro_esp32s2.menu.PSRAM.disabled=Disabled @@ -3908,11 +3915,11 @@ adafruit_metro_esp32s2.menu.DebugLevel.verbose.build.code_debug=5 adafruit_magtag29_esp32s2.name=Adafruit MagTag 2.9" adafruit_magtag29_esp32s2.vid.0=0x239A -adafruit_magtag29_esp32s2.pid.0=0x80DF +adafruit_magtag29_esp32s2.pid.0=0x80E5 adafruit_magtag29_esp32s2.vid.1=0x239A -adafruit_magtag29_esp32s2.pid.1=0x00DF +adafruit_magtag29_esp32s2.pid.1=0x00E5 adafruit_magtag29_esp32s2.vid.1=0x239A -adafruit_magtag29_esp32s2.pid.1=0x80E0 +adafruit_magtag29_esp32s2.pid.1=0x80E6 adafruit_magtag29_esp32s2.upload.tool=esptool_py adafruit_magtag29_esp32s2.upload.maximum_size=1310720 @@ -3959,6 +3966,13 @@ adafruit_magtag29_esp32s2.menu.DFUOnBoot.default.build.dfu_on_boot=0 adafruit_magtag29_esp32s2.menu.DFUOnBoot.dfu=Enabled adafruit_magtag29_esp32s2.menu.DFUOnBoot.dfu.build.dfu_on_boot=1 +adafruit_magtag29_esp32s2.menu.UploadMode.cdc=Internal USB +adafruit_magtag29_esp32s2.menu.UploadMode.cdc.upload.use_1200bps_touch=true +adafruit_magtag29_esp32s2.menu.UploadMode.cdc.upload.wait_for_upload_port=true +adafruit_magtag29_esp32s2.menu.UploadMode.default=UART0 +adafruit_magtag29_esp32s2.menu.UploadMode.default.upload.use_1200bps_touch=false +adafruit_magtag29_esp32s2.menu.UploadMode.default.upload.wait_for_upload_port=false + adafruit_magtag29_esp32s2.menu.PSRAM.enabled=Enabled adafruit_magtag29_esp32s2.menu.PSRAM.enabled.build.defines=-DBOARD_HAS_PSRAM adafruit_magtag29_esp32s2.menu.PSRAM.disabled=Disabled @@ -4124,6 +4138,13 @@ adafruit_funhouse_esp32s2.menu.DFUOnBoot.default.build.dfu_on_boot=0 adafruit_funhouse_esp32s2.menu.DFUOnBoot.dfu=Enabled adafruit_funhouse_esp32s2.menu.DFUOnBoot.dfu.build.dfu_on_boot=1 +adafruit_funhouse_esp32s2.menu.UploadMode.cdc=Internal USB +adafruit_funhouse_esp32s2.menu.UploadMode.cdc.upload.use_1200bps_touch=true +adafruit_funhouse_esp32s2.menu.UploadMode.cdc.upload.wait_for_upload_port=true +adafruit_funhouse_esp32s2.menu.UploadMode.default=UART0 +adafruit_funhouse_esp32s2.menu.UploadMode.default.upload.use_1200bps_touch=false +adafruit_funhouse_esp32s2.menu.UploadMode.default.upload.wait_for_upload_port=false + adafruit_funhouse_esp32s2.menu.PSRAM.enabled=Enabled adafruit_funhouse_esp32s2.menu.PSRAM.enabled.build.defines=-DBOARD_HAS_PSRAM adafruit_funhouse_esp32s2.menu.PSRAM.disabled=Disabled diff --git a/variants/adafruit_feather_esp32s2/bootloader.bin b/variants/adafruit_feather_esp32s2/bootloader.bin index 0ee2a679b49..e2797e37f9d 100644 Binary files a/variants/adafruit_feather_esp32s2/bootloader.bin and b/variants/adafruit_feather_esp32s2/bootloader.bin differ diff --git a/variants/adafruit_feather_esp32s2/pins_arduino.h b/variants/adafruit_feather_esp32s2/pins_arduino.h index f84ab6fe0e2..36f23d63186 100644 --- a/variants/adafruit_feather_esp32s2/pins_arduino.h +++ b/variants/adafruit_feather_esp32s2/pins_arduino.h @@ -4,11 +4,11 @@ #include -#define USB_VID 0x239A -#define USB_PID 0x80EB -#define USB_MANUFACTURER "Adafruit" -#define USB_PRODUCT "Adafruit Feather ESP32-S2" -#define USB_SERIAL "" +#define USB_VID 0x239A +#define USB_PID 0x80EB +#define USB_MANUFACTURER "Adafruit" +#define USB_PRODUCT "Feather ESP32-S2" +#define USB_SERIAL "" // Empty string for MAC adddress #define EXTERNAL_NUM_INTERRUPTS 46 @@ -19,12 +19,12 @@ #define digitalPinToInterrupt(p) (((p)<48)?(p):-1) #define digitalPinHasPWM(p) (p < 46) -static const uint8_t PIN_NEOPIXEL = 33; -static const uint8_t PIN_NEOPIXEL_POWER = 21; -static const uint8_t LED_BUILTIN = 13; +#define LED_BUILTIN 13 -static const uint8_t TX = 39; -static const uint8_t RX = 38; +#define PIN_NEOPIXEL 33 +#define NEOPIXEL_NUM 1 // number of neopixels +#define NEOPIXEL_POWER 21 // power pin +#define NEOPIXEL_POWER_ON HIGH // power pin state when on static const uint8_t SDA = 3; static const uint8_t SCL = 4; @@ -41,6 +41,12 @@ static const uint8_t A3 = 15; static const uint8_t A4 = 14; static const uint8_t A5 = 8; + + + +static const uint8_t TX = 43; +static const uint8_t RX = 44; + static const uint8_t T1 = 1; static const uint8_t T2 = 2; static const uint8_t T3 = 3; diff --git a/variants/adafruit_feather_esp32s2/tinyuf2.bin b/variants/adafruit_feather_esp32s2/tinyuf2.bin index 92f792ff1b5..434c8c97adc 100644 Binary files a/variants/adafruit_feather_esp32s2/tinyuf2.bin and b/variants/adafruit_feather_esp32s2/tinyuf2.bin differ diff --git a/variants/adafruit_funhouse_esp32s2/bootloader.bin b/variants/adafruit_funhouse_esp32s2/bootloader.bin index be442c44e98..a8d573b0491 100644 Binary files a/variants/adafruit_funhouse_esp32s2/bootloader.bin and b/variants/adafruit_funhouse_esp32s2/bootloader.bin differ diff --git a/variants/adafruit_funhouse_esp32s2/pins_arduino.h b/variants/adafruit_funhouse_esp32s2/pins_arduino.h index bef0a830970..3b8d19e329b 100644 --- a/variants/adafruit_funhouse_esp32s2/pins_arduino.h +++ b/variants/adafruit_funhouse_esp32s2/pins_arduino.h @@ -4,12 +4,11 @@ #include -#define USB_VID 0x239A -#define USB_PID 0x80F9 - -#define USB_MANUFACTURER "Adafruit" -#define USB_PRODUCT "Adafruit Funhouse ESP32-S2" -#define USB_SERIAL "" +#define USB_VID 0x239A +#define USB_PID 0x80F9 +#define USB_MANUFACTURER "Adafruit" +#define USB_PRODUCT "Funhouse ESP32-S2" +#define USB_SERIAL "" // Empty string for MAC adddress #define EXTERNAL_NUM_INTERRUPTS 46 @@ -20,24 +19,27 @@ #define digitalPinToInterrupt(p) (((p)<48)?(p):-1) #define digitalPinHasPWM(p) (p < 46) +#define LED_BUILTIN 37 + +#define PIN_BUTTON1 3 +#define PIN_BUTTON2 4 +#define PIN_BUTTON3 5 +#define PIN_BUTTON4 0 // BOOT0 switch + static const uint8_t PIN_DOTSTAR_DATA = 14; static const uint8_t PIN_DOTSTAR_CLOCK = 15; -static const uint8_t LED_BUILTIN = 37; -static const uint8_t TX = 2; -static const uint8_t RX = 3; +static const uint8_t TFT_BACKLIGHT = 21; +static const uint8_t TFT_DC = 39; +static const uint8_t TFT_CS = 40; +static const uint8_t TFT_RESET = 41; -static const uint8_t TFT_BACKLIGHT = 21; -static const uint8_t TFT_DC = 39; -static const uint8_t TFT_CS = 40; -static const uint8_t TFT_RESET = 41; - -static const uint8_t SPEAKER = 42; -static const uint8_t BUTTON_DOWN = 3; -static const uint8_t BUTTON_SELECT = 4; -static const uint8_t BUTTON_UP = 5; -static const uint8_t SENSOR_PIR = 16; -static const uint8_t SENSOR_LIGHT = 18; +static const uint8_t SPEAKER = 42; +static const uint8_t BUTTON_DOWN = PIN_BUTTON1; +static const uint8_t BUTTON_SELECT = PIN_BUTTON2; +static const uint8_t BUTTON_UP = PIN_BUTTON3; +static const uint8_t SENSOR_PIR = 16; +static const uint8_t SENSOR_LIGHT = 18; static const uint8_t SDA = 34; static const uint8_t SCL = 33; @@ -49,9 +51,16 @@ static const uint8_t MISO = 37; static const uint8_t A0 = 17; static const uint8_t A1 = 2; -static const uint8_t A2 = 3; +static const uint8_t A2 = 1; static const uint8_t A3 = 18; // light sensor + + + + +static const uint8_t TX = 43; +static const uint8_t RX = 44; + static const uint8_t T1 = 1; static const uint8_t T2 = 2; static const uint8_t T3 = 3; diff --git a/variants/adafruit_funhouse_esp32s2/tinyuf2.bin b/variants/adafruit_funhouse_esp32s2/tinyuf2.bin index 71de9d52fe0..9b344159d75 100644 Binary files a/variants/adafruit_funhouse_esp32s2/tinyuf2.bin and b/variants/adafruit_funhouse_esp32s2/tinyuf2.bin differ diff --git a/variants/adafruit_magtag29_esp32s2/bootloader.bin b/variants/adafruit_magtag29_esp32s2/bootloader.bin index 6dc55ab400c..2ba2cd8c433 100644 Binary files a/variants/adafruit_magtag29_esp32s2/bootloader.bin and b/variants/adafruit_magtag29_esp32s2/bootloader.bin differ diff --git a/variants/adafruit_magtag29_esp32s2/pins_arduino.h b/variants/adafruit_magtag29_esp32s2/pins_arduino.h index c015aff6864..55aafd1a657 100644 --- a/variants/adafruit_magtag29_esp32s2/pins_arduino.h +++ b/variants/adafruit_magtag29_esp32s2/pins_arduino.h @@ -4,11 +4,11 @@ #include -#define USB_VID 0x239A -#define USB_PID 0x80DF -#define USB_MANUFACTURER "Adafruit" -#define USB_PRODUCT "EPD MagTag 2.9\" ESP32-S2" -#define USB_SERIAL "" +#define USB_VID 0x239A +#define USB_PID 0x80E5 +#define USB_MANUFACTURER "Adafruit" +#define USB_PRODUCT "EPD MagTag 2.9\" ESP32-S2" +#define USB_SERIAL "" // Empty string for MAC adddress #define EXTERNAL_NUM_INTERRUPTS 46 @@ -19,22 +19,31 @@ #define digitalPinToInterrupt(p) (((p)<48)?(p):-1) #define digitalPinHasPWM(p) (p < 46) -static const uint8_t PIN_NEOPIXEL = 1; // D1 -static const uint8_t NEOPIXEL_POWER = 21; +#define LED_BUILTIN 13 -static const uint8_t LED_BUILTIN = 13; +#define PIN_NEOPIXEL 1 // D1 +#define NEOPIXEL_NUM 4 // number of neopixels +#define NEOPIXEL_POWER 21 // power pin +#define NEOPIXEL_POWER_ON LOW // power pin state when on -static const uint8_t EPD_BUSY = 5; + +#define PIN_BUTTON1 15 +#define PIN_BUTTON2 14 +#define PIN_BUTTON3 12 +#define PIN_BUTTON4 11 +#define PIN_BUTTON5 0 // BOOT0 switch + +static const uint8_t EPD_BUSY = 5; static const uint8_t EPD_RESET = 6; -static const uint8_t EPD_DC = 7; -static const uint8_t EPD_CS = 8; +static const uint8_t EPD_DC = 7; +static const uint8_t EPD_CS = 8; static const uint8_t ACCEL_IRQ = 9; -static const uint8_t BUTTON_A = 15; -static const uint8_t BUTTON_B = 14; -static const uint8_t BUTTON_C = 12; -static const uint8_t BUTTON_D = 11; +static const uint8_t BUTTON_A = PIN_BUTTON1; +static const uint8_t BUTTON_B = PIN_BUTTON2; +static const uint8_t BUTTON_C = PIN_BUTTON3; +static const uint8_t BUTTON_D = PIN_BUTTON4; static const uint8_t LIGHT_SENSOR = 3; static const uint8_t BATT_MONITOR = 4; @@ -52,8 +61,8 @@ static const uint8_t MISO = 37; -static const uint8_t TX = 37; -static const uint8_t RX = 38; +static const uint8_t TX = 43; +static const uint8_t RX = 44; static const uint8_t A0 = 17; diff --git a/variants/adafruit_magtag29_esp32s2/tinyuf2.bin b/variants/adafruit_magtag29_esp32s2/tinyuf2.bin index 7b7562f1fb6..8f78bc9d0cb 100644 Binary files a/variants/adafruit_magtag29_esp32s2/tinyuf2.bin and b/variants/adafruit_magtag29_esp32s2/tinyuf2.bin differ diff --git a/variants/adafruit_metro_esp32s2/bootloader.bin b/variants/adafruit_metro_esp32s2/bootloader.bin index acc9a0cfeea..87938c4771a 100644 Binary files a/variants/adafruit_metro_esp32s2/bootloader.bin and b/variants/adafruit_metro_esp32s2/bootloader.bin differ diff --git a/variants/adafruit_metro_esp32s2/pins_arduino.h b/variants/adafruit_metro_esp32s2/pins_arduino.h index db016d4716f..b7eb3778c1e 100644 --- a/variants/adafruit_metro_esp32s2/pins_arduino.h +++ b/variants/adafruit_metro_esp32s2/pins_arduino.h @@ -4,12 +4,11 @@ #include -#define USB_VID 0x239A -#define USB_PID 0x80DF -#define USB_MANUFACTURER "Adafruit" -#define USB_PRODUCT "Metro ESP32-S2" -#define USB_SERIAL "" - +#define USB_VID 0x239A +#define USB_PID 0x80DF +#define USB_MANUFACTURER "Adafruit" +#define USB_PRODUCT "Metro ESP32-S2" +#define USB_SERIAL "" // Empty string for MAC adddress #define EXTERNAL_NUM_INTERRUPTS 46 #define NUM_DIGITAL_PINS 48 @@ -19,8 +18,12 @@ #define digitalPinToInterrupt(p) (((p)<48)?(p):-1) #define digitalPinHasPWM(p) (p < 46) -static const uint8_t PIN_NEOPIXEL = 45; -static const uint8_t LED_BUILTIN = 42; +#define LED_BUILTIN 42 + +#define PIN_NEOPIXEL 45 +#define NEOPIXEL_NUM 1 + +#define PIN_BUTTON1 0 // BOOT0 switch static const uint8_t TX = 5; static const uint8_t RX = 6; diff --git a/variants/adafruit_metro_esp32s2/tinyuf2.bin b/variants/adafruit_metro_esp32s2/tinyuf2.bin index 6d2d3a51357..33c7995162d 100644 Binary files a/variants/adafruit_metro_esp32s2/tinyuf2.bin and b/variants/adafruit_metro_esp32s2/tinyuf2.bin differ