Merge pull request #83 from Barmaluk/patch-1

Fixed All Scripts

Author: brettle

AAAScripts/scripts.txt

@@ -9,101 +9,100 @@
 
 #Cross Auto Line
 Rxxx: 
-	moveto (0, 120) #Drive past auto line 
+	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  
+	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
+	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
+	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
+	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
+	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
+	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
+	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
+	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
+	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
+	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
+	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
+	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
+	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
+	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
+	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
+	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
+	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
+	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,128.4) (0,80.4) (-144,80.4) #Back out from switch
+	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
+	moveto (0,188.4) (-210.6,188.4) (-210.6,44.4) (-123.6,44.4) 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
+	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) (-12, 80.4) #Drive toward cubes
+	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
+	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
@@ -123,22 +122,22 @@ Lxxx:
 
 #Switch
 LLxx:
-	moveto (0, 129.8) (42.6, 129.8) -90 #Drive directly forward to switch and then ram into switch  
+	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
+	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
+	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
+	moveto (0, 188.4) (246.6, 188.4) (246.6, 284.4) (216.05, 284.4) -90 #Curve around switch + place at init distance to scale
 	scale
 
 #-------------------------------------------------
@@ -158,7 +157,7 @@ LRRx:
 	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
+	moveto (246.6, 284.4) (16.05, 284.4) -90 #Curve around switch + place at init distance to scale
 	scale
 
 LRLx:
@@ -168,50 +167,50 @@ LRLx:
 	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
+	moveto (0, 188.4) (210.6,188.4) (210.6, 129.8) (186.6, 129.8) 90 #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
+	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
+	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
+	moveto (0, 80.4) (108, 80.4) 90 #Drive toward cubes
 	intake
 	moveto (0, 80.4) #Back out from cubes
-	moveto (0, 284.4) (24.6, 284.4) -90 #Drive toward scale
+	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
+	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, 3.7) (124.8, 3.7) (124.8, -39.6) #Drive toward exchange
+	moveto (246.6, 3.7) (124.8, 3.7) 180 #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
+	moveto (0, 129.8) #Back out from switch
+	moveto (102, 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, 44.4) (124.8, 44.4) (124.8, -39.6) 180 #Go to exchange
+	moveto (0, 36) (96,36) 180 #Go to exchange
 	exchange
 
 # moveto
@@ -242,40 +241,34 @@ 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
+
+moveto (0,60) (48,60) (-48,104.375)#5 feet forward, 4 right, 7 forward
 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
+moveto (0,60) (-48,60) (-48,104.375)#5 feet forward, 4 left, 7 forward
 switch #deploy switch 
 
-
 # Scale
 CxRx:
-moveto (0,60) 90 #5 feet forward, turn 90
-moveto (114,60) -90 #9.5 feet right, turn -90
+moveto (0,60) (114,60)#5 feet forward, 9.5 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
+moveto (0,60) (-90,60) #5 feet forward, 90in 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
+moveto (0,60) (48,60) (48,104.375) #5 feet forward, 4 right, 7 forward
 switch #deploy switch 
 move -39 #move 39 inches back
 turn -90 #turn -90 degrees
@@ -284,36 +277,35 @@ 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
+moveto (-90,60)#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
+moveto (0,60) (48,60) (48,104.375)#5 feet forward, 4 right, 7 forward
 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
+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
+moveto (114, 60)#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
+
+moveto (0,60) (-48,60) (-48,104.375) #5 feet forward, 4 left, 7 for
 switch #deploy switch 
 move -39 #move 39 inches back
 turn -90 #turn -90 degrees
@@ -322,16 +314,16 @@ 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
+moveto (114, 60)#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
+
+moveto (0,60) (-48,60) (-48,104.375) #5 feet forward, 4 left, 7 forward
 switch #deploy switch 
 move -39 #move 39 inches back
 turn 90 #turn 90 degrees
@@ -340,7 +332,8 @@ 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
+moveto (-90,60)#7.5 feet right
+turn -90
 move 264 #22 feet forward
 turn 90 #turn to face the switch
 scale #deploy scale2
@@ -350,9 +343,8 @@ 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
+
+moveto (0,60) (48,60) (48,104.375)#5 feet forward, 4 right, 7 forward
 switch #deploy switch 
 move -24 # 2 feet back
 turn -90
@@ -366,9 +358,8 @@ 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
+
+moveto (0,60) (-48,60) (-48,104.375)#5 feet forward, 4 left, 7 forward
 switch #deploy switch
 move -24
 turn 90
@@ -381,9 +372,7 @@ 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
+moveto (0,60) (-48,60) (-48,104.375) #5 feet forward, 3 left, 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
+exchange