diff --git a/boards.txt b/boards.txt
index 288edfbd..a31f995c 100644
--- a/boards.txt
+++ b/boards.txt
@@ -2480,6 +2480,77 @@ t-beam.menu.DebugLevel.verbose.build.code_debug=5
 
 ##############################################################
 
+d-duino-32.name=D-duino-32
+
+d-duino-32.upload.tool=esptool
+d-duino-32.upload.maximum_size=1310720
+d-duino-32.upload.maximum_data_size=327680
+d-duino-32.upload.wait_for_upload_port=true
+
+d-duino-32.serial.disableDTR=true
+d-duino-32.serial.disableRTS=true
+
+d-duino-32.build.mcu=esp32
+d-duino-32.build.core=esp32
+d-duino-32.build.variant=d-duino-32
+d-duino-32.build.board=D-duino-32
+
+d-duino-32.build.f_cpu=240000000L
+d-duino-32.build.flash_size=4MB
+d-duino-32.build.flash_freq=40m
+d-duino-32.build.flash_mode=dio
+d-duino-32.build.boot=dio
+d-duino-32.build.partitions=default
+d-duino-32.build.defines=
+
+d-duino-32.menu.PartitionScheme.default=Default
+d-duino-32.menu.PartitionScheme.default.build.partitions=default
+d-duino-32.menu.PartitionScheme.minimal=Minimal (2MB FLASH)
+d-duino-32.menu.PartitionScheme.minimal.build.partitions=minimal
+d-duino-32.menu.PartitionScheme.no_ota=No OTA (Large APP)
+d-duino-32.menu.PartitionScheme.no_ota.build.partitions=no_ota
+d-duino-32.menu.PartitionScheme.no_ota.upload.maximum_size=2097152
+d-duino-32.menu.PartitionScheme.min_spiffs=Minimal SPIFFS (Large APPS with OTA)
+d-duino-32.menu.PartitionScheme.min_spiffs.build.partitions=min_spiffs
+d-duino-32.menu.PartitionScheme.min_spiffs.upload.maximum_size=1966080
+d-duino-32.menu.PartitionScheme.fatflash=16M Fat
+d-duino-32.menu.PartitionScheme.fatflash.build.partitions=ffat
+
+d-duino-32.menu.FlashFreq.80=80MHz
+d-duino-32.menu.FlashFreq.80.build.flash_freq=80m
+d-duino-32.menu.FlashFreq.40=40MHz
+d-duino-32.menu.FlashFreq.40.build.flash_freq=40m
+
+d-duino-32.menu.UploadSpeed.921600=921600
+d-duino-32.menu.UploadSpeed.921600.upload.speed=921600
+d-duino-32.menu.UploadSpeed.115200=115200
+d-duino-32.menu.UploadSpeed.115200.upload.speed=115200
+d-duino-32.menu.UploadSpeed.256000.windows=256000
+d-duino-32.menu.UploadSpeed.256000.upload.speed=256000
+d-duino-32.menu.UploadSpeed.230400.windows.upload.speed=256000
+d-duino-32.menu.UploadSpeed.230400=230400
+d-duino-32.menu.UploadSpeed.230400.upload.speed=230400
+d-duino-32.menu.UploadSpeed.460800.linux=460800
+d-duino-32.menu.UploadSpeed.460800.macosx=460800
+d-duino-32.menu.UploadSpeed.460800.upload.speed=460800
+d-duino-32.menu.UploadSpeed.512000.windows=512000
+d-duino-32.menu.UploadSpeed.512000.upload.speed=512000
+
+d-duino-32.menu.DebugLevel.none=None
+d-duino-32.menu.DebugLevel.none.build.code_debug=0
+d-duino-32.menu.DebugLevel.error=Error
+d-duino-32.menu.DebugLevel.error.build.code_debug=1
+d-duino-32.menu.DebugLevel.warn=Warn
+d-duino-32.menu.DebugLevel.warn.build.code_debug=2
+d-duino-32.menu.DebugLevel.info=Info
+d-duino-32.menu.DebugLevel.info.build.code_debug=3
+d-duino-32.menu.DebugLevel.debug=Debug
+d-duino-32.menu.DebugLevel.debug.build.code_debug=4
+d-duino-32.menu.DebugLevel.verbose=Verbose
+d-duino-32.menu.DebugLevel.verbose.build.code_debug=5
+
+##############################################################
+
 lopy.name=LoPy
 
 lopy.upload.tool=esptool
@@ -2594,5 +2665,3 @@ lopy4.menu.DebugLevel.debug=Debug
 lopy4.menu.DebugLevel.debug.build.code_debug=4
 lopy4.menu.DebugLevel.verbose=Verbose
 lopy4.menu.DebugLevel.verbose.build.code_debug=5
-
-
diff --git a/variants/d-duino-32/pins_arduino.h b/variants/d-duino-32/pins_arduino.h
new file mode 100644
index 00000000..19a1eb91
--- /dev/null
+++ b/variants/d-duino-32/pins_arduino.h
@@ -0,0 +1,64 @@
+#ifndef Pins_Arduino_h
+#define Pins_Arduino_h
+
+#include <stdint.h>
+
+#define EXTERNAL_NUM_INTERRUPTS 16
+#define NUM_DIGITAL_PINS        40
+#define NUM_ANALOG_INPUTS       16
+
+#define analogInputToDigitalPin(p)  (((p)<20)?(esp32_adc2gpio[(p)]):-1)
+#define digitalPinToInterrupt(p)    (((p)<40)?(p):-1)
+#define digitalPinHasPWM(p)         (p < 34)
+
+static const uint8_t TX = 1;
+static const uint8_t RX = 3;
+
+static const uint8_t SDA = 5;
+static const uint8_t SCL = 4;
+
+static const uint8_t SS    = 15;
+static const uint8_t MOSI  = 13;
+static const uint8_t MISO  = 12;
+static const uint8_t SCK   = 14;
+
+static const uint8_t A0 = 36;
+static const uint8_t A3 = 39;
+static const uint8_t A10 = 4;
+static const uint8_t A11 = 0;
+static const uint8_t A12 = 2;
+static const uint8_t A13 = 15;
+static const uint8_t A14 = 13;
+static const uint8_t A15 = 12;
+static const uint8_t A16 = 14;
+static const uint8_t A18 = 25;
+static const uint8_t A19 = 26;
+
+static const uint8_t T0 = 4;
+static const uint8_t T1 = 0;
+static const uint8_t T2 = 2;
+static const uint8_t T3 = 15;
+static const uint8_t T4 = 13;
+static const uint8_t T5 = 12;
+static const uint8_t T6 = 14;
+
+static const uint8_t DAC1 = 25;
+static const uint8_t DAC2 = 26;
+
+// Wemos Grove Shield
+static const uint8_t D1 = 5;
+static const uint8_t D2 = 4;
+static const uint8_t D3 = 0;
+static const uint8_t D4 = 2;
+static const uint8_t D5 = 14;
+static const uint8_t D6 = 12;
+static const uint8_t D7 = 13;
+static const uint8_t D8 = 15;
+static const uint8_t D9 = 3;
+static const uint8_t D10 = 1;
+
+// OLed
+static const uint8_t OLED_SCL = SCL;
+static const uint8_t OLED_SDA = SDA;
+
+#endif /* Pins_Arduino_h */