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

Merged David's code into master, basic implementation of velocityPID class(es)#37

Merged
lhmcgann merged 42 commits intoDeepBlueRobotics:masterfrom
lhmcgann:master
Jan 27, 2018
Merged

Merged David's code into master, basic implementation of velocityPID class(es)#37
lhmcgann merged 42 commits intoDeepBlueRobotics:masterfrom
lhmcgann:master

Conversation

@lhmcgann
Copy link
Copy Markdown
Contributor

No description provided.

kevinzwang and others added 30 commits January 14, 2018 17:40
* First commit of DavidRobot2018 adding basic drivetrain functionality

* changed up workspace organization, functionailty should not be changed

* integrated DavidRobot2018 into Robot2018

* fixed project setup and migrated all packages to one standard

* deleted DavidRobot2018 (previously merged manually into Robot2018)

* split drivetrain gear shift into 2 commands (from 1) and added more flexibility
…mplementing PIDSource, moved logic from TeleopDrive command to Drivetrain subsystem, and finished integrating PID in PIDTurn and PIDDrive.
Finished initialization of RobotMap, finished getting Drivetrain to i…
:sweatsmile: fixed initialization in robotMap for moveController
dfang314 and others added 12 commits January 20, 2018 14:52
jars referenced incorrectly and got the exclamation mark error --> fixed
changed slave controllers to VictorSPX, added Listener for NetworkTable constants --> needs testing, buttons for PID testing --> need to be removed once PIDget gets up and running
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
@lhmcgann lhmcgann requested a review from brettle January 27, 2018 20:10
@lhmcgann lhmcgann merged commit 545fd17 into DeepBlueRobotics:master Jan 27, 2018
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants