-
Notifications
You must be signed in to change notification settings - Fork 7.6k
Update Heltec Automation(TM) boards defintion. #2392
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Closed
Closed
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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 | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The default LoRa32 v2 has 8MB of flash and needs a different partition map. This can be found in PR #2407 |
||
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 | ||
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,76 @@ | ||
#ifndef Pins_Arduino_h | ||
#define Pins_Arduino_h | ||
|
||
#include <stdint.h> | ||
|
||
#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 */ |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,75 @@ | ||
#ifndef Pins_Arduino_h | ||
#define Pins_Arduino_h | ||
|
||
#include <stdint.h> | ||
|
||
#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 */ |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This should be 8MB to cover the flash on the V2 HW.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for your notice @n9wxu.
@me-no-dev I had submisson a new PR #2475, it's include a new partition map as @n9wxu suggested. This one is OK and I will close PR #2470
I think #2407 can be closed too.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good.