Subversion Repositories MK3Mag

Compare Revisions

Ignore whitespace Rev 55 → Rev 56

/trunk/uart.c
96,13 → 96,13
uint8_t RequestFlags = 0x00;
uint8_t RequestDebugLabel = 0;
uint8_t ConfirmFrame = 0;
/*
uint8_t RemoteKeys = 0;
uint8_t DisplayLine = 0;
 
const uint8_t BoardString[20] = "++ MK3MAG ++";
const uint8_t EmptyString[20] = " ";
const uint8_t VersionString[20] = {' ',' ',' ',' ',' ',' ',' ','V',(0x30 + VERSION_MAJOR),'.',('0' + VERSION_MINOR/10),('0' + VERSION_MINOR%10),('a' + VERSION_PATCH),' ',' ',' ',' ',' ',' ',' '};
 
*/
uint16_t PC_Connected = 0;
uint16_t FC_Connected = 0;
 
560,8 → 560,8
break;
 
case 'h': // request display data
RemoteKeys |= pRxData[0];
if(RemoteKeys) DisplayLine = 0;
//RemoteKeys |= pRxData[0];
//if(RemoteKeys) DisplayLine = 0;
RequestFlags |= RQST_DISPLAY_DATA;
PC_Connected = 2000;
break;
611,7 → 611,7
ConfirmFrame = 0;
}
 
if(( (DebugData_Interval>0 && CheckDelay(DebugData_Timer)) || (RequestFlags & RQST_DEBUG_DATA)) && txd_complete)
if(( ((DebugData_Interval > 0) && CheckDelay(DebugData_Timer)) || (RequestFlags & RQST_DEBUG_DATA)) && txd_complete)
{
SetDebugValues();
SendOutData('D', MK3MAG_ADDRESS, 1, (uint8_t *) &DebugOut, sizeof(DebugOut));
621,6 → 621,7
 
if((RequestFlags & RQST_DISPLAY_DATA) && txd_complete)
{
/*
switch(DisplayLine)
{
case 0:
637,6 → 638,7
}
DisplayLine++;
if(DisplayLine >= 4) DisplayLine = 0;
*/
RequestFlags &= ~RQST_DISPLAY_DATA;
}