This repository was archived by the owner on Sep 14, 2019. It is now read-only.
Commit 403f9f5
committed
Merge branch 'testing-no-auto' of
https://github.com/doawelul/RobotCode2018.git
Conflicts:
Robot2018/.classpath
Robot2018/src/org/usfirst/frc/team199/Robot2018/Robot.java
Robot2018/src/org/usfirst/frc/team199/Robot2018/commands/AutonomousInterface.java
Robot2018/src/org/usfirst/frc/team199/Robot2018/commands/README.md
Robot2018/src/org/usfirst/frc/team199/Robot2018/commands/RunScript.java
Robot2018/src/org/usfirst/frc/team199/Robot2018/commands/TestAuto.java
Robot2018/src/org/usfirst/frc/team199/Robot2018/commands/TestAutoInterface.java
resolved all conflicts
in RunScript, commented out "implements RunScriptInterface" bc that
doesn't exist here
changed to disable in Drivetrain (line 273)
in Robot, made all subsystems NOT final and initialized them in
robotInit
includes basic, first implementation of VelocityPIDController,
TalonPIDController and its tests
new PID classes in autonomous package, test in test folder36 files changed
Lines changed: 1428 additions & 183 deletions
File tree
- Robot2018
- lib
- src
- org/usfirst/frc/team199/Robot2018
- autonomous
- commands
- subsystems
- tests/scriptupload
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2 | 2 | | |
3 | 3 | | |
4 | 4 | | |
| 5 | + | |
| 6 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
15 | 15 | | |
16 | 16 | | |
17 | 17 | | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
18 | 30 | | |
19 | 31 | | |
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
0 commit comments