From 617032fdef46b7345654945a9d14a5d140a2a021 Mon Sep 17 00:00:00 2001 From: Heltec-Aaron-Lee Date: Mon, 28 Jan 2019 20:11:20 +0800 Subject: [PATCH] Update Heltec Automation(TM) boards defintion. --- boards.txt | 90 ++++++++++++++++++- variants/heltec_wifi_kit_32/pins_arduino.h | 10 +++ variants/heltec_wifi_lora_32/pins_arduino.h | 31 ++++--- .../heltec_wifi_lora_32_V2/pins_arduino.h | 76 ++++++++++++++++ variants/heltec_wireless_stick/pins_arduino.h | 75 ++++++++++++++++ 5 files changed, 265 insertions(+), 17 deletions(-) create mode 100644 variants/heltec_wifi_lora_32_V2/pins_arduino.h create mode 100644 variants/heltec_wireless_stick/pins_arduino.h diff --git a/boards.txt b/boards.txt index a5dd94a75e6..df2c988ac15 100644 --- a/boards.txt +++ b/boards.txt @@ -2048,7 +2048,7 @@ heltec_wifi_kit_32.build.board=Heltec_WIFI_Kit_32 heltec_wifi_kit_32.build.f_cpu=240000000L heltec_wifi_kit_32.build.flash_mode=dio -heltec_wifi_kit_32.build.flash_size=4MB +heltec_wifi_kit_32.build.flash_size=8MB heltec_wifi_kit_32.build.boot=dio heltec_wifi_kit_32.build.partitions=default heltec_wifi_kit_32.build.defines= @@ -2119,6 +2119,94 @@ heltec_wifi_lora_32.menu.UploadSpeed.512000.upload.speed=512000 ############################################################## +heltec_wifi_lora_32_V2.name=Heltec_WIFI_LoRa_32_V2 + +heltec_wifi_lora_32_V2.upload.tool=esptool_py +heltec_wifi_lora_32_V2.upload.maximum_size=1310720 +heltec_wifi_lora_32_V2.upload.maximum_data_size=327680 +heltec_wifi_lora_32_V2.upload.wait_for_upload_port=true + +heltec_wifi_lora_32_V2.serial.disableDTR=true +heltec_wifi_lora_32_V2.serial.disableRTS=true + +heltec_wifi_lora_32_V2.build.mcu=esp32 +heltec_wifi_lora_32_V2.build.core=esp32 +heltec_wifi_lora_32_V2.build.variant=heltec_wifi_lora_32_V2 +heltec_wifi_lora_32_V2.build.board=Heltec_WIFI_LoRa_32_V2 + +heltec_wifi_lora_32_V2.build.f_cpu=240000000L +heltec_wifi_lora_32_V2.build.flash_mode=dio +heltec_wifi_lora_32_V2.build.flash_size=4MB +heltec_wifi_lora_32_V2.build.boot=dio +heltec_wifi_lora_32_V2.build.partitions=default +heltec_wifi_lora_32_V2.build.defines= + +heltec_wifi_lora_32_V2.menu.FlashFreq.80=80MHz +heltec_wifi_lora_32_V2.menu.FlashFreq.80.build.flash_freq=80m +heltec_wifi_lora_32_V2.menu.FlashFreq.40=40MHz +heltec_wifi_lora_32_V2.menu.FlashFreq.40.build.flash_freq=40m + +heltec_wifi_lora_32_V2.menu.UploadSpeed.921600=921600 +heltec_wifi_lora_32_V2.menu.UploadSpeed.921600.upload.speed=921600 +heltec_wifi_lora_32_V2.menu.UploadSpeed.115200=115200 +heltec_wifi_lora_32_V2.menu.UploadSpeed.115200.upload.speed=115200 +heltec_wifi_lora_32_V2.menu.UploadSpeed.256000.windows=256000 +heltec_wifi_lora_32_V2.menu.UploadSpeed.256000.upload.speed=256000 +heltec_wifi_lora_32_V2.menu.UploadSpeed.230400.windows.upload.speed=256000 +heltec_wifi_lora_32_V2.menu.UploadSpeed.230400=230400 +heltec_wifi_lora_32_V2.menu.UploadSpeed.230400.upload.speed=230400 +heltec_wifi_lora_32_V2.menu.UploadSpeed.460800.linux=460800 +heltec_wifi_lora_32_V2.menu.UploadSpeed.460800.macosx=460800 +heltec_wifi_lora_32_V2.menu.UploadSpeed.460800.upload.speed=460800 +heltec_wifi_lora_32_V2.menu.UploadSpeed.512000.windows=512000 +heltec_wifi_lora_32_V2.menu.UploadSpeed.512000.upload.speed=512000 + +############################################################## + +heltec_wireless_stick.name=Heltec_Wireless_Stick + +heltec_wireless_stick.upload.tool=esptool_py +heltec_wireless_stick.upload.maximum_size=1310720 +heltec_wireless_stick.upload.maximum_data_size=327680 +heltec_wireless_stick.upload.wait_for_upload_port=true + +heltec_wireless_stick.serial.disableDTR=true +heltec_wireless_stick.serial.disableRTS=true + +heltec_wireless_stick.build.mcu=esp32 +heltec_wireless_stick.build.core=esp32 +heltec_wireless_stick.build.variant=heltec_wireless_stick +heltec_wireless_stick.build.board=Heltec_Wireless_Stick + +heltec_wireless_stick.build.f_cpu=240000000L +heltec_wireless_stick.build.flash_mode=dio +heltec_wireless_stick.build.flash_size=8MB +heltec_wireless_stick.build.boot=dio +heltec_wireless_stick.build.partitions=default +heltec_wireless_stick.build.defines= + +heltec_wireless_stick.menu.FlashFreq.80=80MHz +heltec_wireless_stick.menu.FlashFreq.80.build.flash_freq=80m +heltec_wireless_stick.menu.FlashFreq.40=40MHz +heltec_wireless_stick.menu.FlashFreq.40.build.flash_freq=40m + +heltec_wireless_stick.menu.UploadSpeed.921600=921600 +heltec_wireless_stick.menu.UploadSpeed.921600.upload.speed=921600 +heltec_wireless_stick.menu.UploadSpeed.115200=115200 +heltec_wireless_stick.menu.UploadSpeed.115200.upload.speed=115200 +heltec_wireless_stick.menu.UploadSpeed.256000.windows=256000 +heltec_wireless_stick.menu.UploadSpeed.256000.upload.speed=256000 +heltec_wireless_stick.menu.UploadSpeed.230400.windows.upload.speed=256000 +heltec_wireless_stick.menu.UploadSpeed.230400=230400 +heltec_wireless_stick.menu.UploadSpeed.230400.upload.speed=230400 +heltec_wireless_stick.menu.UploadSpeed.460800.linux=460800 +heltec_wireless_stick.menu.UploadSpeed.460800.macosx=460800 +heltec_wireless_stick.menu.UploadSpeed.460800.upload.speed=460800 +heltec_wireless_stick.menu.UploadSpeed.512000.windows=512000 +heltec_wireless_stick.menu.UploadSpeed.512000.upload.speed=512000 + +############################################################## + espectro32.name=ESPectro32 espectro32.upload.tool=esptool_py diff --git a/variants/heltec_wifi_kit_32/pins_arduino.h b/variants/heltec_wifi_kit_32/pins_arduino.h index e05d5f7ac9d..c17574a46f5 100644 --- a/variants/heltec_wifi_kit_32/pins_arduino.h +++ b/variants/heltec_wifi_kit_32/pins_arduino.h @@ -3,6 +3,10 @@ #include +#define WIFI_Kit_32 true +#define DISPLAY_HEIGHT 64 +#define DISPLAY_WIDTH 128 + #define EXTERNAL_NUM_INTERRUPTS 16 #define NUM_DIGITAL_PINS 40 #define NUM_ANALOG_INPUTS 16 @@ -61,4 +65,10 @@ static const uint8_t T9 = 32; static const uint8_t DAC1 = 25; static const uint8_t DAC2 = 26; +static const uint8_t Vext = 21; +static const uint8_t LED = 25; +static const uint8_t RST_OLED = 16; +static const uint8_t SCL_OLED = 15; +static const uint8_t SDA_OLED = 4; + #endif /* Pins_Arduino_h */ diff --git a/variants/heltec_wifi_lora_32/pins_arduino.h b/variants/heltec_wifi_lora_32/pins_arduino.h index 6b366426158..b8f466ec703 100644 --- a/variants/heltec_wifi_lora_32/pins_arduino.h +++ b/variants/heltec_wifi_lora_32/pins_arduino.h @@ -3,6 +3,10 @@ #include +#define WIFI_LoRa_32 +#define DISPLAY_HEIGHT 64 +#define DISPLAY_WIDTH 128 + #define EXTERNAL_NUM_INTERRUPTS 16 #define NUM_DIGITAL_PINS 40 #define NUM_ANALOG_INPUTS 16 @@ -19,8 +23,8 @@ static const uint8_t KEY_BUILTIN = 0; static const uint8_t TX = 1; static const uint8_t RX = 3; -static const uint8_t SDA = 4; -static const uint8_t SCL = 15; +static const uint8_t SDA = 21; +static const uint8_t SCL = 22; static const uint8_t SS = 18; static const uint8_t MOSI = 27; @@ -28,14 +32,11 @@ static const uint8_t MISO = 19; static const uint8_t SCK = 5; 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; @@ -61,17 +62,15 @@ static const uint8_t T9 = 32; static const uint8_t DAC1 = 25; static const uint8_t DAC2 = 26; -// OLed -static const uint8_t OLED_SCL = 15; -static const uint8_t OLED_SDA = 4; -static const uint8_t OLED_RST = 16; +static const uint8_t Vext = 21; +static const uint8_t LED = 25; +static const uint8_t RST_OLED = 16; +static const uint8_t SCL_OLED = 15; +static const uint8_t SDA_OLED = 4; +static const uint8_t RST_LoRa = 14; +static const uint8_t DIO0 = 26; +static const uint8_t DIO1 = 33; +static const uint8_t DIO2 = 32; -// LoRA -static const uint8_t LORA_SCK = 5; -static const uint8_t LORA_MOSI = 27; -static const uint8_t LORA_MISO = 19; -static const uint8_t LORA_CS = 18; -static const uint8_t LORA_RST = 14; -static const uint8_t LORA_IRQ = 26; #endif /* Pins_Arduino_h */ diff --git a/variants/heltec_wifi_lora_32_V2/pins_arduino.h b/variants/heltec_wifi_lora_32_V2/pins_arduino.h new file mode 100644 index 00000000000..1881f02f89d --- /dev/null +++ b/variants/heltec_wifi_lora_32_V2/pins_arduino.h @@ -0,0 +1,76 @@ +#ifndef Pins_Arduino_h +#define Pins_Arduino_h + +#include + +#define WIFI_LoRa_32_V2 +#define DISPLAY_HEIGHT 64 +#define DISPLAY_WIDTH 128 + +#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 LED_BUILTIN = 25; +#define BUILTIN_LED LED_BUILTIN // backward compatibility + +static const uint8_t KEY_BUILTIN = 0; + +static const uint8_t TX = 1; +static const uint8_t RX = 3; + +static const uint8_t SDA = 21; +static const uint8_t SCL = 22; + +static const uint8_t SS = 18; +static const uint8_t MOSI = 27; +static const uint8_t MISO = 19; +static const uint8_t SCK = 5; + +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; + +static const uint8_t Vext = 21; +static const uint8_t LED = 25; +static const uint8_t RST_OLED = 16; +static const uint8_t SCL_OLED = 15; +static const uint8_t SDA_OLED = 4; +static const uint8_t RST_LoRa = 14; +static const uint8_t DIO0 = 26; +static const uint8_t DIO1 = 35; +static const uint8_t DIO2 = 34; + + +#endif /* Pins_Arduino_h */ diff --git a/variants/heltec_wireless_stick/pins_arduino.h b/variants/heltec_wireless_stick/pins_arduino.h new file mode 100644 index 00000000000..5dd199781b9 --- /dev/null +++ b/variants/heltec_wireless_stick/pins_arduino.h @@ -0,0 +1,75 @@ +#ifndef Pins_Arduino_h +#define Pins_Arduino_h + +#include + +#define Wireless_Stick +#define DISPLAY_HEIGHT 32 +#define DISPLAY_WIDTH 64 + +#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 LED_BUILTIN = 25; +#define BUILTIN_LED LED_BUILTIN // backward compatibility + +static const uint8_t KEY_BUILTIN = 0; + +static const uint8_t TX = 1; +static const uint8_t RX = 3; + +static const uint8_t SDA = 21; +static const uint8_t SCL = 22; + +static const uint8_t SS = 18; +static const uint8_t MOSI = 27; +static const uint8_t MISO = 19; +static const uint8_t SCK = 5; + +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; + +static const uint8_t Vext = 21; +static const uint8_t LED = 25; +static const uint8_t RST_OLED = 16; +static const uint8_t SCL_OLED = 15; +static const uint8_t SDA_OLED = 4; +static const uint8_t RST_LoRa = 14; +static const uint8_t DIO0 = 26; +static const uint8_t DIO1 = 35; +static const uint8_t DIO2 = 34; + +#endif /* Pins_Arduino_h */