Input device configuration working

evoggy · evoggy · commit 788903e43294 · 2015-01-21T11:41:41.000+01:00
diff --git a/lib/cfclient/ui/dialogs/inputconfigdialogue.py b/lib/cfclient/ui/dialogs/inputconfigdialogue.py
@@ -176,7 +176,7 @@ def showConfigBox(self, caption, message, directions=[]):
         self.box.show()
 
     def startConfigOfInputDevice(self):
-        self.joystickReader.enableRawReading(self.inputDeviceSelector.currentIndex())
+        self.joystickReader.enableRawReading(str(self.inputDeviceSelector.currentText()))
         self.rawinputreader.startReading()
         self.populateDropDown()
         self.profileCombo.setEnabled(True)
@@ -448,5 +448,7 @@ def startReading(self):
     @pyqtSlot()
     def read_input(self):
         [rawaxis, rawbuttons] = self.joystickReader.readRawValues()
+        #logger.info("AX: {}".format(rawaxis))
+        #logger.info("BT: {}".format(rawbuttons))
         self.rawAxisUpdateSignal.emit(rawaxis)
         self.rawButtonUpdateSignal.emit(rawbuttons)
diff --git a/lib/cfclient/utils/input.py b/lib/cfclient/utils/input.py
@@ -181,7 +181,7 @@ def getAvailableDevices(self):
 
         return approved_devs 
 
-    def enableRawReading(self, deviceId):
+    def enableRawReading(self, device_name):
         """
         Enable raw reading of the input device with id deviceId. This is used
         to get raw values for setting up of input devices. Values are read
@@ -191,7 +191,7 @@ def enableRawReading(self, deviceId):
             self._input_device.close()
 
         for d in readers.devices():
-            if d.id == deviceId:
+            if d.name == device_name:
                 self._input_device = d
 
         # Set the mapping to None to get raw values
