diff --git a/radio/src/pulses/modules.h b/radio/src/pulses/modules.h index fe87cb0a5..29cf31b5b 100644 --- a/radio/src/pulses/modules.h +++ b/radio/src/pulses/modules.h @@ -110,12 +110,17 @@ inline bool isModulePPM(uint8_t idx) } #endif -#if defined(PCBXLITE) inline bool isModuleR9M(uint8_t idx) { return g_model.moduleData[idx].type == MODULE_TYPE_R9M; } +inline bool isModuleR9M2(uint8_t idx) +{ + return g_model.moduleData[idx].type == MODULE_TYPE_R9M2; +} + +#if defined(PCBXLITE) inline bool isModuleR9M_FCC(uint8_t idx) { return isModuleR9M(idx) && g_model.moduleData[idx].subType == MODULE_SUBTYPE_R9M_FCC; @@ -141,16 +146,6 @@ inline bool isModuleR9M_AU_PLUS(uint8_t idx) return isModuleR9M(idx) && g_model.moduleData[idx].subType != MODULE_SUBTYPE_R9M_AUPLUS; } #else -inline bool isModuleR9M(uint8_t idx) -{ - return g_model.moduleData[idx].type == MODULE_TYPE_R9M; -} - -inline bool isModuleR9M2(uint8_t idx) -{ - return g_model.moduleData[idx].type == MODULE_TYPE_R9M2; -} - inline bool isModuleR9M_FCC(uint8_t idx) { return isModuleR9M(idx) && g_model.moduleData[idx].r9m.region == MODULE_R9M_REGION_FCC;