Skip to content

fix: guard modem preset frequency when region unset #338

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
RCGV1 wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

fix: guard modem preset frequency when region unset #338

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions source/graphics/TFT/TFTView_320x240.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1741,7 +1741,8 @@ void TFTView_320x240::ui_event_region_button(lv_event_t *e)
void TFTView_320x240::ui_event_preset_button(lv_event_t *e)
{
lv_event_code_t event_code = lv_event_get_code(e);
if (event_code == LV_EVENT_CLICKED && THIS->activeSettings == eNone && THIS->db.config.lora.use_preset) {
if (event_code == LV_EVENT_CLICKED && THIS->activeSettings == eNone && THIS->db.config.lora.use_preset &&
THIS->db.config.lora.region != meshtastic_Config_LoRaConfig_RegionCode_UNSET) {
THIS->activeSettings = eModemPreset;
lv_dropdown_set_selected(objects.settings_modem_preset_dropdown, THIS->preset2val(THIS->db.config.lora.modem_preset));

Expand Down Expand Up @@ -6013,8 +6014,13 @@ void TFTView_320x240::updateLoRaConfig(const meshtastic_Config_LoRaConfig &cfg)
lv_label_set_text(objects.basic_settings_modem_preset_label, buf2);

uint32_t numChannels = LoRaPresets::getNumChannels(cfg.region, cfg.modem_preset);
lv_slider_set_range(objects.frequency_slot_slider, 1, numChannels);
lv_slider_set_value(objects.frequency_slot_slider, db.config.lora.channel_num, LV_ANIM_OFF);
if (numChannels) {
lv_slider_set_range(objects.frequency_slot_slider, 1, numChannels);
lv_slider_set_value(objects.frequency_slot_slider, db.config.lora.channel_num, LV_ANIM_OFF);
} else {
lv_slider_set_range(objects.frequency_slot_slider, 0, 0);
lv_slider_set_value(objects.frequency_slot_slider, 0, LV_ANIM_OFF);
}
} else {
lv_label_set_text(objects.basic_settings_modem_preset_label, _("Modem Preset: custom"));
}
Expand Down Expand Up @@ -6042,6 +6048,7 @@ void TFTView_320x240::showLoRaFrequency(const meshtastic_Config_LoRaConfig &cfg)
char loraFreq[48];
if (!cfg.region) {
strcpy(loraFreq, _("region unset"));
lv_obj_add_state(objects.basic_settings_modem_preset_button, LV_STATE_DISABLED);
} else if (cfg.use_preset) {
float frequency = LoRaPresets::getRadioFreq(cfg.region, cfg.modem_preset, cfg.channel_num) + cfg.frequency_offset;
sprintf(loraFreq, "LoRa %g MHz\n[%s kHz]", frequency, LoRaPresets::getBandwidthString(cfg.modem_preset));
Expand Down
4 changes: 4 additions & 0 deletions source/graphics/common/LoRaPresets.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,10 @@ uint32_t LoRaPresets::getNumChannels(meshtastic_Config_LoRaConfig_RegionCode reg
float LoRaPresets::getRadioFreq(meshtastic_Config_LoRaConfig_RegionCode region, meshtastic_Config_LoRaConfig_ModemPreset preset,
uint32_t channel)
{
if (region == meshtastic_Config_LoRaConfig_RegionCode_UNSET || channel == 0) {
return 0.0f;
}

return (regionInfo[region].freqStart + modemPreset[preset].bandwidth_MHz / 2) +
(channel - 1) * modemPreset[preset].bandwidth_MHz;
}
12 changes: 12 additions & 0 deletions tests/test_LoRaPresets.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
#include "graphics/common/LoRaPresets.h"
#include <doctest/doctest.h>

TEST_CASE("LoRaPresets::getRadioFreq returns no frequency without a valid region and slot")
{
CHECK(LoRaPresets::getRadioFreq(meshtastic_Config_LoRaConfig_RegionCode_UNSET,
meshtastic_Config_LoRaConfig_ModemPreset_LONG_FAST, 0) == doctest::Approx(0.0f));
CHECK(LoRaPresets::getRadioFreq(meshtastic_Config_LoRaConfig_RegionCode_US,
meshtastic_Config_LoRaConfig_ModemPreset_LONG_FAST, 0) == doctest::Approx(0.0f));
CHECK(LoRaPresets::getRadioFreq(meshtastic_Config_LoRaConfig_RegionCode_US,
meshtastic_Config_LoRaConfig_ModemPreset_LONG_FAST, 1) == doctest::Approx(902.125f));
}
Loading