Skip to content
This repository was archived by the owner on Sep 14, 2019. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
61 commits
Select commit Hold shift + click to select a range
54c5bea
Other misc. offseason robot configurations to ensure smooth use
DriverStationComputer Jan 28, 2018
aa0924c
Add scriptupload. Apparently all my code got rewrote?
MysteryPig Feb 1, 2018
619bf9b
Begin writing AutoMoveTo
MysteryPig Feb 3, 2018
0ce8802
Finish writing AutoMoveTo, change RunScript to use PID commands instead
Feb 3, 2018
2645eff
Add scripts to project
Feb 3, 2018
9c918c6
Merge remote-tracking branch 'upstream/master'
MysteryPig Feb 3, 2018
34a6e0e
remember to save before committing kids
MysteryPig Feb 3, 2018
cc0d6d5
Make turning and moving without MoveTo track position, and fixed a
MysteryPig Feb 3, 2018
7170ab4
getting new teleop working
DriverStationComputer Feb 3, 2018
fd1b3b4
teleop VPID working!
DriverStationComputer Feb 3, 2018
7e88dbd
added basic velocityPID functionality to the drivetrain using the tal…
dfang314 Feb 4, 2018
dfd6217
VPID works with shifting gears!
DriverStationComputer Feb 4, 2018
e3eae40
Added default kD math
dfang314 Feb 4, 2018
23c5c72
added shiftLowGear to beginning of auto
dfang314 Feb 4, 2018
dad76f7
changes to get it working
DriverStationComputer Feb 4, 2018
91e34ed
Merge branch 'working' of
DriverStationComputer Feb 4, 2018
71a0c43
VPID testing in test mode
DriverStationComputer Feb 4, 2018
306cbf5
Merge branch 'working' of https://github.com/DriverStationComputer/Ro…
DriverStationComputer Feb 4, 2018
55965bd
ready for encoder ratio testing
DriverStationComputer Feb 4, 2018
ff28259
* Defined SmartDashboardInterface to be able to mock calls to the sma…
Feb 6, 2018
bc7a5e5
Added the testForward case for AutoMoveTo. This test also fails and …
Feb 6, 2018
f840cef
Merge branch 'master' into master
dfang314 Feb 7, 2018
f985006
Merge branch 'master' into corvin-refactor-for-AutoMoveTo-unit-tests
MysteryPig Feb 8, 2018
5c9444d
Merge pull request #1 from corvinb/corvin-refactor-for-AutoMoveTo-uni…
MysteryPig Feb 8, 2018
1c73625
More updates to AutoMoveTo
MysteryPig Feb 8, 2018
febb807
Merge branch 'master' of https://github.com/MysteryPig/RobotCode2018
MysteryPig Feb 8, 2018
b899642
teleop working on practice bot
DriverStationComputer Feb 9, 2018
be7362f
Put PID controllers and commands to SmartDashboard and some other stuff
DriverStationComputer Feb 10, 2018
6d823a3
added standard err message to smartdashboard fails
Feb 10, 2018
df84a71
Merge remote-tracking branch 'dadavid/master'
Feb 10, 2018
7c9f56c
Factored in gear ratio in kD method
dfang314 Feb 10, 2018
d6ab7d9
Merge remote-tracking branch 'origin/master'
dfang314 Feb 10, 2018
7e4e9bf
Added division by 2 because each side of the drivetrain only supports…
dfang314 Feb 10, 2018
5ea98aa
Added lift motors to robotMap and accounted for two CIMs in kD calcul…
dfang314 Feb 10, 2018
2fd8b6e
Merge remote-tracking branch 'daremote/master'
MysteryPig Feb 10, 2018
dd737a3
added lift and changed dt solenoid keys
dfang314 Feb 10, 2018
9159815
changed the rpm to radians per second
dfang314 Feb 10, 2018
a740f2e
got rid of compiling errors
dfang314 Feb 10, 2018
8e5407e
Fix merging, reorganize PIDTurn's constructor to match PIDMove's,
MysteryPig Feb 10, 2018
f89470d
Merge branch 'master' of https://github.com/doawelul/RobotCode2018.git
DriverStationComputer Feb 10, 2018
e774c5f
parsePoint method, Position class, math fixes, etc.
MysteryPig Feb 10, 2018
9bfb9bb
Merge branch 'master' into master
MysteryPig Feb 10, 2018
77a42c8
Simple constructor for AMT, make math readable
MysteryPig Feb 11, 2018
c307756
Merge branch 'master' of https://github.com/MysteryPig/RobotCode2018
MysteryPig Feb 11, 2018
8ca27e3
fix my horrible redunant code and Corvin's test
MysteryPig Feb 11, 2018
2c2738c
latest changes so code can run on robot
DriverStationComputer Feb 11, 2018
a8b8730
happy VPID!
DriverStationComputer Feb 11, 2018
2146a50
new shuffleboard layout
DriverStationComputer Feb 11, 2018
b16bac6
Merge remote-tracking branch 'blue/master'
dfang314 Feb 12, 2018
230af70
changed intake and outake functionality to whenPressed and added flex…
dfang314 Feb 12, 2018
a7a86b4
PID Move testing
DriverStationComputer Feb 13, 2018
f8b8af7
shuffleboard layout
DriverStationComputer Feb 13, 2018
c154138
Added a try/catch in AutoUtils.parsePoint
MysteryPig Feb 15, 2018
305b8e3
added encoder rate getters and implemented maximum velocity when endi…
dfang314 Feb 17, 2018
4c38478
testing move and turn pids, new navx jar
Feb 17, 2018
06e33e2
changed project name back to Robot2018
Feb 17, 2018
17c2c71
Added cameras, comment out PID
DriverStationComputer Feb 17, 2018
9a97982
Merge branch 'master' of https://github.com/DriverStationComputer/Rob…
DriverStationComputer Feb 17, 2018
2846211
Merge branch 'master' of https://github.com/DeepBlueRobotics/RobotCod…
DriverStationComputer Feb 17, 2018
8980ef6
Merge branch 'master' of https://github.com/MysteryPig/RobotCode2018.git
DriverStationComputer Feb 18, 2018
5212a32
Merge branch 'master' of https://github.com/doawelul/RobotCode2018.git
DriverStationComputer Feb 18, 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
389 changes: 389 additions & 0 deletions AAAScripts/scripts.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,389 @@
# Naming Conventions
# -------------------
# 1. Robot's start position. R = right, C = center, L = left.
# 2. Switch information. R = going for the right plate, L = going for the left plate, x = not going for switch
# 3. Scale information. R = going for the right plate, L = going for the left plate, x = not going for scale
# 4. Exchange. E = going for the exchange, x = not going for exchange

