diff --git a/boards.txt b/boards.txt
index 7204ffdca5..fd128a4f69 100644
--- a/boards.txt
+++ b/boards.txt
@@ -3844,6 +3844,234 @@ inventone.menu.eesz.autoflash.build.flash_ld=eagle.flash.auto.ld
 inventone.menu.eesz.autoflash.build.extra_flags=-DFLASH_MAP_SUPPORT=1
 inventone.menu.eesz.autoflash.upload.maximum_size=1044464
 
+##############################################################
+d1_wroom_02.name=LOLIN(WEMOS) D1 ESP-WROOM-02
+d1_wroom_02.build.board=ESP8266_WEMOS_D1WROOM02
+d1_wroom_02.build.variant=d1_mini
+d1_wroom_02.upload.tool=esptool
+d1_wroom_02.upload.maximum_data_size=81920
+d1_wroom_02.upload.wait_for_upload_port=true
+d1_wroom_02.upload.erase_cmd=
+d1_wroom_02.serial.disableDTR=true
+d1_wroom_02.serial.disableRTS=true
+d1_wroom_02.build.mcu=esp8266
+d1_wroom_02.build.core=esp8266
+d1_wroom_02.build.spiffs_pagesize=256
+d1_wroom_02.build.debug_port=
+d1_wroom_02.build.debug_level=
+d1_wroom_02.menu.xtal.80=80 MHz
+d1_wroom_02.menu.xtal.80.build.f_cpu=80000000L
+d1_wroom_02.menu.xtal.160=160 MHz
+d1_wroom_02.menu.xtal.160.build.f_cpu=160000000L
+d1_wroom_02.menu.vt.flash=Flash
+d1_wroom_02.menu.vt.flash.build.vtable_flags=-DVTABLES_IN_FLASH
+d1_wroom_02.menu.vt.heap=Heap
+d1_wroom_02.menu.vt.heap.build.vtable_flags=-DVTABLES_IN_DRAM
+d1_wroom_02.menu.vt.iram=IRAM
+d1_wroom_02.menu.vt.iram.build.vtable_flags=-DVTABLES_IN_IRAM
+d1_wroom_02.menu.exception.disabled=Disabled (new aborts on oom)
+d1_wroom_02.menu.exception.disabled.build.exception_flags=-fno-exceptions
+d1_wroom_02.menu.exception.disabled.build.stdcpp_lib=-lstdc++
+d1_wroom_02.menu.exception.enabled=Enabled
+d1_wroom_02.menu.exception.enabled.build.exception_flags=-fexceptions
+d1_wroom_02.menu.exception.enabled.build.stdcpp_lib=-lstdc++-exc
+d1_wroom_02.menu.stacksmash.disabled=Disabled
+d1_wroom_02.menu.stacksmash.disabled.build.stacksmash_flags=
+d1_wroom_02.menu.stacksmash.enabled=Enabled
+d1_wroom_02.menu.stacksmash.enabled.build.stacksmash_flags=-fstack-protector
+d1_wroom_02.menu.ssl.all=All SSL ciphers (most compatible)
+d1_wroom_02.menu.ssl.all.build.sslflags=
+d1_wroom_02.menu.ssl.basic=Basic SSL ciphers (lower ROM use)
+d1_wroom_02.menu.ssl.basic.build.sslflags=-DBEARSSL_SSL_BASIC
+d1_wroom_02.menu.mmu.3232=32KB cache + 32KB IRAM (balanced)
+d1_wroom_02.menu.mmu.3232.build.mmuflags=-DMMU_IRAM_SIZE=0x8000 -DMMU_ICACHE_SIZE=0x8000
+d1_wroom_02.menu.mmu.4816=16KB cache + 48KB IRAM (IRAM)
+d1_wroom_02.menu.mmu.4816.build.mmuflags=-DMMU_IRAM_SIZE=0xC000 -DMMU_ICACHE_SIZE=0x4000
+d1_wroom_02.menu.mmu.4816H=16KB cache + 48KB IRAM and 2nd Heap (shared)
+d1_wroom_02.menu.mmu.4816H.build.mmuflags=-DMMU_IRAM_SIZE=0xC000 -DMMU_ICACHE_SIZE=0x4000 -DMMU_IRAM_HEAP
+d1_wroom_02.menu.mmu.3216=16KB cache + 32KB IRAM + 16KB 2nd Heap (not shared)
+d1_wroom_02.menu.mmu.3216.build.mmuflags=-DMMU_IRAM_SIZE=0x8000 -DMMU_ICACHE_SIZE=0x4000 -DMMU_SEC_HEAP=0x40108000 -DMMU_SEC_HEAP_SIZE=0x4000
+d1_wroom_02.menu.mmu.ext128k=128K Heap External 23LC1024
+d1_wroom_02.menu.mmu.ext128k.build.mmuflags=-DMMU_EXTERNAL_HEAP=128 -DMMU_IRAM_SIZE=0x8000 -DMMU_ICACHE_SIZE=0x8000
+d1_wroom_02.menu.mmu.ext8192k=8M w/256K Heap External 64 MBit PSRAM
+d1_wroom_02.menu.mmu.ext8192k.build.mmuflags=-DMMU_EXTERNAL_HEAP=256 -DMMU_IRAM_SIZE=0x8000 -DMMU_ICACHE_SIZE=0x8000
+d1_wroom_02.menu.non32xfer.fast=Use pgm_read macros for IRAM/PROGMEM
+d1_wroom_02.menu.non32xfer.fast.build.non32xferflags=
+d1_wroom_02.menu.non32xfer.safe=Byte/Word access to IRAM/PROGMEM (very slow)
+d1_wroom_02.menu.non32xfer.safe.build.non32xferflags=-DNON32XFER_HANDLER
+d1_wroom_02.upload.resetmethod=--before default_reset --after hard_reset
+d1_wroom_02.build.flash_mode=dio
+d1_wroom_02.build.flash_flags=-DFLASHMODE_DIO
+d1_wroom_02.build.flash_freq=26
+d1_wroom_02.menu.eesz.2M64=2MB (FS:64KB OTA:~992KB)
+d1_wroom_02.menu.eesz.2M64.build.flash_size=2M
+d1_wroom_02.menu.eesz.2M64.build.flash_ld=eagle.flash.2m64.ld
+d1_wroom_02.menu.eesz.2M64.build.spiffs_pagesize=256
+d1_wroom_02.menu.eesz.2M64.build.rfcal_addr=0x1FC000
+d1_wroom_02.menu.eesz.2M64.build.spiffs_start=0x1F0000
+d1_wroom_02.menu.eesz.2M64.build.spiffs_end=0x1FB000
+d1_wroom_02.menu.eesz.2M64.build.spiffs_blocksize=4096
+d1_wroom_02.menu.eesz.2M128=2MB (FS:128KB OTA:~960KB)
+d1_wroom_02.menu.eesz.2M128.build.flash_size=2M
+d1_wroom_02.menu.eesz.2M128.build.flash_ld=eagle.flash.2m128.ld
+d1_wroom_02.menu.eesz.2M128.build.spiffs_pagesize=256
+d1_wroom_02.menu.eesz.2M128.build.rfcal_addr=0x1FC000
+d1_wroom_02.menu.eesz.2M128.build.spiffs_start=0x1E0000
+d1_wroom_02.menu.eesz.2M128.build.spiffs_end=0x1FB000
+d1_wroom_02.menu.eesz.2M128.build.spiffs_blocksize=4096
+d1_wroom_02.menu.eesz.2M256=2MB (FS:256KB OTA:~896KB)
+d1_wroom_02.menu.eesz.2M256.build.flash_size=2M
+d1_wroom_02.menu.eesz.2M256.build.flash_ld=eagle.flash.2m256.ld
+d1_wroom_02.menu.eesz.2M256.build.spiffs_pagesize=256
+d1_wroom_02.menu.eesz.2M256.build.rfcal_addr=0x1FC000
+d1_wroom_02.menu.eesz.2M256.build.spiffs_start=0x1C0000
+d1_wroom_02.menu.eesz.2M256.build.spiffs_end=0x1FB000
+d1_wroom_02.menu.eesz.2M256.build.spiffs_blocksize=4096
+d1_wroom_02.menu.eesz.2M512=2MB (FS:512KB OTA:~768KB)
+d1_wroom_02.menu.eesz.2M512.build.flash_size=2M
+d1_wroom_02.menu.eesz.2M512.build.flash_ld=eagle.flash.2m512.ld
+d1_wroom_02.menu.eesz.2M512.build.spiffs_pagesize=256
+d1_wroom_02.menu.eesz.2M512.build.rfcal_addr=0x1FC000
+d1_wroom_02.menu.eesz.2M512.build.spiffs_start=0x180000
+d1_wroom_02.menu.eesz.2M512.build.spiffs_end=0x1FA000
+d1_wroom_02.menu.eesz.2M512.build.spiffs_blocksize=8192
+d1_wroom_02.menu.eesz.2M1M=2MB (FS:1MB OTA:~512KB)
+d1_wroom_02.menu.eesz.2M1M.build.flash_size=2M
+d1_wroom_02.menu.eesz.2M1M.build.flash_ld=eagle.flash.2m1m.ld
+d1_wroom_02.menu.eesz.2M1M.build.spiffs_pagesize=256
+d1_wroom_02.menu.eesz.2M1M.build.rfcal_addr=0x1FC000
+d1_wroom_02.menu.eesz.2M1M.build.spiffs_start=0x100000
+d1_wroom_02.menu.eesz.2M1M.build.spiffs_end=0x1FA000
+d1_wroom_02.menu.eesz.2M1M.build.spiffs_blocksize=8192
+d1_wroom_02.menu.eesz.2M=2MB (FS:none OTA:~1019KB)
+d1_wroom_02.menu.eesz.2M.build.flash_size=2M
+d1_wroom_02.menu.eesz.2M.build.flash_ld=eagle.flash.2m.ld
+d1_wroom_02.menu.eesz.2M.build.spiffs_pagesize=256
+d1_wroom_02.menu.eesz.2M.build.rfcal_addr=0x1FC000
+d1_wroom_02.menu.ip.lm2f=v2 Lower Memory
+d1_wroom_02.menu.ip.lm2f.build.lwip_include=lwip2/include
+d1_wroom_02.menu.ip.lm2f.build.lwip_lib=-llwip2-536-feat
+d1_wroom_02.menu.ip.lm2f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 -DLWIP_FEATURES=1 -DLWIP_IPV6=0
+d1_wroom_02.menu.ip.hb2f=v2 Higher Bandwidth
+d1_wroom_02.menu.ip.hb2f.build.lwip_include=lwip2/include
+d1_wroom_02.menu.ip.hb2f.build.lwip_lib=-llwip2-1460-feat
+d1_wroom_02.menu.ip.hb2f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 -DLWIP_FEATURES=1 -DLWIP_IPV6=0
+d1_wroom_02.menu.ip.lm2n=v2 Lower Memory (no features)
+d1_wroom_02.menu.ip.lm2n.build.lwip_include=lwip2/include
+d1_wroom_02.menu.ip.lm2n.build.lwip_lib=-llwip2-536
+d1_wroom_02.menu.ip.lm2n.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 -DLWIP_FEATURES=0 -DLWIP_IPV6=0
+d1_wroom_02.menu.ip.hb2n=v2 Higher Bandwidth (no features)
+d1_wroom_02.menu.ip.hb2n.build.lwip_include=lwip2/include
+d1_wroom_02.menu.ip.hb2n.build.lwip_lib=-llwip2-1460
+d1_wroom_02.menu.ip.hb2n.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 -DLWIP_FEATURES=0 -DLWIP_IPV6=0
+d1_wroom_02.menu.ip.lm6f=v2 IPv6 Lower Memory
+d1_wroom_02.menu.ip.lm6f.build.lwip_include=lwip2/include
+d1_wroom_02.menu.ip.lm6f.build.lwip_lib=-llwip6-536-feat
+d1_wroom_02.menu.ip.lm6f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=536 -DLWIP_FEATURES=1 -DLWIP_IPV6=1
+d1_wroom_02.menu.ip.hb6f=v2 IPv6 Higher Bandwidth
+d1_wroom_02.menu.ip.hb6f.build.lwip_include=lwip2/include
+d1_wroom_02.menu.ip.hb6f.build.lwip_lib=-llwip6-1460-feat
+d1_wroom_02.menu.ip.hb6f.build.lwip_flags=-DLWIP_OPEN_SRC -DTCP_MSS=1460 -DLWIP_FEATURES=1 -DLWIP_IPV6=1
+d1_wroom_02.menu.dbg.Disabled=Disabled
+d1_wroom_02.menu.dbg.Disabled.build.debug_port=
+d1_wroom_02.menu.dbg.Serial=Serial
+d1_wroom_02.menu.dbg.Serial.build.debug_port=-DDEBUG_ESP_PORT=Serial
+d1_wroom_02.menu.dbg.Serial1=Serial1
+d1_wroom_02.menu.dbg.Serial1.build.debug_port=-DDEBUG_ESP_PORT=Serial1
+d1_wroom_02.menu.lvl.None____=None
+d1_wroom_02.menu.lvl.None____.build.debug_level=
+d1_wroom_02.menu.lvl.SSL=SSL
+d1_wroom_02.menu.lvl.SSL.build.debug_level= -DDEBUG_ESP_SSL
+d1_wroom_02.menu.lvl.TLS_MEM=TLS_MEM
+d1_wroom_02.menu.lvl.TLS_MEM.build.debug_level= -DDEBUG_ESP_TLS_MEM
+d1_wroom_02.menu.lvl.HTTP_CLIENT=HTTP_CLIENT
+d1_wroom_02.menu.lvl.HTTP_CLIENT.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT
+d1_wroom_02.menu.lvl.HTTP_SERVER=HTTP_SERVER
+d1_wroom_02.menu.lvl.HTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_SERVER
+d1_wroom_02.menu.lvl.SSLTLS_MEM=SSL+TLS_MEM
+d1_wroom_02.menu.lvl.SSLTLS_MEM.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM
+d1_wroom_02.menu.lvl.SSLHTTP_CLIENT=SSL+HTTP_CLIENT
+d1_wroom_02.menu.lvl.SSLHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT
+d1_wroom_02.menu.lvl.SSLHTTP_SERVER=SSL+HTTP_SERVER
+d1_wroom_02.menu.lvl.SSLHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_SERVER
+d1_wroom_02.menu.lvl.TLS_MEMHTTP_CLIENT=TLS_MEM+HTTP_CLIENT
+d1_wroom_02.menu.lvl.TLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT
+d1_wroom_02.menu.lvl.TLS_MEMHTTP_SERVER=TLS_MEM+HTTP_SERVER
+d1_wroom_02.menu.lvl.TLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER
+d1_wroom_02.menu.lvl.HTTP_CLIENTHTTP_SERVER=HTTP_CLIENT+HTTP_SERVER
+d1_wroom_02.menu.lvl.HTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+d1_wroom_02.menu.lvl.SSLTLS_MEMHTTP_CLIENT=SSL+TLS_MEM+HTTP_CLIENT
+d1_wroom_02.menu.lvl.SSLTLS_MEMHTTP_CLIENT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT
+d1_wroom_02.menu.lvl.SSLTLS_MEMHTTP_SERVER=SSL+TLS_MEM+HTTP_SERVER
+d1_wroom_02.menu.lvl.SSLTLS_MEMHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_SERVER
+d1_wroom_02.menu.lvl.SSLHTTP_CLIENTHTTP_SERVER=SSL+HTTP_CLIENT+HTTP_SERVER
+d1_wroom_02.menu.lvl.SSLHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+d1_wroom_02.menu.lvl.TLS_MEMHTTP_CLIENTHTTP_SERVER=TLS_MEM+HTTP_CLIENT+HTTP_SERVER
+d1_wroom_02.menu.lvl.TLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+d1_wroom_02.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER
+d1_wroom_02.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVER.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER
+d1_wroom_02.menu.lvl.CORE=CORE
+d1_wroom_02.menu.lvl.CORE.build.debug_level= -DDEBUG_ESP_CORE
+d1_wroom_02.menu.lvl.WIFI=WIFI
+d1_wroom_02.menu.lvl.WIFI.build.debug_level= -DDEBUG_ESP_WIFI
+d1_wroom_02.menu.lvl.HTTP_UPDATE=HTTP_UPDATE
+d1_wroom_02.menu.lvl.HTTP_UPDATE.build.debug_level= -DDEBUG_ESP_HTTP_UPDATE
+d1_wroom_02.menu.lvl.UPDATER=UPDATER
+d1_wroom_02.menu.lvl.UPDATER.build.debug_level= -DDEBUG_ESP_UPDATER
+d1_wroom_02.menu.lvl.OTA=OTA
+d1_wroom_02.menu.lvl.OTA.build.debug_level= -DDEBUG_ESP_OTA
+d1_wroom_02.menu.lvl.OOM=OOM
+d1_wroom_02.menu.lvl.OOM.build.debug_level= -DDEBUG_ESP_OOM
+d1_wroom_02.menu.lvl.MDNS=MDNS
+d1_wroom_02.menu.lvl.MDNS.build.debug_level= -DDEBUG_ESP_MDNS
+d1_wroom_02.menu.lvl.HWDT=HWDT
+d1_wroom_02.menu.lvl.HWDT.build.debug_level= -DDEBUG_ESP_HWDT
+d1_wroom_02.menu.lvl.HWDT_NOEXTRA4K=HWDT_NOEXTRA4K
+d1_wroom_02.menu.lvl.HWDT_NOEXTRA4K.build.debug_level= -DDEBUG_ESP_HWDT_NOEXTRA4K
+d1_wroom_02.menu.lvl.COREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS=CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM+MDNS
+d1_wroom_02.menu.lvl.COREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS.build.debug_level= -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM -DDEBUG_ESP_MDNS
+d1_wroom_02.menu.lvl.COREWIFIHTTP_UPDATEUPDATEROTAOOMMDNSHWDT=CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM+MDNS+HWDT
+d1_wroom_02.menu.lvl.COREWIFIHTTP_UPDATEUPDATEROTAOOMMDNSHWDT.build.debug_level= -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM -DDEBUG_ESP_MDNS -DDEBUG_ESP_HWDT
+d1_wroom_02.menu.lvl.COREWIFIHTTP_UPDATEUPDATEROTAOOMMDNSHWDT_NOEXTRA4K=CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM+MDNS+HWDT_NOEXTRA4K
+d1_wroom_02.menu.lvl.COREWIFIHTTP_UPDATEUPDATEROTAOOMMDNSHWDT_NOEXTRA4K.build.debug_level= -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM -DDEBUG_ESP_MDNS -DDEBUG_ESP_HWDT_NOEXTRA4K
+d1_wroom_02.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER+CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM+MDNS
+d1_wroom_02.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOMMDNS.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM -DDEBUG_ESP_MDNS
+d1_wroom_02.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOMMDNSHWDT=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER+CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM+MDNS+HWDT
+d1_wroom_02.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOMMDNSHWDT.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM -DDEBUG_ESP_MDNS -DDEBUG_ESP_HWDT
+d1_wroom_02.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOMMDNSHWDT_NOEXTRA4K=SSL+TLS_MEM+HTTP_CLIENT+HTTP_SERVER+CORE+WIFI+HTTP_UPDATE+UPDATER+OTA+OOM+MDNS+HWDT_NOEXTRA4K
+d1_wroom_02.menu.lvl.SSLTLS_MEMHTTP_CLIENTHTTP_SERVERCOREWIFIHTTP_UPDATEUPDATEROTAOOMMDNSHWDT_NOEXTRA4K.build.debug_level= -DDEBUG_ESP_SSL -DDEBUG_ESP_TLS_MEM -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_UPDATE -DDEBUG_ESP_UPDATER -DDEBUG_ESP_OTA -DDEBUG_ESP_OOM -DDEBUG_ESP_MDNS -DDEBUG_ESP_HWDT_NOEXTRA4K
+d1_wroom_02.menu.lvl.NoAssert-NDEBUG=NoAssert-NDEBUG
+d1_wroom_02.menu.lvl.NoAssert-NDEBUG.build.debug_level= -DNDEBUG
+d1_wroom_02.menu.wipe.none=Only Sketch
+d1_wroom_02.menu.wipe.none.upload.erase_cmd=
+d1_wroom_02.menu.wipe.sdk=Sketch + WiFi Settings
+d1_wroom_02.menu.wipe.sdk.upload.erase_cmd=erase_region "{build.rfcal_addr}" 0x4000
+d1_wroom_02.menu.wipe.all=All Flash Contents
+d1_wroom_02.menu.wipe.all.upload.erase_cmd=erase_flash
+d1_wroom_02.menu.baud.921600=921600
+d1_wroom_02.menu.baud.921600.upload.speed=921600
+d1_wroom_02.menu.baud.57600=57600
+d1_wroom_02.menu.baud.57600.upload.speed=57600
+d1_wroom_02.menu.baud.115200=115200
+d1_wroom_02.menu.baud.115200.upload.speed=115200
+d1_wroom_02.menu.baud.230400.linux=230400
+d1_wroom_02.menu.baud.230400.macosx=230400
+d1_wroom_02.menu.baud.230400.upload.speed=230400
+d1_wroom_02.menu.baud.256000.windows=256000
+d1_wroom_02.menu.baud.256000.upload.speed=256000
+d1_wroom_02.menu.baud.460800.linux=460800
+d1_wroom_02.menu.baud.460800.macosx=460800
+d1_wroom_02.menu.baud.460800.upload.speed=460800
+d1_wroom_02.menu.baud.512000.windows=512000
+d1_wroom_02.menu.baud.512000.upload.speed=512000
+d1_wroom_02.menu.baud.3000000=3000000
+d1_wroom_02.menu.baud.3000000.upload.speed=3000000
+d1_wroom_02.menu.eesz.autoflash=Mapping defined by Hardware and Sketch
+d1_wroom_02.menu.eesz.autoflash.build.flash_size=16M
+d1_wroom_02.menu.eesz.autoflash.build.flash_ld=eagle.flash.auto.ld
+d1_wroom_02.menu.eesz.autoflash.build.extra_flags=-DFLASH_MAP_SUPPORT=1
+d1_wroom_02.menu.eesz.autoflash.upload.maximum_size=1044464
+
 ##############################################################
 d1_mini.name=LOLIN(WEMOS) D1 R2 & mini
 d1_mini.build.board=ESP8266_WEMOS_D1MINI
