From dc3a26df1cc556bc08c393a19db98750c92cf8f9 Mon Sep 17 00:00:00 2001 From: 3djc Date: Mon, 6 Feb 2017 19:49:29 +0100 Subject: [PATCH 1/2] Fix #4412 --- radio/src/gui/128x64/view_telemetry.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/radio/src/gui/128x64/view_telemetry.cpp b/radio/src/gui/128x64/view_telemetry.cpp index ef9570506..2095b47ec 100644 --- a/radio/src/gui/128x64/view_telemetry.cpp +++ b/radio/src/gui/128x64/view_telemetry.cpp @@ -541,7 +541,14 @@ void menuViewTelemetryFrsky(event_t event) break; case EVT_KEY_FIRST(KEY_ENTER): +#if defined(CPUARM) + killEvents(event); + POPUP_MENU_ADD_ITEM(STR_RESET_TELEMETRY); + POPUP_MENU_ADD_ITEM(STR_RESET_FLIGHT); + POPUP_MENU_START(onMainViewMenu); +#else telemetryReset(); +#endif break; } From 559bde6b4a88bcc8ef54d6358ca47681cfe77ca9 Mon Sep 17 00:00:00 2001 From: Raphael Coeffic Date: Mon, 6 Feb 2017 22:18:23 +0100 Subject: [PATCH 2/2] =?UTF-8?q?make=20=E2=80=9Creset=E2=80=9D=20menu=20con?= =?UTF-8?q?sistent=20with=20X9D=20(long=20enter=20press)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- radio/src/gui/128x64/view_telemetry.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/radio/src/gui/128x64/view_telemetry.cpp b/radio/src/gui/128x64/view_telemetry.cpp index 2095b47ec..8340d3009 100644 --- a/radio/src/gui/128x64/view_telemetry.cpp +++ b/radio/src/gui/128x64/view_telemetry.cpp @@ -540,13 +540,14 @@ void menuViewTelemetryFrsky(event_t event) incrTelemetryScreen(); break; - case EVT_KEY_FIRST(KEY_ENTER): #if defined(CPUARM) + case EVT_KEY_LONG(KEY_ENTER): killEvents(event); POPUP_MENU_ADD_ITEM(STR_RESET_TELEMETRY); POPUP_MENU_ADD_ITEM(STR_RESET_FLIGHT); POPUP_MENU_START(onMainViewMenu); #else + case EVT_KEY_FIRST(KEY_ENTER): telemetryReset(); #endif break;