From ab2610a0cd0f58dc60a19ba29721f1fb33092f40 Mon Sep 17 00:00:00 2001 From: Matthias Prinke Date: Fri, 2 Feb 2024 21:32:53 +0100 Subject: [PATCH 1/6] feat: Add board revisions V2/V3 to Heltec Wireless Stick --- boards.txt | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/boards.txt b/boards.txt index 3261b181bf7..294b9f5875f 100644 --- a/boards.txt +++ b/boards.txt @@ -21180,7 +21180,6 @@ heltec_wireless_stick.build.bootloader_addr=0x1000 heltec_wireless_stick.build.target=esp32 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 @@ -21268,6 +21267,14 @@ heltec_wireless_stick.menu.EraseFlash.none.upload.erase_cmd= heltec_wireless_stick.menu.EraseFlash.all=Enabled heltec_wireless_stick.menu.EraseFlash.all.upload.erase_cmd=-e +heltec_wireless_stick.menu.Revision.Heltec_Wireless_Stick_V2=Heltec Wireless Stick V2 (SX1276) +heltec_wireless_stick.menu.Revision.Heltec_Wireless_Stick_V2.build.board=heltec_wireless_stick_v2 +heltec_wireless_stick.menu.Revision.Heltec_Wireless_Stick_V2.build.variant=heltec_wireless_stick + +heltec_wireless_stick.menu.Revision.Heltec_Wireless_Stick_V3=Heltec Wireless Stick V3 (SX1262) +heltec_wireless_stick.menu.Revision.Heltec_Wireless_Stick_V3.build.board=heltec_wireless_stick_v3 +heltec_wireless_stick.menu.Revision.Heltec_Wireless_Stick_V3.build.variant=heltec_wireless_stick + ############################################################## heltec_wireless_stick_lite.name=Heltec Wireless Stick Lite From 3817395d6d183c0a55afcbf33c6cfced16f2a9e6 Mon Sep 17 00:00:00 2001 From: Matthias Prinke <83612361+matthias-bs@users.noreply.github.com> Date: Mon, 5 Feb 2024 12:19:38 +0100 Subject: [PATCH 2/6] Update boards.txt --- boards.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/boards.txt b/boards.txt index 294b9f5875f..4e79cff70a0 100644 --- a/boards.txt +++ b/boards.txt @@ -21180,6 +21180,7 @@ heltec_wireless_stick.build.bootloader_addr=0x1000 heltec_wireless_stick.build.target=esp32 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 @@ -21269,11 +21270,9 @@ heltec_wireless_stick.menu.EraseFlash.all.upload.erase_cmd=-e heltec_wireless_stick.menu.Revision.Heltec_Wireless_Stick_V2=Heltec Wireless Stick V2 (SX1276) heltec_wireless_stick.menu.Revision.Heltec_Wireless_Stick_V2.build.board=heltec_wireless_stick_v2 -heltec_wireless_stick.menu.Revision.Heltec_Wireless_Stick_V2.build.variant=heltec_wireless_stick heltec_wireless_stick.menu.Revision.Heltec_Wireless_Stick_V3=Heltec Wireless Stick V3 (SX1262) heltec_wireless_stick.menu.Revision.Heltec_Wireless_Stick_V3.build.board=heltec_wireless_stick_v3 -heltec_wireless_stick.menu.Revision.Heltec_Wireless_Stick_V3.build.variant=heltec_wireless_stick ############################################################## From b4c6dbf370a88f25d6d615a4431fb490771f7c34 Mon Sep 17 00:00:00 2001 From: Matthias Prinke Date: Mon, 5 Feb 2024 18:04:57 +0100 Subject: [PATCH 3/6] Added according to https://docs.heltec.cn/en/node/esp32/hardware_update_log.html#v2 --- .../heltec_wireless_stick_v1/pins_arduino.h | 68 +++++++++++++++++++ 1 file changed, 68 insertions(+) create mode 100644 variants/heltec_wireless_stick_v1/pins_arduino.h diff --git a/variants/heltec_wireless_stick_v1/pins_arduino.h b/variants/heltec_wireless_stick_v1/pins_arduino.h new file mode 100644 index 00000000000..1c1b2196da3 --- /dev/null +++ b/variants/heltec_wireless_stick_v1/pins_arduino.h @@ -0,0 +1,68 @@ +#ifndef Pins_Arduino_h +#define Pins_Arduino_h + +#include + +#define Wireless_Stick true +#define DISPLAY_HEIGHT 32 +#define DISPLAY_WIDTH 64 + +static const uint8_t LED_BUILTIN = 25; +#define BUILTIN_LED LED_BUILTIN // backward compatibility +#define LED_BUILTIN LED_BUILTIN // allow testing #ifdef LED_BUILTIN + +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 = 33; +static const uint8_t DIO2 = 32; + +#endif /* Pins_Arduino_h */ From 3c4bc9ded333a520a5ac0df81d98a03bf39c6306 Mon Sep 17 00:00:00 2001 From: Matthias Prinke Date: Mon, 5 Feb 2024 18:20:27 +0100 Subject: [PATCH 4/6] Added HELTEC_WIRELESS_STICK_V1 --- boards.txt | 19 ++++-- .../heltec_wireless_stick_V1/pins_arduino.h | 68 +++++++++++++++++++ 2 files changed, 82 insertions(+), 5 deletions(-) create mode 100644 variants/heltec_wireless_stick_V1/pins_arduino.h diff --git a/boards.txt b/boards.txt index 4e79cff70a0..2fc60273eb4 100644 --- a/boards.txt +++ b/boards.txt @@ -21180,15 +21180,12 @@ heltec_wireless_stick.build.bootloader_addr=0x1000 heltec_wireless_stick.build.target=esp32 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_size=8MB heltec_wireless_stick.build.flash_freq=80m heltec_wireless_stick.build.flash_mode=dio heltec_wireless_stick.build.boot=dio -heltec_wireless_stick.build.partitions=default_8MB heltec_wireless_stick.build.defines=-D{build.band} -DLoRaWAN_DEBUG_LEVEL={build.LoRaWanDebugLevel} -DACTIVE_REGION=LORAMAC_{build.band} {build.psram} heltec_wireless_stick.menu.PSRAM.disabled=Disabled @@ -21268,11 +21265,23 @@ heltec_wireless_stick.menu.EraseFlash.none.upload.erase_cmd= heltec_wireless_stick.menu.EraseFlash.all=Enabled heltec_wireless_stick.menu.EraseFlash.all.upload.erase_cmd=-e +heltec_wireless_stick.menu.Revision.Heltec_Wireless_Stick_V1=Heltec Wireless Stick V1 (SX1276) +heltec_wireless_stick.menu.Revision.Heltec_Wireless_Stick_V1.build.board=HELTEC_WIRELESS_STICK_V1 +heltec_wireless_stick.menu.Revision.Heltec_Wireless_Stick_V1.build.variant=heltec_wireless_stick_V1 +heltec_wireless_stick.menu.Revision.Heltec_Wireless_Stick_V1.build.flash_size=4MB +heltec_wireless_stick.menu.Revision.Heltec_Wireless_Stick_V1.build.partitions=default_4MB + heltec_wireless_stick.menu.Revision.Heltec_Wireless_Stick_V2=Heltec Wireless Stick V2 (SX1276) -heltec_wireless_stick.menu.Revision.Heltec_Wireless_Stick_V2.build.board=heltec_wireless_stick_v2 +heltec_wireless_stick.menu.Revision.Heltec_Wireless_Stick_V2.build.board=HELTEC_WIRELESS_STICK_V2 +heltec_wireless_stick.menu.Revision.Heltec_Wireless_Stick_V2.build.variant=heltec_wireless_stick +heltec_wireless_stick.menu.Revision.Heltec_Wireless_Stick_V2.build.flash_size=8MB +heltec_wireless_stick.menu.Revision.Heltec_Wireless_Stick_V2.build.partitions=default_8MB heltec_wireless_stick.menu.Revision.Heltec_Wireless_Stick_V3=Heltec Wireless Stick V3 (SX1262) -heltec_wireless_stick.menu.Revision.Heltec_Wireless_Stick_V3.build.board=heltec_wireless_stick_v3 +heltec_wireless_stick.menu.Revision.Heltec_Wireless_Stick_V3.build.board=HELTEC_WIRELESS_STICK_V3 +heltec_wireless_stick.menu.Revision.Heltec_Wireless_Stick_V3.build.variant=heltec_wireless_stick +heltec_wireless_stick.menu.Revision.Heltec_Wireless_Stick_V3.build.flash_size=8MB +heltec_wireless_stick.menu.Revision.Heltec_Wireless_Stick_V3.build.partitions=default_8MB ############################################################## diff --git a/variants/heltec_wireless_stick_V1/pins_arduino.h b/variants/heltec_wireless_stick_V1/pins_arduino.h new file mode 100644 index 00000000000..1c1b2196da3 --- /dev/null +++ b/variants/heltec_wireless_stick_V1/pins_arduino.h @@ -0,0 +1,68 @@ +#ifndef Pins_Arduino_h +#define Pins_Arduino_h + +#include + +#define Wireless_Stick true +#define DISPLAY_HEIGHT 32 +#define DISPLAY_WIDTH 64 + +static const uint8_t LED_BUILTIN = 25; +#define BUILTIN_LED LED_BUILTIN // backward compatibility +#define LED_BUILTIN LED_BUILTIN // allow testing #ifdef LED_BUILTIN + +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 = 33; +static const uint8_t DIO2 = 32; + +#endif /* Pins_Arduino_h */ From 32dc4b688ad3a7a4dfd8f27cf225dd9adf24512f Mon Sep 17 00:00:00 2001 From: Matthias Prinke Date: Mon, 5 Feb 2024 18:20:43 +0100 Subject: [PATCH 5/6] Renamed --- .../heltec_wireless_stick_v1/pins_arduino.h | 68 ------------------- 1 file changed, 68 deletions(-) delete mode 100644 variants/heltec_wireless_stick_v1/pins_arduino.h diff --git a/variants/heltec_wireless_stick_v1/pins_arduino.h b/variants/heltec_wireless_stick_v1/pins_arduino.h deleted file mode 100644 index 1c1b2196da3..00000000000 --- a/variants/heltec_wireless_stick_v1/pins_arduino.h +++ /dev/null @@ -1,68 +0,0 @@ -#ifndef Pins_Arduino_h -#define Pins_Arduino_h - -#include - -#define Wireless_Stick true -#define DISPLAY_HEIGHT 32 -#define DISPLAY_WIDTH 64 - -static const uint8_t LED_BUILTIN = 25; -#define BUILTIN_LED LED_BUILTIN // backward compatibility -#define LED_BUILTIN LED_BUILTIN // allow testing #ifdef LED_BUILTIN - -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 = 33; -static const uint8_t DIO2 = 32; - -#endif /* Pins_Arduino_h */ From 9131440079c8b8ffe9cc7b5ec183a3dad86097b8 Mon Sep 17 00:00:00 2001 From: Matthias Prinke Date: Wed, 7 Feb 2024 17:37:30 +0100 Subject: [PATCH 6/6] Fixed partition scheme --- boards.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boards.txt b/boards.txt index 2fc60273eb4..d0ac935bc82 100644 --- a/boards.txt +++ b/boards.txt @@ -21269,7 +21269,7 @@ heltec_wireless_stick.menu.Revision.Heltec_Wireless_Stick_V1=Heltec Wireless Sti heltec_wireless_stick.menu.Revision.Heltec_Wireless_Stick_V1.build.board=HELTEC_WIRELESS_STICK_V1 heltec_wireless_stick.menu.Revision.Heltec_Wireless_Stick_V1.build.variant=heltec_wireless_stick_V1 heltec_wireless_stick.menu.Revision.Heltec_Wireless_Stick_V1.build.flash_size=4MB -heltec_wireless_stick.menu.Revision.Heltec_Wireless_Stick_V1.build.partitions=default_4MB +heltec_wireless_stick.menu.Revision.Heltec_Wireless_Stick_V1.build.partitions=default heltec_wireless_stick.menu.Revision.Heltec_Wireless_Stick_V2=Heltec Wireless Stick V2 (SX1276) heltec_wireless_stick.menu.Revision.Heltec_Wireless_Stick_V2.build.board=HELTEC_WIRELESS_STICK_V2