diff --git a/doc/boards.rst b/doc/boards.rst
index 5721fab624..c8cd3d6bdb 100644
--- a/doc/boards.rst
+++ b/doc/boards.rst
@@ -351,6 +351,11 @@ LOLIN(WEMOS) D1 R2 & mini
 
 Product page: https://www.wemos.cc/
 
+LOLIN(WEMOS) D1 ESP-WROOM-02
+----------------------------
+
+No real product pages. See: https://www.instructables.com/How-to-Use-Wemos-ESP-Wroom-02-D1-Mini-WiFi-Module-/ or https://www.arduino-tech.com/wemos-esp-wroom-02-mainboard-d1-mini-wifi-module-esp826618650-battery/ 
+
 LOLIN(WEMOS) D1 mini (clone)
 ----------------------------
 
diff --git a/package/package_esp8266com_index.template.json b/package/package_esp8266com_index.template.json
index 03cfddbd68..23350b5a99 100644
--- a/package/package_esp8266com_index.template.json
+++ b/package/package_esp8266com_index.template.json
@@ -77,6 +77,9 @@
                   {
                      "name": "LOLIN(WEMOS) D1 R2 & mini"
                   },
+                  {
+                     "name": "LOLIN(WEMOS) D1 ESP-WROOM-02"
+                  },
                   {
                      "name": "LOLIN(WEMOS) D1 mini (clone)"
                   },
