From aac26a4d1e2c1a1af8f8793b126aa4f9c9848a0b Mon Sep 17 00:00:00 2001 From: "Aaron.Lee" <32860565+Heltec-Aaron-Lee@users.noreply.github.com> Date: Wed, 2 Dec 2020 17:50:12 +0800 Subject: [PATCH] [1.0.5] Update Heltec ESP32 series boards definition (#4577) --- boards.txt | 431 +++++++++--------- variants/heltec_wifi_lora_32/pins_arduino.h | 2 +- .../heltec_wifi_lora_32_V2/pins_arduino.h | 2 +- variants/heltec_wireless_stick/pins_arduino.h | 2 +- .../heltec_wireless_stick_lite/pins_arduino.h | 73 +++ 5 files changed, 286 insertions(+), 224 deletions(-) create mode 100644 variants/heltec_wireless_stick_lite/pins_arduino.h diff --git a/boards.txt b/boards.txt index 67862f55..c209235b 100644 --- a/boards.txt +++ b/boards.txt @@ -7,6 +7,8 @@ menu.PartitionScheme=Partition Scheme menu.DebugLevel=Core Debug Level menu.PSRAM=PSRAM menu.Revision=Board Revision +menu.LORAWAN_REGION=LoRaWan Region +menu.LoRaWanDebugLevel=LoRaWan Debug Level ############################################################## ### DO NOT PUT BOARDS ABOVE THE OFFICIAL ESPRESSIF BOARDS! ### @@ -3073,74 +3075,29 @@ heltec_wifi_kit_32.serial.disableRTS=true 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 -heltec_wifi_kit_32.build.flash_freq=40m +heltec_wifi_kit_32.build.flash_freq=80m heltec_wifi_kit_32.build.flash_mode=dio heltec_wifi_kit_32.build.boot=dio heltec_wifi_kit_32.build.partitions=default heltec_wifi_kit_32.build.defines= +heltec_wifi_kit_32.build.band=LoRaWAN_NONE +heltec_wifi_kit_32.build.LoRaWanDebugLevel=0 heltec_wifi_kit_32.menu.PSRAM.disabled=Disabled heltec_wifi_kit_32.menu.PSRAM.disabled.build.defines= heltec_wifi_kit_32.menu.PSRAM.enabled=Enabled heltec_wifi_kit_32.menu.PSRAM.enabled.build.defines=-DBOARD_HAS_PSRAM -mfix-esp32-psram-cache-issue -heltec_wifi_kit_32.menu.PartitionScheme.default=Default -heltec_wifi_kit_32.menu.PartitionScheme.default.build.partitions=default -heltec_wifi_kit_32.menu.PartitionScheme.minimal=Minimal (2MB FLASH) -heltec_wifi_kit_32.menu.PartitionScheme.minimal.build.partitions=minimal -heltec_wifi_kit_32.menu.PartitionScheme.no_ota=No OTA (Large APP) -heltec_wifi_kit_32.menu.PartitionScheme.no_ota.build.partitions=no_ota -heltec_wifi_kit_32.menu.PartitionScheme.no_ota.upload.maximum_size=2097152 -heltec_wifi_kit_32.menu.PartitionScheme.huge_app=Huge APP (3MB No OTA) -heltec_wifi_kit_32.menu.PartitionScheme.huge_app.build.partitions=huge_app -heltec_wifi_kit_32.menu.PartitionScheme.huge_app.upload.maximum_size=3145728 -heltec_wifi_kit_32.menu.PartitionScheme.min_spiffs=Minimal SPIFFS (Large APPS with OTA) -heltec_wifi_kit_32.menu.PartitionScheme.min_spiffs.build.partitions=min_spiffs -heltec_wifi_kit_32.menu.PartitionScheme.min_spiffs.upload.maximum_size=1966080 -heltec_wifi_kit_32.menu.PartitionScheme.fatflash=16M Fat -heltec_wifi_kit_32.menu.PartitionScheme.fatflash.build.partitions=ffat - heltec_wifi_kit_32.menu.CPUFreq.240=240MHz (WiFi/BT) heltec_wifi_kit_32.menu.CPUFreq.240.build.f_cpu=240000000L heltec_wifi_kit_32.menu.CPUFreq.160=160MHz (WiFi/BT) heltec_wifi_kit_32.menu.CPUFreq.160.build.f_cpu=160000000L heltec_wifi_kit_32.menu.CPUFreq.80=80MHz (WiFi/BT) heltec_wifi_kit_32.menu.CPUFreq.80.build.f_cpu=80000000L -heltec_wifi_kit_32.menu.CPUFreq.26=26MHz (26MHz XTAL) -heltec_wifi_kit_32.menu.CPUFreq.26.build.f_cpu=26000000L -heltec_wifi_kit_32.menu.CPUFreq.13=13MHz (26MHz XTAL) -heltec_wifi_kit_32.menu.CPUFreq.13.build.f_cpu=13000000L - -heltec_wifi_kit_32.menu.FlashMode.qio=QIO -heltec_wifi_kit_32.menu.FlashMode.qio.build.flash_mode=dio -heltec_wifi_kit_32.menu.FlashMode.qio.build.boot=qio -heltec_wifi_kit_32.menu.FlashMode.dio=DIO -heltec_wifi_kit_32.menu.FlashMode.dio.build.flash_mode=dio -heltec_wifi_kit_32.menu.FlashMode.dio.build.boot=dio -heltec_wifi_kit_32.menu.FlashMode.qout=QOUT -heltec_wifi_kit_32.menu.FlashMode.qout.build.flash_mode=dout -heltec_wifi_kit_32.menu.FlashMode.qout.build.boot=qout -heltec_wifi_kit_32.menu.FlashMode.dout=DOUT -heltec_wifi_kit_32.menu.FlashMode.dout.build.flash_mode=dout -heltec_wifi_kit_32.menu.FlashMode.dout.build.boot=dout - -heltec_wifi_kit_32.menu.FlashFreq.40=40MHz -heltec_wifi_kit_32.menu.FlashFreq.40.build.flash_freq=40m -heltec_wifi_kit_32.menu.FlashFreq.80=80MHz -heltec_wifi_kit_32.menu.FlashFreq.80.build.flash_freq=80m - -heltec_wifi_kit_32.menu.FlashSize.4M=4MB (32Mb) -heltec_wifi_kit_32.menu.FlashSize.4M.build.flash_size=4MB -heltec_wifi_kit_32.menu.FlashSize.2M=2MB (16Mb) -heltec_wifi_kit_32.menu.FlashSize.2M.build.flash_size=2MB -heltec_wifi_kit_32.menu.FlashSize.2M.build.partitions=minimal -heltec_wifi_kit_32.menu.FlashSize.16M=16MB (128Mb) -heltec_wifi_kit_32.menu.FlashSize.16M.build.flash_size=16MB -heltec_wifi_kit_32.menu.FlashSize.16M.build.partitions=ffat heltec_wifi_kit_32.menu.UploadSpeed.921600=921600 heltec_wifi_kit_32.menu.UploadSpeed.921600.upload.speed=921600 @@ -3185,74 +3142,27 @@ heltec_wifi_lora_32.serial.disableRTS=true 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 -heltec_wifi_lora_32.build.flash_freq=40m +heltec_wifi_lora_32.build.flash_freq=80m heltec_wifi_lora_32.build.flash_mode=dio heltec_wifi_lora_32.build.boot=dio heltec_wifi_lora_32.build.partitions=default -heltec_wifi_lora_32.build.defines= +heltec_wifi_lora_32.build.defines=-D{build.band} -DLoRaWAN_DEBUG_LEVEL={build.LoRaWanDebugLevel} -DACTIVE_REGION=LORAMAC_{build.band} {build.psram} heltec_wifi_lora_32.menu.PSRAM.disabled=Disabled -heltec_wifi_lora_32.menu.PSRAM.disabled.build.defines= +heltec_wifi_lora_32.menu.PSRAM.disabled.build.psram= heltec_wifi_lora_32.menu.PSRAM.enabled=Enabled -heltec_wifi_lora_32.menu.PSRAM.enabled.build.defines=-DBOARD_HAS_PSRAM -mfix-esp32-psram-cache-issue - -heltec_wifi_lora_32.menu.PartitionScheme.default=Default -heltec_wifi_lora_32.menu.PartitionScheme.default.build.partitions=default -heltec_wifi_lora_32.menu.PartitionScheme.minimal=Minimal (2MB FLASH) -heltec_wifi_lora_32.menu.PartitionScheme.minimal.build.partitions=minimal -heltec_wifi_lora_32.menu.PartitionScheme.no_ota=No OTA (Large APP) -heltec_wifi_lora_32.menu.PartitionScheme.no_ota.build.partitions=no_ota -heltec_wifi_lora_32.menu.PartitionScheme.no_ota.upload.maximum_size=2097152 -heltec_wifi_lora_32.menu.PartitionScheme.huge_app=Huge APP (3MB No OTA) -heltec_wifi_lora_32.menu.PartitionScheme.huge_app.build.partitions=huge_app -heltec_wifi_lora_32.menu.PartitionScheme.huge_app.upload.maximum_size=3145728 -heltec_wifi_lora_32.menu.PartitionScheme.min_spiffs=Minimal SPIFFS (Large APPS with OTA) -heltec_wifi_lora_32.menu.PartitionScheme.min_spiffs.build.partitions=min_spiffs -heltec_wifi_lora_32.menu.PartitionScheme.min_spiffs.upload.maximum_size=1966080 -heltec_wifi_lora_32.menu.PartitionScheme.fatflash=16M Fat -heltec_wifi_lora_32.menu.PartitionScheme.fatflash.build.partitions=ffat +heltec_wifi_lora_32.menu.PSRAM.enabled.build.psram=-DBOARD_HAS_PSRAM -mfix-esp32-psram-cache-issue heltec_wifi_lora_32.menu.CPUFreq.240=240MHz (WiFi/BT) heltec_wifi_lora_32.menu.CPUFreq.240.build.f_cpu=240000000L heltec_wifi_lora_32.menu.CPUFreq.160=160MHz (WiFi/BT) heltec_wifi_lora_32.menu.CPUFreq.160.build.f_cpu=160000000L heltec_wifi_lora_32.menu.CPUFreq.80=80MHz (WiFi/BT) -heltec_wifi_lora_32.menu.CPUFreq.80.build.f_cpu=80000000L -heltec_wifi_lora_32.menu.CPUFreq.26=26MHz (26MHz XTAL) -heltec_wifi_lora_32.menu.CPUFreq.26.build.f_cpu=26000000L -heltec_wifi_lora_32.menu.CPUFreq.13=13MHz (26MHz XTAL) -heltec_wifi_lora_32.menu.CPUFreq.13.build.f_cpu=13000000L - -heltec_wifi_lora_32.menu.FlashMode.qio=QIO -heltec_wifi_lora_32.menu.FlashMode.qio.build.flash_mode=dio -heltec_wifi_lora_32.menu.FlashMode.qio.build.boot=qio -heltec_wifi_lora_32.menu.FlashMode.dio=DIO -heltec_wifi_lora_32.menu.FlashMode.dio.build.flash_mode=dio -heltec_wifi_lora_32.menu.FlashMode.dio.build.boot=dio -heltec_wifi_lora_32.menu.FlashMode.qout=QOUT -heltec_wifi_lora_32.menu.FlashMode.qout.build.flash_mode=dout -heltec_wifi_lora_32.menu.FlashMode.qout.build.boot=qout -heltec_wifi_lora_32.menu.FlashMode.dout=DOUT -heltec_wifi_lora_32.menu.FlashMode.dout.build.flash_mode=dout -heltec_wifi_lora_32.menu.FlashMode.dout.build.boot=dout - -heltec_wifi_lora_32.menu.FlashFreq.40=40MHz -heltec_wifi_lora_32.menu.FlashFreq.40.build.flash_freq=40m -heltec_wifi_lora_32.menu.FlashFreq.80=80MHz -heltec_wifi_lora_32.menu.FlashFreq.80.build.flash_freq=80m - -heltec_wifi_lora_32.menu.FlashSize.4M=4MB (32Mb) -heltec_wifi_lora_32.menu.FlashSize.4M.build.flash_size=4MB -heltec_wifi_lora_32.menu.FlashSize.2M=2MB (16Mb) -heltec_wifi_lora_32.menu.FlashSize.2M.build.flash_size=2MB -heltec_wifi_lora_32.menu.FlashSize.2M.build.partitions=minimal -heltec_wifi_lora_32.menu.FlashSize.16M=16MB (128Mb) -heltec_wifi_lora_32.menu.FlashSize.16M.build.flash_size=16MB -heltec_wifi_lora_32.menu.FlashSize.16M.build.partitions=ffat +heltec_wifi_lora_32.menu.CPUFreq.160.build.f_cpu=80000000L heltec_wifi_lora_32.menu.UploadSpeed.921600=921600 heltec_wifi_lora_32.menu.UploadSpeed.921600.upload.speed=921600 @@ -3282,12 +3192,42 @@ heltec_wifi_lora_32.menu.DebugLevel.debug.build.code_debug=4 heltec_wifi_lora_32.menu.DebugLevel.verbose=Verbose heltec_wifi_lora_32.menu.DebugLevel.verbose.build.code_debug=5 +heltec_wifi_lora_32.menu.LORAWAN_REGION.0=REGION_EU868 +heltec_wifi_lora_32.menu.LORAWAN_REGION.0.build.band=REGION_EU868 +heltec_wifi_lora_32.menu.LORAWAN_REGION.1=REGION_EU433 +heltec_wifi_lora_32.menu.LORAWAN_REGION.1.build.band=REGION_EU433 +heltec_wifi_lora_32.menu.LORAWAN_REGION.2=REGION_CN470 +heltec_wifi_lora_32.menu.LORAWAN_REGION.2.build.band=REGION_CN470 +heltec_wifi_lora_32.menu.LORAWAN_REGION.3=REGION_US915 +heltec_wifi_lora_32.menu.LORAWAN_REGION.3.build.band=REGION_US915 +heltec_wifi_lora_32.menu.LORAWAN_REGION.4=REGION_AU915 +heltec_wifi_lora_32.menu.LORAWAN_REGION.4.build.band=REGION_AU915 +heltec_wifi_lora_32.menu.LORAWAN_REGION.5=REGION_CN779 +heltec_wifi_lora_32.menu.LORAWAN_REGION.5.build.band=REGION_CN779 +heltec_wifi_lora_32.menu.LORAWAN_REGION.6=REGION_AS923 +heltec_wifi_lora_32.menu.LORAWAN_REGION.6.build.band=REGION_AS923 +heltec_wifi_lora_32.menu.LORAWAN_REGION.7=REGION_KR920 +heltec_wifi_lora_32.menu.LORAWAN_REGION.7.build.band=REGION_KR920 +heltec_wifi_lora_32.menu.LORAWAN_REGION.8=REGION_IN865 +heltec_wifi_lora_32.menu.LORAWAN_REGION.8.build.band=REGION_IN865 +heltec_wifi_lora_32.menu.LORAWAN_REGION.9=REGION_US915_HYBRID +heltec_wifi_lora_32.menu.LORAWAN_REGION.9.build.band=REGION_US915_HYBRID + +heltec_wifi_lora_32.menu.LoRaWanDebugLevel.0=None +heltec_wifi_lora_32.menu.LoRaWanDebugLevel.0.build.LoRaWanDebugLevel=0 +heltec_wifi_lora_32.menu.LoRaWanDebugLevel.1=Freq +heltec_wifi_lora_32.menu.LoRaWanDebugLevel.1.build.LoRaWanDebugLevel=1 +heltec_wifi_lora_32.menu.LoRaWanDebugLevel.2=Freq && DIO +heltec_wifi_lora_32.menu.LoRaWanDebugLevel.2.build.LoRaWanDebugLevel=2 +heltec_wifi_lora_32.menu.LoRaWanDebugLevel.3=Freq && DIO && PW +heltec_wifi_lora_32.menu.LoRaWanDebugLevel.3.build.LoRaWanDebugLevel=3 + ############################################################## 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_size=3342336 heltec_wifi_lora_32_V2.upload.maximum_data_size=327680 heltec_wifi_lora_32_V2.upload.wait_for_upload_port=true @@ -3297,37 +3237,20 @@ 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.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=40m +heltec_wifi_lora_32_V2.build.flash_freq=80m heltec_wifi_lora_32_V2.build.flash_mode=dio -heltec_wifi_lora_32_V2.build.boot=dio +heltec_wifi_lora_32_V2.build.boot=qio heltec_wifi_lora_32_V2.build.partitions=default_8MB -heltec_wifi_lora_32_V2.build.defines= +heltec_wifi_lora_32_V2.build.defines=-D{build.band} -DLoRaWAN_DEBUG_LEVEL={build.LoRaWanDebugLevel} -DACTIVE_REGION=LORAMAC_{build.band} {build.psram} heltec_wifi_lora_32_V2.menu.PSRAM.disabled=Disabled -heltec_wifi_lora_32_V2.menu.PSRAM.disabled.build.defines= +heltec_wifi_lora_32_V2.menu.PSRAM.disabled.build.psram= heltec_wifi_lora_32_V2.menu.PSRAM.enabled=Enabled -heltec_wifi_lora_32_V2.menu.PSRAM.enabled.build.defines=-DBOARD_HAS_PSRAM -mfix-esp32-psram-cache-issue - -heltec_wifi_lora_32_V2.menu.PartitionScheme.default=default_8MB -heltec_wifi_lora_32_V2.menu.PartitionScheme.default.build.partitions=default_8MB -heltec_wifi_lora_32_V2.menu.PartitionScheme.default.upload.maximum_size=3342336 -heltec_wifi_lora_32_V2.menu.PartitionScheme.minimal=Minimal (2MB FLASH) -heltec_wifi_lora_32_V2.menu.PartitionScheme.minimal.build.partitions=minimal -heltec_wifi_lora_32_V2.menu.PartitionScheme.no_ota=No OTA (Large APP) -heltec_wifi_lora_32_V2.menu.PartitionScheme.no_ota.build.partitions=no_ota -heltec_wifi_lora_32_V2.menu.PartitionScheme.no_ota.upload.maximum_size=2097152 -heltec_wifi_lora_32_V2.menu.PartitionScheme.huge_app=Huge APP (3MB No OTA) -heltec_wifi_lora_32_V2.menu.PartitionScheme.huge_app.build.partitions=huge_app -heltec_wifi_lora_32_V2.menu.PartitionScheme.huge_app.upload.maximum_size=3145728 -heltec_wifi_lora_32_V2.menu.PartitionScheme.min_spiffs=Minimal SPIFFS (Large APPS with OTA) -heltec_wifi_lora_32_V2.menu.PartitionScheme.min_spiffs.build.partitions=min_spiffs -heltec_wifi_lora_32_V2.menu.PartitionScheme.min_spiffs.upload.maximum_size=1966080 -heltec_wifi_lora_32_V2.menu.PartitionScheme.fatflash=16M Fat -heltec_wifi_lora_32_V2.menu.PartitionScheme.fatflash.build.partitions=ffat +heltec_wifi_lora_32_V2.menu.PSRAM.enabled.build.psram=-DBOARD_HAS_PSRAM -mfix-esp32-psram-cache-issue heltec_wifi_lora_32_V2.menu.CPUFreq.240=240MHz (WiFi/BT) heltec_wifi_lora_32_V2.menu.CPUFreq.240.build.f_cpu=240000000L @@ -3335,42 +3258,6 @@ heltec_wifi_lora_32_V2.menu.CPUFreq.160=160MHz (WiFi/BT) heltec_wifi_lora_32_V2.menu.CPUFreq.160.build.f_cpu=160000000L heltec_wifi_lora_32_V2.menu.CPUFreq.80=80MHz (WiFi/BT) heltec_wifi_lora_32_V2.menu.CPUFreq.80.build.f_cpu=80000000L -heltec_wifi_lora_32_V2.menu.CPUFreq.40=40MHz (40MHz XTAL) -heltec_wifi_lora_32_V2.menu.CPUFreq.40.build.f_cpu=40000000L -heltec_wifi_lora_32_V2.menu.CPUFreq.20=20MHz (40MHz XTAL) -heltec_wifi_lora_32_V2.menu.CPUFreq.20.build.f_cpu=20000000L -heltec_wifi_lora_32_V2.menu.CPUFreq.10=10MHz (40MHz XTAL) -heltec_wifi_lora_32_V2.menu.CPUFreq.10.build.f_cpu=10000000L - -heltec_wifi_lora_32_V2.menu.FlashMode.qio=QIO -heltec_wifi_lora_32_V2.menu.FlashMode.qio.build.flash_mode=dio -heltec_wifi_lora_32_V2.menu.FlashMode.qio.build.boot=qio -heltec_wifi_lora_32_V2.menu.FlashMode.dio=DIO -heltec_wifi_lora_32_V2.menu.FlashMode.dio.build.flash_mode=dio -heltec_wifi_lora_32_V2.menu.FlashMode.dio.build.boot=dio -heltec_wifi_lora_32_V2.menu.FlashMode.qout=QOUT -heltec_wifi_lora_32_V2.menu.FlashMode.qout.build.flash_mode=dout -heltec_wifi_lora_32_V2.menu.FlashMode.qout.build.boot=qout -heltec_wifi_lora_32_V2.menu.FlashMode.dout=DOUT -heltec_wifi_lora_32_V2.menu.FlashMode.dout.build.flash_mode=dout -heltec_wifi_lora_32_V2.menu.FlashMode.dout.build.boot=dout - -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.FlashSize.8M=8MB (64Mb) -heltec_wifi_lora_32_V2.menu.FlashSize.8M.build.flash_size=8MB -heltec_wifi_lora_32_V2.menu.FlashSize.8M.build.partitions=default_8MB -heltec_wifi_lora_32_V2.menu.FlashSize.4M=4MB (32Mb) -heltec_wifi_lora_32_V2.menu.FlashSize.4M.build.flash_size=4MB -heltec_wifi_lora_32_V2.menu.FlashSize.2M=2MB (16Mb) -heltec_wifi_lora_32_V2.menu.FlashSize.2M.build.flash_size=2MB -heltec_wifi_lora_32_V2.menu.FlashSize.2M.build.partitions=minimal -heltec_wifi_lora_32_V2.menu.FlashSize.16M=16MB (128Mb) -heltec_wifi_lora_32_V2.menu.FlashSize.16M.build.flash_size=16MB -heltec_wifi_lora_32_V2.menu.FlashSize.16M.build.partitions=ffat heltec_wifi_lora_32_V2.menu.UploadSpeed.921600=921600 heltec_wifi_lora_32_V2.menu.UploadSpeed.921600.upload.speed=921600 @@ -3400,12 +3287,42 @@ heltec_wifi_lora_32_V2.menu.DebugLevel.debug.build.code_debug=4 heltec_wifi_lora_32_V2.menu.DebugLevel.verbose=Verbose heltec_wifi_lora_32_V2.menu.DebugLevel.verbose.build.code_debug=5 +heltec_wifi_lora_32_V2.menu.LORAWAN_REGION.0=REGION_EU868 +heltec_wifi_lora_32_V2.menu.LORAWAN_REGION.0.build.band=REGION_EU868 +heltec_wifi_lora_32_V2.menu.LORAWAN_REGION.1=REGION_EU433 +heltec_wifi_lora_32_V2.menu.LORAWAN_REGION.1.build.band=REGION_EU433 +heltec_wifi_lora_32_V2.menu.LORAWAN_REGION.2=REGION_CN470 +heltec_wifi_lora_32_V2.menu.LORAWAN_REGION.2.build.band=REGION_CN470 +heltec_wifi_lora_32_V2.menu.LORAWAN_REGION.3=REGION_US915 +heltec_wifi_lora_32_V2.menu.LORAWAN_REGION.3.build.band=REGION_US915 +heltec_wifi_lora_32_V2.menu.LORAWAN_REGION.4=REGION_AU915 +heltec_wifi_lora_32_V2.menu.LORAWAN_REGION.4.build.band=REGION_AU915 +heltec_wifi_lora_32_V2.menu.LORAWAN_REGION.5=REGION_CN779 +heltec_wifi_lora_32_V2.menu.LORAWAN_REGION.5.build.band=REGION_CN779 +heltec_wifi_lora_32_V2.menu.LORAWAN_REGION.6=REGION_AS923 +heltec_wifi_lora_32_V2.menu.LORAWAN_REGION.6.build.band=REGION_AS923 +heltec_wifi_lora_32_V2.menu.LORAWAN_REGION.7=REGION_KR920 +heltec_wifi_lora_32_V2.menu.LORAWAN_REGION.7.build.band=REGION_KR920 +heltec_wifi_lora_32_V2.menu.LORAWAN_REGION.8=REGION_IN865 +heltec_wifi_lora_32_V2.menu.LORAWAN_REGION.8.build.band=REGION_IN865 +heltec_wifi_lora_32_V2.menu.LORAWAN_REGION.9=REGION_US915_HYBRID +heltec_wifi_lora_32_V2.menu.LORAWAN_REGION.9.build.band=REGION_US915_HYBRID + +heltec_wifi_lora_32_V2.menu.LoRaWanDebugLevel.0=None +heltec_wifi_lora_32_V2.menu.LoRaWanDebugLevel.0.build.LoRaWanDebugLevel=0 +heltec_wifi_lora_32_V2.menu.LoRaWanDebugLevel.1=Freq +heltec_wifi_lora_32_V2.menu.LoRaWanDebugLevel.1.build.LoRaWanDebugLevel=1 +heltec_wifi_lora_32_V2.menu.LoRaWanDebugLevel.2=Freq && DIO +heltec_wifi_lora_32_V2.menu.LoRaWanDebugLevel.2.build.LoRaWanDebugLevel=2 +heltec_wifi_lora_32_V2.menu.LoRaWanDebugLevel.3=Freq && DIO && PW +heltec_wifi_lora_32_V2.menu.LoRaWanDebugLevel.3.build.LoRaWanDebugLevel=3 + ############################################################## 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_size=3342336 heltec_wireless_stick.upload.maximum_data_size=327680 heltec_wireless_stick.upload.wait_for_upload_port=true @@ -3415,37 +3332,20 @@ 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.board=heltec_wireless_stick heltec_wireless_stick.build.f_cpu=240000000L heltec_wireless_stick.build.flash_size=8MB -heltec_wireless_stick.build.flash_freq=40m +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= +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 -heltec_wireless_stick.menu.PSRAM.disabled.build.defines= +heltec_wireless_stick.menu.PSRAM.disabled.build.psram= heltec_wireless_stick.menu.PSRAM.enabled=Enabled -heltec_wireless_stick.menu.PSRAM.enabled.build.defines=-DBOARD_HAS_PSRAM -mfix-esp32-psram-cache-issue - -heltec_wireless_stick.menu.PartitionScheme.default=default_8MB -heltec_wireless_stick.menu.PartitionScheme.default.build.partitions=default_8MB -heltec_wireless_stick.menu.PartitionScheme.default.upload.maximum_size=3342336 -heltec_wireless_stick.menu.PartitionScheme.minimal=Minimal (2MB FLASH) -heltec_wireless_stick.menu.PartitionScheme.minimal.build.partitions=minimal -heltec_wireless_stick.menu.PartitionScheme.no_ota=No OTA (Large APP) -heltec_wireless_stick.menu.PartitionScheme.no_ota.build.partitions=no_ota -heltec_wireless_stick.menu.PartitionScheme.no_ota.upload.maximum_size=2097152 -heltec_wireless_stick.menu.PartitionScheme.huge_app=Huge APP (3MB No OTA) -heltec_wireless_stick.menu.PartitionScheme.huge_app.build.partitions=huge_app -heltec_wireless_stick.menu.PartitionScheme.huge_app.upload.maximum_size=3145728 -heltec_wireless_stick.menu.PartitionScheme.min_spiffs=Minimal SPIFFS (Large APPS with OTA) -heltec_wireless_stick.menu.PartitionScheme.min_spiffs.build.partitions=min_spiffs -heltec_wireless_stick.menu.PartitionScheme.min_spiffs.upload.maximum_size=1966080 -heltec_wireless_stick.menu.PartitionScheme.fatflash=16M Fat -heltec_wireless_stick.menu.PartitionScheme.fatflash.build.partitions=ffat +heltec_wireless_stick.menu.PSRAM.enabled.build.psram=-DBOARD_HAS_PSRAM -mfix-esp32-psram-cache-issue heltec_wireless_stick.menu.CPUFreq.240=240MHz (WiFi/BT) heltec_wireless_stick.menu.CPUFreq.240.build.f_cpu=240000000L @@ -3453,42 +3353,6 @@ heltec_wireless_stick.menu.CPUFreq.160=160MHz (WiFi/BT) heltec_wireless_stick.menu.CPUFreq.160.build.f_cpu=160000000L heltec_wireless_stick.menu.CPUFreq.80=80MHz (WiFi/BT) heltec_wireless_stick.menu.CPUFreq.80.build.f_cpu=80000000L -heltec_wireless_stick.menu.CPUFreq.40=40MHz (40MHz XTAL) -heltec_wireless_stick.menu.CPUFreq.40.build.f_cpu=40000000L -heltec_wireless_stick.menu.CPUFreq.20=20MHz (40MHz XTAL) -heltec_wireless_stick.menu.CPUFreq.20.build.f_cpu=20000000L -heltec_wireless_stick.menu.CPUFreq.10=10MHz (40MHz XTAL) -heltec_wireless_stick.menu.CPUFreq.10.build.f_cpu=10000000L - -heltec_wireless_stick.menu.FlashMode.qio=QIO -heltec_wireless_stick.menu.FlashMode.qio.build.flash_mode=dio -heltec_wireless_stick.menu.FlashMode.qio.build.boot=qio -heltec_wireless_stick.menu.FlashMode.dio=DIO -heltec_wireless_stick.menu.FlashMode.dio.build.flash_mode=dio -heltec_wireless_stick.menu.FlashMode.dio.build.boot=dio -heltec_wireless_stick.menu.FlashMode.qout=QOUT -heltec_wireless_stick.menu.FlashMode.qout.build.flash_mode=dout -heltec_wireless_stick.menu.FlashMode.qout.build.boot=qout -heltec_wireless_stick.menu.FlashMode.dout=DOUT -heltec_wireless_stick.menu.FlashMode.dout.build.flash_mode=dout -heltec_wireless_stick.menu.FlashMode.dout.build.boot=dout - -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.FlashSize.8M=8MB (64Mb) -heltec_wireless_stick.menu.FlashSize.8M.build.flash_size=8MB -heltec_wireless_stick.menu.FlashSize.2M.build.partitions=default_8MB -heltec_wireless_stick.menu.FlashSize.4M=4MB (32Mb) -heltec_wireless_stick.menu.FlashSize.4M.build.flash_size=4MB -heltec_wireless_stick.menu.FlashSize.2M=2MB (16Mb) -heltec_wireless_stick.menu.FlashSize.2M.build.flash_size=2MB -heltec_wireless_stick.menu.FlashSize.2M.build.partitions=minimal -heltec_wireless_stick.menu.FlashSize.16M=16MB (128Mb) -heltec_wireless_stick.menu.FlashSize.16M.build.flash_size=16MB -heltec_wireless_stick.menu.FlashSize.16M.build.partitions=ffat heltec_wireless_stick.menu.UploadSpeed.921600=921600 heltec_wireless_stick.menu.UploadSpeed.921600.upload.speed=921600 @@ -3518,6 +3382,131 @@ heltec_wireless_stick.menu.DebugLevel.debug.build.code_debug=4 heltec_wireless_stick.menu.DebugLevel.verbose=Verbose heltec_wireless_stick.menu.DebugLevel.verbose.build.code_debug=5 +heltec_wireless_stick.menu.LORAWAN_REGION.0=REGION_EU868 +heltec_wireless_stick.menu.LORAWAN_REGION.0.build.band=REGION_EU868 +heltec_wireless_stick.menu.LORAWAN_REGION.1=REGION_EU433 +heltec_wireless_stick.menu.LORAWAN_REGION.1.build.band=REGION_EU433 +heltec_wireless_stick.menu.LORAWAN_REGION.2=REGION_CN470 +heltec_wireless_stick.menu.LORAWAN_REGION.2.build.band=REGION_CN470 +heltec_wireless_stick.menu.LORAWAN_REGION.3=REGION_US915 +heltec_wireless_stick.menu.LORAWAN_REGION.3.build.band=REGION_US915 +heltec_wireless_stick.menu.LORAWAN_REGION.4=REGION_AU915 +heltec_wireless_stick.menu.LORAWAN_REGION.4.build.band=REGION_AU915 +heltec_wireless_stick.menu.LORAWAN_REGION.5=REGION_CN779 +heltec_wireless_stick.menu.LORAWAN_REGION.5.build.band=REGION_CN779 +heltec_wireless_stick.menu.LORAWAN_REGION.6=REGION_AS923 +heltec_wireless_stick.menu.LORAWAN_REGION.6.build.band=REGION_AS923 +heltec_wireless_stick.menu.LORAWAN_REGION.7=REGION_KR920 +heltec_wireless_stick.menu.LORAWAN_REGION.7.build.band=REGION_KR920 +heltec_wireless_stick.menu.LORAWAN_REGION.8=REGION_IN865 +heltec_wireless_stick.menu.LORAWAN_REGION.8.build.band=REGION_IN865 +heltec_wireless_stick.menu.LORAWAN_REGION.9=REGION_US915_HYBRID +heltec_wireless_stick.menu.LORAWAN_REGION.9.build.band=REGION_US915_HYBRID + +heltec_wireless_stick.menu.LoRaWanDebugLevel.0=None +heltec_wireless_stick.menu.LoRaWanDebugLevel.0.build.LoRaWanDebugLevel=0 +heltec_wireless_stick.menu.LoRaWanDebugLevel.1=Freq +heltec_wireless_stick.menu.LoRaWanDebugLevel.1.build.LoRaWanDebugLevel=1 +heltec_wireless_stick.menu.LoRaWanDebugLevel.2=Freq && DIO +heltec_wireless_stick.menu.LoRaWanDebugLevel.2.build.LoRaWanDebugLevel=2 +heltec_wireless_stick.menu.LoRaWanDebugLevel.3=Freq && DIO && PW +heltec_wireless_stick.menu.LoRaWanDebugLevel.3.build.LoRaWanDebugLevel=3 + +############################################################## + +heltec_wireless_stick_lite.name=Heltec Wireless Stick Lite + +heltec_wireless_stick_lite.upload.tool=esptool_py +heltec_wireless_stick_lite.upload.maximum_size=1310720 +heltec_wireless_stick_lite.upload.maximum_data_size=327680 +heltec_wireless_stick_lite.upload.wait_for_upload_port=true + +heltec_wireless_stick_lite.serial.disableDTR=true +heltec_wireless_stick_lite.serial.disableRTS=true + +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 +heltec_wireless_stick_lite.build.flash_mode=dio +heltec_wireless_stick_lite.build.boot=dio +heltec_wireless_stick_lite.build.partitions=default +heltec_wireless_stick_lite.build.defines=-D{build.band} -DLoRaWAN_DEBUG_LEVEL={build.LoRaWanDebugLevel} -DACTIVE_REGION=LORAMAC_{build.band} {build.psram} + +heltec_wireless_stick_lite.menu.PSRAM.disabled=Disabled +heltec_wireless_stick_lite.menu.PSRAM.disabled.build.psram= +heltec_wireless_stick_lite.menu.PSRAM.enabled=Enabled +heltec_wireless_stick_lite.menu.PSRAM.enabled.build.psram=-DBOARD_HAS_PSRAM -mfix-esp32-psram-cache-issue + +heltec_wireless_stick_lite.menu.CPUFreq.240=240MHz (WiFi/BT) +heltec_wireless_stick_lite.menu.CPUFreq.240.build.f_cpu=240000000L +heltec_wireless_stick_lite.menu.CPUFreq.160=160MHz (WiFi/BT) +heltec_wireless_stick_lite.menu.CPUFreq.160.build.f_cpu=160000000L +heltec_wireless_stick_lite.menu.CPUFreq.80=80MHz (WiFi/BT) +heltec_wireless_stick_lite.menu.CPUFreq.80.build.f_cpu=80000000L + +heltec_wireless_stick_lite.menu.UploadSpeed.921600=921600 +heltec_wireless_stick_lite.menu.UploadSpeed.921600.upload.speed=921600 +heltec_wireless_stick_lite.menu.UploadSpeed.115200=115200 +heltec_wireless_stick_lite.menu.UploadSpeed.115200.upload.speed=115200 +heltec_wireless_stick_lite.menu.UploadSpeed.256000.windows=256000 +heltec_wireless_stick_lite.menu.UploadSpeed.256000.upload.speed=256000 +heltec_wireless_stick_lite.menu.UploadSpeed.230400.windows.upload.speed=256000 +heltec_wireless_stick_lite.menu.UploadSpeed.230400=230400 +heltec_wireless_stick_lite.menu.UploadSpeed.230400.upload.speed=230400 +heltec_wireless_stick_lite.menu.UploadSpeed.460800.linux=460800 +heltec_wireless_stick_lite.menu.UploadSpeed.460800.macosx=460800 +heltec_wireless_stick_lite.menu.UploadSpeed.460800.upload.speed=460800 +heltec_wireless_stick_lite.menu.UploadSpeed.512000.windows=512000 +heltec_wireless_stick_lite.menu.UploadSpeed.512000.upload.speed=512000 + +heltec_wireless_stick_lite.menu.DebugLevel.none=None +heltec_wireless_stick_lite.menu.DebugLevel.none.build.code_debug=0 +heltec_wireless_stick_lite.menu.DebugLevel.error=Error +heltec_wireless_stick_lite.menu.DebugLevel.error.build.code_debug=1 +heltec_wireless_stick_lite.menu.DebugLevel.warn=Warn +heltec_wireless_stick_lite.menu.DebugLevel.warn.build.code_debug=2 +heltec_wireless_stick_lite.menu.DebugLevel.info=Info +heltec_wireless_stick_lite.menu.DebugLevel.info.build.code_debug=3 +heltec_wireless_stick_lite.menu.DebugLevel.debug=Debug +heltec_wireless_stick_lite.menu.DebugLevel.debug.build.code_debug=4 +heltec_wireless_stick_lite.menu.DebugLevel.verbose=Verbose +heltec_wireless_stick_lite.menu.DebugLevel.verbose.build.code_debug=5 + +heltec_wireless_stick_lite.menu.LORAWAN_REGION.0=REGION_EU868 +heltec_wireless_stick_lite.menu.LORAWAN_REGION.0.build.band=REGION_EU868 +heltec_wireless_stick_lite.menu.LORAWAN_REGION.1=REGION_EU433 +heltec_wireless_stick_lite.menu.LORAWAN_REGION.1.build.band=REGION_EU433 +heltec_wireless_stick_lite.menu.LORAWAN_REGION.2=REGION_CN470 +heltec_wireless_stick_lite.menu.LORAWAN_REGION.2.build.band=REGION_CN470 +heltec_wireless_stick_lite.menu.LORAWAN_REGION.3=REGION_US915 +heltec_wireless_stick_lite.menu.LORAWAN_REGION.3.build.band=REGION_US915 +heltec_wireless_stick_lite.menu.LORAWAN_REGION.4=REGION_AU915 +heltec_wireless_stick_lite.menu.LORAWAN_REGION.4.build.band=REGION_AU915 +heltec_wireless_stick_lite.menu.LORAWAN_REGION.5=REGION_CN779 +heltec_wireless_stick_lite.menu.LORAWAN_REGION.5.build.band=REGION_CN779 +heltec_wireless_stick_lite.menu.LORAWAN_REGION.6=REGION_AS923 +heltec_wireless_stick_lite.menu.LORAWAN_REGION.6.build.band=REGION_AS923 +heltec_wireless_stick_lite.menu.LORAWAN_REGION.7=REGION_KR920 +heltec_wireless_stick_lite.menu.LORAWAN_REGION.7.build.band=REGION_KR920 +heltec_wireless_stick_lite.menu.LORAWAN_REGION.8=REGION_IN865 +heltec_wireless_stick_lite.menu.LORAWAN_REGION.8.build.band=REGION_IN865 +heltec_wireless_stick_lite.menu.LORAWAN_REGION.9=REGION_US915_HYBRID +heltec_wireless_stick_lite.menu.LORAWAN_REGION.9.build.band=REGION_US915_HYBRID + +heltec_wireless_stick_lite.menu.LoRaWanDebugLevel.0=None +heltec_wireless_stick_lite.menu.LoRaWanDebugLevel.0.build.LoRaWanDebugLevel=0 +heltec_wireless_stick_lite.menu.LoRaWanDebugLevel.1=Freq +heltec_wireless_stick_lite.menu.LoRaWanDebugLevel.1.build.LoRaWanDebugLevel=1 +heltec_wireless_stick_lite.menu.LoRaWanDebugLevel.2=Freq && DIO +heltec_wireless_stick_lite.menu.LoRaWanDebugLevel.2.build.LoRaWanDebugLevel=2 +heltec_wireless_stick_lite.menu.LoRaWanDebugLevel.3=Freq && DIO && PW +heltec_wireless_stick_lite.menu.LoRaWanDebugLevel.3.build.LoRaWanDebugLevel=3 + ############################################################## espectro32.name=ESPectro32 diff --git a/variants/heltec_wifi_lora_32/pins_arduino.h b/variants/heltec_wifi_lora_32/pins_arduino.h index b65e50be..4b4ccfec 100644 --- a/variants/heltec_wifi_lora_32/pins_arduino.h +++ b/variants/heltec_wifi_lora_32/pins_arduino.h @@ -3,7 +3,7 @@ #include -#define WIFI_LoRa_32 +#define WIFI_LoRa_32 true #define DISPLAY_HEIGHT 64 #define DISPLAY_WIDTH 128 diff --git a/variants/heltec_wifi_lora_32_V2/pins_arduino.h b/variants/heltec_wifi_lora_32_V2/pins_arduino.h index 4d091dab..088a0da9 100644 --- a/variants/heltec_wifi_lora_32_V2/pins_arduino.h +++ b/variants/heltec_wifi_lora_32_V2/pins_arduino.h @@ -3,7 +3,7 @@ #include -#define WIFI_LoRa_32_V2 +#define WIFI_LoRa_32_V2 true #define DISPLAY_HEIGHT 64 #define DISPLAY_WIDTH 128 diff --git a/variants/heltec_wireless_stick/pins_arduino.h b/variants/heltec_wireless_stick/pins_arduino.h index 11e028d9..901c62d9 100644 --- a/variants/heltec_wireless_stick/pins_arduino.h +++ b/variants/heltec_wireless_stick/pins_arduino.h @@ -3,7 +3,7 @@ #include -#define Wireless_Stick +#define Wireless_Stick true #define DISPLAY_HEIGHT 32 #define DISPLAY_WIDTH 64 diff --git a/variants/heltec_wireless_stick_lite/pins_arduino.h b/variants/heltec_wireless_stick_lite/pins_arduino.h new file mode 100644 index 00000000..2b4bf80f --- /dev/null +++ b/variants/heltec_wireless_stick_lite/pins_arduino.h @@ -0,0 +1,73 @@ +#ifndef Pins_Arduino_h +#define Pins_Arduino_h + +#include + +#define Wireless_Stick_Lite true +#define DISPLAY_HEIGHT 0 +#define DISPLAY_WIDTH 0 + +#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 +#define LED_BUILTIN 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_LoRa = 14; +static const uint8_t DIO0 = 26; +static const uint8_t DIO1 = 35; +static const uint8_t DIO2 = 34; + +#endif /* Pins_Arduino_h */