Compare commits
3 Commits
656591ee43
...
99080ce07e
| Author | SHA1 | Date | |
|---|---|---|---|
| 99080ce07e | |||
| 75013f1039 | |||
| f2a0d940e0 |
@@ -31,30 +31,31 @@ def set_speed(straight_speed, st_acc, turn_speed, turn_acc):
|
|||||||
|
|
||||||
#Run code
|
#Run code
|
||||||
drive_base.straight(50)#Was 50
|
drive_base.straight(50)#Was 50
|
||||||
drive_base.turn(-43.75)#42 Mostly works
|
drive_base.turn(-49)#42 Mostly works
|
||||||
drive_base.straight(735)#Was 750
|
drive_base.straight(700)#Was 735
|
||||||
#left_arm.run_angle(1500,-100)#Was 1000,And was -30
|
#left_arm.run_angle(1500,-100)#Was 1000,And was -30
|
||||||
#wait(1000)
|
#wait(1000)
|
||||||
#drive_base.straight(330)
|
#drive_base.straight(330)
|
||||||
drive_base.turn(80)#Was 80
|
drive_base.turn(40)#Was 80
|
||||||
set_speed(100,300,300,200)
|
set_speed(100,300,300,200)
|
||||||
drive_base.straight(350)#Was 400
|
drive_base.straight(100)
|
||||||
|
drive_base.turn(47)#Was 37
|
||||||
|
drive_base.straight(320)#Was 300-350
|
||||||
drive_base.straight(-110)#Was -125
|
drive_base.straight(-110)#Was -125
|
||||||
set_default_speed
|
set_default_speed
|
||||||
drive_base.turn(87)#Was 90
|
drive_base.turn(85)#Was 87
|
||||||
#right_arm.run_angle(1000, -30)#Was -47
|
#right_arm.run_angle(1000, -30)#Was -47
|
||||||
drive_base.straight(100)
|
drive_base.straight(50)#150
|
||||||
drive_base.turn(-70)
|
drive_base.turn(-67)#Was -73
|
||||||
left_arm.run_angle(1000,180)
|
print("Mycellium")
|
||||||
drive_base.straight(55)
|
left_arm.run_angle(1000,180)#Towards Mycellium
|
||||||
drive_base.turn(-30)#Was Positive 30
|
drive_base.straight(75)#Was 75
|
||||||
#left_arm.run_angle(2000,-180)
|
drive_base.turn(-10)#Was Positive 30
|
||||||
drive_base.straight(-20)
|
drive_base.straight(3)
|
||||||
drive_base.straight(-200)
|
set_speed(1000,300,300,200)
|
||||||
drive_base.turn(120)
|
left_arm.run_angle(102020,-180)
|
||||||
#Going back
|
drive_base.turn(70)#Orignal 120
|
||||||
drive_base.straight(700)
|
drive_base.straight(300)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -230,8 +230,8 @@ async def Run1(): # Flip The Rock, Lucky Leaves, Reaching Roots - Johannes
|
|||||||
async def Run2(): # Exploding Seeds - Johannes
|
async def Run2(): # Exploding Seeds - Johannes
|
||||||
|
|
||||||
await multitask(
|
await multitask(
|
||||||
right_arm.run_angle(400,-100)
|
right_arm.run_angle(400,-100),
|
||||||
left_arm.run_angle(300,100)
|
left_arm.run_angle(300,100),
|
||||||
drive_base.arc(150,None,115)
|
drive_base.arc(150,None,115)
|
||||||
)
|
)
|
||||||
await drive_base.straight(270)
|
await drive_base.straight(270)
|
||||||
@@ -273,18 +273,30 @@ async def Run3(): # Window to the Past, Leaf Cutter, Humongous Fungus, Experimen
|
|||||||
await drive_base.turn(40)
|
await drive_base.turn(40)
|
||||||
set_speed(100,200,300,200)
|
set_speed(100,200,300,200)
|
||||||
await drive_base.straight(170)
|
await drive_base.straight(170)
|
||||||
|
<<<<<<< HEAD
|
||||||
await drive_base.straight(-145)
|
await drive_base.straight(-145)
|
||||||
await drive_base.turn(80)
|
await drive_base.turn(80)
|
||||||
await drive_base.straight(230)
|
await drive_base.straight(230)
|
||||||
set_speed(600, 500, 300, 200)
|
set_speed(600, 500, 300, 200)
|
||||||
await drive_base.straight(-138)
|
await drive_base.straight(-138)
|
||||||
|
=======
|
||||||
|
await drive_base.straight(-135)
|
||||||
|
await drive_base.turn(80)
|
||||||
|
await drive_base.straight(230)
|
||||||
|
set_speed(600, 500, 300, 200)
|
||||||
|
await drive_base.straight(-145)
|
||||||
|
>>>>>>> 0e1e580 (Update discovery-phase/missions/Showcase_codes.py)
|
||||||
await multitask(
|
await multitask(
|
||||||
drive_base.turn(-36),
|
drive_base.turn(-36),
|
||||||
right_arm.run_angle(200,-140)
|
right_arm.run_angle(200,-140)
|
||||||
)
|
)
|
||||||
set_speed(100,200,300,200)
|
set_speed(100,200,300,200)
|
||||||
await drive_base.straight(230)
|
await drive_base.straight(230)
|
||||||
|
<<<<<<< HEAD
|
||||||
await right_arm.run_angle(300,105)
|
await right_arm.run_angle(300,105)
|
||||||
|
=======
|
||||||
|
await right_arm.run_angle(300,160)
|
||||||
|
>>>>>>> 0e1e580 (Update discovery-phase/missions/Showcase_codes.py)
|
||||||
await wait(200)
|
await wait(200)
|
||||||
await drive_base.turn(-90)
|
await drive_base.turn(-90)
|
||||||
await drive_base.straight(-170)
|
await drive_base.straight(-170)
|
||||||
|
|||||||
Reference in New Issue
Block a user