Skip to content

Commit 7a010a3

Browse files
Links2004Links2004
committed
Merge pull request #1309 from wemos/master
fix d1_mini board.
2 parents 7e0f839 + 16244c5 commit 7a010a3

File tree

2 files changed

+75
-74
lines changed

2 files changed

+75
-74
lines changed

‎boards.txt

+72-71
Original file line numberDiff line numberDiff line change
@@ -577,7 +577,78 @@ esp210.menu.FlashSize.4M1M.build.spiffs_pagesize=256
577577
#
578578

579579
##############################################################
580-
d1.name=WeMos D1
580+
d1_mini.name=WeMos D1 R2 & mini
581+
582+
d1_mini.upload.tool=esptool
583+
d1_mini.upload.speed=460800
584+
d1_mini.upload.resetmethod=nodemcu
585+
d1_mini.upload.maximum_size=1044464
586+
d1_mini.upload.maximum_data_size=81920
587+
d1_mini.upload.wait_for_upload_port=true
588+
d1_mini.serial.disableDTR=true
589+
d1_mini.serial.disableRTS=true
590+
591+
d1_mini.build.mcu=esp8266
592+
d1_mini.build.f_cpu=80000000L
593+
d1_mini.build.board=ESP8266_ESP12
594+
d1_mini.build.core=esp8266
595+
d1_mini.build.variant=d1_mini
596+
d1_mini.build.flash_mode=dio
597+
d1_mini.build.flash_size=4M
598+
d1_mini.build.flash_freq=40
599+
600+
d1_mini.menu.CpuFrequency.80=80 MHz
601+
d1_mini.menu.CpuFrequency.80.build.f_cpu=80000000L
602+
d1_mini.menu.CpuFrequency.160=160 MHz
603+
d1_mini.menu.CpuFrequency.160.build.f_cpu=160000000L
604+
605+
d1_mini.menu.UploadTool.esptool=Serial
606+
d1_mini.menu.UploadTool.esptool.upload.tool=esptool
607+
d1_mini.menu.UploadTool.esptool.upload.verbose=-vv
608+
609+
d1_mini.menu.UploadTool.espota=OTA
610+
d1_mini.menu.UploadTool.espota.upload.tool=espota
611+
612+
d1_mini.menu.UploadSpeed.921600=921600
613+
d1_mini.menu.UploadSpeed.921600.upload.speed=921600
614+
d1_mini.menu.UploadSpeed.115200=115200
615+
d1_mini.menu.UploadSpeed.115200.upload.speed=115200
616+
d1_mini.menu.UploadSpeed.9600=9600
617+
d1_mini.menu.UploadSpeed.9600.upload.speed=9600
618+
d1_mini.menu.UploadSpeed.57600=57600
619+
d1_mini.menu.UploadSpeed.57600.upload.speed=57600
620+
d1_mini.menu.UploadSpeed.256000.windows=256000
621+
d1_mini.menu.UploadSpeed.256000.upload.speed=256000
622+
d1_mini.menu.UploadSpeed.230400.linux=230400
623+
d1_mini.menu.UploadSpeed.230400.macosx=230400
624+
d1_mini.menu.UploadSpeed.230400.macosx=230400
625+
d1_mini.menu.UploadSpeed.230400.upload.speed=230400
626+
d1_mini.menu.UploadSpeed.460800.linux=460800
627+
d1_mini.menu.UploadSpeed.460800.macosx=460800
628+
d1_mini.menu.UploadSpeed.460800.upload.speed=460800
629+
d1_mini.menu.UploadSpeed.512000.windows=512000
630+
d1_mini.menu.UploadSpeed.512000.upload.speed=512000
631+
632+
633+
d1_mini.menu.FlashSize.4M3M=4M (3M SPIFFS)
634+
d1_mini.menu.FlashSize.4M3M.build.flash_size=4M
635+
d1_mini.menu.FlashSize.4M3M.build.flash_ld=eagle.flash.4m.ld
636+
d1_mini.menu.FlashSize.4M3M.build.spiffs_start=0x100000
637+
d1_mini.menu.FlashSize.4M3M.build.spiffs_end=0x3FB000
638+
d1_mini.menu.FlashSize.4M3M.build.spiffs_blocksize=8192
639+
d1_mini.menu.FlashSize.4M3M.build.spiffs_pagesize=256
640+
641+
d1_mini.menu.FlashSize.4M1M=4M (1M SPIFFS)
642+
d1_mini.menu.FlashSize.4M1M.build.flash_size=4M
643+
d1_mini.menu.FlashSize.4M1M.build.flash_ld=eagle.flash.4m1m.ld
644+
d1_mini.menu.FlashSize.4M1M.build.spiffs_start=0x300000
645+
d1_mini.menu.FlashSize.4M1M.build.spiffs_end=0x3FB000
646+
d1_mini.menu.FlashSize.4M1M.build.spiffs_blocksize=8192
647+
d1_mini.menu.FlashSize.4M1M.build.spiffs_pagesize=256
648+
649+
650+
##############################################################
651+
d1.name=WeMos D1(Retired)
581652

582653
d1.upload.tool=esptool
583654
d1.upload.speed=460800
@@ -648,77 +719,7 @@ d1.menu.FlashSize.4M1M.build.spiffs_pagesize=256
648719

