9XR-PRO navigation fixes
This commit is contained in:
@@ -116,8 +116,6 @@ enum MenuModelSetupItems {
|
|||||||
#if defined(MULTIMODULE)
|
#if defined(MULTIMODULE)
|
||||||
ITEM_MODEL_SETUP_EXTERNAL_MODULE_PROTOCOL,
|
ITEM_MODEL_SETUP_EXTERNAL_MODULE_PROTOCOL,
|
||||||
ITEM_MODEL_SETUP_EXTERNAL_MODULE_SUBTYPE,
|
ITEM_MODEL_SETUP_EXTERNAL_MODULE_SUBTYPE,
|
||||||
#endif
|
|
||||||
#if defined(MULTIMODULE)
|
|
||||||
ITEM_MODEL_SETUP_EXTERNAL_MODULE_STATUS,
|
ITEM_MODEL_SETUP_EXTERNAL_MODULE_STATUS,
|
||||||
ITEM_MODEL_SETUP_EXTERNAL_MODULE_SYNCSTATUS,
|
ITEM_MODEL_SETUP_EXTERNAL_MODULE_SYNCSTATUS,
|
||||||
#endif
|
#endif
|
||||||
@@ -406,13 +404,14 @@ void menuModelSetup(event_t event)
|
|||||||
NUM_STICKS+NUM_POTS+NUM_SLIDERS-1, // Center beeps
|
NUM_STICKS+NUM_POTS+NUM_SLIDERS-1, // Center beeps
|
||||||
0, // Global functions
|
0, // Global functions
|
||||||
|
|
||||||
LABEL(ExternalModule),
|
LABEL(ExternalModule),
|
||||||
MODULE_TYPE_ROWS(EXTERNAL_MODULE),
|
MODULE_TYPE_ROWS(EXTERNAL_MODULE),
|
||||||
MULTIMODULE_SUBTYPE_ROWS(EXTERNAL_MODULE)
|
MULTIMODULE_SUBTYPE_ROWS(EXTERNAL_MODULE)
|
||||||
MULTIMODULE_STATUS_ROWS(EXTERNAL_MODULE)
|
MULTIMODULE_STATUS_ROWS(EXTERNAL_MODULE)
|
||||||
MODULE_CHANNELS_ROWS(EXTERNAL_MODULE),
|
MODULE_CHANNELS_ROWS(EXTERNAL_MODULE),
|
||||||
IF_NOT_ACCESS_MODULE_RF(EXTERNAL_MODULE, MODULE_BIND_ROWS(EXTERNAL_MODULE)), // line reused for PPM: PPM settings
|
IF_NOT_ACCESS_MODULE_RF(EXTERNAL_MODULE, MODULE_BIND_ROWS(EXTERNAL_MODULE)), // line reused for PPM: PPM settings
|
||||||
IF_ACCESS_MODULE_RF(EXTERNAL_MODULE, 0), // RxNum
|
IF_ACCESS_MODULE_RF(EXTERNAL_MODULE, 0), // RxNum
|
||||||
|
0, // Output type (OpenDrain / PushPull)
|
||||||
MODULE_POWER_ROW(EXTERNAL_MODULE),
|
MODULE_POWER_ROW(EXTERNAL_MODULE),
|
||||||
IF_NOT_PXX2_MODULE(EXTERNAL_MODULE, MODULE_OPTION_ROW(EXTERNAL_MODULE)),
|
IF_NOT_PXX2_MODULE(EXTERNAL_MODULE, MODULE_OPTION_ROW(EXTERNAL_MODULE)),
|
||||||
MULTIMODULE_MODULE_ROWS(EXTERNAL_MODULE)
|
MULTIMODULE_MODULE_ROWS(EXTERNAL_MODULE)
|
||||||
@@ -732,24 +731,24 @@ void menuModelSetup(event_t event)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
for (uint8_t i=0; i<NUM_SWITCHES-1/*not on TRN switch*/; i++) {
|
for (uint8_t i = 0; i < NUM_SWITCHES-1/*not on TRN switch*/; i++) {
|
||||||
uint8_t swactive = !(g_model.switchWarningEnable & 1 << i);
|
uint8_t swactive = !(g_model.switchWarningEnable & (1u << i));
|
||||||
attr = 0;
|
uint8_t swattr = 0;
|
||||||
|
|
||||||
if (IS_3POS(i)) {
|
if (IS_3POS(i)) {
|
||||||
c = '0'+(states & 0x03);
|
c = '0' + (states & 0x03);
|
||||||
states >>= 2;
|
states >>= 2u;
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
if ((states & 0x01) && swactive)
|
if ((states & 0x01) && swactive)
|
||||||
attr = INVERS;
|
swattr = INVERS;
|
||||||
c = *(STR_VSWITCHES - 2 + 9 + (3*(i+1)));
|
c = *(STR_VSWITCHES - 2 + 9 + (3*(i+1)));
|
||||||
states >>= 1;
|
states >>= 1u;
|
||||||
}
|
}
|
||||||
if (attr && (menuHorizontalPosition == i)) {
|
if (attr && (menuHorizontalPosition == i)) {
|
||||||
attr = BLINK | INVERS;
|
swattr = BLINK | INVERS;
|
||||||
}
|
}
|
||||||
lcdDrawChar(MODEL_SETUP_2ND_COLUMN+i*FW, y, (swactive) ? c : '-', attr);
|
lcdDrawChar(MODEL_SETUP_2ND_COLUMN+i*FW, y, swactive ? c : '-', swattr);
|
||||||
lcdDrawText(MODEL_SETUP_2ND_COLUMN+(NUM_SWITCHES*FW), y, "<]", (menuHorizontalPosition == NUM_SWITCHES-1 && !NO_HIGHLIGHT()) ? attr : 0);
|
lcdDrawText(MODEL_SETUP_2ND_COLUMN+(NUM_SWITCHES*FW), y, "<]", (menuHorizontalPosition == NUM_SWITCHES-1 && !NO_HIGHLIGHT()) ? attr : 0);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
@@ -807,10 +806,9 @@ void menuModelSetup(event_t event)
|
|||||||
|
|
||||||
case ITEM_MODEL_SETUP_BEEP_CENTER:
|
case ITEM_MODEL_SETUP_BEEP_CENTER:
|
||||||
lcdDrawTextAlignedLeft(y, STR_BEEPCTR);
|
lcdDrawTextAlignedLeft(y, STR_BEEPCTR);
|
||||||
for (uint8_t i=0; i<NUM_STICKS+NUM_POTS+NUM_SLIDERS; i++) {
|
for (uint8_t i = 0; i < NUM_STICKS+NUM_POTS+NUM_SLIDERS; i++) {
|
||||||
// TODO flash saving, \001 not needed in STR_RETA123
|
coord_t x = MODEL_SETUP_2ND_COLUMN + i*FW;
|
||||||
coord_t x = MODEL_SETUP_2ND_COLUMN+i*FW;
|
lcdDrawTextAtIndex(x, y, STR_RETA123, i, ((menuHorizontalPosition==i) && attr) ? BLINK | INVERS : (((g_model.beepANACenter & ((BeepANACenter)1<<i)) || (attr && CURSOR_ON_LINE())) ? INVERS : 0 ) );
|
||||||
lcdDrawTextAtIndex(x, y, STR_RETA123, i, ((menuHorizontalPosition==i) && attr) ? BLINK|INVERS : (((g_model.beepANACenter & ((BeepANACenter)1<<i)) || (attr && CURSOR_ON_LINE())) ? INVERS : 0 ) );
|
|
||||||
}
|
}
|
||||||
if (attr) {
|
if (attr) {
|
||||||
if (event == EVT_KEY_BREAK(KEY_ENTER)) {
|
if (event == EVT_KEY_BREAK(KEY_ENTER)) {
|
||||||
|
|||||||
@@ -169,10 +169,10 @@ void lcdClear();
|
|||||||
uint8_t * lcdLoadBitmap(uint8_t * dest, const char * filename, uint16_t width, uint16_t height);
|
uint8_t * lcdLoadBitmap(uint8_t * dest, const char * filename, uint16_t width, uint16_t height);
|
||||||
|
|
||||||
#if defined(BOOT)
|
#if defined(BOOT)
|
||||||
#define BLINK_ON_PHASE (0)
|
#define BLINK_ON_PHASE (0)
|
||||||
#else
|
#else
|
||||||
#define BLINK_ON_PHASE (g_blinkTmr10ms & (1<<6))
|
#define BLINK_ON_PHASE (g_blinkTmr10ms & (1 << 6))
|
||||||
#define SLOW_BLINK_ON_PHASE (g_blinkTmr10ms & (1<<7))
|
#define SLOW_BLINK_ON_PHASE (g_blinkTmr10ms & (1 << 7))
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
inline display_t getPixel(unsigned int x, unsigned int y)
|
inline display_t getPixel(unsigned int x, unsigned int y)
|
||||||
|
|||||||
@@ -265,6 +265,7 @@ inline uint8_t MULTIMODULE_HASOPTIONS(uint8_t moduleIdx)
|
|||||||
#define MULTIMODULE_STATUS_ROWS(moduleIdx)
|
#define MULTIMODULE_STATUS_ROWS(moduleIdx)
|
||||||
#define MULTIMODULE_MODULE_ROWS(moduleIdx)
|
#define MULTIMODULE_MODULE_ROWS(moduleIdx)
|
||||||
#define MULTIMODULE_SUBTYPE_ROWS(moduleIdx)
|
#define MULTIMODULE_SUBTYPE_ROWS(moduleIdx)
|
||||||
|
#define MULTIMODULE_TYPE_ROWS(moduleIdx)
|
||||||
#define MULTIMODULE_MODE_ROWS(moduleIdx) (uint8_t)0
|
#define MULTIMODULE_MODE_ROWS(moduleIdx) (uint8_t)0
|
||||||
#define MULTIMODULE_OPTIONS_ROW(moduleIdx) HIDDEN_ROW
|
#define MULTIMODULE_OPTIONS_ROW(moduleIdx) HIDDEN_ROW
|
||||||
#define MODULE_POWER_ROW(moduleIdx) isModuleR9MNonAccess(moduleIdx) ? (isModuleR9MLiteNonPro(moduleIdx) ? (isModuleR9M_FCC_VARIANT(moduleIdx) ? READONLY_ROW : (uint8_t)0) : (uint8_t)0) : HIDDEN_ROW
|
#define MODULE_POWER_ROW(moduleIdx) isModuleR9MNonAccess(moduleIdx) ? (isModuleR9MLiteNonPro(moduleIdx) ? (isModuleR9M_FCC_VARIANT(moduleIdx) ? READONLY_ROW : (uint8_t)0) : (uint8_t)0) : HIDDEN_ROW
|
||||||
|
|||||||
Reference in New Issue
Block a user