From aae6f24a3780fd408796e72018813c662ef1db2c Mon Sep 17 00:00:00 2001 From: Stanimir-Petev Date: Wed, 5 Jun 2019 14:44:52 +0300 Subject: [PATCH] Update (#2838) Added PoE-ISO and DevKit-Lipo. For the other boards added alternative Serial (Serial1/Serial2) pins. --- boards.txt | 115 ++++++++++++++++++++++ variants/esp32-devkit-lipo/pins_arduino.h | 62 ++++++++++++ variants/esp32-evb/pins_arduino.h | 3 + variants/esp32-gateway/pins_arduino.h | 5 +- variants/esp32-poe-iso/pins_arduino.h | 38 +++++++ variants/esp32-poe/pins_arduino.h | 6 ++ 6 files changed, 226 insertions(+), 3 deletions(-) create mode 100644 variants/esp32-devkit-lipo/pins_arduino.h create mode 100644 variants/esp32-poe-iso/pins_arduino.h diff --git a/boards.txt b/boards.txt index 360fd823..efeb7223 100644 --- a/boards.txt +++ b/boards.txt @@ -1953,6 +1953,121 @@ esp32-poe.menu.PartitionScheme.min_spiffs.upload.maximum_size=1966080 ############################################################## +esp32-poe-iso.name=OLIMEX ESP32-PoE-ISO + +esp32-poe-iso.upload.tool=esptool_py +esp32-poe-iso.upload.maximum_size=1310720 +esp32-poe-iso.upload.maximum_data_size=327680 +esp32-poe-iso.upload.wait_for_upload_port=true + +esp32-poe-iso.serial.disableDTR=true +esp32-poe-iso.serial.disableRTS=true + +esp32-poe-iso.build.mcu=esp32 +esp32-poe-iso.build.core=esp32 +esp32-poe-iso.build.variant=esp32-poe-iso +esp32-poe-iso.build.board=ESP32_POE_ISO + +esp32-poe-iso.build.f_cpu=240000000L +esp32-poe-iso.build.flash_mode=dio +esp32-poe-iso.build.flash_size=4MB +esp32-poe-iso.build.boot=dio +esp32-poe-iso.build.partitions=default +esp32-poe-iso.build.defines= + +esp32-poe-iso.menu.FlashFreq.80=80MHz +esp32-poe-iso.menu.FlashFreq.80.build.flash_freq=80m +esp32-poe-iso.menu.FlashFreq.40=40MHz +esp32-poe-iso.menu.FlashFreq.40.build.flash_freq=40m + + +esp32-poe-iso.menu.UploadSpeed.115200=115200 +esp32-poe-iso.menu.UploadSpeed.115200.upload.speed=115200 + +esp32-poe-iso.menu.PartitionScheme.default=Default +esp32-poe-iso.menu.PartitionScheme.default.build.partitions=default +esp32-poe-iso.menu.PartitionScheme.no_ota=No OTA (Large APP) +esp32-poe-iso.menu.PartitionScheme.no_ota.build.partitions=no_ota +esp32-poe-iso.menu.PartitionScheme.no_ota.upload.maximum_size=2097152 +esp32-poe-iso.menu.PartitionScheme.min_spiffs=Minimal SPIFFS (Large APPS with OTA) +esp32-poe-iso.menu.PartitionScheme.min_spiffs.build.partitions=min_spiffs +esp32-poe-iso.menu.PartitionScheme.min_spiffs.upload.maximum_size=1966080 + +############################################################## + +esp32-DevKitLipo.name=OLIMEX ESP32-DevKit-LiPo + +esp32-DevKitLipo.upload.tool=esptool_py +esp32-DevKitLipo.upload.maximum_size=1310720 +esp32-DevKitLipo.upload.maximum_data_size=327680 +esp32-DevKitLipo.upload.wait_for_upload_port=true + +esp32-DevKitLipo.serial.disableDTR=true +esp32-DevKitLipo.serial.disableRTS=true + +esp32-DevKitLipo.build.mcu=esp32 +esp32-DevKitLipo.build.core=esp32 +esp32-DevKitLipo.build.variant=esp32-devkit-lipo +esp32-DevKitLipo.build.board=ESP32_DEVKIT_LIPO + +esp32-DevKitLipo.build.f_cpu=240000000L +esp32-DevKitLipo.build.flash_size=4MB +esp32-DevKitLipo.build.flash_freq=40m +esp32-DevKitLipo.build.flash_mode=dio +esp32-DevKitLipo.build.boot=dio +esp32-DevKitLipo.build.partitions=default +esp32-DevKitLipo.build.defines= + +esp32-DevKitLipo.menu.PartitionScheme.default=Default +esp32-DevKitLipo.menu.PartitionScheme.default.build.partitions=default +esp32-DevKitLipo.menu.PartitionScheme.minimal=Minimal (2MB FLASH) +esp32-DevKitLipo.menu.PartitionScheme.minimal.build.partitions=minimal +esp32-DevKitLipo.menu.PartitionScheme.no_ota=No OTA (Large APP) +esp32-DevKitLipo.menu.PartitionScheme.no_ota.build.partitions=no_ota +esp32-DevKitLipo.menu.PartitionScheme.no_ota.upload.maximum_size=2097152 +esp32-DevKitLipo.menu.PartitionScheme.huge_app=Huge APP (3MB No OTA) +esp32-DevKitLipo.menu.PartitionScheme.huge_app.build.partitions=huge_app +esp32-DevKitLipo.menu.PartitionScheme.huge_app.upload.maximum_size=3145728 +esp32-DevKitLipo.menu.PartitionScheme.min_spiffs=Minimal SPIFFS (Large APPS with OTA) +esp32-DevKitLipo.menu.PartitionScheme.min_spiffs.build.partitions=min_spiffs +esp32-DevKitLipo.menu.PartitionScheme.min_spiffs.upload.maximum_size=1966080 +esp32-DevKitLipo.menu.PartitionScheme.fatflash=16M Fat +esp32-DevKitLipo.menu.PartitionScheme.fatflash.build.partitions=ffat + +esp32-DevKitLipo.menu.FlashMode.qio=QIO +esp32-DevKitLipo.menu.FlashMode.qio.build.flash_mode=dio +esp32-DevKitLipo.menu.FlashMode.qio.build.boot=qio +esp32-DevKitLipo.menu.FlashMode.dio=DIO +esp32-DevKitLipo.menu.FlashMode.dio.build.flash_mode=dio +esp32-DevKitLipo.menu.FlashMode.dio.build.boot=dio +esp32-DevKitLipo.menu.FlashMode.qout=QOUT +esp32-DevKitLipo.menu.FlashMode.qout.build.flash_mode=dout +esp32-DevKitLipo.menu.FlashMode.qout.build.boot=qout +esp32-DevKitLipo.menu.FlashMode.dout=DOUT +esp32-DevKitLipo.menu.FlashMode.dout.build.flash_mode=dout +esp32-DevKitLipo.menu.FlashMode.dout.build.boot=dout + +esp32-DevKitLipo.menu.FlashFreq.80=80MHz +esp32-DevKitLipo.menu.FlashFreq.80.build.flash_freq=80m +esp32-DevKitLipo.menu.FlashFreq.40=40MHz +esp32-DevKitLipo.menu.FlashFreq.40.build.flash_freq=40m + +esp32-DevKitLipo.menu.UploadSpeed.921600=921600 +esp32-DevKitLipo.menu.UploadSpeed.921600.upload.speed=921600 +esp32-DevKitLipo.menu.UploadSpeed.115200=115200 +esp32-DevKitLipo.menu.UploadSpeed.115200.upload.speed=115200 +esp32-DevKitLipo.menu.UploadSpeed.256000.windows=256000 +esp32-DevKitLipo.menu.UploadSpeed.256000.upload.speed=256000 +esp32-DevKitLipo.menu.UploadSpeed.230400.windows.upload.speed=256000 +esp32-DevKitLipo.menu.UploadSpeed.230400=230400 +esp32-DevKitLipo.menu.UploadSpeed.230400.upload.speed=230400 +esp32-DevKitLipo.menu.UploadSpeed.460800.linux=460800 +esp32-DevKitLipo.menu.UploadSpeed.460800.macosx=460800 +esp32-DevKitLipo.menu.UploadSpeed.460800.upload.speed=460800 +esp32-DevKitLipo.menu.UploadSpeed.512000.windows=512000 +esp32-DevKitLipo.menu.UploadSpeed.512000.upload.speed=512000 +############################################################## + espino32.name=ThaiEasyElec's ESPino32 espino32.upload.tool=esptool_py diff --git a/variants/esp32-devkit-lipo/pins_arduino.h b/variants/esp32-devkit-lipo/pins_arduino.h new file mode 100644 index 00000000..a405e764 --- /dev/null +++ b/variants/esp32-devkit-lipo/pins_arduino.h @@ -0,0 +1,62 @@ +#ifndef Pins_Arduino_h +#define Pins_Arduino_h + +#include + +#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; + +#define TX1 33 // Ext1 pin 8 +#define RX1 25 // Ext1 pin 9 + +#define TX2 19 // Ext2 pin 8 +#define RX2 18 // Ext2 pin 9 + +static const uint8_t SDA = 21; +static const uint8_t SCL = 22; + +static const uint8_t SS = 5; +static const uint8_t MOSI = 23; +static const uint8_t MISO = 19; +static const uint8_t SCK = 18; + +static const uint8_t A0 = 36; +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 */ diff --git a/variants/esp32-evb/pins_arduino.h b/variants/esp32-evb/pins_arduino.h index 1153c77c..15fa98e2 100644 --- a/variants/esp32-evb/pins_arduino.h +++ b/variants/esp32-evb/pins_arduino.h @@ -17,6 +17,9 @@ static const uint8_t KEY_BUILTIN = 34; static const uint8_t TX = 1; static const uint8_t RX = 3; +#define TX1 4 +#define RX1 36 + static const uint8_t SDA = 13; static const uint8_t SCL = 16; diff --git a/variants/esp32-gateway/pins_arduino.h b/variants/esp32-gateway/pins_arduino.h index 4bb154ad..fda30927 100644 --- a/variants/esp32-gateway/pins_arduino.h +++ b/variants/esp32-gateway/pins_arduino.h @@ -21,9 +21,8 @@ static const uint8_t LED_BUILTIN = 33; static const uint8_t KEY_BUILTIN = 34; -// See https://github.com/OLIMEX/ESP32-GATEWAY/blob/master/SOFTWARE/MOD-RTC/main/main.c for more info about IIC on the GATEWAY -static const uint8_t SCL = 16; // This is pin 11 -static const uint8_t SDA = 17; // This is pin 12 +static const uint8_t SCL = 16; // This is extention pin 11 +static const uint8_t SDA = 32; // This is extention pin 13 static const uint8_t SS = 5; static const uint8_t MOSI = 23; diff --git a/variants/esp32-poe-iso/pins_arduino.h b/variants/esp32-poe-iso/pins_arduino.h new file mode 100644 index 00000000..1ab04a75 --- /dev/null +++ b/variants/esp32-poe-iso/pins_arduino.h @@ -0,0 +1,38 @@ +#ifndef Pins_Arduino_h +#define Pins_Arduino_h + +#include + +#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) + +#define ETH_CLK_MODE ETH_CLOCK_GPIO17_OUT +#define ETH_PHY_POWER 12 + +static const uint8_t KEY_BUILTIN = 34; + +static const uint8_t TX = 1; +static const uint8_t RX = 3; + +#define TX1 4 +#define RX1 36 + +#define TX2 33 // ext2 pin 5 +#define RX2 35 // ext2 pin 3 + +static const uint8_t SDA = 13; +static const uint8_t SCL = 16; + +static const uint8_t SS = 5; +static const uint8_t MOSI = 2; +static const uint8_t MISO = 15; +static const uint8_t SCK = 14; + +#define BOARD_HAS_1BIT_SDMMC + +#endif /* Pins_Arduino_h */ diff --git a/variants/esp32-poe/pins_arduino.h b/variants/esp32-poe/pins_arduino.h index c88b1e64..1ab04a75 100644 --- a/variants/esp32-poe/pins_arduino.h +++ b/variants/esp32-poe/pins_arduino.h @@ -19,6 +19,12 @@ static const uint8_t KEY_BUILTIN = 34; static const uint8_t TX = 1; static const uint8_t RX = 3; +#define TX1 4 +#define RX1 36 + +#define TX2 33 // ext2 pin 5 +#define RX2 35 // ext2 pin 3 + static const uint8_t SDA = 13; static const uint8_t SCL = 16;