[X10 Express] ACCESS Fixes
This commit is contained in:
@@ -755,9 +755,9 @@ void menuModelSetup(event_t event)
|
|||||||
#if defined(INTERNAL_MODULE_PXX1)
|
#if defined(INTERNAL_MODULE_PXX1)
|
||||||
lcdDrawTextAtIndex(MODEL_SETUP_2ND_COLUMN, y, STR_INTERNAL_MODULE_PROTOCOLS, g_model.moduleData[INTERNAL_MODULE].type, menuHorizontalPosition==0 ? attr : 0);
|
lcdDrawTextAtIndex(MODEL_SETUP_2ND_COLUMN, y, STR_INTERNAL_MODULE_PROTOCOLS, g_model.moduleData[INTERNAL_MODULE].type, menuHorizontalPosition==0 ? attr : 0);
|
||||||
if (isModuleXJT(INTERNAL_MODULE))
|
if (isModuleXJT(INTERNAL_MODULE))
|
||||||
lcdDrawTextAtIndex(lcdNextPos + 3, y, STR_XJT_ACCST_RF_PROTOCOLS, 1+g_model.moduleData[INTERNAL_MODULE].rfProtocol, menuHorizontalPosition==1 ? attr : 0);
|
lcdDrawTextAtIndex(lcdNextPos + 3, y, STR_XJT_ACCST_RF_PROTOCOLS, 1 + g_model.moduleData[INTERNAL_MODULE].rfProtocol, menuHorizontalPosition==1 ? attr : 0);
|
||||||
else if (isModuleISRM(INTERNAL_MODULE))
|
else if (isModuleISRM(INTERNAL_MODULE))
|
||||||
lcdDrawTextAtIndex(lcdNextPos + 3, y, STR_ISRM_RF_PROTOCOLS, g_model.moduleData[INTERNAL_MODULE].subType, menuHorizontalPosition==1 ? attr : 0);
|
lcdDrawTextAtIndex(lcdNextPos + 3, y, STR_ISRM_RF_PROTOCOLS, 1 + g_model.moduleData[INTERNAL_MODULE].subType, menuHorizontalPosition==1 ? attr : 0);
|
||||||
if (attr) {
|
if (attr) {
|
||||||
if (menuHorizontalPosition == 0) {
|
if (menuHorizontalPosition == 0) {
|
||||||
uint8_t moduleType = checkIncDec(event, g_model.moduleData[INTERNAL_MODULE].type, MODULE_TYPE_NONE, MODULE_TYPE_MAX, EE_MODEL, isInternalModuleAvailable);
|
uint8_t moduleType = checkIncDec(event, g_model.moduleData[INTERNAL_MODULE].type, MODULE_TYPE_NONE, MODULE_TYPE_MAX, EE_MODEL, isInternalModuleAvailable);
|
||||||
@@ -769,7 +769,7 @@ void menuModelSetup(event_t event)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (isModuleXJT(INTERNAL_MODULE)) {
|
else if (isModuleXJT(INTERNAL_MODULE)) {
|
||||||
g_model.moduleData[INTERNAL_MODULE].rfProtocol = checkIncDec(event, g_model.moduleData[INTERNAL_MODULE].rfProtocol, 0, MODULE_SUBTYPE_PXX1_LAST, EE_MODEL, isRfProtocolAvailable);
|
g_model.moduleData[INTERNAL_MODULE].subType = checkIncDec(event, g_model.moduleData[INTERNAL_MODULE].subType, 0, MODULE_SUBTYPE_PXX1_LAST, EE_MODEL, isRfProtocolAvailable);
|
||||||
if (checkIncDec_Ret) {
|
if (checkIncDec_Ret) {
|
||||||
g_model.moduleData[0].type = MODULE_TYPE_XJT_PXX1;
|
g_model.moduleData[0].type = MODULE_TYPE_XJT_PXX1;
|
||||||
g_model.moduleData[0].channelsStart = 0;
|
g_model.moduleData[0].channelsStart = 0;
|
||||||
@@ -777,7 +777,7 @@ void menuModelSetup(event_t event)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (isModulePXX2(INTERNAL_MODULE)) {
|
else if (isModulePXX2(INTERNAL_MODULE)) {
|
||||||
g_model.moduleData[INTERNAL_MODULE].subType = checkIncDec(event, g_model.moduleData[INTERNAL_MODULE].subType, 0, MODULE_SUBTYPE_ISRM_PXX2_LAST, EE_MODEL, isRfProtocolAvailable);
|
g_model.moduleData[INTERNAL_MODULE].subType = checkIncDec(event, g_model.moduleData[INTERNAL_MODULE].subType, 0, MODULE_SUBTYPE_ISRM_PXX2_ACCST_LR12, EE_MODEL, isRfProtocolAvailable);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
|
|||||||
@@ -484,13 +484,9 @@ int getSwitchWarningsCount()
|
|||||||
#define IF_ACCESS_MODULE_RF(module, xxx) (isModuleRFAccess(module) ? (uint8_t)(xxx) : HIDDEN_ROW)
|
#define IF_ACCESS_MODULE_RF(module, xxx) (isModuleRFAccess(module) ? (uint8_t)(xxx) : HIDDEN_ROW)
|
||||||
#define IF_NOT_ACCESS_MODULE_RF(module, xxx) (isModuleRFAccess(module) ? HIDDEN_ROW : (uint8_t)(xxx))
|
#define IF_NOT_ACCESS_MODULE_RF(module, xxx) (isModuleRFAccess(module) ? HIDDEN_ROW : (uint8_t)(xxx))
|
||||||
|
|
||||||
#if defined(INTERNAL_MODULE_PXX1)
|
|
||||||
#define INTERNAL_MODULE_TYPE_ROWS ((isModuleXJT(INTERNAL_MODULE) || isModulePXX2(INTERNAL_MODULE)) ? (uint8_t)1 : (uint8_t)0) // Module type + RF protocols
|
#define INTERNAL_MODULE_TYPE_ROWS ((isModuleXJT(INTERNAL_MODULE) || isModulePXX2(INTERNAL_MODULE)) ? (uint8_t)1 : (uint8_t)0) // Module type + RF protocols
|
||||||
#else
|
|
||||||
#define INTERNAL_MODULE_TYPE_ROWS 0 // Module type + RF protocols
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#define PORT_CHANNELS_ROWS(x) (x==INTERNAL_MODULE ? INTERNAL_MODULE_CHANNELS_ROWS : (x==EXTERNAL_MODULE ? EXTERNAL_MODULE_CHANNELS_ROWS : 1))
|
#define MODULE_CHANNELS_ROWS(x) (x==INTERNAL_MODULE ? INTERNAL_MODULE_CHANNELS_ROWS : (x==EXTERNAL_MODULE ? EXTERNAL_MODULE_CHANNELS_ROWS : 1))
|
||||||
|
|
||||||
#define TIMER_ROWS(x) NAVIGATION_LINE_BY_LINE|1, 0, 0, 0, g_model.timers[x].countdownBeep != COUNTDOWN_SILENT ? (uint8_t)1 : (uint8_t)0
|
#define TIMER_ROWS(x) NAVIGATION_LINE_BY_LINE|1, 0, 0, 0, g_model.timers[x].countdownBeep != COUNTDOWN_SILENT ? (uint8_t)1 : (uint8_t)0
|
||||||
|
|
||||||
@@ -964,9 +960,9 @@ bool menuModelSetup(event_t event)
|
|||||||
lcdDrawText(MENUS_MARGIN_LEFT + INDENT_WIDTH, y, STR_MODE);
|
lcdDrawText(MENUS_MARGIN_LEFT + INDENT_WIDTH, y, STR_MODE);
|
||||||
lcdDrawTextAtIndex(MODEL_SETUP_2ND_COLUMN, y, STR_INTERNAL_MODULE_PROTOCOLS, g_model.moduleData[INTERNAL_MODULE].type, menuHorizontalPosition==0 ? attr : 0);
|
lcdDrawTextAtIndex(MODEL_SETUP_2ND_COLUMN, y, STR_INTERNAL_MODULE_PROTOCOLS, g_model.moduleData[INTERNAL_MODULE].type, menuHorizontalPosition==0 ? attr : 0);
|
||||||
if (isModuleXJT(INTERNAL_MODULE))
|
if (isModuleXJT(INTERNAL_MODULE))
|
||||||
lcdDrawTextAtIndex(MODEL_SETUP_3RD_COLUMN, y, STR_XJT_ACCST_RF_PROTOCOLS, 1+g_model.moduleData[INTERNAL_MODULE].subType, menuHorizontalPosition==1 ? attr : 0);
|
lcdDrawTextAtIndex(MODEL_SETUP_3RD_COLUMN, y, STR_XJT_ACCST_RF_PROTOCOLS, 1 + g_model.moduleData[INTERNAL_MODULE].subType, menuHorizontalPosition==1 ? attr : 0);
|
||||||
else if (isModuleISRM(INTERNAL_MODULE))
|
else if (isModuleISRM(INTERNAL_MODULE))
|
||||||
lcdDrawTextAtIndex(MODEL_SETUP_3RD_COLUMN, y, STR_ISRM_RF_PROTOCOLS, g_model.moduleData[INTERNAL_MODULE].subType, menuHorizontalPosition==1 ? attr : 0);
|
lcdDrawTextAtIndex(MODEL_SETUP_3RD_COLUMN, y, STR_ISRM_RF_PROTOCOLS, 1 + g_model.moduleData[INTERNAL_MODULE].subType, menuHorizontalPosition==1 ? attr : 0);
|
||||||
if (attr) {
|
if (attr) {
|
||||||
if (menuHorizontalPosition == 0) {
|
if (menuHorizontalPosition == 0) {
|
||||||
uint8_t moduleType = checkIncDec(event, g_model.moduleData[INTERNAL_MODULE].type, MODULE_TYPE_NONE, MODULE_TYPE_MAX, EE_MODEL, isInternalModuleAvailable);
|
uint8_t moduleType = checkIncDec(event, g_model.moduleData[INTERNAL_MODULE].type, MODULE_TYPE_NONE, MODULE_TYPE_MAX, EE_MODEL, isInternalModuleAvailable);
|
||||||
@@ -978,7 +974,7 @@ bool menuModelSetup(event_t event)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (isModuleXJT(INTERNAL_MODULE)) {
|
else if (isModuleXJT(INTERNAL_MODULE)) {
|
||||||
g_model.moduleData[INTERNAL_MODULE].rfProtocol = checkIncDec(event, g_model.moduleData[INTERNAL_MODULE].subType, 0, MODULE_SUBTYPE_PXX1_LAST, EE_MODEL, isRfProtocolAvailable);
|
g_model.moduleData[INTERNAL_MODULE].subType = checkIncDec(event, g_model.moduleData[INTERNAL_MODULE].subType, 0, MODULE_SUBTYPE_PXX1_LAST, EE_MODEL, isRfProtocolAvailable);
|
||||||
if (checkIncDec_Ret) {
|
if (checkIncDec_Ret) {
|
||||||
g_model.moduleData[0].type = MODULE_TYPE_XJT_PXX1;
|
g_model.moduleData[0].type = MODULE_TYPE_XJT_PXX1;
|
||||||
g_model.moduleData[0].channelsStart = 0;
|
g_model.moduleData[0].channelsStart = 0;
|
||||||
@@ -1136,7 +1132,7 @@ bool menuModelSetup(event_t event)
|
|||||||
uint8_t moduleIdx = CURRENT_MODULE_EDITED(k);
|
uint8_t moduleIdx = CURRENT_MODULE_EDITED(k);
|
||||||
ModuleData & moduleData = g_model.moduleData[moduleIdx];
|
ModuleData & moduleData = g_model.moduleData[moduleIdx];
|
||||||
lcdDrawText(MENUS_MARGIN_LEFT, y, STR_CHANNELRANGE);
|
lcdDrawText(MENUS_MARGIN_LEFT, y, STR_CHANNELRANGE);
|
||||||
if ((int8_t)PORT_CHANNELS_ROWS(moduleIdx) >= 0) {
|
if ((int8_t)MODULE_CHANNELS_ROWS(moduleIdx) >= 0) {
|
||||||
drawStringWithIndex(MODEL_SETUP_2ND_COLUMN, y, STR_CH, moduleData.channelsStart+1, menuHorizontalPosition==0 ? attr : 0);
|
drawStringWithIndex(MODEL_SETUP_2ND_COLUMN, y, STR_CH, moduleData.channelsStart+1, menuHorizontalPosition==0 ? attr : 0);
|
||||||
lcdDrawText(lcdNextPos+5, y, "-");
|
lcdDrawText(lcdNextPos+5, y, "-");
|
||||||
drawStringWithIndex(lcdNextPos+5, y, STR_CH, moduleData.channelsStart+sentModuleChannels(moduleIdx), menuHorizontalPosition==1 ? attr : 0);
|
drawStringWithIndex(lcdNextPos+5, y, STR_CH, moduleData.channelsStart+sentModuleChannels(moduleIdx), menuHorizontalPosition==1 ? attr : 0);
|
||||||
|
|||||||
@@ -61,7 +61,7 @@ bool isSwitchAvailableInTimers(int swtch);
|
|||||||
bool isR9MModeAvailable(int mode);
|
bool isR9MModeAvailable(int mode);
|
||||||
bool isPxx2IsrmChannelsCountAllowed(int channels);
|
bool isPxx2IsrmChannelsCountAllowed(int channels);
|
||||||
bool isExternalModuleAvailable(int moduleType);
|
bool isExternalModuleAvailable(int moduleType);
|
||||||
bool isInternalModuleAvailable(int module);
|
bool isInternalModuleAvailable(int moduleType);
|
||||||
bool isRfProtocolAvailable(int protocol);
|
bool isRfProtocolAvailable(int protocol);
|
||||||
bool isTelemetryProtocolAvailable(int protocol);
|
bool isTelemetryProtocolAvailable(int protocol);
|
||||||
bool isTrainerModeAvailable(int mode);
|
bool isTrainerModeAvailable(int mode);
|
||||||
|
|||||||
@@ -1,9 +1,7 @@
|
|||||||
option(DISK_CACHE "Enable SD card disk cache" YES)
|
option(DISK_CACHE "Enable SD card disk cache" ON)
|
||||||
option(UNEXPECTED_SHUTDOWN "Enable the Unexpected Shutdown screen" YES)
|
option(UNEXPECTED_SHUTDOWN "Enable the Unexpected Shutdown screen" ON)
|
||||||
option(PXX1 "PXX1 protocol support" ON)
|
option(PXX1 "PXX1 protocol support" ON)
|
||||||
option(PXX2 "PXX2 protocol support" OFF)
|
option(PXX2 "PXX2 protocol support" OFF)
|
||||||
option(INTERNAL_MODULE_PXX1 "Support for PXX1 internal module" ON)
|
|
||||||
option(INTERNAL_MODULE_PXX2 "Support for PXX2 internal module" OFF)
|
|
||||||
|
|
||||||
set(PWR_BUTTON "PRESS" CACHE STRING "Pwr button type (PRESS/SWITCH)")
|
set(PWR_BUTTON "PRESS" CACHE STRING "Pwr button type (PRESS/SWITCH)")
|
||||||
set(CPU_TYPE STM32F4)
|
set(CPU_TYPE STM32F4)
|
||||||
@@ -43,6 +41,13 @@ if (PCB STREQUAL X10)
|
|||||||
set(FONTS_TARGET x10_fonts)
|
set(FONTS_TARGET x10_fonts)
|
||||||
set(LCD_DRIVER lcd_driver.cpp)
|
set(LCD_DRIVER lcd_driver.cpp)
|
||||||
set(LUA_EXPORT lua_export_x10)
|
set(LUA_EXPORT lua_export_x10)
|
||||||
|
if (PCBREV STREQUAL EXPRESS)
|
||||||
|
option(INTERNAL_MODULE_PXX1 "Support for PXX1 internal module" OFF)
|
||||||
|
option(INTERNAL_MODULE_PXX2 "Support for PXX2 internal module" ON)
|
||||||
|
else()
|
||||||
|
option(INTERNAL_MODULE_PXX1 "Support for PXX1 internal module" ON)
|
||||||
|
option(INTERNAL_MODULE_PXX2 "Support for PXX2 internal module" OFF)
|
||||||
|
endif()
|
||||||
elseif (PCB STREQUAL X12S)
|
elseif (PCB STREQUAL X12S)
|
||||||
set(FLAVOUR x12s)
|
set(FLAVOUR x12s)
|
||||||
set(PCBREV "13" CACHE STRING "PCB Revision")
|
set(PCBREV "13" CACHE STRING "PCB Revision")
|
||||||
|
|||||||
Reference in New Issue
Block a user