mirror
/
OpenRTX
kopia lustrzana https://github.com/OpenRTX/OpenRTX
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Fix layout, implement tone enable disable macro

replace/61779a46b9715dca4cecd9dc53af718aca257d73
Niccolò Izzo 2021-01-05 09:11:43 +01:00
rodzic bbcd6483a2
commit 29e4e35199
1 zmienionych plików z 22 dodań i 6 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

28
openrtx/src/ui.c
Wyświetl plik

@ -735,17 +735,17 @@ bool _ui_drawMenuMacro(state_t* last_state) {
// Second row // Second row
gfx_print(layout.line2_left, "4", layout.top_font, TEXT_ALIGN_LEFT, gfx_print(layout.line2_left, "4", layout.top_font, TEXT_ALIGN_LEFT,
yellow_fab413); yellow_fab413);
char bw_str[7] = { 0 }; char bw_str[8] = { 0 };
switch (last_state->channel.bandwidth) switch (last_state->channel.bandwidth)
{ {
case BW_12_5: case BW_12_5:
snprintf(bw_str, 7, " 12.5"); snprintf(bw_str, 8, " 12.5");
break; break;
case BW_20: case BW_20:
snprintf(bw_str, 7, " 20"); snprintf(bw_str, 8, " 20");
break; break;
case BW_25: case BW_25:
snprintf(bw_str, 7, " 25"); snprintf(bw_str, 8, " 25");
break; break;
} }
gfx_print(layout.line2_left, bw_str, layout.top_font, TEXT_ALIGN_LEFT, gfx_print(layout.line2_left, bw_str, layout.top_font, TEXT_ALIGN_LEFT,
@ -1029,27 +1029,43 @@ void ui_updateFSM(event_t event, bool *sync_rtx)
if(!msg.long_press && input_isNumberPressed(msg)) if(!msg.long_press && input_isNumberPressed(msg))
{ {
input_number = input_getPressedNumber(msg); input_number = input_getPressedNumber(msg);
// Backlight
int32_t new_blight = state.backlight_level; int32_t new_blight = state.backlight_level;
// CTCSS Encode/Decode Selection
bool tone_tx_enable = state.channel.fm.txToneEn;
bool tone_rx_enable = state.channel.fm.rxToneEn;
uint8_t tone_flags = tone_tx_enable << 1 | tone_rx_enable;
switch(input_number) switch(input_number)
{ {
case 2:
tone_flags++;
tone_flags %= 4;
tone_tx_enable = tone_flags >> 1;
tone_rx_enable = tone_flags & 1;
state.channel.fm.txToneEn = tone_tx_enable;
state.channel.fm.rxToneEn = tone_rx_enable;
*sync_rtx = true;
break;
case 3: case 3:
if (state.channel.power == 1.0f) if (state.channel.power == 1.0f)
state.channel.power = 5.0f; state.channel.power = 5.0f;
else else
state.channel.power = 1.0f; state.channel.power = 1.0f;
*sync_rtx = true;
break; break;
case 4: case 4:
state.channel.bandwidth++; state.channel.bandwidth++;
state.channel.bandwidth %= 3; state.channel.bandwidth %= 3;
*sync_rtx = true;
break; break;
case 7: case 7:
new_blight += 10; new_blight += 25;
new_blight = (new_blight > 255) ? 255 : new_blight; new_blight = (new_blight > 255) ? 255 : new_blight;
state.backlight_level = new_blight; state.backlight_level = new_blight;
platform_setBacklightLevel(state.backlight_level); platform_setBacklightLevel(state.backlight_level);
break; break;
case 8: case 8:
new_blight -= 10; new_blight -= 25;
new_blight = (new_blight < 0) ? 0 : new_blight; new_blight = (new_blight < 0) ? 0 : new_blight;
state.backlight_level = new_blight; state.backlight_level = new_blight;
platform_setBacklightLevel(state.backlight_level); platform_setBacklightLevel(state.backlight_level);