From aa5f1e717045adffb523ae020f51b5036ed548fe Mon Sep 17 00:00:00 2001 From: Jan Prochazka <90197375+P-R-O-C-H-Y@users.noreply.github.com> Date: Tue, 5 Dec 2023 09:34:34 +0100 Subject: [PATCH 1/6] uppercase heltec board names --- boards.txt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/boards.txt b/boards.txt index 8647ee4e906..959876d8a5a 100644 --- a/boards.txt +++ b/boards.txt @@ -17110,7 +17110,7 @@ heltec_wifi_kit_32.build.target=esp32 heltec_wifi_kit_32.build.mcu=esp32 heltec_wifi_kit_32.build.core=esp32 heltec_wifi_kit_32.build.variant=heltec_wifi_kit_32 -heltec_wifi_kit_32.build.board=heltec_wifi_kit_32 +heltec_wifi_kit_32.build.board=HELTEC_WIFI_KIT_32 heltec_wifi_kit_32.build.f_cpu=240000000L heltec_wifi_kit_32.build.flash_size=4MB @@ -17199,7 +17199,7 @@ heltec_wifi_kit_32_V3.build.target=esp32s3 heltec_wifi_kit_32_V3.build.mcu=esp32s3 heltec_wifi_kit_32_V3.build.core=esp32 heltec_wifi_kit_32_V3.build.variant=heltec_wifi_kit_32_V3 -heltec_wifi_kit_32_V3.build.board=heltec_wifi_kit_32_V3 +heltec_wifi_kit_32_V3.build.board=HELTEC_WIFI_KIT_32_V3 heltec_wifi_kit_32_V3.build.usb_mode=1 heltec_wifi_kit_32_V3.build.cdc_on_boot=0 @@ -17298,7 +17298,7 @@ heltec_wifi_lora_32.build.target=esp32 heltec_wifi_lora_32.build.mcu=esp32 heltec_wifi_lora_32.build.core=esp32 heltec_wifi_lora_32.build.variant=heltec_wifi_lora_32 -heltec_wifi_lora_32.build.board=heltec_wifi_lora_32 +heltec_wifi_lora_32.build.board=HELTEC_WIFI_LORA_32 heltec_wifi_lora_32.build.f_cpu=240000000L heltec_wifi_lora_32.build.flash_size=4MB @@ -17435,7 +17435,7 @@ heltec_wifi_lora_32_V2.build.target=esp32 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.board=HELTEC_WIFI_LORA_32_V2 heltec_wifi_lora_32_V2.build.f_cpu=240000000L heltec_wifi_lora_32_V2.build.flash_size=8MB @@ -17551,7 +17551,7 @@ heltec_wifi_lora_32_V3.build.target=esp32s3 heltec_wifi_lora_32_V3.build.mcu=esp32s3 heltec_wifi_lora_32_V3.build.core=esp32 heltec_wifi_lora_32_V3.build.variant=heltec_wifi_lora_32_V3 -heltec_wifi_lora_32_V3.build.board=heltec_wifi_32_lora_V3 +heltec_wifi_lora_32_V3.build.board=HELTEC_WIFI_LORA_32_V3 heltec_wifi_lora_32_V3.build.usb_mode=1 heltec_wifi_lora_32_V3.build.cdc_on_boot=0 @@ -17693,7 +17693,7 @@ 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.board=HELTEC_WIRELESS_STICK heltec_wireless_stick.build.f_cpu=240000000L heltec_wireless_stick.build.flash_size=8MB @@ -17806,7 +17806,7 @@ heltec_wireless_stick_lite.build.target=esp32 heltec_wireless_stick_lite.build.mcu=esp32 heltec_wireless_stick_lite.build.core=esp32 heltec_wireless_stick_lite.build.variant=heltec_wireless_stick_lite -heltec_wireless_stick_lite.build.board=heltec_wireless_stick_LITE +heltec_wireless_stick_lite.build.board=HELTEC_WIRELESS_STICK_LITE heltec_wireless_stick_lite.build.f_cpu=240000000L heltec_wireless_stick_lite.build.flash_size=4MB From 91d5a8e174ec595cdc9a4506db9074a2f0f08ab7 Mon Sep 17 00:00:00 2001 From: Jan Prochazka <90197375+P-R-O-C-H-Y@users.noreply.github.com> Date: Tue, 5 Dec 2023 09:49:11 +0100 Subject: [PATCH 2/6] debug commit - will be reverted --- boards.txt | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/boards.txt b/boards.txt index 959876d8a5a..6984c6c47d0 100644 --- a/boards.txt +++ b/boards.txt @@ -17110,6 +17110,8 @@ heltec_wifi_kit_32.build.target=esp32 heltec_wifi_kit_32.build.mcu=esp32 heltec_wifi_kit_32.build.core=esp32 heltec_wifi_kit_32.build.variant=heltec_wifi_kit_32 + + heltec_wifi_kit_32.build.board=HELTEC_WIFI_KIT_32 heltec_wifi_kit_32.build.f_cpu=240000000L @@ -17199,6 +17201,8 @@ heltec_wifi_kit_32_V3.build.target=esp32s3 heltec_wifi_kit_32_V3.build.mcu=esp32s3 heltec_wifi_kit_32_V3.build.core=esp32 heltec_wifi_kit_32_V3.build.variant=heltec_wifi_kit_32_V3 + + heltec_wifi_kit_32_V3.build.board=HELTEC_WIFI_KIT_32_V3 heltec_wifi_kit_32_V3.build.usb_mode=1 @@ -17298,6 +17302,8 @@ heltec_wifi_lora_32.build.target=esp32 heltec_wifi_lora_32.build.mcu=esp32 heltec_wifi_lora_32.build.core=esp32 heltec_wifi_lora_32.build.variant=heltec_wifi_lora_32 + + heltec_wifi_lora_32.build.board=HELTEC_WIFI_LORA_32 heltec_wifi_lora_32.build.f_cpu=240000000L @@ -17435,6 +17441,8 @@ heltec_wifi_lora_32_V2.build.target=esp32 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 @@ -17551,6 +17559,8 @@ heltec_wifi_lora_32_V3.build.target=esp32s3 heltec_wifi_lora_32_V3.build.mcu=esp32s3 heltec_wifi_lora_32_V3.build.core=esp32 heltec_wifi_lora_32_V3.build.variant=heltec_wifi_lora_32_V3 + + heltec_wifi_lora_32_V3.build.board=HELTEC_WIFI_LORA_32_V3 heltec_wifi_lora_32_V3.build.usb_mode=1 @@ -17693,6 +17703,8 @@ 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 @@ -17806,6 +17818,8 @@ heltec_wireless_stick_lite.build.target=esp32 heltec_wireless_stick_lite.build.mcu=esp32 heltec_wireless_stick_lite.build.core=esp32 heltec_wireless_stick_lite.build.variant=heltec_wireless_stick_lite + + heltec_wireless_stick_lite.build.board=HELTEC_WIRELESS_STICK_LITE heltec_wireless_stick_lite.build.f_cpu=240000000L From ca2db6e4f63ae72b6aa77dafa1573e208b8f4f09 Mon Sep 17 00:00:00 2001 From: Jan Prochazka <90197375+P-R-O-C-H-Y@users.noreply.github.com> Date: Tue, 5 Dec 2023 09:50:44 +0100 Subject: [PATCH 3/6] debug commit - will be reverted --- boards.txt | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/boards.txt b/boards.txt index 6984c6c47d0..77df9bee1c9 100644 --- a/boards.txt +++ b/boards.txt @@ -17112,6 +17112,9 @@ heltec_wifi_kit_32.build.core=esp32 heltec_wifi_kit_32.build.variant=heltec_wifi_kit_32 + + + heltec_wifi_kit_32.build.board=HELTEC_WIFI_KIT_32 heltec_wifi_kit_32.build.f_cpu=240000000L @@ -17203,6 +17206,9 @@ heltec_wifi_kit_32_V3.build.core=esp32 heltec_wifi_kit_32_V3.build.variant=heltec_wifi_kit_32_V3 + + + heltec_wifi_kit_32_V3.build.board=HELTEC_WIFI_KIT_32_V3 heltec_wifi_kit_32_V3.build.usb_mode=1 @@ -17304,6 +17310,9 @@ heltec_wifi_lora_32.build.core=esp32 heltec_wifi_lora_32.build.variant=heltec_wifi_lora_32 + + + heltec_wifi_lora_32.build.board=HELTEC_WIFI_LORA_32 heltec_wifi_lora_32.build.f_cpu=240000000L @@ -17443,6 +17452,9 @@ 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 @@ -17561,6 +17573,9 @@ heltec_wifi_lora_32_V3.build.core=esp32 heltec_wifi_lora_32_V3.build.variant=heltec_wifi_lora_32_V3 + + + heltec_wifi_lora_32_V3.build.board=HELTEC_WIFI_LORA_32_V3 heltec_wifi_lora_32_V3.build.usb_mode=1 @@ -17705,6 +17720,9 @@ 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 @@ -17820,6 +17838,9 @@ heltec_wireless_stick_lite.build.core=esp32 heltec_wireless_stick_lite.build.variant=heltec_wireless_stick_lite + + + heltec_wireless_stick_lite.build.board=HELTEC_WIRELESS_STICK_LITE heltec_wireless_stick_lite.build.f_cpu=240000000L From 7da8837608d721fa0404c80a8ecd443c8932b73b Mon Sep 17 00:00:00 2001 From: Jan Prochazka <90197375+P-R-O-C-H-Y@users.noreply.github.com> Date: Tue, 5 Dec 2023 09:52:14 +0100 Subject: [PATCH 4/6] debug commit - will be reverted --- boards.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/boards.txt b/boards.txt index 77df9bee1c9..b186f743958 100644 --- a/boards.txt +++ b/boards.txt @@ -17113,9 +17113,10 @@ heltec_wifi_kit_32.build.variant=heltec_wifi_kit_32 +heltec_wifi_kit_32.build.board=HELTEC_WIFI_KIT_32 + -heltec_wifi_kit_32.build.board=HELTEC_WIFI_KIT_32 heltec_wifi_kit_32.build.f_cpu=240000000L heltec_wifi_kit_32.build.flash_size=4MB From 9e5385471a7946ec4f75bb4225f4c508efe80a54 Mon Sep 17 00:00:00 2001 From: Jan Prochazka <90197375+P-R-O-C-H-Y@users.noreply.github.com> Date: Tue, 5 Dec 2023 09:53:55 +0100 Subject: [PATCH 5/6] debug commit - will be reverted --- boards.txt | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/boards.txt b/boards.txt index b186f743958..9e0924fe73f 100644 --- a/boards.txt +++ b/boards.txt @@ -17208,9 +17208,10 @@ heltec_wifi_kit_32_V3.build.variant=heltec_wifi_kit_32_V3 +heltec_wifi_kit_32_V3.build.board=HELTEC_WIFI_KIT_32_V3 + -heltec_wifi_kit_32_V3.build.board=HELTEC_WIFI_KIT_32_V3 heltec_wifi_kit_32_V3.build.usb_mode=1 heltec_wifi_kit_32_V3.build.cdc_on_boot=0 @@ -17313,9 +17314,11 @@ heltec_wifi_lora_32.build.variant=heltec_wifi_lora_32 - heltec_wifi_lora_32.build.board=HELTEC_WIFI_LORA_32 + + + heltec_wifi_lora_32.build.f_cpu=240000000L heltec_wifi_lora_32.build.flash_size=4MB heltec_wifi_lora_32.build.flash_freq=80m @@ -17455,9 +17458,11 @@ 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_size=8MB heltec_wifi_lora_32_V2.build.flash_freq=80m @@ -17576,9 +17581,11 @@ heltec_wifi_lora_32_V3.build.variant=heltec_wifi_lora_32_V3 - heltec_wifi_lora_32_V3.build.board=HELTEC_WIFI_LORA_32_V3 + + + heltec_wifi_lora_32_V3.build.usb_mode=1 heltec_wifi_lora_32_V3.build.cdc_on_boot=0 heltec_wifi_lora_32_V3.build.msc_on_boot=0 @@ -17723,9 +17730,11 @@ 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 @@ -17844,6 +17853,9 @@ heltec_wireless_stick_lite.build.variant=heltec_wireless_stick_lite heltec_wireless_stick_lite.build.board=HELTEC_WIRELESS_STICK_LITE + + + heltec_wireless_stick_lite.build.f_cpu=240000000L heltec_wireless_stick_lite.build.flash_size=4MB heltec_wireless_stick_lite.build.flash_freq=80m From 689a9e73f3d7e34fceaf26519bfd28450a37c962 Mon Sep 17 00:00:00 2001 From: Jan Prochazka <90197375+P-R-O-C-H-Y@users.noreply.github.com> Date: Tue, 5 Dec 2023 09:57:26 +0100 Subject: [PATCH 6/6] revert debug commits --- boards.txt | 48 ------------------------------------------------ 1 file changed, 48 deletions(-) diff --git a/boards.txt b/boards.txt index 9e0924fe73f..959876d8a5a 100644 --- a/boards.txt +++ b/boards.txt @@ -17110,14 +17110,8 @@ heltec_wifi_kit_32.build.target=esp32 heltec_wifi_kit_32.build.mcu=esp32 heltec_wifi_kit_32.build.core=esp32 heltec_wifi_kit_32.build.variant=heltec_wifi_kit_32 - - - heltec_wifi_kit_32.build.board=HELTEC_WIFI_KIT_32 - - - heltec_wifi_kit_32.build.f_cpu=240000000L heltec_wifi_kit_32.build.flash_size=4MB heltec_wifi_kit_32.build.flash_freq=80m @@ -17205,14 +17199,8 @@ heltec_wifi_kit_32_V3.build.target=esp32s3 heltec_wifi_kit_32_V3.build.mcu=esp32s3 heltec_wifi_kit_32_V3.build.core=esp32 heltec_wifi_kit_32_V3.build.variant=heltec_wifi_kit_32_V3 - - - heltec_wifi_kit_32_V3.build.board=HELTEC_WIFI_KIT_32_V3 - - - heltec_wifi_kit_32_V3.build.usb_mode=1 heltec_wifi_kit_32_V3.build.cdc_on_boot=0 heltec_wifi_kit_32_V3.build.msc_on_boot=0 @@ -17310,15 +17298,8 @@ heltec_wifi_lora_32.build.target=esp32 heltec_wifi_lora_32.build.mcu=esp32 heltec_wifi_lora_32.build.core=esp32 heltec_wifi_lora_32.build.variant=heltec_wifi_lora_32 - - - - heltec_wifi_lora_32.build.board=HELTEC_WIFI_LORA_32 - - - heltec_wifi_lora_32.build.f_cpu=240000000L heltec_wifi_lora_32.build.flash_size=4MB heltec_wifi_lora_32.build.flash_freq=80m @@ -17454,15 +17435,8 @@ heltec_wifi_lora_32_V2.build.target=esp32 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_size=8MB heltec_wifi_lora_32_V2.build.flash_freq=80m @@ -17577,15 +17551,8 @@ heltec_wifi_lora_32_V3.build.target=esp32s3 heltec_wifi_lora_32_V3.build.mcu=esp32s3 heltec_wifi_lora_32_V3.build.core=esp32 heltec_wifi_lora_32_V3.build.variant=heltec_wifi_lora_32_V3 - - - - heltec_wifi_lora_32_V3.build.board=HELTEC_WIFI_LORA_32_V3 - - - heltec_wifi_lora_32_V3.build.usb_mode=1 heltec_wifi_lora_32_V3.build.cdc_on_boot=0 heltec_wifi_lora_32_V3.build.msc_on_boot=0 @@ -17726,15 +17693,8 @@ 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 @@ -17846,16 +17806,8 @@ heltec_wireless_stick_lite.build.target=esp32 heltec_wireless_stick_lite.build.mcu=esp32 heltec_wireless_stick_lite.build.core=esp32 heltec_wireless_stick_lite.build.variant=heltec_wireless_stick_lite - - - - - heltec_wireless_stick_lite.build.board=HELTEC_WIRELESS_STICK_LITE - - - heltec_wireless_stick_lite.build.f_cpu=240000000L heltec_wireless_stick_lite.build.flash_size=4MB heltec_wireless_stick_lite.build.flash_freq=80m