# 3.3(l) x 2.9(w)

#Cross Auto Line
Rxxx:
moveto (0, 120) #Drive past auto line

#-------------------------------------------------

#Switch
RRxx:
moveto (0, 128.4) (-42.6, 128.4) -90 #Drive directly forward to switch and then ram into switch
switch

RLxx:
moveto (0, 188.4) (-210.6, 188.4) (-210.6, 128.4) (-186.6, 128.4) 90 #Curve around switch and then "ram" into switch
switch

#-------------------------------------------------

#Scale
RxRx:
moveto (0, 284.4) (-24.6, 284.4) -90 #Drive directly forward and place at initial horizontal to scale
scale

RxLx:
moveto (0, 188.4) (-246.6, 188.4) (-246.6, 284.4) (-192.6, 284.4) 90 #Curve around switch and drive to scale
scale

#-------------------------------------------------

#Exchange
RxxE
moveto (0, 188.4) (-210.6, 188.4) (-210.6, 44.4) (-123.6, 44.4) (-123.6, -39.6) 180 #Curve around switch for baseline #then go to exchange
exchange

#-------------------------------------------------

#Switch and Scale
RRRx:
moveto (0, 128.4) (-41.4, 128.4) 90 #Drive directly forward then turn into switch
switch
moveto (0, 128.4) #Back out from switch
moveto (0, 80.4) (-9, 80.4) #Drive toward cubes
intake
moveto (0, 80.4) #Back out from cubes
moveto (0, 284.4) (-24.6, 284.4) -90 #Drive toward scale
scale

