Cleaning up

evoggy · evoggy · commit 55e14c9f6974 · 2015-03-05T17:23:05.000+01:00
diff --git a/lib/cfclient/ui/main.py b/lib/cfclient/ui/main.py
@@ -485,17 +485,11 @@ def _update_input(self, device="", config=""):
     def _mux_selected(self, checked):
         if not checked:
             return
-        #self.joystickReader.stop_input()
-        #self.joystickReader.stop_input()
+
         selected_mux_name = str(self.sender().text())
         self.joystickReader.set_mux(name=selected_mux_name)
 
-        # If MUX supports more than one device, de-select all
-        #if self.joystickReader.get_mux_supported_dev_count() > 1:
-        #    for c in self._menu_devices.actions():
-        #        c.setChecked(False)
-
-        logger.info("Selected mux supports {} devices".format(self.joystickReader.get_mux_supported_dev_count()))
+        logger.debug("Selected mux supports {} devices".format(self.joystickReader.get_mux_supported_dev_count()))
         self._adjust_nbr_of_selected_devices()
 
     def _get_saved_device_mapping(self, device_name):
@@ -527,14 +521,9 @@ def _adjust_nbr_of_selected_devices(self):
         nbr_of_supported = self.joystickReader.get_mux_supported_dev_count()
         while len(self._input_dev_stack) > nbr_of_supported:
             to_close = self._input_dev_stack.pop(0)
-            logger.info("Supports {} open ({}),"
-                        "closing {}".format(nbr_of_supported,
-                                            len(self._input_dev_stack),
-                                            to_close))
             # Close and de-select it in the UI
             self.joystickReader.stop_input(to_close)
             for c in self._menu_devices.actions():
-                logger.info("Checking {}".format(c.text()))
                 if c.text() == to_close:
                         c.setChecked(False)
 
@@ -564,7 +553,6 @@ def _inputdevice_selected(self, checked):
         if self.joystickReader.get_mux_supported_dev_count() == 1:
             preferred_config = self.joystickReader.get_saved_device_mapping(selected_device_name)
             if preferred_config:
-                logger.info("Preferred config is {} for {}".format(preferred_config, selected_device_name))
                 for c in self._menu_mappings.actions():
                     if c.text() == preferred_config:
                         c.setChecked(True)
diff --git a/lib/cfclient/utils/input.py b/lib/cfclient/utils/input.py
@@ -273,7 +273,6 @@ def set_input_map(self, device_name, input_map_name):
         self._input_map = ConfigManager().get_config(input_map_name)
         if self._input_device:
             self._input_device.input_map = self._input_map
-        logger.info("Saving inputmap to {} for {}".format(input_map_name, device_name))
         Config().get("device_config_mapping")[device_name] = input_map_name
 
     def get_device_name(self):
@@ -295,7 +294,6 @@ def start_input(self, device_name, config_name=None):
                     self._input_device = d
                     if not config_name:
                         config_name = self.get_saved_device_mapping(device_name)
-                        logger.info("{}-->{}".format(device_name, config_name))
                     self.set_input_map(device_name, config_name)
                     self._input_device.open()
                     self._input_device.input_map = self._input_map
diff --git a/lib/cfclient/utils/inputreaders/linuxjsdev.py b/lib/cfclient/utils/inputreaders/linuxjsdev.py
@@ -116,8 +116,6 @@ def open(self):
         self.buttons = list(0 for i in range(val.value))
         self.__initvalues()
 
-        #logger.info("Opened {} ({})".format(self.name, self.num))
-
     def close(self):
         """Open the joystick device"""
         if not self._f:
@@ -175,9 +173,6 @@ def read(self):
 
         self._read_all_events()
 
-        #if self.num == 0:
-        #    logger.error("{}:{}".format(self.num, self.buttons))
-
         return [self.axes, self.buttons]
 
 
@@ -201,7 +196,6 @@ def devices(self):
 
         for path in syspaths:
             device_id = int(os.path.basename(path)[2:])
-            logger.info("{}".format(device_id))
             with open(path + "/device/name") as namefile:
                 name = namefile.read().strip()
             self._js[device_id] = _JS(device_id, name)
