From 39d99abc3095defaba085254aa977775476b1e22 Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Thu, 21 Mar 2019 18:19:53 +0100 Subject: [PATCH] TX options modification --- radio/src/gui/128x64/model_setup.cpp | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/radio/src/gui/128x64/model_setup.cpp b/radio/src/gui/128x64/model_setup.cpp index 83f331138..af70b54d4 100644 --- a/radio/src/gui/128x64/model_setup.cpp +++ b/radio/src/gui/128x64/model_setup.cpp @@ -1962,12 +1962,11 @@ void onTxOptionsUpdateConfirm(const char * result) { if (result == STR_OK) { reusableBuffer.moduleSettings.state = PXX2_SETTINGS_WRITE; - reusableBuffer.moduleSettings.dirty = 0; + reusableBuffer.moduleSettings.dirty = 2; reusableBuffer.moduleSettings.timeout = 0; moduleSettings[g_moduleIdx].mode = MODULE_MODE_MODULE_SETTINGS; } else { - reusableBuffer.moduleSettings.dirty = 0; popMenu(); } } @@ -1994,6 +1993,10 @@ void menuModelModuleOptions(event_t event) } } + if (reusableBuffer.moduleSettings.dirty == 2 && reusableBuffer.moduleSettings.state == PXX2_SETTINGS_OK) { + popMenu(); + } + int8_t sub = menuVerticalPosition; lcdDrawTextAlignedLeft(0, "Module options"); @@ -2055,12 +2058,11 @@ void onRxOptionsUpdateConfirm(const char * result) { if (result == STR_OK) { reusableBuffer.receiverSettings.state = PXX2_SETTINGS_WRITE; - reusableBuffer.receiverSettings.dirty = 0; + reusableBuffer.receiverSettings.dirty = 2; reusableBuffer.receiverSettings.timeout = 0; moduleSettings[g_moduleIdx].mode = MODULE_MODE_RECEIVER_SETTINGS; } else { - reusableBuffer.receiverSettings.dirty = 0; popMenu(); } } @@ -2090,6 +2092,10 @@ void menuModelReceiverOptions(event_t event) } } + if (reusableBuffer.moduleSettings.dirty == 2 && reusableBuffer.receiverSettings.state == PXX2_SETTINGS_OK) { + popMenu(); + } + int8_t sub = menuVerticalPosition; lcdDrawTextAlignedLeft(0, STR_RECEIVER_OPTIONS);