From 423e1d072990e32d549ed356d1a9b6b7fec73548 Mon Sep 17 00:00:00 2001 From: "Dirk O. Kaar" Date: Thu, 25 Apr 2019 15:14:51 +0200 Subject: [PATCH 1/4] Add board "WEMOS MINI D1 ESP32". --- boards.txt | 69 +++++++++++++++++++++++ package/package_esp32_index.template.json | 3 + variants/mini32/pins_arduino.h | 33 +++++++++++ 3 files changed, 105 insertions(+) create mode 100644 variants/mini32/pins_arduino.h diff --git a/boards.txt b/boards.txt index 4822b95747e..90b37ce1a3f 100644 --- a/boards.txt +++ b/boards.txt @@ -3648,4 +3648,73 @@ ttgo-t-watch.menu.DebugLevel.verbose.build.code_debug=5 ############################################################## +mini32.name=WEMOS MINI D1 ESP32 + +mini32.upload.tool=esptool_py +mini32.upload.maximum_size=1310720 +mini32.upload.maximum_data_size=327680 +mini32.upload.wait_for_upload_port=true + +mini32.serial.disableDTR=true +mini32.serial.disableRTS=true + +mini32.build.mcu=esp32 +mini32.build.core=esp32 +mini32.build.variant=mini32 +mini32.build.board=MINI32 + +mini32.build.f_cpu=240000000L +mini32.build.flash_mode=dio +mini32.build.flash_size=4MB +mini32.build.boot=dio +mini32.build.partitions=default +mini32.build.defines= + +mini32.menu.FlashFreq.80=80MHz +mini32.menu.FlashFreq.80.build.flash_freq=80m +mini32.menu.FlashFreq.40=40MHz +mini32.menu.FlashFreq.40.build.flash_freq=40m + +mini32.menu.PartitionScheme.default=Default +mini32.menu.PartitionScheme.default.build.partitions=default +mini32.menu.PartitionScheme.no_ota=No OTA (Large APP) +mini32.menu.PartitionScheme.no_ota.build.partitions=no_ota +mini32.menu.PartitionScheme.no_ota.upload.maximum_size=2097152 +mini32.menu.PartitionScheme.min_spiffs=Minimal SPIFFS (Large APPS with OTA) +mini32.menu.PartitionScheme.min_spiffs.build.partitions=min_spiffs +mini32.menu.PartitionScheme.min_spiffs.upload.maximum_size=1966080 + +mini32.menu.CPUFreq.240=240MHz (WiFi/BT) +mini32.menu.CPUFreq.240.build.f_cpu=240000000L +mini32.menu.CPUFreq.160=160MHz (WiFi/BT) +mini32.menu.CPUFreq.160.build.f_cpu=160000000L +mini32.menu.CPUFreq.80=80MHz (WiFi/BT) +mini32.menu.CPUFreq.80.build.f_cpu=80000000L +mini32.menu.CPUFreq.40=40MHz (40MHz XTAL) +mini32.menu.CPUFreq.40.build.f_cpu=40000000L +mini32.menu.CPUFreq.26=26MHz (26MHz XTAL) +mini32.menu.CPUFreq.26.build.f_cpu=26000000L +mini32.menu.CPUFreq.20=20MHz (40MHz XTAL) +mini32.menu.CPUFreq.20.build.f_cpu=20000000L +mini32.menu.CPUFreq.13=13MHz (26MHz XTAL) +mini32.menu.CPUFreq.13.build.f_cpu=13000000L +mini32.menu.CPUFreq.10=10MHz (40MHz XTAL) +mini32.menu.CPUFreq.10.build.f_cpu=10000000L + +mini32.menu.UploadSpeed.921600=921600 +mini32.menu.UploadSpeed.921600.upload.speed=921600 +mini32.menu.UploadSpeed.115200=115200 +mini32.menu.UploadSpeed.115200.upload.speed=115200 +mini32.menu.UploadSpeed.256000.windows=256000 +mini32.menu.UploadSpeed.256000.upload.speed=256000 +mini32.menu.UploadSpeed.230400.windows.upload.speed=256000 +mini32.menu.UploadSpeed.230400=230400 +mini32.menu.UploadSpeed.230400.upload.speed=230400 +mini32.menu.UploadSpeed.460800.linux=460800 +mini32.menu.UploadSpeed.460800.macosx=460800 +mini32.menu.UploadSpeed.460800.upload.speed=460800 +mini32.menu.UploadSpeed.512000.windows=512000 +mini32.menu.UploadSpeed.512000.upload.speed=512000 + +############################################################## diff --git a/package/package_esp32_index.template.json b/package/package_esp32_index.template.json index b8692bdf66e..b69dc1e0e26 100644 --- a/package/package_esp32_index.template.json +++ b/package/package_esp32_index.template.json @@ -27,6 +27,9 @@ }, { "name": "WEMOS LoLin32" + }, + { + "name": "WEMOS MINI D1 ESP32" } ], "toolsDependencies": [ diff --git a/variants/mini32/pins_arduino.h b/variants/mini32/pins_arduino.h new file mode 100644 index 00000000000..2a3f67aca4a --- /dev/null +++ b/variants/mini32/pins_arduino.h @@ -0,0 +1,33 @@ +#ifndef Pins_Arduino_h +#define Pins_Arduino_h + +#include +#include <../d32/d32_core.h> + +static const uint8_t LED_BUILTIN = 2; +#define BUILTIN_LED LED_BUILTIN // backward compatibility +static const uint8_t _VBAT = 35; // battery voltage + +#define PIN_WIRE_SDA SDA // backward compatibility +#define PIN_WIRE_SCL SCL // backward compatibility + +static const uint8_t D0 = 26; +static const uint8_t D1 = 22; +static const uint8_t D2 = 21; +static const uint8_t D3 = 17; +static const uint8_t D4 = 16; +static const uint8_t D5 = 18; +static const uint8_t D6 = 19; +static const uint8_t D7 = 23; +static const uint8_t D8 = 5; +static const uint8_t RXD0 = 9; +static const uint8_t TXD0 = 10; + +#define PIN_SPI_SS SS // backward compatibility +#define PIN_SPI_MOSI MOSI // backward compatibility +#define PIN_SPI_MISO MISO // backward compatibility +#define PIN_SPI_SCK SCK // backward compatibility + +#define PIN_A0 A0 // backward compatibility + +#endif /* Pins_Arduino_h */ From b163894ed2b8fdbc71e2d394da82137fbbf49fb8 Mon Sep 17 00:00:00 2001 From: "Dirk O. Kaar" Date: Fri, 26 Apr 2019 07:07:13 +0200 Subject: [PATCH 2/4] The name of the board which has its pinout mirrored is actually D1 MINI, not MINI D1. --- boards.txt | 2 +- package/package_esp32_index.template.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/boards.txt b/boards.txt index 90b37ce1a3f..9eb84d85f63 100644 --- a/boards.txt +++ b/boards.txt @@ -3648,7 +3648,7 @@ ttgo-t-watch.menu.DebugLevel.verbose.build.code_debug=5 ############################################################## -mini32.name=WEMOS MINI D1 ESP32 +mini32.name=WEMOS D1 MINI ESP32 mini32.upload.tool=esptool_py mini32.upload.maximum_size=1310720 diff --git a/package/package_esp32_index.template.json b/package/package_esp32_index.template.json index b69dc1e0e26..9baa377f8ad 100644 --- a/package/package_esp32_index.template.json +++ b/package/package_esp32_index.template.json @@ -29,7 +29,7 @@ "name": "WEMOS LoLin32" }, { - "name": "WEMOS MINI D1 ESP32" + "name": "WEMOS D1 MINI ESP32" } ], "toolsDependencies": [ From 50debbe225b028213d571805f333e3b87aaa33bd Mon Sep 17 00:00:00 2001 From: "Dirk O. Kaar" Date: Fri, 26 Apr 2019 21:02:36 +0200 Subject: [PATCH 3/4] D1_MINI32 is a more unique name for this specific board layout. Reviewer caught mistake with RXD0/TXD0. --- boards.txt | 134 +++++++++--------- variants/{mini32 => d1_mini32}/pins_arduino.h | 4 +- 2 files changed, 69 insertions(+), 69 deletions(-) rename variants/{mini32 => d1_mini32}/pins_arduino.h (93%) diff --git a/boards.txt b/boards.txt index 9eb84d85f63..ed5439ec841 100644 --- a/boards.txt +++ b/boards.txt @@ -3648,73 +3648,73 @@ ttgo-t-watch.menu.DebugLevel.verbose.build.code_debug=5 ############################################################## -mini32.name=WEMOS D1 MINI ESP32 - -mini32.upload.tool=esptool_py -mini32.upload.maximum_size=1310720 -mini32.upload.maximum_data_size=327680 -mini32.upload.wait_for_upload_port=true - -mini32.serial.disableDTR=true -mini32.serial.disableRTS=true - -mini32.build.mcu=esp32 -mini32.build.core=esp32 -mini32.build.variant=mini32 -mini32.build.board=MINI32 - -mini32.build.f_cpu=240000000L -mini32.build.flash_mode=dio -mini32.build.flash_size=4MB -mini32.build.boot=dio -mini32.build.partitions=default -mini32.build.defines= - -mini32.menu.FlashFreq.80=80MHz -mini32.menu.FlashFreq.80.build.flash_freq=80m -mini32.menu.FlashFreq.40=40MHz -mini32.menu.FlashFreq.40.build.flash_freq=40m - -mini32.menu.PartitionScheme.default=Default -mini32.menu.PartitionScheme.default.build.partitions=default -mini32.menu.PartitionScheme.no_ota=No OTA (Large APP) -mini32.menu.PartitionScheme.no_ota.build.partitions=no_ota -mini32.menu.PartitionScheme.no_ota.upload.maximum_size=2097152 -mini32.menu.PartitionScheme.min_spiffs=Minimal SPIFFS (Large APPS with OTA) -mini32.menu.PartitionScheme.min_spiffs.build.partitions=min_spiffs -mini32.menu.PartitionScheme.min_spiffs.upload.maximum_size=1966080 - -mini32.menu.CPUFreq.240=240MHz (WiFi/BT) -mini32.menu.CPUFreq.240.build.f_cpu=240000000L -mini32.menu.CPUFreq.160=160MHz (WiFi/BT) -mini32.menu.CPUFreq.160.build.f_cpu=160000000L -mini32.menu.CPUFreq.80=80MHz (WiFi/BT) -mini32.menu.CPUFreq.80.build.f_cpu=80000000L -mini32.menu.CPUFreq.40=40MHz (40MHz XTAL) -mini32.menu.CPUFreq.40.build.f_cpu=40000000L -mini32.menu.CPUFreq.26=26MHz (26MHz XTAL) -mini32.menu.CPUFreq.26.build.f_cpu=26000000L -mini32.menu.CPUFreq.20=20MHz (40MHz XTAL) -mini32.menu.CPUFreq.20.build.f_cpu=20000000L -mini32.menu.CPUFreq.13=13MHz (26MHz XTAL) -mini32.menu.CPUFreq.13.build.f_cpu=13000000L -mini32.menu.CPUFreq.10=10MHz (40MHz XTAL) -mini32.menu.CPUFreq.10.build.f_cpu=10000000L - -mini32.menu.UploadSpeed.921600=921600 -mini32.menu.UploadSpeed.921600.upload.speed=921600 -mini32.menu.UploadSpeed.115200=115200 -mini32.menu.UploadSpeed.115200.upload.speed=115200 -mini32.menu.UploadSpeed.256000.windows=256000 -mini32.menu.UploadSpeed.256000.upload.speed=256000 -mini32.menu.UploadSpeed.230400.windows.upload.speed=256000 -mini32.menu.UploadSpeed.230400=230400 -mini32.menu.UploadSpeed.230400.upload.speed=230400 -mini32.menu.UploadSpeed.460800.linux=460800 -mini32.menu.UploadSpeed.460800.macosx=460800 -mini32.menu.UploadSpeed.460800.upload.speed=460800 -mini32.menu.UploadSpeed.512000.windows=512000 -mini32.menu.UploadSpeed.512000.upload.speed=512000 +d1_mini32.name=WEMOS D1 MINI ESP32 + +d1_mini32.upload.tool=esptool_py +d1_mini32.upload.maximum_size=1310720 +d1_mini32.upload.maximum_data_size=327680 +d1_mini32.upload.wait_for_upload_port=true + +d1_mini32.serial.disableDTR=true +d1_mini32.serial.disableRTS=true + +d1_mini32.build.mcu=esp32 +d1_mini32.build.core=esp32 +d1_mini32.build.variant=d1_mini32 +d1_mini32.build.board=D1_MINI32 + +d1_mini32.build.f_cpu=240000000L +d1_mini32.build.flash_mode=dio +d1_mini32.build.flash_size=4MB +d1_mini32.build.boot=dio +d1_mini32.build.partitions=default +d1_mini32.build.defines= + +d1_mini32.menu.FlashFreq.80=80MHz +d1_mini32.menu.FlashFreq.80.build.flash_freq=80m +d1_mini32.menu.FlashFreq.40=40MHz +d1_mini32.menu.FlashFreq.40.build.flash_freq=40m + +d1_mini32.menu.PartitionScheme.default=Default +d1_mini32.menu.PartitionScheme.default.build.partitions=default +d1_mini32.menu.PartitionScheme.no_ota=No OTA (Large APP) +d1_mini32.menu.PartitionScheme.no_ota.build.partitions=no_ota +d1_mini32.menu.PartitionScheme.no_ota.upload.maximum_size=2097152 +d1_mini32.menu.PartitionScheme.min_spiffs=Minimal SPIFFS (Large APPS with OTA) +d1_mini32.menu.PartitionScheme.min_spiffs.build.partitions=min_spiffs +d1_mini32.menu.PartitionScheme.min_spiffs.upload.maximum_size=1966080 + +d1_mini32.menu.CPUFreq.240=240MHz (WiFi/BT) +d1_mini32.menu.CPUFreq.240.build.f_cpu=240000000L +d1_mini32.menu.CPUFreq.160=160MHz (WiFi/BT) +d1_mini32.menu.CPUFreq.160.build.f_cpu=160000000L +d1_mini32.menu.CPUFreq.80=80MHz (WiFi/BT) +d1_mini32.menu.CPUFreq.80.build.f_cpu=80000000L +d1_mini32.menu.CPUFreq.40=40MHz (40MHz XTAL) +d1_mini32.menu.CPUFreq.40.build.f_cpu=40000000L +d1_mini32.menu.CPUFreq.26=26MHz (26MHz XTAL) +d1_mini32.menu.CPUFreq.26.build.f_cpu=26000000L +d1_mini32.menu.CPUFreq.20=20MHz (40MHz XTAL) +d1_mini32.menu.CPUFreq.20.build.f_cpu=20000000L +d1_mini32.menu.CPUFreq.13=13MHz (26MHz XTAL) +d1_mini32.menu.CPUFreq.13.build.f_cpu=13000000L +d1_mini32.menu.CPUFreq.10=10MHz (40MHz XTAL) +d1_mini32.menu.CPUFreq.10.build.f_cpu=10000000L + +d1_mini32.menu.UploadSpeed.921600=921600 +d1_mini32.menu.UploadSpeed.921600.upload.speed=921600 +d1_mini32.menu.UploadSpeed.115200=115200 +d1_mini32.menu.UploadSpeed.115200.upload.speed=115200 +d1_mini32.menu.UploadSpeed.256000.windows=256000 +d1_mini32.menu.UploadSpeed.256000.upload.speed=256000 +d1_mini32.menu.UploadSpeed.230400.windows.upload.speed=256000 +d1_mini32.menu.UploadSpeed.230400=230400 +d1_mini32.menu.UploadSpeed.230400.upload.speed=230400 +d1_mini32.menu.UploadSpeed.460800.linux=460800 +d1_mini32.menu.UploadSpeed.460800.macosx=460800 +d1_mini32.menu.UploadSpeed.460800.upload.speed=460800 +d1_mini32.menu.UploadSpeed.512000.windows=512000 +d1_mini32.menu.UploadSpeed.512000.upload.speed=512000 ############################################################## diff --git a/variants/mini32/pins_arduino.h b/variants/d1_mini32/pins_arduino.h similarity index 93% rename from variants/mini32/pins_arduino.h rename to variants/d1_mini32/pins_arduino.h index 2a3f67aca4a..957158f36a3 100644 --- a/variants/mini32/pins_arduino.h +++ b/variants/d1_mini32/pins_arduino.h @@ -20,8 +20,8 @@ static const uint8_t D5 = 18; static const uint8_t D6 = 19; static const uint8_t D7 = 23; static const uint8_t D8 = 5; -static const uint8_t RXD0 = 9; -static const uint8_t TXD0 = 10; +static const uint8_t RXD0 = 3; +static const uint8_t TXD0 = 1; #define PIN_SPI_SS SS // backward compatibility #define PIN_SPI_MOSI MOSI // backward compatibility From 57d8afa46a8a2c592b5877b4f60cd82972a6713f Mon Sep 17 00:00:00 2001 From: "Dirk O. Kaar" Date: Sat, 27 Apr 2019 02:18:42 +0200 Subject: [PATCH 4/4] RXD/TXD without 0 correspond to board labels and the default HardwareSerial Serial without 0 naming. --- variants/d1_mini32/pins_arduino.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/variants/d1_mini32/pins_arduino.h b/variants/d1_mini32/pins_arduino.h index 957158f36a3..757adf14149 100644 --- a/variants/d1_mini32/pins_arduino.h +++ b/variants/d1_mini32/pins_arduino.h @@ -20,8 +20,8 @@ static const uint8_t D5 = 18; static const uint8_t D6 = 19; static const uint8_t D7 = 23; static const uint8_t D8 = 5; -static const uint8_t RXD0 = 3; -static const uint8_t TXD0 = 1; +static const uint8_t RXD = 3; +static const uint8_t TXD = 1; #define PIN_SPI_SS SS // backward compatibility #define PIN_SPI_MOSI MOSI // backward compatibility