diff --git a/boards.txt b/boards.txt
index 248cb7a8fa9..5d2fd5d2d05 100644
--- a/boards.txt
+++ b/boards.txt
@@ -466,6 +466,127 @@ pico32.menu.DebugLevel.debug.build.code_debug=4
 pico32.menu.DebugLevel.verbose=Verbose
 pico32.menu.DebugLevel.verbose.build.code_debug=5
 
+##############################################################
+micros2.name=microS2
+micros2.vid.0=0x239A
+micros2.pid.0=0x80C5
+
+micros2.upload.tool=esptool_py
+micros2.upload.maximum_size=1310720
+micros2.upload.maximum_data_size=327680
+micros2.upload.flags=
+
+micros2.serial.disableDTR=false
+micros2.serial.disableRTS=false
+
+micros2.build.mcu=esp32s2
+micros2.build.core=esp32
+micros2.build.variant=micro_s2
+micros2.build.board=MICROS2
+
+micros2.build.serial=1
+micros2.build.f_cpu=240000000L
+micros2.build.flash_size=16MB
+micros2.build.flash_freq=80m
+micros2.build.flash_mode=dio
+micros2.build.boot=qio
+micros2.build.partitions=fatflash
+micros2.build.defines=
+
+micros2.menu.SerialMode.cdc=USB CDC
+micros2.menu.SerialMode.cdc.build.serial=1
+micros2.menu.SerialMode.default=UART0
+micros2.menu.SerialMode.default.build.serial=0
+
+micros2.menu.PSRAM.enabled=Enabled
+micros2.menu.PSRAM.enabled.build.defines=-DBOARD_HAS_PSRAM
+micros2.menu.PSRAM.disabled=Disabled
+micros2.menu.PSRAM.disabled.build.defines=
+
+micros2.menu.PartitionScheme.fatflash=16M Flash (2MB APP/12.5MB FAT)
+micros2.menu.PartitionScheme.fatflash.build.partitions=ffat
+micros2.menu.PartitionScheme.fatflash.upload.maximum_size=2097152
+micros2.menu.PartitionScheme.app3M_fat9M_16MB=16M Flash (3MB APP/9MB FATFS)
+micros2.menu.PartitionScheme.app3M_fat9M_16MB.build.partitions=app3M_fat9M_16MB
+micros2.menu.PartitionScheme.app3M_fat9M_16MB.upload.maximum_size=3145728
+micros2.menu.PartitionScheme.default=Default 4MB with spiffs (1.2MB APP/1.5MB SPIFFS)
+micros2.menu.PartitionScheme.default.build.partitions=default
+micros2.menu.PartitionScheme.defaultffat=Default 4MB with ffat (1.2MB APP/1.5MB FATFS)
+micros2.menu.PartitionScheme.defaultffat.build.partitions=default_ffat
+micros2.menu.PartitionScheme.default_8MB=8M Flash (3MB APP/1.5MB FAT)
+micros2.menu.PartitionScheme.default_8MB.build.partitions=default_8MB
+micros2.menu.PartitionScheme.default_8MB.upload.maximum_size=3342336
+micros2.menu.PartitionScheme.minimal=Minimal (1.3MB APP/700KB SPIFFS)
+micros2.menu.PartitionScheme.minimal.build.partitions=minimal
+micros2.menu.PartitionScheme.no_ota=No OTA (2MB APP/2MB SPIFFS)
+micros2.menu.PartitionScheme.no_ota.build.partitions=no_ota
+micros2.menu.PartitionScheme.no_ota.upload.maximum_size=2097152
+micros2.menu.PartitionScheme.noota_3g=No OTA (1MB APP/3MB SPIFFS)
+micros2.menu.PartitionScheme.noota_3g.build.partitions=noota_3g
+micros2.menu.PartitionScheme.noota_3g.upload.maximum_size=1048576
+micros2.menu.PartitionScheme.noota_ffat=No OTA (2MB APP/2MB FATFS)
+micros2.menu.PartitionScheme.noota_ffat.build.partitions=noota_ffat
+micros2.menu.PartitionScheme.noota_ffat.upload.maximum_size=2097152
+micros2.menu.PartitionScheme.noota_3gffat=No OTA (1MB APP/3MB FATFS)
+micros2.menu.PartitionScheme.noota_3gffat.build.partitions=noota_3gffat
+micros2.menu.PartitionScheme.noota_3gffat.upload.maximum_size=1048576
+micros2.menu.PartitionScheme.huge_app=Huge APP (3MB No OTA/1MB SPIFFS)
+micros2.menu.PartitionScheme.huge_app.build.partitions=huge_app
+micros2.menu.PartitionScheme.huge_app.upload.maximum_size=3145728
+micros2.menu.PartitionScheme.min_spiffs=Minimal SPIFFS (1.9MB APP with OTA/190KB SPIFFS)
+micros2.menu.PartitionScheme.min_spiffs.build.partitions=min_spiffs
+micros2.menu.PartitionScheme.min_spiffs.upload.maximum_size=1966080
+
+micros2.menu.CPUFreq.240=240MHz (WiFi)
+micros2.menu.CPUFreq.240.build.f_cpu=240000000L
+micros2.menu.CPUFreq.160=160MHz (WiFi)
+micros2.menu.CPUFreq.160.build.f_cpu=160000000L
+micros2.menu.CPUFreq.80=80MHz (WiFi)
+micros2.menu.CPUFreq.80.build.f_cpu=80000000L
+micros2.menu.CPUFreq.40=40MHz
+micros2.menu.CPUFreq.40.build.f_cpu=40000000L
+micros2.menu.CPUFreq.20=20MHz
+micros2.menu.CPUFreq.20.build.f_cpu=20000000L
+micros2.menu.CPUFreq.10=10MHz
+micros2.menu.CPUFreq.10.build.f_cpu=10000000L
+
+micros2.menu.FlashSize.16M=16MB (128Mb)
+micros2.menu.FlashSize.16M.build.flash_size=16MB
+micros2.menu.FlashSize.4M=4MB (32Mb)
+micros2.menu.FlashSize.4M.build.flash_size=4MB
+micros2.menu.FlashSize.8M=8MB (64Mb)
+micros2.menu.FlashSize.8M.build.flash_size=8MB
+micros2.menu.FlashSize.8M.build.partitions=default_8MB
+micros2.menu.FlashSize.2M=2MB (16Mb)
+micros2.menu.FlashSize.2M.build.flash_size=2MB
+micros2.menu.FlashSize.2M.build.partitions=minimal
+
+micros2.menu.UploadSpeed.921600=921600
+micros2.menu.UploadSpeed.921600.upload.speed=921600
+micros2.menu.UploadSpeed.115200=115200
+micros2.menu.UploadSpeed.115200.upload.speed=115200
+micros2.menu.UploadSpeed.256000.windows=256000
+micros2.menu.UploadSpeed.256000.upload.speed=256000
+micros2.menu.UploadSpeed.230400.windows.upload.speed=256000
+micros2.menu.UploadSpeed.230400=230400
+micros2.menu.UploadSpeed.230400.upload.speed=230400
+micros2.menu.UploadSpeed.460800.linux=460800
+micros2.menu.UploadSpeed.460800.macosx=460800
+micros2.menu.UploadSpeed.460800.upload.speed=460800
+
+micros2.menu.DebugLevel.none=None
+micros2.menu.DebugLevel.none.build.code_debug=0
+micros2.menu.DebugLevel.error=Error
+micros2.menu.DebugLevel.error.build.code_debug=1
+micros2.menu.DebugLevel.warn=Warn
+micros2.menu.DebugLevel.warn.build.code_debug=2
+micros2.menu.DebugLevel.info=Info
+micros2.menu.DebugLevel.info.build.code_debug=3
+micros2.menu.DebugLevel.debug=Debug
+micros2.menu.DebugLevel.debug.build.code_debug=4
+micros2.menu.DebugLevel.verbose=Verbose
+micros2.menu.DebugLevel.verbose.build.code_debug=5
+
 ##############################################################
 tinypico.name=UM TinyPICO
 
