Skip to content
This repository was archived by the owner on Sep 14, 2019. It is now read-only.

Commit 403f9f5

Browse files
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 folder
2 parents 72c2b79 + 6d43455 commit 403f9f5

36 files changed

Lines changed: 1428 additions & 183 deletions

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,5 @@ bin/
22
build/
33
dist/
44
.DS_Store
5+
*auto*
6+
*Auto*

Robot2018/.classpath

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,17 @@
1515
<classpathentry kind="lib" path="lib/objenesis-2.6.jar"/>
1616
<classpathentry kind="lib" path="lib/CTRE_Phoenix-sources.jar"/>
1717
<classpathentry kind="lib" path="lib/CTRE_Phoenix.jar"/>
18+
19+
<classpathentry kind="lib" path="lib/cscore-sources.jar"/>
20+
<classpathentry kind="lib" path="lib/cscore.jar"/>
21+
<classpathentry kind="lib" path="lib/navx_frc.jar"/>
22+
<classpathentry kind="lib" path="lib/ntcore-sources.jar"/>
23+
<classpathentry kind="lib" path="lib/ntcore.jar"/>
24+
<classpathentry kind="lib" path="lib/opencv-sources.jar"/>
25+
<classpathentry kind="lib" path="lib/opencv.jar"/>
26+
<classpathentry kind="lib" path="lib/WPILib-sources.jar"/>
27+
<classpathentry kind="lib" path="lib/WPILib.jar"/>
28+
<classpathentry kind="lib" path="lib/wpiutil-sources.jar"/>
29+
<classpathentry kind="lib" path="lib/wpiutil.jar"/>
1830
<classpathentry kind="output" path="bin"/>
1931
</classpath>

Robot2018/lib/WPILib-sources.jar

245 KB
Binary file not shown.

Robot2018/lib/WPILib.jar

303 KB
Binary file not shown.

Robot2018/lib/cscore-sources.jar

16.7 KB
Binary file not shown.

Robot2018/lib/cscore.jar

24.5 KB
Binary file not shown.

Robot2018/lib/navx_frc.jar

107 KB
Binary file not shown.

Robot2018/lib/ntcore-sources.jar

38.4 KB
Binary file not shown.

Robot2018/lib/ntcore.jar

51.6 KB
Binary file not shown.

Robot2018/lib/opencv-sources.jar

151 KB
Binary file not shown.

0 commit comments

Comments
 (0)