From 201524d61afec479a9782c23a1189023361f62ec Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Thu, 18 Apr 2019 12:46:39 +0200 Subject: [PATCH] Attempt to fix the issue when coming from Powermeter --- radio/src/gui/common/stdlcd/radio_power_meter.cpp | 11 +++-------- .../src/gui/common/stdlcd/radio_spectrum_analyser.cpp | 11 +++-------- 2 files changed, 6 insertions(+), 16 deletions(-) diff --git a/radio/src/gui/common/stdlcd/radio_power_meter.cpp b/radio/src/gui/common/stdlcd/radio_power_meter.cpp index 8a13343e7..63fb19df4 100644 --- a/radio/src/gui/common/stdlcd/radio_power_meter.cpp +++ b/radio/src/gui/common/stdlcd/radio_power_meter.cpp @@ -48,15 +48,10 @@ void menuRadioPowerMeter(event_t event) if (menuEvent) { lcdDrawCenteredText(LCD_H/2, "Stopping..."); lcdRefresh(); - pausePulses(); moduleSettings[g_moduleIdx].mode = MODULE_MODE_NORMAL; - /* wait 500ms off */ - watchdogSuspend(500); - RTOS_WAIT_MS(500); - resumePulses(); - /* wait 500ms to resume normal operation before leaving */ - watchdogSuspend(500); - RTOS_WAIT_MS(500); + /* wait 1s to resume normal operation before leaving */ + watchdogSuspend(1000); + RTOS_WAIT_MS(1000); return; } diff --git a/radio/src/gui/common/stdlcd/radio_spectrum_analyser.cpp b/radio/src/gui/common/stdlcd/radio_spectrum_analyser.cpp index effdd0308..50355ac89 100644 --- a/radio/src/gui/common/stdlcd/radio_spectrum_analyser.cpp +++ b/radio/src/gui/common/stdlcd/radio_spectrum_analyser.cpp @@ -44,15 +44,10 @@ void menuRadioSpectrumAnalyser(event_t event) if (menuEvent) { lcdDrawCenteredText(LCD_H/2, "Stopping..."); lcdRefresh(); - pausePulses(); moduleSettings[g_moduleIdx].mode = MODULE_MODE_NORMAL; - /* wait 500ms off */ - watchdogSuspend(500); - RTOS_WAIT_MS(500); - resumePulses(); - /* wait 500ms to resume normal operation before leaving */ - watchdogSuspend(500); - RTOS_WAIT_MS(500); + /* wait 1s to resume normal operation before leaving */ + watchdogSuspend(1000); + RTOS_WAIT_MS(1000); return; }