Merged
Conversation
# Conflicts: # README.md
# Conflicts: # .travis.yml
# Conflicts: # .idea/compiler.xml # .idea/modules.xml # .idea/modules/Alloy.iml # README.md # src/main/java/org/montclairrobotics/alloy/ftc/FTCDebug.java
Member
Author
GarrettBurroughs
left a comment
GarrettBurroughs
left a comment
There was a problem hiding this comment.
Some changes need to be made before merge
There are still some auto features that need to be implemented, but as this is just the framework behind it, this can be merged without those
|
|
||
| /** | ||
| * Created by MHS Robotics on 1/26/2018. | ||
| * |
| 3. Alloy Autonomus - This is the basic framework for alloy auto's. An alloy autonomous takes care of running the state machine<br> | ||
| that the auto is using so all the user has to do is create the state machine and define functionality. | ||
| You can read more about how to use an Alloy Autonomous [Here](https://github.com/GarrettBurroughs/Alloy/wiki/Creating-An-Auto-Mode) | ||
| <<<<<<< HEAD |
| * @param currentState the current state so that it can be used in the debug | ||
| * @return debug information about the state | ||
| */ | ||
| public String debugInfo(int currentState) { |
Member
Author
There was a problem hiding this comment.
Update to give different levels of debugs depending on the debug mode
| this.name = name; | ||
| this.states = new ArrayList<>(Arrays.asList(states)); | ||
| this.finalState = finalState; | ||
| description = "A state machine"; |
Member
Author
There was a problem hiding this comment.
Change to
description = name + "state machine";
and add default name
Member
Author
There was a problem hiding this comment.
Maybe just get rid of default description, and set default name to "state machine"
| * A conditional state takes in a boolean input, and evaluates it when the state starts. | ||
| * If the input is true when the state starts, the passed in state will execute. | ||
| */ | ||
| public class ConditionalState extends State { |
Member
Author
There was a problem hiding this comment.
Add to simple auto
Member
Author
|
fixes #22 |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Added a basic autonomous framework. This includes:
It is also possible that the state machine aspect of the autonomous framework will change to allow for more flexible auto-modes