Subversion Repositories MK3Mag

Compare Revisions

Ignore whitespace Rev 60 → Rev 61

/trunk/uart.c
604,14 → 604,12
RequestDebugLabel = 0xFF;
RequestFlags &= ~RQST_DEBUG_LABEL;
}
 
if(ConfirmFrame && txd_complete)
else if(ConfirmFrame && txd_complete)
{
SendOutData('B', MK3MAG_ADDRESS, 1, (uint8_t *) &ConfirmFrame, sizeof(ConfirmFrame));
ConfirmFrame = 0;
}
 
if(( ((DebugData_Interval > 0) && CheckDelay(DebugData_Timer)) || (RequestFlags & RQST_DEBUG_DATA)) && txd_complete)
else if(( ((DebugData_Interval > 0) && CheckDelay(DebugData_Timer)) || (RequestFlags & RQST_DEBUG_DATA)) && txd_complete)
{
SetDebugValues();
SendOutData('D', MK3MAG_ADDRESS, 1, (uint8_t *) &DebugOut, sizeof(DebugOut));
618,8 → 616,7
DebugData_Timer = SetDelay(DebugData_Interval);
RequestFlags &= ~RQST_DEBUG_DATA;
}
 
if((RequestFlags & RQST_DISPLAY_DATA) && txd_complete)
else if((RequestFlags & RQST_DISPLAY_DATA) && txd_complete)
{
LCD_PrintMenu();
SendOutData('H', FC_ADDRESS, 2, &DisplayLine, sizeof(DisplayLine), &DisplayBuff[DisplayLine * 20], 20);
627,20 → 624,17
if(DisplayLine >= 4) DisplayLine = 0;
RequestFlags &= ~RQST_DISPLAY_DATA;
}
 
if((RequestFlags & RQST_EXTERN_CTRL) && txd_complete)
else if((RequestFlags & RQST_EXTERN_CTRL) && txd_complete)
{
SendOutData('G', MK3MAG_ADDRESS, 1, (uint8_t *) &ExternControl,sizeof(ExternControl));
RequestFlags &= ~RQST_EXTERN_CTRL;
}
 
if((RequestFlags & RQST_COMPASS_HEADING) && txd_complete)
else if((RequestFlags & RQST_COMPASS_HEADING) && txd_complete)
{
SendOutData('K', FC_ADDRESS, 1, (uint8_t *) &Heading, sizeof(Heading)); // send compass heading to FC
RequestFlags &= ~RQST_COMPASS_HEADING;
}
 
if((RequestFlags & RQST_VERSION_INFO) && txd_complete)
else if((RequestFlags & RQST_VERSION_INFO) && txd_complete)
{
SendOutData('V', MK3MAG_ADDRESS, 1, (uint8_t *) &UART_VersionInfo, sizeof(UART_VersionInfo));
RequestFlags &= ~RQST_VERSION_INFO;