slight tweak to gamepad input code

breakout.py

@@ -81,20 +81,7 @@ class Breakout:
 
         self.place()
 
-        self.old_keys = {
-            "left": False,
-            "right": False,
-            "up": False,
-            "down": False,
-            "a": False,
-            "b": False,
-            "x": False,
-            "y": False,
-            "l": False,
-            "r": False,
-            "start": False,
-            "select": False,
-        }
+        self.old_keys = self.input.empty() # TODO support missing input
 
     def finished(self):
         if self.input == None:

gamepad.py

@@ -17,20 +17,7 @@ class InputWrapper:
     def __init__(self):
         self.devices = []
         self.selector = DefaultSelector()
-        self.keys = {
-            "left": False,
-            "right": False,
-            "up": False,
-            "down": False,
-            "a": False,
-            "b": False,
-            "x": False,
-            "y": False,
-            "l": False,
-            "r": False,
-            "start": False,
-            "select": False,
-        }
+        self.keys = self.empty()
 
         devices = [InputDevice(path) for path in list_devices()]
         for device in devices:
@@ -58,6 +45,24 @@ class InputWrapper:
             self.devices.append(d)
             self.selector.register(d, EVENT_READ)
 
+    def empty(self):
+        return {
+            "left": False,
+            "right": False,
+            "up": False,
+            "down": False,
+            "a": False,
+            "b": False,
+            "x": False,
+            "y": False,
+            "l": False,
+            "r": False,
+            "start": False,
+            "select": False,
+            "l2": False,
+            "r2": False,
+        }
+
     def get(self, verbose = False):
         for key, mask in self.selector.select(0):
             device = key.fileobj
@@ -87,6 +92,10 @@ class InputWrapper:
                         self.keys["r"] = v
                     elif (event.code == ecodes.BTN_TOP2) or (event.code == ecodes.KEY_A):
                         self.keys["l"] = v
+                    elif event.code == ecodes.BTN_BASE:
+                        self.keys["r2"] = v
+                    elif event.code == ecodes.BTN_BASE2:
+                        self.keys["l2"] = v
                     elif (event.code == ecodes.BTN_BASE4) or (event.code == ecodes.KEY_BACKSPACE):
                         self.keys["start"] = v
                     elif event.code == ecodes.BTN_BASE3:
@@ -113,9 +122,13 @@ class InputWrapper:
                         else:
                             self.keys["down"] = False
                             self.keys["up"] = False
+                elif event.type == ecodes.EV_SYN:
+                    continue # don't print sync events
 
                 if verbose:
-                    print(categorize(event), event)
+                    print(categorize(event))
+                    print(event)
+                    print()
 
         return self.keys
 
@@ -123,13 +136,23 @@ if __name__ == "__main__":
     from pprint import pprint
     import sys
 
-    if len(sys.argv) > 1:
+    if (len(sys.argv) > 1) and (sys.argv[1] == "list"):
         devices = [InputDevice(path) for path in list_devices()]
         for device in devices:
             print(device.path, device.name, device.phys)
             pprint(device.capabilities(verbose=True))
             print()
-    else:
+    elif (len(sys.argv) > 1) and (sys.argv[1] == "events"):
         i = InputWrapper()
+        last_keys = None
         while True:
             i.get(True)
+    else:
+        i = InputWrapper()
+        last_keys = None
+        while True:
+            keys = i.get()
+            if (last_keys == None) or (keys != last_keys):
+                pprint(keys)
+                print()
+                last_keys = keys.copy()

mapper.py

@@ -109,20 +109,7 @@ class MapperReduceBrightness(MapperNull):
         self.refresh = 60 * 60 * 6
         self.factor = 1.0
         self.user_mod = None
-        self.old_keys = {
-            "left": False,
-            "right": False,
-            "up": False,
-            "down": False,
-            "a": False,
-            "b": False,
-            "x": False,
-            "y": False,
-            "l": False,
-            "r": False,
-            "start": False,
-            "select": False,
-        }
+        self.old_keys = self.input.empty() # TODO support missing input
 
     def fetch(self):
         if useNTP:

pico.py

@@ -291,20 +291,7 @@ class PicoBatt:
 class PicoInput:
     def __init__(self):
         self.gui = None
-        self.keys = {
-            "left": False,
-            "right": False,
-            "up": False,
-            "down": False,
-            "a": False,
-            "b": False,
-            "x": False,
-            "y": False,
-            "l": False,
-            "r": False,
-            "start": False,
-            "select": False,
-        }
+        self.keys = self.input.empty() # TODO support missing input
 
     def get(self):
         if self.gui != None:

runner.py

@@ -40,20 +40,7 @@ class TunnelRun:
 
         self.player = [ int(self.gui.width / 2), int(self.gui.height / 2) ]
 
-        self.old_keys = {
-            "left": False,
-            "right": False,
-            "up": False,
-            "down": False,
-            "a": False,
-            "b": False,
-            "x": False,
-            "y": False,
-            "l": False,
-            "r": False,
-            "start": False,
-            "select": False,
-        }
+        self.old_keys = self.input.empty() # TODO support missing input
 
     def finished(self):
         if self.input == None:

snake.py

@@ -49,20 +49,7 @@ class Snake:
         DrawText = util.getTextDrawer()
         self.text = DrawText(self.gui, self.text_c)
 
-        self.old_keys = {
-            "left": False,
-            "right": False,
-            "up": False,
-            "down": False,
-            "a": False,
-            "b": False,
-            "x": False,
-            "y": False,
-            "l": False,
-            "r": False,
-            "start": False,
-            "select": False,
-        }
+        self.old_keys = self.input.empty() # TODO support missing input
 
         self.placeDot()
 

tetris.py

@@ -145,20 +145,7 @@ class Tetris:
         self.data = [[self.bg for y in range(self.height)] for x in range(self.width)]
         self.piece = None
         self.next_piece = None
-        self.old_keys = {
-            "left": False,
-            "right": False,
-            "up": False,
-            "down": False,
-            "a": False,
-            "b": False,
-            "x": False,
-            "y": False,
-            "l": False,
-            "r": False,
-            "start": False,
-            "select": False,
-        }
+        self.old_keys = self.input.empty() # TODO support missing input
         self.pause = False
 
     def finished(self):

weather.py

@@ -85,20 +85,7 @@ class WeatherScreen:
 
     def restart(self):
         self.state = 0
-        self.old_keys = {
-            "left": False,
-            "right": False,
-            "up": False,
-            "down": False,
-            "a": False,
-            "b": False,
-            "x": False,
-            "y": False,
-            "l": False,
-            "r": False,
-            "start": False,
-            "select": False,
-        }
+        self.old_keys = self.input.empty() # TODO support missing input
         self.done = False
         self.last = time.time()