Rev 517 | Rev 528 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
Rev 517 | Rev 519 | ||
---|---|---|---|
Line 612... | Line 612... | ||
612 | if(!PointList_Move(1, &(NaviData.TargetPosition),NaviData.CompassHeading)) PointList_Clear(); // try to move wp-list so that 1st entry matches the current position |
612 | if(!PointList_Move(1, &(NaviData.TargetPosition),NaviData.CompassHeading)) PointList_Clear(); // try to move wp-list so that 1st entry matches the current position |
613 | } |
613 | } |
614 | } |
614 | } |
615 | if(FC.StatusFlags & FC_STATUS_FLY) PointList_WPActive(TRUE); |
615 | if(FC.StatusFlags & FC_STATUS_FLY) PointList_WPActive(TRUE); |
616 | GPS_pWaypoint = PointList_WPBegin(); // updates POI index |
616 | GPS_pWaypoint = PointList_WPBegin(); // updates POI index |
- | 617 | SpeakWaypointRached = 1; // Speak once when the last Point is reached |
|
- | 618 | SpeakNextWaypoint = 1; // Speak once as soon as the Points are active |
|
- | 619 | NCFlags &= ~NC_FLAG_TARGET_REACHED; |
|
617 | BeepTime = 150; |
620 | BeepTime = 150; |
618 | } |
621 | } |
619 | } |
622 | } |
620 | FromFC_LoadWP_List = 0; |
623 | FromFC_LoadWP_List = 0; |
621 | } |
624 | } |
Line 634... | Line 637... | ||
634 | { |
637 | { |
635 | if(PointList_LoadSinglePoint(&WPL_Store) == WPL_OK) |
638 | if(PointList_LoadSinglePoint(&WPL_Store) == WPL_OK) |
636 | { |
639 | { |
637 | if(FC.StatusFlags & FC_STATUS_FLY) PointList_WPActive(TRUE); |
640 | if(FC.StatusFlags & FC_STATUS_FLY) PointList_WPActive(TRUE); |
638 | GPS_pWaypoint = PointList_WPBegin(); // updates POI index |
641 | GPS_pWaypoint = PointList_WPBegin(); // updates POI index |
- | 642 | SpeakWaypointRached = 1; // Speak once when the last Point is reached |
|
- | 643 | SpeakNextWaypoint = 1; // Speak once as soon as the Points are active |
|
- | 644 | NCFlags &= ~NC_FLAG_TARGET_REACHED; |
|
639 | BeepTime = 150; |
645 | BeepTime = 150; |
640 | } |
646 | } |
641 | } |
647 | } |
642 | FromFC_Load_SinglePoint = 0; |
648 | FromFC_Load_SinglePoint = 0; |
643 | } |
649 | } |