Merge pull request #21 from ddemidov/master

Rename a couple of methods in Button

Author: rhempel

ev3dev.py

@@ -1722,6 +1722,8 @@ class Button(object):
     in /include/uapi/linux/input.h for details.
     """
 
+#~autogen
+
     KEY_MAX = 0x2FF
     KEY_BUF_LEN = int((KEY_MAX + 7) / 8)
     EVIOCGKEY = (2 << (14 + 8 + 8) | KEY_BUF_LEN << (8 + 8) | ord('E') << 8 | 0x18)
@@ -1750,7 +1752,8 @@ def read_buttons(self):
         for b in self.buffer_cache:
             fcntl.ioctl(self.filehandle_cache[b], self.EVIOCGKEY, self.buffer_cache[b])
 
-    def check_buttons(self):
+    @property
+    def buttons_pressed(self):
         pressed = []
         self.read_buttons()
         for k,v in self._buttons.items():
@@ -1762,24 +1765,19 @@ def check_buttons(self):
 
     @property
     def any(self):
-        return bool(len(self.check_buttons()) != 0)
+        return bool(self.buttons_pressed)
 
-    @property
-    def which(self):
-        return self.check_buttons()
-
-    def these(self,buttons={}):
+    def check_buttons(self,buttons=[]):
         if len(buttons) == 0:
             return False
-        s = self.check_buttons()
+        s = self.buttons_pressed
         if len(s) == 0:
             return False
         for b in buttons:
             if b not in s:
                 return False
         return True
 
-#~autogen
     if current_platform() == 'ev3':
 #~autogen button-property platforms.ev3.button>currentClass
         _buttons = { 
@@ -1793,27 +1791,27 @@ def these(self,buttons={}):
 
         @property
         def up(self):
-            return 'up' in self.check_buttons()
+            return 'up' in self.buttons_pressed
 
         @property
         def down(self):
-            return 'down' in self.check_buttons()
+            return 'down' in self.buttons_pressed
 
         @property
         def left(self):
-            return 'left' in self.check_buttons()
+            return 'left' in self.buttons_pressed
 
         @property
         def right(self):
-            return 'right' in self.check_buttons()
+            return 'right' in self.buttons_pressed
 
         @property
         def enter(self):
-            return 'enter' in self.check_buttons()
+            return 'enter' in self.buttons_pressed
 
         @property
         def backspace(self):
-            return 'backspace' in self.check_buttons()
+            return 'backspace' in self.buttons_pressed
 
 
 #~autogen

templates/button-class.liquid

@@ -13,60 +13,3 @@ class {{ class_name }}({{ base_class }}):
     to be able to read the button state buffer. See Linux kernel source
     in /include/uapi/linux/input.h for details.
     """
-
-    KEY_MAX = 0x2FF
-    KEY_BUF_LEN = int((KEY_MAX + 7) / 8)
-    EVIOCGKEY = (2 << (14 + 8 + 8) | KEY_BUF_LEN << (8 + 8) | ord('E') << 8 | 0x18)
-
-    def __init__(self):
-        self.buffer_cache = {}
-        self.filehandle_cache = {}
-        for b in self._buttons:
-            self._button_file( self._buttons[b]['name'] )
-            self._button_buffer( self._buttons[b]['name'] )
-
-    def _button_file(self, name):
-        if name not in self.filehandle_cache:
-            f = open( name, 'r' )
-            self.filehandle_cache[name] = f
-        else:
-            f = self.filehandle_cache[name]
-        return f
-
-    def _button_buffer(self, name):
-        if name not in self.buffer_cache:
-            self.buffer_cache[name] = array.array( 'B', [0] * self.KEY_BUF_LEN )
-        return self.buffer_cache[name]
-
-    def read_buttons(self):
-        for b in self.buffer_cache:
-            fcntl.ioctl(self.filehandle_cache[b], self.EVIOCGKEY, self.buffer_cache[b])
-
-    def check_buttons(self):
-        pressed = []
-        self.read_buttons()
-        for k,v in self._buttons.items():
-            buf = self.buffer_cache[v['name']]
-            bit = v['value']
-            if not bool(buf[int(bit / 8)] & 1 << bit % 8):
-                pressed += [k]
-        return pressed
-
-    @property
-    def any(self):
-        return bool(len(self.check_buttons()) != 0)
-
-    @property
-    def which(self):
-        return self.check_buttons()
-
-    def these(self,buttons={}):
-        if len(buttons) == 0:
-            return False
-        s = self.check_buttons()
-        if len(s) == 0:
-            return False
-        for b in buttons:
-            if b not in s:
-                return False
-        return True

templates/button-property.liquid

@@ -6,5 +6,5 @@
 {% for instance in currentClass.instances %}
         @property
         def {{ instance.name }}(self):
-            return '{{ instance.name }}' in self.check_buttons()
+            return '{{ instance.name }}' in self.buttons_pressed
 {% endfor %}