Replacing lambda with def per request from code review. adafruit#1185

Author: Kevin J Walters

CLUE_Rock_Paper_Scissors/advanced/clue-multi-rpsgame.py

@@ -1,4 +1,4 @@
-# clue-multi-rpsgame v1.19
+# clue-multi-rpsgame v1.20
 # CircuitPython massively multiplayer rock paper scissors game over Bluetooth LE
 
 # Tested with CLUE and Circuit Playground Bluefruit Alpha with TFT Gizmo
@@ -138,16 +138,15 @@ def tftGizmoPresent():
     _button_b = digitalio.DigitalInOut(board.BUTTON_B)
     _button_b.switch_to_input(pull=digitalio.Pull.DOWN)
     if display is None:
-        button_left = lambda: _button_a.value
-        button_right = lambda: _button_b.value
-        ##button_left = lambda: cp.button_a
-        ##button_right = lambda: cp.button_b
-
+        def button_left():
+            return _button_a.value
+        def button_right():
+            return _button_b.value
     else:
-        button_left = lambda: _button_b.value
-        button_right = lambda: _button_a.value
-        ##button_left = lambda: cp.button_b
-        ##button_right = lambda: cp.button_a
+        def button_left():
+            return _button_b.value
+        def button_right():
+            return _button_a.value
 
 else:
     # CLUE with builtin screen (240x240)
@@ -166,10 +165,11 @@ def tftGizmoPresent():
     _button_a.switch_to_input(pull=digitalio.Pull.UP)
     _button_b = digitalio.DigitalInOut(board.BUTTON_B)
     _button_b.switch_to_input(pull=digitalio.Pull.UP)
-    button_left = lambda: not _button_a.value
-    button_right = lambda: not _button_b.value
-    ##button_left = lambda: clue.button_a
-    ##button_right = lambda: clue.button_b
+    def button_left():
+        return not _button_a.value
+    def  button_right():
+        return not _button_b.value
+
 
 blankScreen(display, pixels)
 
@@ -296,6 +296,20 @@ def addPlayer(name, addr_text, address, ad):
 rps_display.fadeUpDown("down")
 addPlayer(my_name, addrToText(ble.address_bytes), None, None)
 
+
+# These two functions mainly serve to adapt the call back arguments
+# to the called functions which do not use them
+def jgAdCallbackFlashBLE(_a, _b, _c):
+    """Used in broadcastAndReceive to flash the NeoPixels
+       when advertising messages are received."""
+    return rps_display.flashBLE()
+
+def jgEndscanCallback(_a, _b, _c):
+    """Used in broadcastAndReceive to allow early termination of the scanning
+       when the left button is pressed.
+       Button may need to be held down for a second."""
+    return button_left()
+
 # Join Game
 gc.collect()
 d_print(2, "GC before JG", gc.mem_free())
@@ -307,11 +321,10 @@ def addPlayer(name, addr_text, address, ad):
                                 jg_msg,
                                 scan_time=JG_MSG_TIME_S,
                                 scan_response_request=True,
-                                ad_cb=((lambda _a, _b, _c:
-                                        rps_display.flashBLE())
+                                ad_cb=(jgAdCallbackFlashBLE
                                        if JG_FLASH
                                        else None),
-                                endscan_cb=lambda _a, _b, _c: button_left(),
+                                endscan_cb=jgEndscanCallback,
                                 name_cb=addPlayer)
 del _  # To clean-up with GC below
 sample.stop()

CLUE_Rock_Paper_Scissors/advanced/rps_display.py

@@ -578,8 +578,14 @@ def showGameResultNeoPixels(self, pla, sco, rounds_tot=None):
            gradually lighting up pixels in a circle using rainbow
            colours for each revolution of the NeoPixels starting at orange.
            """
+        def selectSecondElem(seq):
+            """Used in a sort() method to sort my second element in a list."""
+            return seq[1]
+
+        # Sort the scores into highest first order
         idx_n_score = [(s, sco[s]) for s in range(len(sco))]
-        idx_n_score.sort(key=lambda s: s[1], reverse=True)
+        idx_n_score.sort(key=selectSecondElem, reverse=True)
+        ##idx_n_score.sort(key=lambda s: s[1], reverse=True)
 
         bg_col = BLACK
         for idx, score in idx_n_score:

CLUE_Rock_Paper_Scissors/simple/clue-simple-rpsgame.py

@@ -1,4 +1,4 @@
-# clue-simple-rpsgame v1.2
+# clue-simple-rpsgame v1.3
 # CircuitPython rock paper scissors game over Bluetooth LE
 
 # Tested with CLUE and Circuit Playground Bluefruit Alpha with TFT Gizmo
@@ -96,11 +96,15 @@ def tftGizmoPresent():
     _button_b = digitalio.DigitalInOut(board.BUTTON_B)
     _button_b.switch_to_input(pull=digitalio.Pull.DOWN)
     if display is None:
-        button_left = lambda: _button_a.value
-        button_right = lambda: _button_b.value
+        def button_left():
+            return _button_a.value
+        def button_right():
+            return _button_b.value
     else:
-        button_left = lambda: _button_b.value
-        button_right = lambda: _button_a.value
+        def button_left():
+            return _button_b.value
+        def button_right():
+            return _button_a.value
 
 else:
     # CLUE with builtin screen (240x240)
@@ -113,8 +117,10 @@ def tftGizmoPresent():
     _button_a.switch_to_input(pull=digitalio.Pull.UP)
     _button_b = digitalio.DigitalInOut(board.BUTTON_B)
     _button_b.switch_to_input(pull=digitalio.Pull.UP)
-    button_left = lambda: not _button_a.value
-    button_right = lambda: not _button_b.value
+    def button_left():
+        return not _button_a.value
+    def button_right():
+        return not _button_b.value
 
 if display is None:
     print("FATAL:", "This version of program only works with a display")