Slightly change the logic so 'detect' is also a valid config option

Author: screamerbg

mbed/mbed.py

@@ -1323,20 +1323,21 @@ def get_env(self):
         return env
 
     def get_target(self, target=None):
-        if target:
-            if target.lower() == 'detect' or target.lower() == 'auto':
-                targets = self.get_detected_targets()
-                if targets == False:
-                    error("The target detection requires that the 'mbed-ls' python module is installed.")
-                elif len(targets) > 1:
-                    error("Multiple targets were detected.\nOnly 1 target board should be connected to your system when you use the '-m auto' switch.")
-                elif len(targets) == 0:
-                    error("No targets were detected.\nPlease make sure a target board to this system.")
-                else:
-                    action("Detected \"%s\" connected to \"%s\" and using com port \"%s\"" % (targets[0]['name'], targets[0]['mount'], targets[0]['serial']))
-                    target = targets[0]['name']
-        else:
-            target = self.get_cfg('TARGET')
+        target_cfg = self.get_cfg('TARGET')
+        target = target if target else target_cfg
+
+        if target and (target.lower() == 'detect' or target.lower() == 'auto'):
+            targets = self.get_detected_targets()
+            if targets == False:
+                error("The target detection requires that the 'mbed-ls' python module is installed.")
+            elif len(targets) > 1:
+                error("Multiple targets were detected.\nOnly 1 target board should be connected to your system when you use the '-m auto' switch.")
+            elif len(targets) == 0:
+                error("No targets were detected.\nPlease make sure a target board to this system.")
+            else:
+                action("Detected \"%s\" connected to \"%s\" and using com port \"%s\"" % (targets[0]['name'], targets[0]['mount'], targets[0]['serial']))
+                target = targets[0]['name']
+
         if target is None:
             error("Please specify target using the -m switch or set default target using command 'mbed target'", 1)
         return target