Mirror/edgetx
1
0
Fork 0
mirror of https://github.com/EdgeTX/edgetx.git synced 2025-07-23 08:15:13 +03:00
Code Activity

Powermeter / Frequency analyser exit issue

Browse source
This commit is contained in:
Bertrand Songis 2019-04-28 22:41:58 +02:00
parent a84a50f8a6
commit 6530f93e21
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
radio/src/bluetooth.cpp
View file

@ -30,8 +30,8 @@
#define BLUETOOTH_COMMAND_BAUD_115200 "TTM:BPS-115200" #define BLUETOOTH_COMMAND_BAUD_115200 "TTM:BPS-115200"
#endif #endif
extern Fifo<uint8_t, 64> btTxFifo; extern Fifo<uint8_t, BT_TX_FIFO_SIZE> btTxFifo;
extern Fifo<uint8_t, 128> btRxFifo; extern Fifo<uint8_t, BT_RX_FIFO_SIZE> btRxFifo;
Bluetooth bluetooth; Bluetooth bluetooth;

2
radio/src/gui/common/stdlcd/radio_power_meter.cpp
View file

@ -49,7 +49,7 @@ void menuRadioPowerMeter(event_t event)
if (menuEvent) { if (menuEvent) {
lcdDrawCenteredText(LCD_H/2, STR_STOPPING); lcdDrawCenteredText(LCD_H/2, STR_STOPPING);
lcdRefresh(); lcdRefresh();
moduleState[g_moduleIdx].mode = MODULE_MODE_NORMAL; moduleState[g_moduleIdx].readModuleInformation(&reusableBuffer.moduleSetup.pxx2.moduleInformation, PXX2_HW_INFO_TX_ID, PXX2_HW_INFO_TX_ID);
/* wait 1s to resume normal operation before leaving */ /* wait 1s to resume normal operation before leaving */
watchdogSuspend(1000); watchdogSuspend(1000);
RTOS_WAIT_MS(1000); RTOS_WAIT_MS(1000);

6
radio/src/gui/common/stdlcd/radio_spectrum_analyser.cpp
View file

@ -33,7 +33,7 @@ void menuRadioSpectrumAnalyser(event_t event)
SUBMENU(STR_MENU_SPECTRUM_ANALYSER, 1, {1}); SUBMENU(STR_MENU_SPECTRUM_ANALYSER, 1, {1});
if (TELEMETRY_STREAMING()) { if (TELEMETRY_STREAMING()) {
lcdDrawCenteredText(LCD_H/2, STR_TURN_OFF_RECEIVER ); lcdDrawCenteredText(LCD_H/2, STR_TURN_OFF_RECEIVER);
if (event == EVT_KEY_FIRST(KEY_EXIT)) { if (event == EVT_KEY_FIRST(KEY_EXIT)) {
killEvents(event); killEvents(event);
popMenu(); popMenu();
@ -42,9 +42,9 @@ void menuRadioSpectrumAnalyser(event_t event)
} }
if (menuEvent) { if (menuEvent) {
lcdDrawCenteredText(LCD_H/2, STR_STOPPING ); lcdDrawCenteredText(LCD_H/2, STR_STOPPING);
lcdRefresh(); lcdRefresh();
moduleState[g_moduleIdx].mode = MODULE_MODE_NORMAL; moduleState[g_moduleIdx].readModuleInformation(&reusableBuffer.moduleSetup.pxx2.moduleInformation, PXX2_HW_INFO_TX_ID, PXX2_HW_INFO_TX_ID);
/* wait 1s to resume normal operation before leaving */ /* wait 1s to resume normal operation before leaving */
watchdogSuspend(1000); watchdogSuspend(1000);
RTOS_WAIT_MS(1000); RTOS_WAIT_MS(1000);