Improve a bit

This commit is contained in:
3djc
2019-12-16 17:59:41 +01:00
parent fdca39c2a5
commit 573985e2ef
5 changed files with 14 additions and 16 deletions
+1 -1
View File
@@ -1328,7 +1328,7 @@ void menuModelSetup(event_t event)
uint8_t newFlag = 0; uint8_t newFlag = 0;
#if defined(MULTIMODULE) #if defined(MULTIMODULE)
if (getMultiBindStatus(moduleIdx) == MULTI_BIND_FINISHED) { if (getMultiBindStatus(moduleIdx) == MULTI_BIND_FINISHED) {
setMultiBindStatus(moduleIdx, MULTI_NORMAL_OPERATION); setMultiBindStatus(moduleIdx, MULTI_BIND_NONE);
s_editMode = 0; s_editMode = 0;
} }
#endif #endif
+1 -1
View File
@@ -1126,7 +1126,7 @@ void menuModelSetup(event_t event)
uint8_t newFlag = 0; uint8_t newFlag = 0;
#if defined(MULTIMODULE) #if defined(MULTIMODULE)
if (getMultiBindStatus(moduleIdx) == MULTI_BIND_FINISHED) { if (getMultiBindStatus(moduleIdx) == MULTI_BIND_FINISHED) {
setMultiBindStatus(moduleIdx, MULTI_NORMAL_OPERATION); setMultiBindStatus(moduleIdx, MULTI_BIND_NONE);
s_editMode = 0; s_editMode = 0;
} }
#endif #endif
+4 -10
View File
@@ -715,17 +715,11 @@ class ModuleWindow : public FormGroup {
if (moduleState[moduleIdx].mode != MODULE_MODE_BIND) { if (moduleState[moduleIdx].mode != MODULE_MODE_BIND) {
bindButton->check(false); bindButton->check(false);
} }
#if !defined(INTERNAL_MODULE_MULTI) if (getMultiBindStatus(moduleIdx) == MULTI_BIND_FINISHED) {
if (moduleIdx == EXTERNAL_MODULE) { setMultiBindStatus(moduleIdx, MULTI_BIND_NONE);
#endif moduleState[moduleIdx].mode = MODULE_MODE_NORMAL;
if (getMultiBindStatus(moduleIdx) == MULTI_BIND_FINISHED) { bindButton->check(false);
setMultiBindStatus(moduleIdx, MULTI_NORMAL_OPERATION);
moduleState[moduleIdx].mode = MODULE_MODE_NORMAL;
bindButton->check(false);
}
#if !defined(INTERNAL_MODULE_MULTI)
} }
#endif
}); });
rangeButton = new TextButton(this, grid.getFieldSlot(2+thirdColumn, 1+thirdColumn), STR_MODULE_RANGE); rangeButton = new TextButton(this, grid.getFieldSlot(2+thirdColumn, 1+thirdColumn), STR_MODULE_RANGE);
+7 -3
View File
@@ -63,7 +63,7 @@ enum MultiBufferState : uint8_t
static MultiModuleStatus multiModuleStatus[NUM_MODULES] = {MultiModuleStatus(), MultiModuleStatus()}; static MultiModuleStatus multiModuleStatus[NUM_MODULES] = {MultiModuleStatus(), MultiModuleStatus()};
static MultiModuleSyncStatus multiSyncStatus[NUM_MODULES] = {MultiModuleSyncStatus(), MultiModuleSyncStatus()}; static MultiModuleSyncStatus multiSyncStatus[NUM_MODULES] = {MultiModuleSyncStatus(), MultiModuleSyncStatus()};
static uint8_t multiBindStatus[NUM_MODULES] = {MULTI_NORMAL_OPERATION, MULTI_NORMAL_OPERATION}; static uint8_t multiBindStatus[NUM_MODULES] = {MULTI_BIND_NONE, MULTI_BIND_NONE};
static MultiBufferState multiTelemetryBufferState[NUM_MODULES]; static MultiBufferState multiTelemetryBufferState[NUM_MODULES];
static uint16_t multiTelemetryLastRxTS[NUM_MODULES]; static uint16_t multiTelemetryLastRxTS[NUM_MODULES];
@@ -111,7 +111,7 @@ uint8_t intTelemetryRxBufferCount;
static MultiModuleStatus multiModuleStatus; static MultiModuleStatus multiModuleStatus;
static MultiModuleSyncStatus multiSyncStatus; static MultiModuleSyncStatus multiSyncStatus;
static uint8_t multiBindStatus = MULTI_NORMAL_OPERATION; static uint8_t multiBindStatus = MULTI_BIND_NONE;
static MultiBufferState multiTelemetryBufferState; static MultiBufferState multiTelemetryBufferState;
static uint16_t multiTelemetryLastRxTS; static uint16_t multiTelemetryLastRxTS;
@@ -126,8 +126,12 @@ MultiModuleSyncStatus& getMultiSyncStatus(uint8_t)
return multiSyncStatus; return multiSyncStatus;
} }
uint8_t getMultiBindStatus(uint8_t) uint8_t getMultiBindStatus(uint8_t moduleIdx)
{ {
#if !defined(INTERNAL_MODULE_MULTI)
if (moduleIdx == INTERNAL_MODULE)
return MULTI_BIND_NONE;
#endif
return multiBindStatus; return multiBindStatus;
} }
+1 -1
View File
@@ -151,7 +151,7 @@ struct MultiModuleStatus {
MultiModuleStatus& getMultiModuleStatus(uint8_t module); MultiModuleStatus& getMultiModuleStatus(uint8_t module);
enum MultiBindStatus : uint8_t { enum MultiBindStatus : uint8_t {
MULTI_NORMAL_OPERATION, MULTI_BIND_NONE,
MULTI_BIND_INITIATED, MULTI_BIND_INITIATED,
MULTI_BIND_FINISHED, MULTI_BIND_FINISHED,
}; };