← Back to branch summary

~gnome15-team/gnome15/trunk

« back to all changes in this revision

Viewing changes to gnome15/src/main/python/gnome15/drivers/pylibg15.py

  • Committer: tanktarta
  • Date: 2012-07-29 22:00:15 UTC
  • Revision ID: tanktarta-20120729220015-mi7ib0uvw1vbnx3p
Yet again, messed up G13's  G19-G22 keys (and joystick buttons). Pretty sure it's exactly right now.

Show diffs side-by-side

added added

removed removed

Lines of Context:
gnome15/src/main/python/gnome15/drivers/pylibg15.py
70
70
                code = 0
71
71
                ext_code = 0
72
72
                if err == G15_NO_ERROR:
73
 
                    key_ext = is_ext_key(pressed_keys.value)
74
 
                    if key_ext:
75
 
                        ext_code = pressed_keys.value
 
73
                    if is_ext_key(pressed_keys.value):
 
74
                        ext_code = int(pressed_keys.value)
76
75
                        ext_code &= ~(1<<28)
77
76
                        err = libg15.getPressedKeys(byref(pressed_keys), 10)
78
77
                        if err == G15_NO_ERROR:
79
78
                            code = pressed_keys.value
80
 
                        elif err in [ G15_TRY_AGAIN, G15_ERROR_READING_USB_DEVICE ] :
81
 
                            continue
 
79
                        elif err in [ G15_TRY_AGAIN, G15_ERROR_READING_USB_DEVICE ]:
 
80
                            pass
82
81
                        elif err == G15_ERROR_NODEV:
83
82
                            # Device unplugged
84
83
                            self._run = False