Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Sirchangealot #10

Open
wants to merge 34 commits into
base: master
Choose a base branch
from
Open

Sirchangealot #10

wants to merge 34 commits into from

Conversation

Feetsalot
Copy link

azd

JenniferPylko and others added 30 commits February 17, 2015 21:04
@JenniferPylko
barebones program
91cf4e9
@JenniferPylko
Merge branch 'sirchangealot' of https://github.com/Pittsford-Robotics…
4b9badf 
…-3181/2015Robotics into sirchangealot
@JenniferPylko
Switched upper and lower lift sensors so lift works correctly
a7c53c9 
Added throttle
Added anti-wobble for the lead screw
Changed flap buttons to 6 and 4
@JenniferPylko
Build status now for correct branch
8c61406
@JenniferPylko
Remove the git diff part so the build will pass
a699e82
@JenniferPylko
Don't style check Travis, I know what I'm doing
bd29d4e
@JenniferPylko
Add explanation for code in TeleopPeriodic()
81d83e0
@JenniferPylko
Update branch for Travis CI badge
46ac102
@JenniferPylko
Update branch for Travis CI badge
14ad19f
@JenniferPylko
Update branch for Travis CI badge
fc811a9
@JenniferPylko
Reversed throttle for drive joystick
ff4bf62 
Added throttle to lift joystick
@JenniferPylko
Merge pull request #16 from Pittsford-Robotics-3181/feature/throttles
b462935 
Feature/throttles working
@JenniferPylko
Update branch for Travis CI badge
ac6ba23
@JenniferPylko
Merge remote-tracking branch 'origin/sirchangealot' into feature/hatc…
5a9b431 
…ontrols
@JenniferPylko
Merge branch 'feature/hatcontrols' into sirchangealot
4ce1eb9
@JenniferPylko
Merge pull request #17 from Pittsford-Robotics-3181/sirchangealot
4a2b9b1 
Merge sirchangealot updates into current working branch
@JenniferPylko
Implemented hat controls
f2fca8f
@JenniferPylko
Merge pull request #18 from Pittsford-Robotics-3181/feature/hatcontrols
263c529 
Feature/hatcontrols
@JenniferPylko
Update branch for Travis CI badge
4f6cb7a
@JenniferPylko
Anti-wobble works amazingly
80311eb
@JenniferPylko
Merge pull request #19 from Pittsford-Robotics-3181/sirchangealot
239dadc 
Update feature/heightpresets to current state of sirchangealot
@Ethan-O
The disabling of the drive system was caused by MotorSafetyHelper being
0af83b0 
enabled. Now that it's disabled it's driving smoothly
@JenniferPylko
Merge pull request #21 from Pittsford-Robotics-3181/fix/motorsafety
733baea 
Disabled MotorSafetyHelper
@Ethan-O
Merge pull request #22 from Pittsford-Robotics-3181/sirchangealot
dcccbbc 
Update feature/heightpresets to current state of sirchangealot
@Ethan-O
Ethan Attempted to add a function where the liftsystem would move down
9c76bc4 
to its origonal position when the butten 7 is continuously pressed. It
does not work.
@Ethan-O
Merge branch 'feature/heightpresets' of https://github.com/Pittsford-…
2ef53de 
…Robotics-3181/2015Robotics.git into feature/heightpresets
Print out encoder values for test
8e20429
Added printDiagnostics(); and Ethan use encoder->Get() instead of
4a163cc 
GetDistance();
Presets almost here
2452afc
The presets kind of work
5b94719
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@Feetsalot @JenniferPylko @Ethan-O