98,16 → 98,11 |
uint8_t ConfirmFrame = 0; |
uint8_t RemoteKeys = 0; |
uint8_t DisplayLine = 0; |
uint8_t DisplayBuff[80]; |
/* |
const uint8_t DisplayBuff[4][20] = |
{ |
"++ MK3MAG ++", |
" ", |
" ", |
" " |
};*/ |
|
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; |
|
163,7 → 158,6 |
/****************************************************************/ |
void USART0_Init (void) |
{ |
uint8_t i; |
uint8_t sreg = SREG; |
uint16_t ubrr = (uint16_t) ((uint32_t) F_CPU/(8 * BAUD_RATE) - 1); |
|
244,33 → 238,13 |
USART0_putchar ('P'); |
USART0_putchar (':'); |
USART0_putchar ('V'); |
USART0_putchar (0x30 + VERSION_MAJOR); |
USART0_putchar ('0' + VERSION_MAJOR); |
USART0_putchar ('.'); |
USART0_putchar (0x30 + VERSION_MINOR/10); |
USART0_putchar (0x30 + VERSION_MINOR%10); |
USART0_putchar ('0' + VERSION_MINOR/10); |
USART0_putchar ('0' + VERSION_MINOR%10); |
USART0_putchar ('a' + VERSION_PATCH); |
USART0_putchar ('\n'); |
|
// prepare display buffer |
for(i=0; i < 80; i++) DisplayBuff[i] = ' '; |
DisplayBuff[0] = '+'; |
DisplayBuff[1] = '+'; |
DisplayBuff[7] = 'M'; |
DisplayBuff[8] = 'K'; |
DisplayBuff[9] = '3'; |
DisplayBuff[10] = 'M'; |
DisplayBuff[11] = 'A'; |
DisplayBuff[12] = 'G'; |
DisplayBuff[18] = '+'; |
DisplayBuff[19] = '+'; |
|
DisplayBuff[47] = 'V'; |
DisplayBuff[48] = (0x30 + VERSION_MAJOR); |
DisplayBuff[49] = '.'; |
DisplayBuff[50] = (0x30 + VERSION_MINOR/10); |
DisplayBuff[51] = (0x30 + VERSION_MINOR%10); |
DisplayBuff[52] = ('a' + VERSION_PATCH); |
|
// restore global interrupt flags |
SREG = sreg; |
} |
646,7 → 620,20 |
|
if((RequestFlags & RQST_DISPLAY_DATA) && txd_complete) |
{ |
SendOutData('H', MK3MAG_ADDRESS, 2, &DisplayLine, sizeof(DisplayLine), &DisplayBuff[DisplayLine * 20], 20); |
switch(DisplayLine) |
{ |
case 0: |
SendOutData('H', MK3MAG_ADDRESS, 2, &DisplayLine, sizeof(DisplayLine), BoardString, 20); |
break; |
|
case 2: |
SendOutData('H', MK3MAG_ADDRESS, 2, &DisplayLine, sizeof(DisplayLine), VersionString, 20); |
break; |
|
default: |
SendOutData('H', MK3MAG_ADDRESS, 2, &DisplayLine, sizeof(DisplayLine), EmptyString, 20); |
break; |
} |
DisplayLine++; |
if(DisplayLine >= 4) DisplayLine = 0; |
RequestFlags &= ~RQST_DISPLAY_DATA; |