Rev 532 | Rev 568 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
Rev 532 | Rev 548 | ||
---|---|---|---|
Line 287... | Line 287... | ||
287 | // Fill Version Info Structure |
287 | // Fill Version Info Structure |
288 | UART_VersionInfo.SWMajor = VERSION_MAJOR; |
288 | UART_VersionInfo.SWMajor = VERSION_MAJOR; |
289 | UART_VersionInfo.SWMinor = VERSION_MINOR; |
289 | UART_VersionInfo.SWMinor = VERSION_MINOR; |
290 | UART_VersionInfo.SWPatch = VERSION_PATCH; |
290 | UART_VersionInfo.SWPatch = VERSION_PATCH; |
291 | UART_VersionInfo.ProtoMajor = VERSION_SERIAL_MAJOR; |
291 | UART_VersionInfo.ProtoMajor = VERSION_SERIAL_MAJOR; |
292 | UART_VersionInfo.ProtoMinor = VERSION_SERIAL_MINOR; |
- | |
293 | UART_VersionInfo.HWMajor = Version_HW & 0x7F; |
292 | UART_VersionInfo.HWMajor = Version_HW & 0x7F; |
294 | UART_VersionInfo.reserved2 = 0; |
293 | UART_VersionInfo.BL_Firmware = 255; |
295 | UART_VersionInfo.Flags = 0; |
294 | UART_VersionInfo.Flags = 0; |
- | 295 | UART_VersionInfo.Reserved1 = 0; |
|
296 | NaviData.Version = NAVIDATA_VERSION; |
296 | NaviData.Version = NAVIDATA_VERSION; |
Line 297... | Line 297... | ||
297 | 297 | ||
298 | UART1_PutString("\r\n UART1 init...ok"); |
298 | UART1_PutString("\r\n UART1 init...ok"); |
Line 623... | Line 623... | ||
623 | if(UART1_NaviData_Interval > 0) UART1_Request_NaviData = TRUE; |
623 | if(UART1_NaviData_Interval > 0) UART1_Request_NaviData = TRUE; |
624 | UART1_AboTimeOut = SetDelay(ABO_TIMEOUT); |
624 | UART1_AboTimeOut = SetDelay(ABO_TIMEOUT); |
625 | break; |
625 | break; |
Line 626... | Line 626... | ||
626 | 626 | ||
- | 627 | case 'v': // request for version info |
|
627 | case 'v': // request for version info |
628 | if(SerialMsg.DataLen > 0 && SerialMsg.pData[0] == 1) UART1_Request_VersionInfo = 1; |
628 | UART1_Request_VersionInfo = TRUE; |
629 | else UART1_Request_VersionInfo = 2; |
629 | break; |
630 | break; |
630 | default: |
631 | default: |
631 | // unsupported command recieved |
632 | // unsupported command recieved |
632 | break; |
633 | break; |
Line 1096... | Line 1097... | ||
1096 | { |
1097 | { |
1097 | Menu_Update(0); |
1098 | Menu_Update(0); |
1098 | MKProtocol_CreateSerialFrame(&UART1_tx_buffer, 'L', NC_ADDRESS, 3, (u8*)&MenuItem, sizeof(MenuItem), (u8*)&MaxMenuItem, sizeof(MaxMenuItem),(u8*)DisplayBuff, sizeof(DisplayBuff)); |
1099 | MKProtocol_CreateSerialFrame(&UART1_tx_buffer, 'L', NC_ADDRESS, 3, (u8*)&MenuItem, sizeof(MenuItem), (u8*)&MaxMenuItem, sizeof(MaxMenuItem),(u8*)DisplayBuff, sizeof(DisplayBuff)); |
1099 | UART1_Request_Display1 = FALSE; |
1100 | UART1_Request_Display1 = FALSE; |
1100 | } |
1101 | } |
1101 | else if(UART1_Request_VersionInfo && (UART1_tx_buffer.Locked == FALSE)) |
1102 | else if(UART1_Request_VersionInfo == 1 && (UART1_tx_buffer.Locked == FALSE)) // get FC-Versions |
- | 1103 | { |
|
- | 1104 | UART_VersionInfo_t version_tmp; |
|
- | 1105 | version_tmp.SWMajor = FC_Version.Major; |
|
- | 1106 | version_tmp.SWMinor = FC_Version.Minor; |
|
- | 1107 | version_tmp.SWPatch = FC_Version.Patch; |
|
- | 1108 | version_tmp.HWMajor = FC_Version.Hardware; |
|
- | 1109 | version_tmp.HardwareError[0] = 0xff; // tells the KopterTool that it is the FC-version |
|
- | 1110 | version_tmp.HardwareError[1] = 0xff; // tells the KopterTool that it is the FC-version |
|
- | 1111 | version_tmp.ProtoMajor = UART_VersionInfo.ProtoMajor; |
|
- | 1112 | version_tmp.BL_Firmware = UART_VersionInfo.BL_Firmware; |
|
- | 1113 | version_tmp.Flags = 0; |
|
- | 1114 | version_tmp.Reserved1 = 0; |
|
- | 1115 | MKProtocol_CreateSerialFrame(&UART1_tx_buffer, 'V', NC_ADDRESS,1, (u8 *)&version_tmp, sizeof(version_tmp)); |
|
- | 1116 | UART1_Request_VersionInfo = FALSE; |
|
- | 1117 | } |
|
- | 1118 | else if(UART1_Request_VersionInfo == 2 && (UART1_tx_buffer.Locked == FALSE)) // get NC-Versions |
|
1102 | { |
1119 | { |
1103 | MKProtocol_CreateSerialFrame(&UART1_tx_buffer, 'V', NC_ADDRESS,1, (u8 *)&UART_VersionInfo, sizeof(UART_VersionInfo)); |
1120 | MKProtocol_CreateSerialFrame(&UART1_tx_buffer, 'V', NC_ADDRESS,1, (u8 *)&UART_VersionInfo, sizeof(UART_VersionInfo)); |
1104 | UART1_Request_VersionInfo = FALSE; |
1121 | UART1_Request_VersionInfo = FALSE; |
1105 | } |
1122 | } |
1106 | else if(UART1_Request_SystemTime && (UART1_tx_buffer.Locked == FALSE)) |
1123 | else if(UART1_Request_SystemTime && (UART1_tx_buffer.Locked == FALSE)) |