Merge pull request 'dev' (#53) from dev into main

Reviewed-on: #53

README.md

@@ -63,17 +63,14 @@ Repository
 
 ### Installation & Deployment - from the server - everyday
 
-1. Download the file codes_for_scrimmage/regional-final/Final_combined.py
+1. Download the file competition_codes/sectionals/sectional_main_dec_6.py 
  - You can do this through the repo, by using cURL, or by using git.
- - Repo - Go to [codes_for_scrimmage/regional-final/Final_combined.py](codes_for_scrimmage/regional-final/Final_combined.py) and click the "Download" button.
+ - Repo - Go to the latest release and click the "Download as ZIP" button to get the full repository.
- - cURL or another HTTP data transferrer - 
+ - Single file - Go to the latest release and click the file link to get the raw master file.
-
- ```curl -o Final_combined.py https://codes.fll-65266.org/FLL_65266_LEGO_DYNAMICS/solutions_season_unearthed/raw/branch/main/codes_for_scrimmage/regional-final/Final_combined.py```
  - git CLI - 
-
+ ```git clone https://codes.fll-65266.org/FLL_65266_LEGO_DYNAMICS/solutions_season_unearthed.git```
- ```git clone -b dev https://codes.fll-65266.org/FLL_65266_LEGO_DYNAMICS/solutions_season_unearthed.git && cd solutions_season_unearthed/codes_for_scrimmage/regional-final```
  
-   Then use Final_combined.py.
+   Then use the master file.
 
 2. Open https://code.pybricks.com/ and select the "Import a file" button on the top of the left bar. Import the .py file. Pair your robot via Bluetooth in Pybricks by selecting the Bluetooth button.
 

competition_codes/sectionals/mukwonago_sectionals_final.py

@@ -123,10 +123,10 @@ async def solve_forge():
     await drive_base.straight(-47)
 
 async def solve_heavy_lifting():
-    await right_arm.run_angle(500,-90) # arm down
+    await right_arm.run_angle(500,-160) # arm down
     await wait(100)
     await drive_base.turn(20) # turn right a little bit
-    await right_arm.run_angle(500,140) #arm up
+    await right_arm.run_angle(500,160) #arm up
     await drive_base.turn(-20) #reset position
 
 async def solve_who_lived_here():
@@ -176,9 +176,8 @@ async def Run3():
         monitor_distance()
     )
 
-
 async def solve_angler_artifacts():
-    await drive_base.straight(920)
+    await drive_base.straight(940)
     await drive_base.turn(-90,Stop.HOLD)
     await drive_base.straight(65)
     #Solve
@@ -187,20 +186,25 @@ async def solve_angler_artifacts():
     await drive_base.straight(-110)
     
     await drive_base.turn(90)
-    await drive_base.arc(-150,-100, None)
+    await drive_base.arc(-150,-103, None)
 
 async def solve_tip_the_scale():
-    await drive_base.straight(135)
+    await drive_base.turn(3)
+    await drive_base.straight(142.5)
     await right_arm.run_angle(800,-150)
     await right_arm.run_angle(900,150)
     
     await drive_base.straight(-100)
     await drive_base.turn(-65)
-    await drive_base.straight(320,Stop.COAST_SMART)
+    await drive_base.straight(300,Stop.COAST_SMART)
     await drive_base.arc(10,-47, None)
     #await drive_base.turn(-23, Stop.COAST_SMART)
 
 
+
+
+
+
 """
 Run #4 
 - Solves the Mineshaft explorer + 2/3 Surface Brush + 1/3 Map Reveal
@@ -208,14 +212,14 @@ Run #4
 """
 async def Run4(): 
     await drive_base.straight(700)
-    await drive_base.turn(-20)
+    await drive_base.turn(-18)
-    await drive_base.straight(110)
+    await drive_base.straight(120)
     await drive_base.straight(-210)
-    await drive_base.turn(60)
+    await drive_base.turn(61)
-    await drive_base.straight(130)
+    await drive_base.straight(133)
-    await right_arm.run_angle(1000, -200)
+    await right_arm.run_angle(400, -200)
     await drive_base.straight(90)
-    await right_arm.run_angle(300, 200)
+    await right_arm.run_angle(100, 95)
     await drive_base.straight(-875)
 
 async def solve_brush_reveal():
@@ -236,7 +240,7 @@ Run#5
 - Solves Salvage Operation + Statue Rebuild
 - Orange Key
 """
-async def Run6():
+async def Run5():
     await drive_base.straight(550)
     await right_arm.run_angle(300,100)
     await drive_base.straight(-75)
@@ -244,16 +248,20 @@ async def Run6():
     await drive_base.straight(300)
     await drive_base.straight(-200)
     await drive_base.turn(-15)
+    #solving statue
     await drive_base.straight(350)
-    await drive_base.turn(-103)
+    await drive_base.turn(-104)
     await drive_base.straight(-80)
     await left_arm.run_angle(500, -900)
-    await drive_base.straight(101)
+    await drive_base.straight(120)
-    await left_arm.run_angle(700, 285)
+    await drive_base.turn(5)
-    await drive_base.turn(30)
+    await left_arm.run_angle(500, 290)
-    await drive_base.straight(-60)
+    await drive_base.turn(18)
-    await drive_base.turn(80)
+    await drive_base.straight(-100)
-    await drive_base.straight(-900)
+    await drive_base.turn(-90)
+    await drive_base.straight(900)
+    drive_base.stop()
+
 
 async def solve_salvage_operation():
     await drive_base.straight(500)