TX options modification

This commit is contained in:
Bertrand Songis
2019-03-21 18:19:53 +01:00
parent e43ad9adc6
commit 39d99abc30
+10 -4
View File
@@ -1962,12 +1962,11 @@ void onTxOptionsUpdateConfirm(const char * result)
{ {
if (result == STR_OK) { if (result == STR_OK) {
reusableBuffer.moduleSettings.state = PXX2_SETTINGS_WRITE; reusableBuffer.moduleSettings.state = PXX2_SETTINGS_WRITE;
reusableBuffer.moduleSettings.dirty = 0; reusableBuffer.moduleSettings.dirty = 2;
reusableBuffer.moduleSettings.timeout = 0; reusableBuffer.moduleSettings.timeout = 0;
moduleSettings[g_moduleIdx].mode = MODULE_MODE_MODULE_SETTINGS; moduleSettings[g_moduleIdx].mode = MODULE_MODE_MODULE_SETTINGS;
} }
else { else {
reusableBuffer.moduleSettings.dirty = 0;
popMenu(); 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; int8_t sub = menuVerticalPosition;
lcdDrawTextAlignedLeft(0, "Module options"); lcdDrawTextAlignedLeft(0, "Module options");
@@ -2055,12 +2058,11 @@ void onRxOptionsUpdateConfirm(const char * result)
{ {
if (result == STR_OK) { if (result == STR_OK) {
reusableBuffer.receiverSettings.state = PXX2_SETTINGS_WRITE; reusableBuffer.receiverSettings.state = PXX2_SETTINGS_WRITE;
reusableBuffer.receiverSettings.dirty = 0; reusableBuffer.receiverSettings.dirty = 2;
reusableBuffer.receiverSettings.timeout = 0; reusableBuffer.receiverSettings.timeout = 0;
moduleSettings[g_moduleIdx].mode = MODULE_MODE_RECEIVER_SETTINGS; moduleSettings[g_moduleIdx].mode = MODULE_MODE_RECEIVER_SETTINGS;
} }
else { else {
reusableBuffer.receiverSettings.dirty = 0;
popMenu(); 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; int8_t sub = menuVerticalPosition;
lcdDrawTextAlignedLeft(0, STR_RECEIVER_OPTIONS); lcdDrawTextAlignedLeft(0, STR_RECEIVER_OPTIONS);