Subversion Repositories Projects

Compare Revisions

Ignore whitespace Rev 744 → Rev 743

/FollowMe/trunk/uart0.c
56,7 → 56,6
 
uint16_t DebugData_Timer;
uint16_t DebugData_Interval = 0; // in 1ms
uint16_t Display_Interval = 0; // in 1 ms
 
Waypoint_t FollowMe;
 
427,18 → 426,9
 
case 'h':// request for display columns
PcAccess = 255;
if((pRxData[0] & 0x80) == 0x00) // old format
{
DisplayLine = 2;
Display_Interval = 0;
}
else // new format
{
RemoteKeys |= ~pRxData[0];
Display_Interval = (unsigned int)pRxData[1] * 10;
DisplayLine = 4;
Request_Display = TRUE;
}
RemoteKeys |= pRxData[0];
if(RemoteKeys) DisplayLine = 0;
Request_Display = TRUE;
break;
 
case 'l':// request for display columns
497,19 → 487,12
SendOutData('V', FM_ADDRESS, 1, (uint8_t *) &UART_VersionInfo, sizeof(UART_VersionInfo));
Request_VerInfo = FALSE;
}
if( ((DebugData_Interval && CheckDelay(DebugData_Timer)) || Request_Display) && txd_complete)
if(Request_Display && txd_complete)
{
if(DisplayLine > 3)// new format
{
LCD_PrintMenu();
SendOutData('H', FM_ADDRESS, 1, (uint8_t *)DisplayBuff, 80);
}
else // old format
{
LCD_printfxy(0,0,"!!! INCOMPATIBLE !!!");
SendOutData('H', FC_ADDRESS, 2, &DisplayLine, sizeof(DisplayLine), (uint8_t *)DisplayBuff, 20);
if(DisplayLine++ > 3) DisplayLine = 0;
}
LCD_PrintMenu();
SendOutData('H', FM_ADDRESS, 2, &DisplayLine, sizeof(DisplayLine), &DisplayBuff[DisplayLine * 20], 20);
DisplayLine++;
if(DisplayLine >= 4) DisplayLine = 0;
Request_Display = FALSE;
}
if(Request_Display1 && txd_complete)