changed wp speech #1728
Open
changed wp speech #1728
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…s "headed to waypoint"
meee1
reviewed
Jan 17, 2018
| @@ -303,14 +303,15 @@ static void chk_CheckStateChanged(object sender, EventArgs e) | |||
|
|
|||
| public static string speechConversion(string input) | |||
| { | |||
| if (MainV2.comPort.MAV.cs.wpno == 0) | |||
| { | |||
| input = input.Replace("{wpn}", "Home"); | |||
There was a problem hiding this comment.
you apear to have removed this function here?
|
Hadn't realized I removed that, added back. |
meee1
reviewed
Jan 17, 2018
| } | ||
| else | ||
| { | ||
| input = input.Replace("{wpn}", MainV2.comPort.MAV.cs.wpno.ToString()); |
There was a problem hiding this comment.
at no point are you putting in the actual waypoint number anymore?
|
Sorry, missed that adding back the home check. Should be good now. |
meee1
reviewed
May 22, 2018
| @@ -303,14 +303,20 @@ static void chk_CheckStateChanged(object sender, EventArgs e) | |||
|
|
|||
| public static string speechConversion(string input) | |||
| { | |||
| if (MainV2.comPort.MAV.cs.mode != "Auto" && MainV2.comPort.MAV.cs.mode != "Guided" && MainV2.comPort.MAV.cs.mode != "RTL") | |||
| input = input.Replace("Heading to Waypoint {wpn}", ""); | |||
There was a problem hiding this comment.
the reason I haven't committed this is because input is a user defined string, and the replace is over bearing and will only hit one condition which a simple thing like case will invalidate it
meee1
force-pushed
the
master
branch
2 times, most recently
from
303616c to
d3b17db
Compare
meee1
force-pushed
the
master
branch
3 times, most recently
from
0614891 to
7d31d41
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
to say guided and return to launch instead of always "headed to waypoint"