Rev 380 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 380 | Rev 398 | ||
|---|---|---|---|
| Line 103... | Line 103... | ||
| 103 | u8 UART1_DisplayKeys = 0; |
103 | u8 UART1_DisplayKeys = 0; |
| 104 | u8 UART1_DisplayLine = 0; |
104 | u8 UART1_DisplayLine = 0; |
| 105 | u8 UART1_ConfirmFrame = 0; |
105 | u8 UART1_ConfirmFrame = 0; |
| 106 | u8 UART1_Request_FTP = FALSE; |
106 | u8 UART1_Request_FTP = FALSE; |
| 107 | u8 LastTransmittedFCStatusFlags2 = 0; |
107 | u8 LastTransmittedFCStatusFlags2 = 0; |
| - | 108 | u8 UART1_ExternalControlConfirmFrame = FALSE; |
|
| Line 108... | Line 109... | ||
| 108 | 109 | ||
| Line 109... | Line 110... | ||
| 109 | UART_TypeDef *DebugUART = UART1; |
110 | UART_TypeDef *DebugUART = UART1; |
| 110 | 111 | ||
| Line 383... | Line 384... | ||
| 383 | if( SerialMsg.Address == FC_ADDRESS ) |
384 | if( SerialMsg.Address == FC_ADDRESS ) |
| 384 | { |
385 | { |
| 385 | switch(SerialMsg.CmdID) |
386 | switch(SerialMsg.CmdID) |
| 386 | { |
387 | { |
| 387 | // case 'v': // version |
388 | // case 'v': // version |
| 388 | case 'y': // serial poti values |
- | |
| 389 | case 'b': // extern control |
389 | case 'b': // extern control |
| - | 390 | UART1_ExternalControlConfirmFrame = 1; |
|
| - | 391 | case 'y': // serial poti values |
|
| 390 | Buffer_Copy(&UART1_rx_buffer, &UART2_tx_buffer); //forward to FC |
392 | Buffer_Copy(&UART1_rx_buffer, &UART2_tx_buffer); //forward to FC |
| 391 | Buffer_Clear(&UART1_rx_buffer); // free rc buffer for next frame |
393 | Buffer_Clear(&UART1_rx_buffer); // free rc buffer for next frame |
| 392 | return; //end process rx data |
394 | return; //end process rx data |
| 393 | break; |
395 | break; |
| 394 | } |
396 | } |
| Line 724... | Line 726... | ||
| 724 | else if((UART1_Request_DebugLabel != 0xFF) && (UART1_tx_buffer.Locked == FALSE)) |
726 | else if((UART1_Request_DebugLabel != 0xFF) && (UART1_tx_buffer.Locked == FALSE)) |
| 725 | { |
727 | { |
| 726 | MKProtocol_CreateSerialFrame(&UART1_tx_buffer, 'A', NC_ADDRESS, 2, &UART1_Request_DebugLabel, sizeof(UART1_Request_DebugLabel), (u8 *) ANALOG_LABEL[UART1_Request_DebugLabel], 16); |
728 | MKProtocol_CreateSerialFrame(&UART1_tx_buffer, 'A', NC_ADDRESS, 2, &UART1_Request_DebugLabel, sizeof(UART1_Request_DebugLabel), (u8 *) ANALOG_LABEL[UART1_Request_DebugLabel], 16); |
| 727 | UART1_Request_DebugLabel = 0xFF; |
729 | UART1_Request_DebugLabel = 0xFF; |
| 728 | } |
730 | } |
| - | 731 | else if(UART1_ExternalControlConfirmFrame && (UART1_tx_buffer.Locked == FALSE)) |
|
| - | 732 | { |
|
| - | 733 | MKProtocol_CreateSerialFrame(&UART1_tx_buffer, 'B', NC_ADDRESS, 1,(u8 *)&UART1_ExternalControlConfirmFrame, sizeof(UART1_ExternalControlConfirmFrame)); |
|
| - | 734 | UART1_ExternalControlConfirmFrame = 0; |
|
| - | 735 | } |
|
| 729 | else if(( ((UART1_NaviData_Interval > 0) && CheckDelay(UART1_NaviData_Timer) ) || UART1_Request_NaviData) && (UART1_tx_buffer.Locked == FALSE)) |
736 | else if(( ((UART1_NaviData_Interval > 0) && CheckDelay(UART1_NaviData_Timer) ) || UART1_Request_NaviData) && (UART1_tx_buffer.Locked == FALSE)) |
| 730 | { |
737 | { |
| 731 | NaviData.Errorcode = ErrorCode; |
738 | NaviData.Errorcode = ErrorCode; |
| 732 | MKProtocol_CreateSerialFrame(&UART1_tx_buffer, 'O', NC_ADDRESS, 1 , (u8 *)&NaviData, sizeof(NaviData)); |
739 | MKProtocol_CreateSerialFrame(&UART1_tx_buffer, 'O', NC_ADDRESS, 1 , (u8 *)&NaviData, sizeof(NaviData)); |
| 733 | UART1_NaviData_Timer = SetDelay(UART1_NaviData_Interval); |
740 | UART1_NaviData_Timer = SetDelay(UART1_NaviData_Interval); |