From 06cce20707040b63b94d438ad01204ff7bdf1034 Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Mon, 12 Feb 2018 17:27:20 +0200 Subject: [PATCH] Minor formatting to the system info --- platformio/builder/tools/piolib.py | 6 +++--- platformio/builder/tools/pioplatform.py | 12 +++++------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/platformio/builder/tools/piolib.py b/platformio/builder/tools/piolib.py index bfaa447e..44988375 100644 --- a/platformio/builder/tools/piolib.py +++ b/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 (LDF) -> http://bit.ly/configure-pio-ldf" - print "LDF MODES: FINDER/%s COMPATIBILITY/%s" % (ldf_mode, - project.lib_compat_mode) + print "Library Dependency Finder -> 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) diff --git a/platformio/builder/tools/pioplatform.py b/platformio/builder/tools/pioplatform.py index c668eaef..e2735b01 100644 --- a/platformio/builder/tools/pioplatform.py +++ b/platformio/builder/tools/pioplatform.py @@ -117,10 +117,8 @@ def PrintConfiguration(env): # pylint: disable=too-many-branches debug_tools = board_config.get("debug", {}).get("tools") ram = board_config.get("upload", {}).get("maximum_ram_size") flash = board_config.get("upload", {}).get("maximum_size") - for (key, value) in (("RAM", ram), ("Flash", flash)): - if not value: - continue - system_data.append("%s/%s" % (key, util.format_filesize(value))) + system_data.append("%s (%s Flash)" % (util.format_filesize(ram), + util.format_filesize(flash))) if platform_data: print " ".join(platform_data) @@ -132,7 +130,7 @@ def PrintConfiguration(env): # pylint: disable=too-many-branches return data = [ - "CURRENT/%s" % board_config.get_debug_tool_name( + "CURRENT(%s)" % board_config.get_debug_tool_name( env.subst("$DEBUG_TOOL")) ] onboard = [] @@ -143,9 +141,9 @@ def PrintConfiguration(env): # pylint: disable=too-many-branches else: external.append(key) if onboard: - data.append("ON-BORD/%s" % ", ".join(sorted(onboard))) + data.append("ON-BORD(%s)" % ", ".join(sorted(onboard))) if external: - data.append("EXTERNAL/%s" % ", ".join(sorted(external))) + data.append("EXTERNAL(%s)" % ", ".join(sorted(external))) print "DEBUG: %s" % " ".join(data)