deathmatch: dead or alive (#33)

Author: dido18

sketches/controller/main.py

@@ -5,7 +5,7 @@
 
 from modulino import ModulinoKnob, ModulinoButtons
 
-ALVIK_MAC = "74:4d:bd:a0:49:e8"
+ALVIK_MAC = "74:4d:bd:a2:08:74"
 
 sta = network.WLAN(network.STA_IF)  # Or network.AP_IF
 sta.active(True)
@@ -45,36 +45,36 @@ def mac_str_to_bytes(mac_str):
 
 
 def stop():
-    e.send(_mac_peer, struct.pack("BHH", STOP), True)
+    e.send(_mac_peer, struct.pack("B", STOP), True)
 
 
 def go_forward():
-    e.send(_mac_peer, struct.pack("BHH", GO_FORWARD), True)
+    e.send(_mac_peer, struct.pack("B", GO_FORWARD), True)
 
 
 def go_backward():
-    e.send(_mac_peer, struct.pack("BHH", GO_BACKWARD), True)
+    e.send(_mac_peer, struct.pack("B", GO_BACKWARD), True)
 
 
 def turn_left():
-    e.send(_mac_peer, struct.pack("BHH", TURN_LEFT), True)
+    e.send(_mac_peer, struct.pack("B", TURN_LEFT), True)
 
 
 def turn_right():
-    e.send(_mac_peer, struct.pack("BHH", TURN_RIGHT), True)
+    e.send(_mac_peer, struct.pack("B", TURN_RIGHT), True)
 
 
 def lift():
-    e.send(_mac_peer, struct.pack("BHH", LIFT), True)
+    e.send(_mac_peer, struct.pack("B", LIFT), True)
 
 
 buttons.on_button_a_press = lambda: go_forward()
 buttons.on_button_b_press = lambda: stop()
 buttons.on_button_c_press = lambda: go_backward()
 
 knob.on_press = lambda: lift()
-knob.on_rotate_clockwise = lambda steps, value: turn_left()
-knob.on_rotate_counter_clockwise = lambda steps, value: turn_right()
+knob.on_rotate_clockwise = lambda steps, value: turn_right()
+knob.on_rotate_counter_clockwise = lambda steps, value: turn_left()
 
 while True:
     knob.update()

sketches/robot/main.py

@@ -13,7 +13,6 @@
     print("ImportError: ModulinoPixels not installed")
     sys.exit(-1)
 
-LIVES = 8
 VELOCITY = 13  # cm/s (max is 13cm/s)
 ANGULAR_VELOCITY = 320  # (max 320.8988764044944)
 
@@ -41,14 +40,14 @@
 
 def receiveAndExecuteFromEspNow():
     global lifState
-    host, msg = e.recv(
+    _, msg = e.recv(
         timeout_ms=0
     )  # TODO: See ESPNow.irecv() for a memory-friendly alternative.
     if msg is None:
         return
-    if len(msg) < 6:  # discard garbage
+    if len(msg) < 1:  # discard garbage
         return
-    unpacked_message = struct.unpack("BHH", msg)
+    unpacked_message = struct.unpack("B", msg)
     msg_type = unpacked_message[0]
     if int(msg_type) == STOP:
         a.drive(0, 0)
@@ -67,6 +66,8 @@ def receiveAndExecuteFromEspNow():
         else:
             liftDown()
             lifState = 0
+    else:
+      print("unknown command type ", msg_type)
 
 def liftUp():
     a.set_servo_positions(180, 0)
@@ -91,118 +92,57 @@ def liftDown():
     a.set_servo_positions(180, 0)
 
 
-def lostLifeAnimation():
-    a.drive(0, 0)
-
-    for i in range(3):
-        a.left_led.set_color(1, 0, 0)
-        a.right_led.set_color(1, 0, 0)
-        sleep_ms(200)
-        a.left_led.set_color(0, 0, 0)
-        a.right_led.set_color(0, 0, 0)
-        sleep_ms(200)
+def showReadyToPlayAnimation():
+    for _ in range(2):
+        pixels.set_all_color(ModulinoColor.GREEN, 15)
+        pixels.show()
+        sleep_ms(250)
+        pixels.clear_all()
+        pixels.show()
+        sleep_ms(250)
 
-    pixels.clear_all()
-    color = ModulinoColor.RED
-    if LIVES >= 6:
-        color = ModulinoColor.GREEN
-    elif LIVES >= 3 and LIVES < 6:
-        color = ModulinoColor(255, 156, 0)
-    else:
-        color = ModulinoColor.RED
-    pixels.set_range_color(0, LIVES - 1, color, 70)
+    pixels.set_all_color(ModulinoColor.GREEN, 15)
     pixels.show()
 
 
-def checkModulinoPixels():
-    ok_pixel = False
-    retries = 3
-    for x in range(retries):
-        if pixels.connected:
-            ok_pixel = True
-            break
-        else:
-            a.left_led.set_color(1, 0, 0)
-            a.right_led.set_color(1, 0, 0)
-            sleep_ms(500)
-    return ok_pixel
-
-
 def showEndAnimation():
-    for j in range(0, 3):
-        for i in range(0, 8):
-            pixels.clear_all()
-            pixels.set_rgb(i, 255, 0, 0, 100)
-            pixels.show()
-            sleep_ms(50)
+    for i in range(0, 8):
+        pixels.clear_all()
+        pixels.set_rgb(i, 255, 0, 0, 15)
+        pixels.show()
+        sleep_ms(50)
 
-        for i in range(7, -1, -1):
-            pixels.clear_all()
-            pixels.set_rgb(i, 255, 0, 0, 100)
-            pixels.show()
-            sleep_ms(50)
+    for i in range(7, -1, -1):
+        pixels.clear_all()
+        pixels.set_rgb(i, 255, 0, 0, 15)
+        pixels.show()
+        sleep_ms(50)
 
 
 STATE_INIT = 0
 STATE_PLAY = 1
-STATE_LOOSE_LIFE = 2
-STATE_END = 3
-STATE_ERROR = -1
+STATE_END = 2
 
 state = STATE_INIT
 
 while True:
     if state == STATE_INIT:
-        if checkModulinoPixels():
+        a.drive(0, 0)
+        showEndAnimation()
+        if a.get_color_label() is not "BLACK":
+            showReadyToPlayAnimation()
             state = STATE_PLAY
-        else:
-            state = STATE_ERROR
 
     elif state == STATE_PLAY:
-        print("PLAY")
+        receiveAndExecuteFromEspNow()
         color = a.get_color_label()
-        print(color)
-
         if color == "BLACK":
-            LIVES -= 1
-            lostLifeAnimation()
-            if LIVES > 0:
-                state = STATE_LOOSE_LIFE
-            elif LIVES == 0:
-                state = STATE_END
-
+            state = STATE_INIT
         elif color == "RED":
             # random spin
             a.rotate(
                 random.choice([30.0, 45.0, 90.0, 130.0, 150.0, 180.0, 275.0, 360.0]),
                 "deg",
-            )
+        )
 
-        receiveAndExecuteFromEspNow()
-
-    elif state == STATE_LOOSE_LIFE:
-        print("LOOSE LIFE")
-
-        receiveAndExecuteFromEspNow()
-
-        if a.get_color_label() is not "BLACK":
-            state = STATE_PLAY
-        else:
-            state = STATE_LOOSE_LIFE
-
-    elif state == STATE_END:
-        a.drive(0, 0)
-        showEndAnimation()
-
-    elif state == STATE_ERROR:
-        a.drive(0, 0)
-        while True:
-            # Blink the LEDs forever
-            a.left_led.set_color(1, 0, 0)
-            a.right_led.set_color(1, 0, 0)
-            sleep_ms(200)
-            a.left_led.set_color(0, 0, 0)
-            a.right_led.set_color(0, 0, 0)
-            sleep_ms(200)
-
-    sleep_ms(100)
+    sleep_ms(50)