Merge branch 'main' of https://github.com/microsoft/microcode

microsoft · Sep 27, 2023 · eb6ed09 · eb6ed09
2 parents 249f332 + 496c3e9
commit eb6ed09
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 36 deletions.
diff --git a/.github/workflows/makecode.yml b/.github/workflows/makecode.yml
@@ -39,3 +39,5 @@ jobs:
               run: |
                   cd robot
                   makecode
+                  makecode -c mkc-cutebot.json
+                  makecode -c mkc-yahboomtinybit.json
diff --git a/robot/main.ts b/robot/main.ts
diff --git a/robot/maincutebot.ts b/robot/maincutebot.ts
@@ -0,0 +1 @@
+microcode.elecfreaksCuteBot.start()
diff --git a/robot/mainyahboomtinybit.ts b/robot/mainyahboomtinybit.ts
@@ -0,0 +1 @@
+microcode.yahboomTinyBit.start()
diff --git a/robot/mkc-cutebot.json b/robot/mkc-cutebot.json
@@ -0,0 +1,5 @@
+{
+    "overrides": {
+        "testFiles": ["maincutebot.ts"]
+    }
+}
diff --git a/robot/mkc-yahboomtinybit.json b/robot/mkc-yahboomtinybit.json
@@ -0,0 +1,5 @@
+{
+    "overrides": {
+        "testFiles": ["mainyahboomtinybit.ts"]
+    }
+}
diff --git a/robot/test.ts b/robot/test.ts
@@ -3,25 +3,16 @@ microcode.elecfreaksCuteBot.start()
 //microcode.keyStudioMiniSmartRobot.start()
 microcode.setMotorDrift(6)
 
-const robotDriver = microcode.robotDriver
-robotDriver.motorRun(60)
-/*
 basic.forever(() => {
-    robotDriver.motorRun(100)
-    pause(1500)
-    robotDriver.motorRun(-100)
-    pause(1500)
-})
-*/
-/*    
-
-    const dist = robotDriver.ultrasonicDistance()
-    if (dist > 5)
-        robotDriver.motorRun(100)
+    const dist = microcode.robotDriver.ultrasonicDistance()
+    if (dist > 10) microcode.robotDriver.motorRun(100)
     else {
-        robotDriver.motorRun(-50)
+        microcode.robotDriver.motorStop()
+        microcode.robotDriver.motorRun(-50)
         pause(400)
-        robotDriver.motorTurn(50)
-        pause(800)
+        microcode.robotDriver.motorStop()
+        microcode.robotDriver.motorTurn(50)
+        pause(400)
+        microcode.robotDriver.motorStop()
     }
-    */
+})