RRLx:
moveto (0, 128.4) (-41.4, 128.4) 90 #Drive directly forward then turn into switch
switch
moveto (0, 128.4) #Back out from switch
moveto (0, 80.4) (-9, 80.4) -90 #Drive toward cubes
intake
moveto (0, 80.4) #Back out from cubes
moveto (0, 188.4) (-246.6, 188.4) (-246.6, 284.4) (-192.6, 284.4) 90 #Curve around switch + place at init distance to scale
scale

RLRx:
moveto (0, 284.4) (-24.6, 284.4) -90 #Drive directly forward and place at initial horizontal to scale
scale
moveto (0, 284.4) #Back out from switch
moveto (0, 80.4) (-108, 80.4) -90 #Drive toward cubes
intake
moveto (0, 80.4) #Back out from cubes
moveto (0, 188.4) (-210.6,188.4) (-210.6, 128.4) (-186.6, 128.4) #Drive toward switch
switch

RLLx:
moveto (0, 188.4) (-210.6,188.4) (-210.6, 128.4) (-186.6, 128.4) -90 #Curve around switch and then "ram" into switch
switch
moveto (-246.6, 128.4) #Back out from switch
moveto (-246.6, 80.4) (-144, 80.4) #Drive toward cubes
intake
moveto (-246.6, 80.4) #Back out from cubes
moveto (-246.6, 284.4) (-192.6, 284.4) 90 #Curve around switch + place at init distance to scale
scale

#-------------------------------------------------

#Switch and Exchange
RRxE:
moveto (0, 128.4) (-41.4, 128.4) 90 #Drive directly forward then turn into switch
switch
moveto (-192, 128.4) #Back out from switch
moveto (-192, 80.4) (-144, 80.4) #Drive toward cubes
#intake
moveto (0, 80.4) #Back out from cubes
moveto (0, 188.4) (-210.6, 188.4) (-210.6, 44.4) (-123.6, 44.4) (-123.6, -39.6) 180 #Curve around switch for baseline #then go to
exchange

RLxE:
moveto (0, 188.4) (-210.6,188.4) (-210.6, 128.4) (-186.6, 128.4) 180 #Curve around switch and then "ram" into switch
switch
moveto (-246.6, 128.4) #Back out from switch
moveto (-246.6, 80.4) (-12, 80.4) #Drive toward cubes
#intake
moveto (-246.6, 80.4) #Back out from cubes
moveto (-246.6, 44.4) (-123.6, 44.4) (-123.6, -39.6) #Drive toward exchange
exchange

# Naming Conventions
# -------------------
# 1. Robot's start position. R = right, C = center, L = left.
# 2. Switch information. R = going for the right plate, L = going for the left plate, x = not going for switch
# 3. Scale information. R = going for the right plate, L = going for the left plate, x = not going for scale
# 4. Exchange. E = going for the exchange, x = not going for exchange

# 3.3(l) x 2.9(w)

#Cross Auto Line
Lxxx:
moveto (0, 120) #Drive past auto line

#-------------------------------------------------

#Switch
LLxx:
moveto (0, 129.8) (42.6, 129.8) -90 #Drive directly forward to switch and then ram into switch
switch

LRxx:
moveto (0, 188.4) (210.6,188.4) (210.6, 129.8) (186.6, 129.8) 90 #Curve around switch and then "ram" into switch
switch

#-------------------------------------------------

#Scale
LxLx:
moveto (0, 284.4) (24.6, 284.4) -90 #Drive directly forward and place at initial horizontal to scale
scale

LxRx:
moveto (0, 188.4) (246.6, 188.4) (246.6, 284.4) (16.05, 284.4) 90 #Curve around switch + place at init distance to scale
scale

#-------------------------------------------------

#Exchange
LxxE
moveto (0, 188.4) (210.6, 188.4) (210.6, 3.7) (124.8, 3.7) (124.8, -3.3) 180 #Curve around switch for baseline then go to exchange
exchange

#-------------------------------------------------

