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.

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

Waterford Competition Changes #36

Open
wants to merge 93 commits into
base: develop
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
93 commits
Select commit Hold shift + click to select a range
437835a
Update motor IDs for the practice robot.
a2aaron Feb 27, 2018
cc91b2c
Add a brake button
a2aaron Feb 27, 2018
835b406
Update claw controls to be simpler
a2aaron Feb 27, 2018
b8389d4
Add gear shifting to the robot
a2aaron Mar 1, 2018
6bbb281
Fix inverted y-axis on controller
a2aaron Mar 1, 2018
a48fc6b
Swap grabber and elevator controls
a2aaron Mar 3, 2018
6e6ef31
Add a deadzone to the operator triggers
a2aaron Mar 3, 2018
ece3708
Fix grabber motor IDs
a2aaron Mar 3, 2018
2dc775c
Clamp some of the maximum motor speeds
a2aaron Mar 3, 2018
ae601ec
Fix Low Gear/High Gear shifting with the right bumper
a2aaron Mar 6, 2018
f1a6ad0
Add a deadzone to the sticks.
a2aaron Mar 6, 2018
7dd7a92
Merge branch 'develop' into update-claw-controls
a2aaron Mar 6, 2018
b3cd418
Up the deadzone sensitivity
a2aaron Mar 6, 2018
5925fc0
Make VisionAuton correct better
a2aaron Mar 6, 2018
70996ce
Learn how encoders work
a2aaron Mar 6, 2018
f9ca702
Add a test auton
a2aaron Mar 6, 2018
92a974f
Comment out some debug
a2aaron Mar 6, 2018
6fd8b31
Add some documentation
a2aaron Mar 6, 2018
50aa642
Change vision target from cube to retroreflective
Dannihu01 Mar 9, 2018
91407b3
Measure distances on the field
a2aaron Mar 9, 2018
dea9717
Make EncoderAutonomous
a2aaron Mar 9, 2018
925c97f
Added L/R auton using EncoderAuton
Dannihu01 Mar 9, 2018
f663a15
Make elevator go up in the first drive forward phase
Dannihu01 Mar 9, 2018
bce0bd0
Make the cube grabber spin and spit during CENTER auton
Dannihu01 Mar 9, 2018
39d2d73
Fix all auton except zigzag with elevator and grabber
Dannihu01 Mar 9, 2018
c08f3d5
Add MyPy to the .gitignore
a2aaron Mar 9, 2018
3a3f355
Add get_encoder_position to Drivetrain
a2aaron Mar 9, 2018
0d5e51b
Fix/Update center_straight and zig_zag
a2aaron Mar 9, 2018
19f5904
Set autonomous to center_straight
a2aaron Mar 9, 2018
2056924
Comment out the debuging code
a2aaron Mar 9, 2018
23bd5ce
Reverse gear shifting to correctly start in low gear
a2aaron Mar 9, 2018
0241483
Dead reckon
a2aaron Mar 9, 2018
fc21d9f
Invert Left Intake Wheel
a2aaron Mar 9, 2018
042ebe0
Drive for only 3 seconds
a2aaron Mar 9, 2018
6a16769
Invert Sticks on Intake
a2aaron Mar 9, 2018
bf6913d
Make grabber tests work again
a2aaron Mar 9, 2018
8af7d68
Side auton
a2aaron Mar 9, 2018
30f6329
Make side auton actually run
a2aaron Mar 10, 2018
4a8646a
AUton changes #1
a2aaron Mar 10, 2018
05e3bfd
auton chagnes 2
a2aaron Mar 10, 2018
a0507ed
auton hcanges 3
a2aaron Mar 10, 2018
3656ef7
auton changes 4
a2aaron Mar 10, 2018
e70a36e
changes 5
a2aaron Mar 10, 2018
d6df760
chagnes 6
a2aaron Mar 10, 2018
3774e1f
deadreckon
a2aaron Mar 10, 2018
d80283a
Switch to Same Side Auton improvement
Dannihu01 Mar 10, 2018
97dac22
Side auton
Dannihu01 Mar 10, 2018
9c2c847
comment out arcade drve
Dannihu01 Mar 10, 2018
6863b38
remove all moving thing so we can test shit
Dannihu01 Mar 10, 2018
c731f46
debug gyro + slow rotate
Dannihu01 Mar 10, 2018
3b1f301
rotate auto now arcade auto bc gyro not work vertically
Dannihu01 Mar 10, 2018
7d91f4d
FIx end in autonmi to actually work
Dannihu01 Mar 10, 2018
ef08efe
increase second elevator length
Dannihu01 Mar 10, 2018
4d35c0f
rotate right when n right side
Dannihu01 Mar 10, 2018
44cbf6b
up autonmi durations
Dannihu01 Mar 10, 2018
d84f103
center auton
a2aaron Mar 10, 2018
fbbebd1
change turn soeed igher
a2aaron Mar 10, 2018
dae1c8f
make turn speed less so we dont go over
Dannihu01 Mar 10, 2018
d2c2c17
Merge remote-tracking branch 'origin/Waterford' into Waterford
Dannihu01 Mar 10, 2018
8d87019
make turn speed eveN SMALLER
Dannihu01 Mar 10, 2018
f5fc4f4
add vision reckon
Dannihu01 Mar 10, 2018
0d0d0e8
make network look for cubes
Dannihu01 Mar 10, 2018
780a965
Make the vision socket able to look for any object
Dannihu01 Mar 10, 2018
e36f455
Fix KeyError bug
a2aaron Mar 10, 2018
ac99d57
maybe create zig zag auton?
a2aaron Mar 10, 2018
ebfc9ad
look for cube in vision_reckon
a2aaron Mar 10, 2018
73988c8
add debug for retroreflective
a2aaron Mar 10, 2018
524013c
more debug
a2aaron Mar 10, 2018
dda6c15
fast debug values
a2aaron Mar 10, 2018
678a96c
Slower vision reckon
a2aaron Mar 10, 2018
123e363
even faster debug
a2aaron Mar 10, 2018
6eb4312
more debug
a2aaron Mar 10, 2018
4483d66
and yet there is still more
a2aaron Mar 10, 2018
58da06c
faster vision reckon
a2aaron Mar 10, 2018
6167b21
higher vision correction
a2aaron Mar 10, 2018
b7ce03a
vision reckon retrorefelctive
a2aaron Mar 10, 2018
e5d083b
more of this
a2aaron Mar 10, 2018
6d25d46
make auton avaliable again
a2aaron Mar 10, 2018
4292ef4
Add Zig Zag auton to robot.py
Dannihu01 Mar 13, 2018
3a825f9
Use encoders for D.R. and shorten drive times in half, add case for RA
Dannihu01 Mar 14, 2018
6616f65
Get Triggered that you wasted an hour implementing visionauto
Dannihu01 Mar 14, 2018
5a670ff
Change zig_zag auton to have encoders and start on center auton with …
Dannihu01 Mar 16, 2018
49727f2
Finish center auto with vision but this still needs changes help
Dannihu01 Mar 17, 2018
ad9be5e
Fix robot.py because i messed it up accidentally
Dannihu01 Mar 17, 2018
1770e0b
Fix syntax errors so tests pass and im not dumb
Dannihu01 Mar 17, 2018
ad6d495
Fix syntax errors so tests pass and im not dumb
Dannihu01 Mar 17, 2018
18d125d
Merge remote-tracking branch 'origin/Waterford' into Waterford
Dannihu01 Mar 17, 2018
02cbb09
Make Angle correction in vision smaller
Dannihu01 Mar 18, 2018
4ebda37
Make turn angle for center ~ 30 deg
Dannihu01 Mar 18, 2018
4d2e079
Set robot pos to center and make angle evern smaller
Dannihu01 Mar 18, 2018
52eb363
Uze the correct motor with encoder values and make forward distance more
Dannihu01 Mar 18, 2018
a244a7e
CORRECT ENCODER FOR COMP BOT DO NOT CHANGE
Dannihu01 Mar 18, 2018
1b4b76b
Leave comments for aaron and adjust turn angle
Dannihu01 Mar 19, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
vision reckon retrorefelctive
a2aaron committed Mar 10, 2018

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit b7ce03a89c2208c19b8a478821da86af1f051f85
2 changes: 1 addition & 1 deletion autonomous.py
Original file line number Diff line number Diff line change
@@ -69,7 +69,7 @@ def dead_reckon(drivetrain):
yield from Timed(ArcadeAutonomous(drivetrain, forward=0.7, rotate=0), duration=3.0).run()

def vision_reckon(drivetrain, gyro, vision_socket):
yield from Timed(VisionAuto(drivetrain, gyro, vision_socket, forward=0.6, look_for="cube"), duration=5.0).run()
yield from Timed(VisionAuto(drivetrain, gyro, vision_socket, forward=0.6, look_for="retroreflective"), duration=5.0).run()


# Used when the robot starts in the center