R9M continued

This commit is contained in:
3djc
2019-04-24 14:11:04 +02:00
parent c490b1abae
commit 2415cd8588
6 changed files with 12 additions and 44 deletions
+1 -1
View File
@@ -187,7 +187,7 @@ enum MenuModelSetupItems {
#define EXTERNAL_MODULE_MODE_ROWS (isModuleXJT(EXTERNAL_MODULE) || isModuleR9M(EXTERNAL_MODULE) || isModuleDSM2(EXTERNAL_MODULE) || isModuleMultimodule(EXTERNAL_MODULE)) ? (uint8_t)1 : (uint8_t)0
#define EXTERNAL_MODULE_FREQ_ROW isR9MMFlex(EXTERNAL_MODULE) ? (uint8_t)1: (uint8_t)HIDDEN_ROW,
#define EXTERNAL_MODULE_FREQ_ROW (isModuleR9M_EUPLUS(EXTERNAL_MODULE) || isModuleR9M_AU_PLUS(EXTERNAL_MODULE)) ? (uint8_t)1: (uint8_t)HIDDEN_ROW,
#define CURSOR_ON_CELL (true)
+5 -5
View File
@@ -530,13 +530,13 @@ bool isR9MModeAvailable(int mode)
#else
bool isR9MModeAvailable(int mode)
{
return mode <= MODULE_SUBTYPE_R9M_EUPLUS;
#if defined(MODULE_R9M_FLEX_FW)
return mode < MODULE_SUBTYPE_R9M_EUPLUS;
#else
return true;
#endif
}
#endif
bool isR9MMFlex(int module)
{
return g_model.moduleData[module].r9m.region == MODULE_R9M_REGION_FLEX;
}
bool isPXX2ChannelsCountAllowed(int channels)
{
+1 -6
View File
@@ -54,7 +54,6 @@ bool isSwitchAvailableInCustomFunctions(int swtch);
bool isSwitchAvailableInMixes(int swtch);
bool isSwitchAvailableInTimers(int swtch);
bool isR9MModeAvailable(int mode);
bool isR9MMFlex(int module);
bool isPXX2ChannelsCountAllowed(int channels);
bool isExternalModuleAvailable(int moduleType);
bool isInternalModuleAvailable(int module);
@@ -159,11 +158,7 @@ const mm_protocol_definition *getMultiProtocolDefinition (uint8_t protocol);
#define FAILSAFE_ROWS(x) ((isModuleXJTVariant(x) && HAS_RF_PROTOCOL_FAILSAFE(g_model.moduleData[x].rfProtocol)) || MULTIMODULE_HASFAILSAFE(x) || isModuleR9M(x) || isModuleR9M2(x)) ? (g_model.moduleData[x].failsafeMode==FAILSAFE_CUSTOM ? (uint8_t)1 : (uint8_t)0) : HIDDEN_ROW
#if defined(PCBXLITE)
#define EXTERNAL_MODULE_OPTION_ROW (isModuleR9M(EXTERNAL_MODULE) || isModuleSBUS(EXTERNAL_MODULE) ? TITLE_ROW : MULTIMODULE_OPTIONS_ROW)
#else
#define EXTERNAL_MODULE_OPTION_ROW (isModuleR9M(EXTERNAL_MODULE) || isModuleSBUS(EXTERNAL_MODULE) ? TITLE_ROW : MULTIMODULE_OPTIONS_ROW)
#endif
#define EXTERNAL_MODULE_OPTION_ROW (isModuleR9M(EXTERNAL_MODULE) || isModuleSBUS(EXTERNAL_MODULE) ? TITLE_ROW : MULTIMODULE_OPTIONS_ROW)
#if defined(PCBXLITE) && !defined(MODULE_R9M_FULLSIZE)
#define EXTERNAL_MODULE_POWER_ROW (isModuleMultimodule(EXTERNAL_MODULE) || isModuleR9M(EXTERNAL_MODULE)) ? (isModuleR9M_FCC_VARIANT(EXTERNAL_MODULE) ? TITLE_ROW : (uint8_t) 0) : HIDDEN_ROW