-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' of https://github.com/wiredCatBruceCrane/WiredC…
…ats2014 Conflicts: WiredCats2014/nbproject/project.bak.xml WiredCats2014/nbproject/project.xml
- Loading branch information
Showing
16 changed files
with
399 additions
and
194 deletions.
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,5 @@ | ||
| /TestAutotune/nbproject/private/ | ||
| /WiredCats2415/nbproject/private/ | ||
| WiredCats2014/nbproject/project.bak.xml | ||
| WiredCats2014/nbproject/project.xml | ||
| /WiredCats2014/build/ |
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
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
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
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
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
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
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
37 changes: 37 additions & 0 deletions
37
...src/edu/wpi/first/wpilibj/templates/commands/AutonomousCommands/CommandStraightDrive.java
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| /* | ||
| * To change this license header, choose License Headers in Project Properties. | ||
| * To change this template file, choose Tools | Templates | ||
| * and open the template in the editor. | ||
| */ | ||
|
|
||
| package edu.wpi.first.wpilibj.templates.commands.AutonomousCommands; | ||
|
|
||
| import edu.wpi.first.wpilibj.templates.commands.CommandBase; | ||
|
|
||
| /** | ||
| * Drives in a straight line from whatever orientation | ||
| * the robot is in upon execution of the command. | ||
| * @author WiredCats | ||
| */ | ||
| public class CommandStraightDrive extends CommandBase { | ||
|
|
||
| public CommandStraightDrive(float distance){ | ||
|
|
||
| } | ||
|
|
||
| protected void initialize() { | ||
| } | ||
|
|
||
| protected void execute() { | ||
| } | ||
|
|
||
| protected boolean isFinished() { | ||
| return false; | ||
| } | ||
|
|
||
| protected void end() { | ||
| } | ||
|
|
||
| protected void interrupted() { | ||
| } | ||
| } |
46 changes: 46 additions & 0 deletions
46
...Cats2014/src/edu/wpi/first/wpilibj/templates/commands/AutonomousCommands/CommandTurn.java
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| /* | ||
| * To change this license header, choose License Headers in Project Properties. | ||
| * To change this template file, choose Tools | Templates | ||
| * and open the template in the editor. | ||
| */ | ||
|
|
||
| package edu.wpi.first.wpilibj.templates.commands.AutonomousCommands; | ||
|
|
||
| import edu.wpi.first.wpilibj.templates.commands.CommandBase; | ||
|
|
||
| /** | ||
| * | ||
| * @author WiredCats | ||
| */ | ||
| public class CommandTurn extends CommandBase { | ||
|
|
||
| /** | ||
| * Turns this many degrees from the current orientation. | ||
| * @param goal the desired orientation. | ||
| */ | ||
| public CommandTurn(float goal){ | ||
|
|
||
| } | ||
|
|
||
| protected void initialize() { | ||
|
|
||
| } | ||
|
|
||
| protected void execute() { | ||
|
|
||
| } | ||
|
|
||
| protected boolean isFinished() { | ||
| //TODO | ||
| return false; | ||
| } | ||
|
|
||
| protected void end() { | ||
|
|
||
| } | ||
|
|
||
| protected void interrupted() { | ||
|
|
||
| } | ||
|
|
||
| } |
Oops, something went wrong.