#Switch and Scale
LRRx:
moveto (0, 188.4) (210.6,188.4) (210.6, 129.8) (186.6, 129.8) -90 #Curve around switch and then "ram" into switch
switch
moveto (246.6, 129.8) #Back out from switch
moveto (246.6, 80.4) (12, 80.4) #Drive toward cubes
intake
moveto (246.6, 80.4) #Back out from cubes
moveto (246.6, 284.4) (16.05, 284.4) 90 #Curve around switch + place at init distance to scale
scale

LRLx:
moveto (0, 284.4) (24.6, 284.4) -90 #Drive directly forward and place at initial horizontal to scale
scale
moveto (0, 284.4) #Back out from switch
moveto (0, 80.4) (108, 80.4) -90 #Drive toward cubes
intake
moveto (0, 80.4) #Back out from cubes
moveto (0, 188.4) (210.6,188.4) (210.6, 129.8) (186.6, 129.8) #Drive toward switch
switch

LLRx:
moveto (0, 129.8) (42.6, 129.8) 90 #Drive directly forward then turn into switch
switch
moveto (0, 129.8) #Back out from switch
moveto (0, 80.4) (108, 80.4) -90 #Drive toward cubes
intake
moveto (0, 80.4) #Back out from cubes
moveto (0, 188.4) (246.6, 188.4) (246.6, 284.4) (192.6, 284.4) 90 #Curve around switch and drive to scale
scale

LLLx:
moveto (0, 129.8) (42.6, 129.8) 90 #Drive directly forward then turn into switch
switch
moveto (0, 129.8) #Back out from switch
moveto (0, 80.4) (108, 80.4) #Drive toward cubes
intake
moveto (0, 80.4) #Back out from cubes
moveto (0, 284.4) (24.6, 284.4) -90 #Drive toward scale
scale

#-------------------------------------------------

#Switch and Exchange
LRxE:
moveto (0, 188.4) (210.6,188.4) (210.6, 129.8) (186.6, 129.8) 180 #Curve around switch and then "ram" into switch
switch
moveto (246.6, 129.8) #Back out from switch
moveto (246.6, 80.4) (12, 80.4) #Drive toward cubes
intake
moveto (246.6, 80.4) #Back out from cubes
moveto (246.6, 3.7) (124.8, 3.7) (124.8, -39.6) #Drive toward exchange
exchange

LLxE:
moveto (0, 129.8) (42.6, 129.8) 90 #Drive directly forward then turn into switch
switch
moveto (17, 129.8) #Back out from switch
moveto (17, 80.4) (12, 80.4) #Drive toward cubes
intake
moveto (0, 80.4) #Back out from cubes
moveto (0, 188.4) (210.6, 188.4) (210.6, 44.4) (124.8, 44.4) (124.8, -39.6) 180 #Go to exchange
exchange

# moveto
# turn
# move
# switch
# scale
# exchange
# wait
# intake
# jump
# end



# 1. Robot's start position. R = right, C = center, L = left.
# 2. Switch information. R = going for the right plate, L = going for the left plate, x = not going for # switch
# 3. Scale information. R = going for the right plate, L = going for the left plate, x = not going for # scale
# 4. Exchange. E = going for the exchange, x = not going for exchange


# Location of Robot: rightmost next to exchange

# Cross Auto Line
Cxxx:
moveto (48,80.375) #cross baseline


# Switch
CRxx:
moveto (0,60) 90 #5 feet forward, turn 90
moveto (48,60) -90 #4 feet right,turn -90
moveto(48,104.375) #7 feet forward until against switch enclosure, compensating for robot length
switch #deploy switch

CLxx:
moveto (0,60) -90 #5 feet forward, turn -90
moveto (-48,60) 90 #4 feet left,turn 90
moveto(-48,104.375) #7 feet forward until against switch enclosure,compensating for robot length
switch #deploy switch


# Scale
CxRx:
moveto (0,60) 90 #5 feet forward, turn 90
moveto (114,60) -90 #9.5 feet right, turn -90
move 224.375 #22 feet forward, compensating for robot length
turn -90 #turn to face the switch
scale #deploy scale


CxLx:
moveto (0,60) -90 #5 feet forward, turn -90
moveto (-90,60) 90 #7.5 feet left, turn 90
move 224.375 #22 feet forward, compensating for robot length
turn 90 #turn to face the switch
scale #deploy scale


