diff --git a/boards.txt b/boards.txt
index 7e4a0ed6..599a39fd 100644
--- a/boards.txt
+++ b/boards.txt
@@ -1640,3 +1640,60 @@ CoreESP32.menu.UploadSpeed.460800.macosx=460800
 CoreESP32.menu.UploadSpeed.460800.upload.speed=460800
 CoreESP32.menu.UploadSpeed.512000.windows=512000
 CoreESP32.menu.UploadSpeed.512000.upload.speed=512000
+
+##############################################################
+
+wipy3.name=WiPy 3.0
+
+wipy3.upload.tool=esptool
+wipy3.upload.maximum_size=1310720
+wipy3.upload.maximum_data_size=294912
+wipy3.upload.wait_for_upload_port=true
+
+wipy3.serial.disableDTR=true
+wipy3.serial.disableRTS=true
+
+wipy3.build.mcu=esp32
+wipy3.build.core=esp32
+wipy3.build.variant=wipy3
+wipy3.build.board=WIPY3
+
+wipy3.build.f_cpu=240000000L
+wipy3.build.flash_mode=dio
+wipy3.build.flash_size=8MB
+wipy3.build.boot=dio
+wipy3.build.partitions=default
+
+wipy3.menu.FlashFreq.80=80MHz
+wipy3.menu.FlashFreq.80.build.flash_freq=80m
+wipy3.menu.FlashFreq.40=40MHz
+wipy3.menu.FlashFreq.40.build.flash_freq=40m
+
+wipy3.menu.UploadSpeed.921600=921600
+wipy3.menu.UploadSpeed.921600.upload.speed=921600
+wipy3.menu.UploadSpeed.115200=115200
+wipy3.menu.UploadSpeed.115200.upload.speed=115200
+wipy3.menu.UploadSpeed.256000.windows=256000
+wipy3.menu.UploadSpeed.256000.upload.speed=256000
+wipy3.menu.UploadSpeed.230400.windows.upload.speed=256000
+wipy3.menu.UploadSpeed.230400=230400
+wipy3.menu.UploadSpeed.230400.upload.speed=230400
+wipy3.menu.UploadSpeed.460800.linux=460800
+wipy3.menu.UploadSpeed.460800.macosx=460800
+wipy3.menu.UploadSpeed.460800.upload.speed=460800
+wipy3.menu.UploadSpeed.512000.windows=512000
+wipy3.menu.UploadSpeed.512000.upload.speed=512000
+
+wipy3.menu.DebugLevel.none=None
+wipy3.menu.DebugLevel.none.build.code_debug=0
+wipy3.menu.DebugLevel.error=Error
+wipy3.menu.DebugLevel.error.build.code_debug=1
+wipy3.menu.DebugLevel.warn=Warn
+wipy3.menu.DebugLevel.warn.build.code_debug=2
+wipy3.menu.DebugLevel.info=Info
+wipy3.menu.DebugLevel.info.build.code_debug=3
+wipy3.menu.DebugLevel.debug=Debug
+wipy3.menu.DebugLevel.debug.build.code_debug=4
+wipy3.menu.DebugLevel.verbose=Verbose
+wipy3.menu.DebugLevel.verbose.build.code_debug=5
+
diff --git a/variants/wipy3/pins_arduino.h b/variants/wipy3/pins_arduino.h
new file mode 100644
index 00000000..818963c7
--- /dev/null
+++ b/variants/wipy3/pins_arduino.h
@@ -0,0 +1,61 @@
+#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       18
+
+#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 LED_BUILTIN = 0; // ->2812 RGB !!!
+#define BUILTIN_LED  LED_BUILTIN // backward compatibility
+
+static const uint8_t TX = 1;
+static const uint8_t RX = 3;
+
+static const uint8_t SDA = 12;
+static const uint8_t SCL = 13;
+
+static const uint8_t SS    = 2;
+static const uint8_t MOSI  = 22;
+static const uint8_t MISO  = 37;
+static const uint8_t SCK   = 13;
+
+static const uint8_t A0 = 36;
+static const uint8_t A1 = 37;
+static const uint8_t A2 = 38;
+static const uint8_t A3 = 39;
+static const uint8_t A4 = 32;
+static const uint8_t A5 = 33;
+static const uint8_t A6 = 34;
+static const uint8_t A7 = 35;
+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 A17 = 27;
+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 T7 = 27;
+static const uint8_t T8 = 33;
+static const uint8_t T9 = 32;
+
+static const uint8_t DAC1 = 25;
+static const uint8_t DAC2 = 26;
+
+#endif /* Pins_Arduino_h */