649720

650721
##############################################################
651-
d1_mini.name=WeMos D1 mini
652722

653-
d1_mini.upload.tool=esptool
654-
d1_mini.upload.speed=460800
655-
d1_mini.upload.resetmethod=nodemcu
656-
d1_mini.upload.maximum_size=1044464
657-
d1_mini.upload.maximum_data_size=81920
658-
d1_mini.upload.wait_for_upload_port=true
659-
d1_mini.serial.disableDTR=true
660-
d1_mini.serial.disableRTS=true
661-
662-
d1_mini.build.mcu=esp8266
663-
d1_mini.build.f_cpu=80000000L
664-
d1_mini.build.board=ESP8266_ESP12
665-
d1_mini.build.core=esp8266
666-
d1_mini.build.variant=d1_mini
667-
d1_mini.build.flash_mode=dio
668-
d1_mini.build.flash_size=4M
669-
d1_mini.build.flash_freq=40
670-
671-
d1_mini.menu.CpuFrequency.80=80 MHz
672-
d1_mini.menu.CpuFrequency.80.build.f_cpu=80000000L
673-
d1_mini.menu.CpuFrequency.160=160 MHz
674-
d1_mini.menu.CpuFrequency.160.build.f_cpu=160000000L
675-
676-
d1_mini.menu.UploadTool.esptool=Serial
677-
d1_mini.menu.UploadTool.esptool.upload.tool=esptool
678-
d1_mini.menu.UploadTool.esptool.upload.verbose=-vv
679-
680-
d1_mini.menu.UploadTool.espota=OTA
681-
d1_mini.menu.UploadTool.espota.upload.tool=espota
682-
683-
d1_mini.menu.UploadSpeed.921600=921600
684-
d1_mini.menu.UploadSpeed.921600.upload.speed=921600
685-
d1_mini.menu.UploadSpeed.115200=115200
686-
d1_mini.menu.UploadSpeed.115200.upload.speed=115200
687-
d1_mini.menu.UploadSpeed.9600=9600
688-
d1_mini.menu.UploadSpeed.9600.upload.speed=9600
689-
d1_mini.menu.UploadSpeed.57600=57600
690-
d1_mini.menu.UploadSpeed.57600.upload.speed=57600
691-
d1_mini.menu.UploadSpeed.256000.windows=256000
692-
d1_mini.menu.UploadSpeed.256000.upload.speed=256000
693-
d1_mini.menu.UploadSpeed.230400.linux=230400
694-
d1_mini.menu.UploadSpeed.230400.macosx=230400
695-
d1_mini.menu.UploadSpeed.230400.macosx=230400
696-
d1_mini.menu.UploadSpeed.230400.upload.speed=230400
697-
d1_mini.menu.UploadSpeed.460800.linux=460800
698-
d1_mini.menu.UploadSpeed.460800.macosx=460800
699-
d1_mini.menu.UploadSpeed.460800.upload.speed=460800
700-
d1_mini.menu.UploadSpeed.512000.windows=512000
701-
d1_mini.menu.UploadSpeed.512000.upload.speed=512000
702-
703-
704-
d1_mini.menu.FlashSize.4M3M=4M (3M SPIFFS)
705-
d1_mini.menu.FlashSize.4M3M.build.flash_size=4M
706-
d1_mini.menu.FlashSize.4M3M.build.flash_ld=eagle.flash.4m.ld
707-
d1_mini.menu.FlashSize.4M3M.build.spiffs_start=0x100000
708-
d1_mini.menu.FlashSize.4M3M.build.spiffs_end=0x3FB000
709-
d1_mini.menu.FlashSize.4M3M.build.spiffs_blocksize=8192
710-
d1_mini.menu.FlashSize.4M3M.build.spiffs_pagesize=256
711-
712-
d1_mini.menu.FlashSize.4M1M=4M (1M SPIFFS)
713-
d1_mini.menu.FlashSize.4M1M.build.flash_size=4M
714-
d1_mini.menu.FlashSize.4M1M.build.flash_ld=eagle.flash.4m1m.ld
715-
d1_mini.menu.FlashSize.4M1M.build.spiffs_start=0x300000
716-
d1_mini.menu.FlashSize.4M1M.build.spiffs_end=0x3FB000
717-
d1_mini.menu.FlashSize.4M1M.build.spiffs_blocksize=8192
718-
d1_mini.menu.FlashSize.4M1M.build.spiffs_pagesize=256
719-
720-
721-
##############################################################
722723
espino.name=ESPino
723724

724725
espino.upload.tool=esptool

‎variants/d1_mini/pins_arduino.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,10 @@ static const uint8_t D5 = 14;
5555
static const uint8_t D6 = 12;
5656
static const uint8_t D7 = 13;
5757
static const uint8_t D8 = 15;
58-
static const uint8_t D9 = 3;
59-
static const uint8_t D10 = 1;
58+
static const uint8_t RX = 3;
59+
static const uint8_t TX = 1;
60+
6061

61-
static const uint8_t D13 = 2;
6262

6363
// These serial port names are intended to allow libraries and architecture-neutral
6464
// sketches to automatically default to the correct port name for a particular type

0 commit comments

Comments
 (0)