Sanitization

This commit is contained in:
Bertrand Songis
2019-07-19 09:31:30 +02:00
parent 3f441c87fe
commit 6da1773dcc
8 changed files with 32 additions and 15 deletions
+4 -4
View File
@@ -360,7 +360,7 @@ static const uint8_t moduleOptions[] = {
0b11110100, // ISRM-N
};
inline uint8_t getModuleOptions(uint8_t modelId)
inline uint8_t getPXX2ModuleOptions(uint8_t modelId)
{
if (modelId < DIM(moduleOptions))
return moduleOptions[modelId];
@@ -370,7 +370,7 @@ inline uint8_t getModuleOptions(uint8_t modelId)
inline bool isModuleOptionAvailable(uint8_t modelId, uint8_t option)
{
return getModuleOptions(modelId) & (1 << option);
return getPXX2ModuleOptions(modelId) & (1 << option);
}
enum {
@@ -423,7 +423,7 @@ enum ReceiverCapabilities {
RECEIVER_CAPABILITY_COUNT
};
inline uint8_t getReceiverOptions(uint8_t modelId)
inline uint8_t getPXX2ReceiverOptions(uint8_t modelId)
{
if (modelId < DIM(receiverOptions))
return receiverOptions[modelId];
@@ -433,7 +433,7 @@ inline uint8_t getReceiverOptions(uint8_t modelId)
inline bool isReceiverOptionAvailable(uint8_t modelId, uint8_t option)
{
return getReceiverOptions(modelId) & (1 << option);
return getPXX2ReceiverOptions(modelId) & (1 << option);
}
inline bool isDefaultModelRegistrationID()
+18 -2
View File
@@ -58,7 +58,7 @@
#define PXX2_HW_INFO_TX_ID 0xFF
static const char * const PXX2modulesModels[] = {
static const char * const PXX2ModulesModels[] = {
"---",
"XJT",
"ISRM",
@@ -70,7 +70,15 @@ static const char * const PXX2modulesModels[] = {
"ISRM-N"
};
static const char * const PXX2receiversModels[] = {
inline const char * getPXX2ModuleName(uint8_t modelId)
{
if (modelId < DIM(PXX2ModulesModels))
return PXX2ModulesModels[modelId];
else
return PXX2ModulesModels[0];
}
static const char * const PXX2ReceiversModels[] = {
"---",
"X8R",
"RX8R",
@@ -100,6 +108,14 @@ static const char * const PXX2receiversModels[] = {
"R9-MM-OTA", // this one has OTA (different bootloader)
};
inline const char * getPXX2ReceiverName(uint8_t modelId)
{
if (modelId < DIM(PXX2ReceiversModels))
return PXX2ReceiversModels[modelId];
else
return PXX2ReceiversModels[0];
}
enum PXX2ModuleModelID {
PXX2_MODULE_NONE,
PXX2_MODULE_XJT,