Merge branch 'Pascal' into master

This commit is contained in:
midelic
2017-12-24 20:24:59 +01:00
committed by GitHub
17 changed files with 54 additions and 5 deletions

View File

@@ -179,6 +179,7 @@ static void AFHDS2A_build_packet(uint8_t type)
packet[0] = 0x56;
for(uint8_t ch=0; ch<14; ch++)
{
#ifdef FAILSAFE_ENABLE
uint16_t failsafeMicros = (Failsafe_data[CH_AETR[ch]]*5)/8+860;
if( failsafeMicros!=FAILSAFE_CHANNEL_HOLD+860)
@@ -192,6 +193,7 @@ static void AFHDS2A_build_packet(uint8_t type)
packet[9 + ch*2] = 0xff;
packet[10+ ch*2] = 0xff;
}
}
break;
case AFHDS2A_PACKET_SETTINGS: