Clean-up / renaming MODULE_TYPE_AFHDS3 to MODULE_TYPE_FLYSKY
This commit is contained in:
@@ -37,8 +37,7 @@ enum ModuleType {
|
||||
MODULE_TYPE_R9M_LITE_PRO_PXX2,
|
||||
MODULE_TYPE_SBUS,
|
||||
MODULE_TYPE_XJT_LITE_PXX2,
|
||||
MODULE_TYPE_AFHDS3, //no more protocols possible because of 4 bits value
|
||||
//MODULE_TYPE_AFHDS2A,
|
||||
MODULE_TYPE_FLYSKY, //no more protocols possible because of 4 bits value
|
||||
MODULE_TYPE_COUNT,
|
||||
MODULE_TYPE_MAX = MODULE_TYPE_COUNT - 1
|
||||
};
|
||||
|
||||
@@ -101,6 +101,11 @@ inline bool isModuleTypeXJT(uint8_t type)
|
||||
return type == MODULE_TYPE_XJT_PXX1 || type == MODULE_TYPE_XJT_LITE_PXX2;
|
||||
}
|
||||
|
||||
inline bool isModuleNone(uint8_t idx)
|
||||
{
|
||||
return g_model.moduleData[idx].type == MODULE_TYPE_NONE;
|
||||
}
|
||||
|
||||
inline bool isModuleXJT(uint8_t idx)
|
||||
{
|
||||
return isModuleTypeXJT(g_model.moduleData[idx].type);
|
||||
@@ -322,7 +327,7 @@ inline bool isModuleSBUS(uint8_t moduleIdx)
|
||||
inline bool isModuleFlySky(uint8_t idx)
|
||||
{
|
||||
return
|
||||
(g_model.moduleData[idx].type == MODULE_TYPE_AFHDS3);
|
||||
(g_model.moduleData[idx].type == MODULE_TYPE_FLYSKY);
|
||||
}
|
||||
|
||||
inline bool isModuleAFHDS2A(uint8_t idx)
|
||||
@@ -700,8 +705,10 @@ inline void setModuleType(uint8_t moduleIdx, uint8_t moduleType)
|
||||
moduleData.sbus.refreshRate = -31;
|
||||
else if (moduleData.type == MODULE_TYPE_PPM)
|
||||
setDefaultPpmFrameLength(moduleIdx);
|
||||
else if (moduleData.type == MODULE_TYPE_AFHDS3)
|
||||
else if (moduleData.type == MODULE_TYPE_FLYSKY) {
|
||||
// TODO: what if AFHDS2A
|
||||
resetAfhds3Options(moduleIdx);
|
||||
}
|
||||
else
|
||||
resetAccessAuthenticationCount();
|
||||
}
|
||||
|
||||
@@ -189,7 +189,7 @@ uint8_t getRequiredProtocol(uint8_t module)
|
||||
#endif
|
||||
|
||||
#if defined(AFHDS3) || defined(AFHDS2)
|
||||
case MODULE_TYPE_AFHDS3:
|
||||
case MODULE_TYPE_FLYSKY:
|
||||
if (isModuleAFHDS3(module)) {
|
||||
protocol = PROTOCOL_CHANNELS_AFHDS3;
|
||||
} else if (isModuleAFHDS2A(module)) {
|
||||
|
||||
Reference in New Issue
Block a user