модификаця на релизную версию
This commit is contained in:
parent
99b1896c8d
commit
9ab4792354
@ -924,6 +924,11 @@ message Config {
|
||||
* Brazil 902MHz
|
||||
*/
|
||||
BR_902 = 26;
|
||||
|
||||
/*
|
||||
* NO LIMITS
|
||||
*/
|
||||
NO_LIMITS = 27;
|
||||
}
|
||||
|
||||
/*
|
||||
|
||||
@ -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
|
||||
#endif
|
||||
|
||||
@ -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
|
||||
#endif // HAS_SCREEN
|
||||
|
||||
@ -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.
|
||||
*/
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
Loading…
Reference in New Issue
Block a user