100LAR/meshtastic-firmware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

модификаця на релизную версию

Browse Source
This commit is contained in:
4LAR 2025-12-10 18:08:56 +00:00
parent 99b1896c8d
commit 9ab4792354
6 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
protobufs/meshtastic/config.proto
View File

@ -924,6 +924,11 @@ message Config {
* Brazil 902MHz * Brazil 902MHz
*/ */
BR_902 = 26; BR_902 = 26;
/*
* NO LIMITS
*/
NO_LIMITS = 27;
} }
/* /*

5
src/graphics/draw/MenuHandler.cpp
View File

@ -102,6 +102,7 @@ void menuHandler::LoraRegionPicker(uint32_t duration)
"KZ_433", "KZ_433",
"KZ_863", "KZ_863",
"NP_865", "NP_865",
"NO_LIMITS",
"BR_902"}; "BR_902"};
BannerOverlayOptions bannerOptions; BannerOverlayOptions bannerOptions;
#if defined(M5STACK_UNITC6L) #if defined(M5STACK_UNITC6L)
@ -111,7 +112,7 @@ void menuHandler::LoraRegionPicker(uint32_t duration)
#endif #endif
bannerOptions.durationMs = duration; bannerOptions.durationMs = duration;
bannerOptions.optionsArrayPtr = optionsArray; bannerOptions.optionsArrayPtr = optionsArray;
bannerOptions.optionsCount = 27; bannerOptions.optionsCount = 28;
bannerOptions.InitialSelected = 0; bannerOptions.InitialSelected = 0;
bannerOptions.bannerCallback = [](int selected) -> void { bannerOptions.bannerCallback = [](int selected) -> void {
if (selected != 0 && config.lora.region != _meshtastic_Config_LoRaConfig_RegionCode(selected)) { if (selected != 0 && config.lora.region != _meshtastic_Config_LoRaConfig_RegionCode(selected)) {
@ -1748,4 +1749,4 @@ void menuHandler::saveUIConfig()
} // namespace graphics } // namespace graphics
#endif #endif

4
src/graphics/draw/UIRenderer.cpp
View File

@ -958,7 +958,7 @@ void UIRenderer::drawIconScreen(const char *upperMsg, OLEDDisplay *display, OLED
display->setFont(FONT_MEDIUM); display->setFont(FONT_MEDIUM);
display->setTextAlignment(TEXT_ALIGN_LEFT); 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->drawString(x + getStringCenteredX(title), y + SCREEN_HEIGHT - FONT_HEIGHT_MEDIUM, title);
display->setFont(FONT_SMALL); display->setFont(FONT_SMALL);
// Draw region in upper left // Draw region in upper left
@ -1422,4 +1422,4 @@ std::string UIRenderer::drawTimeDelta(uint32_t days, uint32_t hours, uint32_t mi
} // namespace graphics } // namespace graphics
#endif // HAS_SCREEN #endif // HAS_SCREEN

5
src/mesh/RadioInterface.cpp
View File

@ -192,6 +192,11 @@ const RegionInfo regions[] = {
*/ */
RDEF(LORA_24, 2400.0f, 2483.5f, 100, 0, 10, true, false, true), 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. This needs to be last. Same as US.
*/ */

4
src/mesh/generated/meshtastic/config.pb.h
View File

@ -285,7 +285,9 @@ typedef enum _meshtastic_Config_LoRaConfig_RegionCode {
/* Nepal 865MHz */ /* Nepal 865MHz */
meshtastic_Config_LoRaConfig_RegionCode_NP_865 = 25, meshtastic_Config_LoRaConfig_RegionCode_NP_865 = 25,
/* Brazil 902MHz */ /* 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; } meshtastic_Config_LoRaConfig_RegionCode;
/* Standard predefined channel settings /* Standard predefined channel settings

5
variants/esp32s3/heltec_v3/platformio.ini
View File

@ -1,10 +1,11 @@
[env:heltec-v3] [env:heltec-v3]
extends = esp32s3_base extends = esp32s3_base
board = heltec_wifi_lora_32_V3 board = heltec_wifi_lora_32_V3
board_level = pr board_level = pr
board_check = true board_check = true
board_build.partitions = default_8MB.csv board_build.partitions = default_8MB.csv
build_flags = build_flags =
${esp32s3_base.build_flags} ${esp32s3_base.build_flags}
-D HELTEC_V3 -D HELTEC_V3
-D OLED_RU
-I variants/esp32s3/heltec_v3 -I variants/esp32s3/heltec_v3