diff --git a/variants/micro_s2/pins_arduino.h b/variants/micro_s2/pins_arduino.h
new file mode 100644
index 00000000000..d95e8f1ac30
--- /dev/null
+++ b/variants/micro_s2/pins_arduino.h
@@ -0,0 +1,77 @@
+#ifndef Pins_Arduino_h
+#define Pins_Arduino_h
+
+#include <stdint.h>
+
+#define USB_VID 0x239A
+#define USB_PID 0x80C5
+#define USB_MANUFACTURER "microDev"
+#define USB_PRODUCT "microS2"
+#define USB_SERIAL ""
+
+#define EXTERNAL_NUM_INTERRUPTS 46
+#define NUM_DIGITAL_PINS        48
+#define NUM_ANALOG_INPUTS       20
+
+#define analogInputToDigitalPin(p)  (((p)<20)?(esp32_adc2gpio[(p)]):-1)
+#define digitalPinToInterrupt(p)    (((p)<48)?(p):-1)
+#define digitalPinHasPWM(p)         (p < 46)
+
+static const uint8_t TX = 43;
+static const uint8_t RX = 44;
+
+static const uint8_t SDA = 8;
+static const uint8_t SCL = 9;
+
+static const uint8_t SS    = 34;
+static const uint8_t MOSI  = 35;
+static const uint8_t MISO  = 37;
+static const uint8_t SDO  = 35;
+static const uint8_t SDI  = 37;
+static const uint8_t SCK   = 36;
+
+static const uint8_t A0 = 1;
+static const uint8_t A1 = 2;
+static const uint8_t A2 = 3;
+static const uint8_t A3 = 4;
+static const uint8_t A4 = 5;
+static const uint8_t A5 = 6;
+static const uint8_t A6 = 7;
+static const uint8_t A7 = 8;
+static const uint8_t A8 = 9;
+static const uint8_t A9 = 10;
+static const uint8_t A10 = 11;
+static const uint8_t A11 = 12;
+static const uint8_t A12 = 13;
+static const uint8_t A13 = 14;
+static const uint8_t A14 = 15;
+static const uint8_t A15 = 16;
+static const uint8_t A16 = 17;
+static const uint8_t A17 = 18;
+static const uint8_t A18 = 19;
+static const uint8_t A19 = 20;
+
+static const uint8_t T1 = 1;
+static const uint8_t T2 = 2;
+static const uint8_t T3 = 3;
+static const uint8_t T4 = 4;
+static const uint8_t T5 = 5;
+static const uint8_t T6 = 6;
+static const uint8_t T7 = 7;
+static const uint8_t T8 = 8;
+static const uint8_t T9 = 9;
+static const uint8_t T10 = 10;
+static const uint8_t T11 = 11;
+static const uint8_t T12 = 12;
+static const uint8_t T13 = 13;
+static const uint8_t T14 = 14;
+
+static const uint8_t DAC1 = 17;
+static const uint8_t DAC2 = 18;
+
+static const uint8_t LED_BUILTIN =  21;
+#define BUILTIN_LED  LED_BUILTIN    // backward compatibility
+static const uint8_t PIXEL_BUILTIN = 33;
+static const uint8_t BUTTON_BUILTIN = 0;
+
+#endif /* Pins_Arduino_h */