Port all Multi changes also to 9X and Horus UI

This commit is contained in:
Arne Schwabe
2016-10-16 22:24:36 +02:00
parent 4082a320b8
commit 543a1d14e8
5 changed files with 99 additions and 84 deletions
+5 -5
View File
@@ -679,18 +679,18 @@ PACK(struct ModuleData {
};
// Helper functions to set both of the rfProto protocol at the same time
inline uint8_t getMultiProtocol(bool returnCustom)
{
NOBACKUP(inline uint8_t getMultiProtocol(bool returnCustom) {
if (returnCustom && multi.customProto)
return MM_RF_CUSTOM_SELECTED;
return ((uint8_t) (rfProtocol & 0x0f)) + (multi.rfProtocolExtra << 4);
}
})
inline void setMultiProtocol(uint8_t proto)
NOBACKUP(inline void setMultiProtocol(uint8_t proto)
{
rfProtocol = (uint8_t) (proto & 0x0f);
multi.rfProtocolExtra = (proto & 0x30) >> 4;
}
})
});
/*