Merge branch 'master' into master

Author: TheKitty

CPX_Simon_Game/code.py

@@ -59,18 +59,32 @@ def read_region(timeout=30):
     while time.time() - start_time < timeout:
         if cpx.touch_A1:
             val = PAD_REGION['A1']
+            time.sleep(.3)
+            break
         elif cpx.touch_A2:
             val = PAD_REGION['A2']
+            time.sleep(.3)
+            break
         elif cpx.touch_A3:
             val = PAD_REGION['A3']
+            time.sleep(.3)
+            break
         elif cpx.touch_A4:
             val = PAD_REGION['A4']
+            time.sleep(.3)
+            break
         elif cpx.touch_A5:
             val = PAD_REGION['A5']
+            time.sleep(.3)
+            break
         elif cpx.touch_A6:
             val = PAD_REGION['A6']
+            time.sleep(.3)
+            break
         elif cpx.touch_A7:
             val = PAD_REGION['A7']
+            time.sleep(.3)
+            break
     return val
 
 def play_sequence(sequence):

Circuit_Playground_Express_IR_Treasure_Hunt/CPX_Hunter.py

@@ -31,7 +31,7 @@
     # Try and decode them
     try:
         # Attempt to convert received pulses into numbers
-        received_code = tuple(decoder.decode_bits(pulses, debug=False))
+        received_code = tuple(decoder.decode_bits(pulses))
     except adafruit_irremote.IRNECRepeatException:
         # We got an unusual short code, probably a 'repeat' signal
         # print("NEC repeat!")

PyPortal_Quarantine_Clock/code.py

@@ -95,7 +95,7 @@
             refresh_time = time.monotonic()
             # set the_time
             the_time = time.localtime()
-        except (ValueError, RuntimeError) as error:
+        except (ValueError, RuntimeError) as e:
             print("Failed to get data, retrying\n", e)
             esp.reset()
             continue

PyPortal_Quarantine_Clock/month_clock.py

@@ -115,7 +115,7 @@
             refresh_time = time.monotonic()
             # set the_time
             the_time = time.localtime()
-        except (ValueError, RuntimeError) as error:
+        except (ValueError, RuntimeError) as e:
             print("Failed to get data, retrying\n", e)
             esp.reset()
             continue