Merge branch 'master' into SPort_Send

This commit is contained in:
pascallanger 2019-10-29 00:02:59 +01:00
commit 243bdf2240
2 changed files with 7 additions and 7 deletions

View File

@ -299,12 +299,12 @@ enum TRAXXAS
struct PPM_Parameters struct PPM_Parameters
{ {
uint8_t protocol; uint8_t protocol : 6;
uint8_t sub_proto : 3; uint8_t sub_proto : 3;
uint8_t rx_num : 4; uint8_t rx_num : 4;
uint8_t power : 1; uint8_t power : 1;
uint8_t autobind : 1; uint8_t autobind : 1;
uint8_t option; int8_t option;
uint32_t chan_order; uint32_t chan_order;
}; };

View File

@ -503,7 +503,7 @@ void setup()
option = FORCE_HITEC_TUNING; // Use config-defined tuning value for HITEC option = FORCE_HITEC_TUNING; // Use config-defined tuning value for HITEC
else else
#endif #endif
option = PPM_prot_line->option; // Use radio-defined option value option = (uint8_t)PPM_prot_line->option; // Use radio-defined option value
if(PPM_prot_line->power) POWER_FLAG_on; if(PPM_prot_line->power) POWER_FLAG_on;
if(PPM_prot_line->autobind) if(PPM_prot_line->autobind)