Reduce RF_PROTO_OFF logic, disable R9M Sport out when internal telemetry is on (#5159)
* Remove most of the special logic associated with RF_PROTO_OFF This simplifies code in many areas since the internal module does not require special handling and also fixes a few bugs with INTERNAL_PPM * Disable R9M sport option if internal module has telemetry * Fix X12s build * Use macros instead of direct comparisions * Fix sport bit sent the wrong way. Rename S.port out to Telemetry * Compile fix
This commit is contained in:
committed by
Bertrand Songis
parent
8e84724c62
commit
e16b48db30
@@ -387,7 +387,9 @@ void setupPulsesPXX(uint8_t port)
|
||||
#endif
|
||||
if (IS_MODULE_R9M(port)) {
|
||||
extra_flags |= g_model.moduleData[port].pxx.power << 3;
|
||||
extra_flags |= g_model.moduleData[port].pxx.sport_out << 5;
|
||||
// Disable s.port if internal module is active
|
||||
if (IS_TELEMETRY_INTERNAL_MODULE || !g_model.moduleData[port].pxx.sport_out)
|
||||
extra_flags |= (1<< 5);
|
||||
}
|
||||
|
||||
putPcmByte(port, extra_flags);
|
||||
|
||||
Reference in New Issue
Block a user