Simultaneous Rover Programming #506
Merged
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
| @@ -18,7 +18,7 @@ var blocklyNodes = {}; | |||
| var graphLines = {}; | |||
| var loggerNodes = {}; | |||
| var currentBlocklyNodeID = undefined; | |||
| var blocklyExecuting = false; | |||
| //var blocklyExecuting = false; | |||
There was a problem hiding this comment.
Remove commented out code.
|
One comment, then 👍 |
|
Now when we stop execution, it stops on the "current" rover, instead of stopping all of them at once. This now depends on virtual-world-framework/vwf#480. Please review! |
|
Be sure to do a rebase then 👍 |
added 7 commits
March 13, 2015 12:39
…ode as a property of the blocklyNodes.
multiple rovers simultaneously, and with a UI that actually works (i.e. the reset button actually works when you choose a rover that is currently executing code).
stopAllExecution behavior.
calling stopExecutionForNode, which expects a node ID to be explicitly passed in.
n8xm
force-pushed
the
simult-rover-execution
branch
from
4edab05
to
a29fc94
Compare
|
Discovered a bug after rebase. Please review my fix. |
| @@ -73,7 +72,7 @@ vwf_view.firedEvent = function( nodeID, eventName, eventArgs ) { | |||
| break; | |||
|
|
|||
| case "blocklyStarted": | |||
| startBlocklyButton.className = "reset"; | |||
| //startBlocklyButton.className = "reset"; | |||
There was a problem hiding this comment.
Should this commented code be removed entirely?
|
One comment, but otherwise 👍 |
n8xm
pushed a commit
that referenced
this pull request
Mar 13, 2015
…cution Simultaneous Rover Programming
|
Remember to delete branches when you're done with them. GitHub gives the option after a merge. |
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.
Rovers now work simultaneously, with some of Brett's suggestions incorporated to make the UI actually work with it.