Implement autodetecting of default debug tool

platformio/builder/main.py

@@ -64,7 +64,11 @@ commonvars.AddVariables(
     ("UPLOAD_PROTOCOL",),
     ("UPLOAD_SPEED",),
     ("UPLOAD_FLAGS",),
-    ("UPLOAD_RESETMETHOD",)
+    ("UPLOAD_RESETMETHOD",),
+
+    # debug options
+    ("DEBUG_TOOL",),
+
 
 )  # yapf: disable
 

platformio/builder/tools/piolib.py

@@ -832,9 +832,9 @@ def BuildProjectLibraries(env):
     project.env = env
     ldf_mode = LibBuilderBase.lib_ldf_mode.fget(project)
 
-    print "Library Dependency Finder -> http://bit.ly/configure-pio-ldf"
-    print "Modes: Finder/%s Compatibility/%s" % (ldf_mode,
-                                                 project.lib_compat_mode)
+    print "Library Dependency Finder (LDF) -> http://bit.ly/configure-pio-ldf"
+    print "LDF MODES: FINDER/%s COMPATIBILITY/%s" % (ldf_mode,
+                                                     project.lib_compat_mode)
 
     lib_builders = env.GetLibBuilders()
     print "Collected %d compatible libraries" % len(lib_builders)

platformio/builder/tools/pioplatform.py

@@ -99,8 +99,8 @@ def LoadPioPlatform(env, variables):
 
 
 def PrintConfiguration(env):  # pylint: disable=too-many-branches
-    platform_data = ["Platform: %s >" % env.PioPlatform().title]
-    system_data = ["System:"]
+    platform_data = ["PLATFORM: %s >" % env.PioPlatform().title]
+    system_data = ["SYSTEM:"]
     mcu = env.subst("$BOARD_MCU")
     f_cpu = env.subst("$BOARD_F_CPU")
     if mcu:
@@ -131,7 +131,10 @@ def PrintConfiguration(env):  # pylint: disable=too-many-branches
     if not debug_tools:
         return
 
-    data = []
+    data = [
+        "CURRENT/%s" % board_config.get_debug_tool_name(
+            env.subst("$DEBUG_TOOL"))
+    ]
     onboard = []
     external = []
     for key, value in debug_tools.items():
@@ -144,7 +147,7 @@ def PrintConfiguration(env):  # pylint: disable=too-many-branches
     if external:
         data.append("EXTERNAL/%s" % ", ".join(sorted(external)))
 
-    print "Debug: %s" % " ".join(data)
+    print "DEBUG: %s" % " ".join(data)
 
 
 def exists(_):

platformio/builder/tools/pioupload.py

@@ -220,9 +220,9 @@ def PrintUploadInfo(env):
         available.extend(env.BoardConfig().get("upload", {}).get(
             "protocols", []))
     if available:
-        print "Available: %s" % ", ".join(sorted(available))
+        print "AVAILABLE: %s" % ", ".join(sorted(available))
     if configured:
-        print "Configured: upload_protocol = %s" % configured
+        print "CURRENT: upload_protocol = %s" % configured
 
 
 def exists(_):