From f43f54117c40f29800c6487321b8d13435ad64e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niccol=C3=B2=20Izzo?= Date: Tue, 27 Jul 2021 08:39:21 +0200 Subject: [PATCH] Fix M17 callsign setting Fix M17 callsign disappearing in M17 settings. The generic callsign (currently not used) was being shown instead of M17 callsign. --- openrtx/include/settings.h | 2 +- openrtx/src/ui/ui.c | 2 +- openrtx/src/ui/ui_menu.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/openrtx/include/settings.h b/openrtx/include/settings.h index 64e18a04..d73c0db1 100644 --- a/openrtx/include/settings.h +++ b/openrtx/include/settings.h @@ -31,7 +31,7 @@ typedef struct int8_t utc_timezone; bool gps_enabled; bool gps_set_time; - char callsign[10]; // Plaintext callsign, used for M17 + char callsign[10]; // Plaintext callsign, for future use } __attribute__((packed)) settings_t; diff --git a/openrtx/src/ui/ui.c b/openrtx/src/ui/ui.c index d909d491..1512bb24 100644 --- a/openrtx/src/ui/ui.c +++ b/openrtx/src/ui/ui.c @@ -1321,7 +1321,7 @@ void ui_updateFSM(event_t event, bool *sync_rtx) { _ui_textInputConfirm(ui_state.new_callsign); // Save selected callsign and disable input mode - strcpy(state.settings.callsign, ui_state.new_callsign); + strcpy(state.m17_data.callsign, ui_state.new_callsign); ui_state.edit_mode = false; } else if(msg.keys & KEY_ESC) diff --git a/openrtx/src/ui/ui_menu.c b/openrtx/src/ui/ui_menu.c index b5b81ad5..402184fb 100644 --- a/openrtx/src/ui/ui_menu.c +++ b/openrtx/src/ui/ui_menu.c @@ -539,7 +539,7 @@ void _ui_drawSettingsM17(ui_state_t* ui_state) // Print M17 current callsign gfx_printLine(1, 1, layout.top_h, SCREEN_HEIGHT - layout.bottom_h, layout.horizontal_pad, layout.input_font, - TEXT_ALIGN_CENTER, color_white, last_state.settings.callsign); + TEXT_ALIGN_CENTER, color_white, last_state.m17_data.callsign); } }