diff --git a/tools/boards.txt.py b/tools/boards.txt.py
index 89efe7f6ca..3b3aeafae4 100755
--- a/tools/boards.txt.py
+++ b/tools/boards.txt.py
@@ -621,6 +621,21 @@
         'serial': '921',
         'desc': [ 'Product page: https://www.wemos.cc/' ],
     }),
+    ( 'd1_wroom_02', {
+        'name': 'LOLIN(WEMOS) D1 ESP-WROOM-02',
+        'opts': {
+            '.build.board': 'ESP8266_WEMOS_D1WROOM02',
+            '.build.variant': 'd1_mini',
+            },
+        'macro': [
+            'resetmethod_nodemcu',
+            'flashmode_dio',
+            'flashfreq_26',
+            '2M',
+            ],
+        'serial': '921',
+        'desc': [ 'No real product pages. See: https://www.instructables.com/How-to-Use-Wemos-ESP-Wroom-02-D1-Mini-WiFi-Module-/ or https://www.arduino-tech.com/wemos-esp-wroom-02-mainboard-d1-mini-wifi-module-esp826618650-battery/ ' ],
+    }),
     ( 'd1_mini_clone', {
         'name': 'LOLIN(WEMOS) D1 mini (clone)',
         'opts': {
@@ -1085,6 +1100,10 @@
         ( '.menu.FlashFreq.26.build.flash_freq', '26' ),
         ]),
 
+    'flashfreq_26': collections.OrderedDict([
+        ( '.build.flash_freq', '26' ),
+        ]),
+
     'flashfreq_40': collections.OrderedDict([
         ( '.build.flash_freq', '40' ),
         ]),