# Switch and Scale
CRLx:
moveto (0,60) 90 #5 feet forward, turn 90
moveto (48,60) -90 #4 feet right,turn -90
moveto(48,104.375) #7 feet forward until against switch enclosure
switch #deploy switch
move -39 #move 39 inches back
turn -90 #turn -90 degrees
move 48 #move 4 feet forward
intake #intake
turn -90 #turn -90
move 45 # move 45 in. forward
turn -90 #turn 90
moveto (-90,60) 90 #7.5 feet left, turn 90
move 264 #22 feet forward
turn 90 #turn to face the switch
scale #deploy scale2



CRRx:
moveto (0,60) 90 #5 feet forward, turn 90
moveto (48,60) -90 #4 feet right,turn -90
moveto(48,104.375) #7 feet forward until against switch enclosure
switch #deploy switch
move -39 #move 39 inches back
turn -90 #turn -90 degrees
move 48 #move 4 feet forward
intake
turn -90 #turn -90nyu
move 45 # move 45 in. forward
turn -90 #turn -90 degrees
moveto (114, 60) -90 #9.5 feet right, turn -90
move 264 #22 feet forward
turn -90 #turn to face the switch
scale #deploy scale



CLRx:
moveto (0,60) -90 #5 feet forward, turn -90
moveto (-48,60) 90 #4 feet left,turn 90
moveto(-48,104.375) #7 feet forward until against switch enclosure
switch #deploy switch
move -39 #move 39 inches back
turn -90 #turn -90 degrees
move 48 #move 4 feet forward
intake #intake
turn 90 #turn 90
move 45 # move 45 in. forward
turn 90 #turn 90 degrees
moveto (114, 60) -90 #9.5 feet right, turn -90
move 264 #22 feet forward
turn -90 #turn to face the switch
scale #deploy scale


CLLx:
moveto (0,60) -90 #5 feet forward, turn -90
moveto (-48,60) 90 #4 feet left,turn 90
moveto(-48,104.375) #7 feet forward until against switch enclosure
switch #deploy switch
move -39 #move 39 inches back
turn 90 #turn 90 degrees
move 48 #move 4 feet forward
intake #intake
turn 90 #turn -90
move 45 # move 45 in. forward
turn 90 #turn 90
moveto (-90,60) -90 #7.5 feet right, turn -90
move 264 #22 feet forward
turn 90 #turn to face the switch
scale #deploy scale2




# Switch and Exchange
CRxE:
moveto (0,60) 90 #5 feet forward, turn 90
moveto (48,60) -90 #4 feet right,turn -90
moveto(48,104.375) #7 feet forward until against switch enclosure, compensating for robot length
switch #deploy switch
move -24 # 2 feet back
turn -90
move 12 # 1 ft forward
intake
turn -90
move 72 #move 6 feet forwards
turn 90
move 60 #move 5 feet forward
turn -90 #turn to face the exchange
exchange

CLxE:
moveto (0,60) -90 #5 feet forward, turn -90
moveto (-48,60) 90 #3 feet left,turn 90
moveto(-48,104.375) #7 feet forward until against switch enclosure,compensating for robot length
switch #deploy switch
move -24
turn 90
move 24
intake
turn 90
move -84 #move 7 feet back
turn 180 #turn 180 degrees to face the exchange
exchange

# Exchange
CxxE:
moveto (0,60) -90 #5 feet forward, turn -90
moveto (-48,60) 90 #3 feet left,turn 90
moveto(-48,104.375) #7 feet forward until against switch enclosure,compensating for robot length
move -96 #move 8 feet back
turn 180 #turn 180 degrees to face the exchange
exchange
1 change: 1 addition & 0 deletions Robot2018/lib/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/User_Libraries.properties
2 changes: 2 additions & 0 deletions Robot2018/lib/User_Libraries.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
#Sat Feb 17 17:04:37 PST 2018
C\:\\Users\\dean\\git\\RobotCode2018\\Robot2018\\lib\\libpathfinderjava.so=4087ee38c338446b8305f67716260df4
Binary file modified Robot2018/lib/navx_frc.jar
Binary file not shown.
Loading