Rev 548 | Rev 576 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 548 | Rev 568 | ||
|---|---|---|---|
| Line 464... | Line 464... | ||
| 464 | PointList_SetAt(pPoint); |
464 | PointList_SetAt(pPoint); |
| 465 | if(FC.StatusFlags & FC_STATUS_FLY) PointList_WPActive(TRUE); |
465 | if(FC.StatusFlags & FC_STATUS_FLY) PointList_WPActive(TRUE); |
| 466 | GPS_pWaypoint = PointList_WPBegin(); // updates POI index |
466 | GPS_pWaypoint = PointList_WPBegin(); // updates POI index |
| 467 | BeepTime = 50; |
467 | BeepTime = 50; |
| 468 | } |
468 | } |
| - | 469 | else |
|
| - | 470 | if((pPoint->Position.Status == SIMULATION) && !(FC.RealStatusFlags & FC_STATUS_MOTOR_RUN)) |
|
| - | 471 | { |
|
| - | 472 | if(pPoint->Event_Flag & SIMULATION_MOTOR_ON) GPSPos_Copy(&(pPoint->Position), &SimulationPosition); // update hold position |
|
| - | 473 | if(!(SimulationFlags & SIMULATION_MOTOR_ON) && (pPoint->Event_Flag & SIMULATION_MOTOR_ON)) |
|
| - | 474 | { |
|
| - | 475 | SimulationFlags = pPoint->Event_Flag | SIMULATION_MOTOR_START; // dann steht da noch nicht "SIMULATION_MOTOR_ON" drin |
|
| - | 476 | SpeakHoTT = SPEAK_STARTING; |
|
| - | 477 | } |
|
| - | 478 | else |
|
| - | 479 | if(!(pPoint->Event_Flag & SIMULATION_MOTOR_ON) && (SimulationFlags & SIMULATION_MOTOR_ON)) |
|
| - | 480 | { |
|
| - | 481 | SimulationFlags = pPoint->Event_Flag; |
|
| - | 482 | SpeakHoTT = SPEAK_MK_OFF; |
|
| - | 483 | BeepTime = 50; |
|
| - | 484 | } |
|
| - | 485 | else |
|
| - | 486 | SimulationFlags = pPoint->Event_Flag | (SimulationFlags & SIMULATION_MOTOR_START); |
|
| - | 487 | } |
|
| 469 | break; |
488 | break; |
| 470 | - | ||
| 471 | case 'u': // redirect debug uart |
489 | case 'u': // redirect debug uart |
| 472 | switch(SerialMsg.pData[0]) |
490 | switch(SerialMsg.pData[0]) |
| 473 | { |
491 | { |
| 474 | case UART_FLIGHTCTRL: |
492 | case UART_FLIGHTCTRL: |
| 475 | UART2_Init(); // initialize UART2 to FC pins |
493 | UART2_Init(); // initialize UART2 to FC pins |
| Line 504... | Line 522... | ||
| 504 | if((pPoint->Position.Status == INVALID) && (pPoint->Index == 0)) |
522 | if((pPoint->Position.Status == INVALID) && (pPoint->Index == 0)) |
| 505 | { |
523 | { |
| 506 | PointList_Clear(); |
524 | PointList_Clear(); |
| 507 | GPS_pWaypoint = PointList_WPBegin(); |
525 | GPS_pWaypoint = PointList_WPBegin(); |
| 508 | UART1_Request_WritePoint = 0; // return new point count |
526 | UART1_Request_WritePoint = 0; // return new point count |
| - | 527 | NewWaypointsReceived = 1; |
|
| 509 | } |
528 | } |
| 510 | else |
529 | else |
| 511 | { // update WP in list at index |
530 | { // update WP in list at index |
| 512 | if(pPoint->Index > MaxNumberOfWaypoints) |
531 | if(pPoint->Index > MaxNumberOfWaypoints) |
| 513 | { |
532 | { |