From 9ab47923547a43bd04359509f028bbbcbe6ca96f Mon Sep 17 00:00:00 2001 From: 4LAR Date: Wed, 10 Dec 2025 18:08:56 +0000 Subject: [PATCH] =?UTF-8?q?=D0=BC=D0=BE=D0=B4=D0=B8=D1=84=D0=B8=D0=BA?= =?UTF-8?q?=D0=B0=D1=86=D1=8F=20=D0=BD=D0=B0=20=D1=80=D0=B5=D0=BB=D0=B8?= =?UTF-8?q?=D0=B7=D0=BD=D1=83=D1=8E=20=D0=B2=D0=B5=D1=80=D1=81=D0=B8=D1=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- protobufs/meshtastic/config.proto | 5 +++++ src/graphics/draw/MenuHandler.cpp | 5 +++-- src/graphics/draw/UIRenderer.cpp | 4 ++-- src/mesh/RadioInterface.cpp | 5 +++++ src/mesh/generated/meshtastic/config.pb.h | 4 +++- variants/esp32s3/heltec_v3/platformio.ini | 5 +++-- 6 files changed, 21 insertions(+), 7 deletions(-) diff --git a/protobufs/meshtastic/config.proto b/protobufs/meshtastic/config.proto index 4d352c1..13eb2c5 100644 --- a/protobufs/meshtastic/config.proto +++ b/protobufs/meshtastic/config.proto @@ -924,6 +924,11 @@ message Config { * Brazil 902MHz */ BR_902 = 26; + + /* + * NO LIMITS + */ + NO_LIMITS = 27; } /* diff --git a/src/graphics/draw/MenuHandler.cpp b/src/graphics/draw/MenuHandler.cpp index 1ac75c4..1f6c10b 100644 --- a/src/graphics/draw/MenuHandler.cpp +++ b/src/graphics/draw/MenuHandler.cpp @@ -102,6 +102,7 @@ void menuHandler::LoraRegionPicker(uint32_t duration) "KZ_433", "KZ_863", "NP_865", + "NO_LIMITS", "BR_902"}; BannerOverlayOptions bannerOptions; #if defined(M5STACK_UNITC6L) @@ -111,7 +112,7 @@ void menuHandler::LoraRegionPicker(uint32_t duration) #endif bannerOptions.durationMs = duration; bannerOptions.optionsArrayPtr = optionsArray; - bannerOptions.optionsCount = 27; + bannerOptions.optionsCount = 28; bannerOptions.InitialSelected = 0; bannerOptions.bannerCallback = [](int selected) -> void { if (selected != 0 && config.lora.region != _meshtastic_Config_LoRaConfig_RegionCode(selected)) { @@ -1748,4 +1749,4 @@ void menuHandler::saveUIConfig() } // namespace graphics -#endif \ No newline at end of file +#endif diff --git a/src/graphics/draw/UIRenderer.cpp b/src/graphics/draw/UIRenderer.cpp index 538c328..55b715c 100644 --- a/src/graphics/draw/UIRenderer.cpp +++ b/src/graphics/draw/UIRenderer.cpp @@ -958,7 +958,7 @@ void UIRenderer::drawIconScreen(const char *upperMsg, OLEDDisplay *display, OLED display->setFont(FONT_MEDIUM); display->setTextAlignment(TEXT_ALIGN_LEFT); - const char *title = "meshtastic.org"; + const char *title = "meshtastic MOD"; display->drawString(x + getStringCenteredX(title), y + SCREEN_HEIGHT - FONT_HEIGHT_MEDIUM, title); display->setFont(FONT_SMALL); // Draw region in upper left @@ -1422,4 +1422,4 @@ std::string UIRenderer::drawTimeDelta(uint32_t days, uint32_t hours, uint32_t mi } // namespace graphics -#endif // HAS_SCREEN \ No newline at end of file +#endif // HAS_SCREEN diff --git a/src/mesh/RadioInterface.cpp b/src/mesh/RadioInterface.cpp index 3c0da44..d96cb22 100644 --- a/src/mesh/RadioInterface.cpp +++ b/src/mesh/RadioInterface.cpp @@ -192,6 +192,11 @@ const RegionInfo regions[] = { */ RDEF(LORA_24, 2400.0f, 2483.5f, 100, 0, 10, true, false, true), + /* + Without limits + */ + RDEF(NO_LIMITS, 863.0f, 870.0f, 100, 0, 36, true, false, false), + /* This needs to be last. Same as US. */ diff --git a/src/mesh/generated/meshtastic/config.pb.h b/src/mesh/generated/meshtastic/config.pb.h index 3275683..5349a64 100644 --- a/src/mesh/generated/meshtastic/config.pb.h +++ b/src/mesh/generated/meshtastic/config.pb.h @@ -285,7 +285,9 @@ typedef enum _meshtastic_Config_LoRaConfig_RegionCode { /* Nepal 865MHz */ meshtastic_Config_LoRaConfig_RegionCode_NP_865 = 25, /* Brazil 902MHz */ - meshtastic_Config_LoRaConfig_RegionCode_BR_902 = 26 + meshtastic_Config_LoRaConfig_RegionCode_BR_902 = 26, + /* NO LIMITS */ + meshtastic_Config_LoRaConfig_RegionCode_NO_LIMITS = 27 } meshtastic_Config_LoRaConfig_RegionCode; /* Standard predefined channel settings diff --git a/variants/esp32s3/heltec_v3/platformio.ini b/variants/esp32s3/heltec_v3/platformio.ini index af0854e..81a96e5 100644 --- a/variants/esp32s3/heltec_v3/platformio.ini +++ b/variants/esp32s3/heltec_v3/platformio.ini @@ -1,10 +1,11 @@ -[env:heltec-v3] +[env:heltec-v3] extends = esp32s3_base board = heltec_wifi_lora_32_V3 board_level = pr board_check = true board_build.partitions = default_8MB.csv -build_flags = +build_flags = ${esp32s3_base.build_flags} -D HELTEC_V3 + -D OLED_RU -I variants/esp32s3/heltec_v3