Skip to content

Demo #39

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
Open
JYoung413 wants to merge 88 commits into
base: master
Choose a base branch
from
Open

Demo #39

JYoung413 wants to merge 88 commits into from

Conversation

@JYoung413
Copy link

@JYoung413 JYoung413 commented Feb 25, 2017

Before Merging

Check the following subsystems work:

Drivetrain

  • Teleop w/ joysticks
  • Hold heading
  • Turn to angle

Shooter

  • Shooter motor spins at right speed
  • Feeder runs forward and backwards on butttons
  • Shoot at least one ball

Turret/Vision

  • All other subsystems work w/ camera unplugged
  • Turret turns to limit switches w/ manual control
  • Turns to target w/ vision

Climbtake

  • Intake runs forward
  • Runs backward
  • Climbs

Auto

  • At least one auto mode has been run

lydiaxing and others added 30 commits February 17, 2017 20:06
@lydiaxing
initial commit
4f604b1
@camilo86
working??? I want to sleep
d93f584
@lydiaxing
merged with week 0
03db5b6
@camilo86
only bug need to press b to start driving
880a5ae
@camilo86
pressed ctrl-alt-l
2f0183b
dt auto
aa27b90
@camilo86
auto
f5bf989
@camilo86
updated framework
7a17711
merged week0 into
3a783a8
@NUTRONSDS
switched to 1 second auto
9265b9c
@NUTRONSDS
updated to add drive distance auto
c95192f
@Brinbri
Added drive hold heading command and changed holdHeading to
a521b69 
teleHoldHeading for the teleop specific command.
@NUTRONSDS
Updated to latest commit of week0-auto Framework and added drivetele …
e0117d8 
…to registerTele.
@NUTRONSDS
updated some stuff
3680227
@NUTRONSDS
doing stuff on Escape Velocity
1a9574f
@NUTRONSDS
updated framework
e251556
@NUTRONSDS
updated to have better interfaces
4db3495
@NUTRONSDS
reverted RobotMap
502898b
added turn to angle
4091e14
Added Gearplace subsystem, works with FRamework
c14460e
Merged with master
84f3063
@lydiaxing
turret working, pid nees to be tuned
cc05ddf
@lydiaxing
working turret
ef8964f
updated framework
ace0949
@NUTRONSDS
with new framework version
c34b149
@NUTRONSDS
reverted robotmap
25d175f
@lydiaxing
fixed climbtake bug
f7b521c
@NUTRONSDS
working distance
2d60401
@NUTRONSDS
fixed turn
e2f2b41
@Brinbri
Updated tunable in Framework
798fe06
Josh Young and others added 28 commits February 21, 2017 19:44
updated frameworK'
0561178 
git push

'
Merge branch 'master' into Gear-Placer
a479f5a
@Brinbri
Added Tuneables to subsystems
79c78b7
Renamed stuffs
5305da8
Turns checkstyle back on
cc2f7c6
style and javadocs
e547039
Merge branch 'master' into drive-holdheading-encoder-pid
cd51c5c
@lydiaxing
FIXED CHECKSTYLE!
990ac7c
@lydiaxing
Merge branch 'workingAndroidVision' of https://github.com/frc125/NU17…
3baf0e7 
…-FRamework into workingAndroidVision
changed to constant naming convention
7377590
Merge branch 'master' into Gear-Placer
08d279b
Changed port!
fa180d5
@NUTRONSDS
change controls
d4aa8a7
@lydiaxing
fixed merge conflicts
e9ef5c3
@lydiaxing
merged master
8be8ccf
@NUTRONSDS
merged
117ec1a
merged with climbtake-cmd
87fead1
moved vision stuff into NU17-FRamework
0ad91e6
updated FRamework
2a8ca7f
merged android vision stuff
27f4091
Merge branch 'master' into tuneables
f6f24f0
tuneable merge
44d696e
merged Gearplacer and Servo things
633fc6b
auto now uses chooser
92a120d
@lydiaxing
made angle update faster and added distance calculation
20b6237
@lydiaxing
fixed checkstyle
9a40f38
@lydiaxing
checkstyle
5da39cd
Checkstyle
b0ac081
@kreeve
Copy link
Contributor

kreeve commented Feb 25, 2017

Looks like this needs its FRamework version updated

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.

7 participants

@JYoung413 @kreeve @lydiaxing @camilo86 @NUTRONSDS @Brinbri