feedc0de/platformio-core
1
0
Fork 0
forked from platformio/platformio-core
Code Pull Requests Activity

Rename "System" to "Hardware" for board spec

Browse Source
This commit is contained in:
Ivan Kravets
2018-11-04 17:24:39 +02:00
parent 1287e51bf8
commit 7789e3bc62
3 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs

Submodule docs updated: 3ad9278c9a...f2d4816cae

13
platformio/builder/tools/pioplatform.py
View File

@ -124,15 +124,15 @@ def LoadPioPlatform(env, variables):
def PrintConfiguration(env): def PrintConfiguration(env):
platform = env.PioPlatform() platform = env.PioPlatform()
platform_data = ["PLATFORM: %s >" % platform.title] platform_data = ["PLATFORM: %s >" % platform.title]
system_data = ["SYSTEM:"] hardware_data = ["HARDWARE:"]
configuration_data = ["CONFIGURATION:"] configuration_data = ["CONFIGURATION:"]
mcu = env.subst("$BOARD_MCU") mcu = env.subst("$BOARD_MCU")
f_cpu = env.subst("$BOARD_F_CPU") f_cpu = env.subst("$BOARD_F_CPU")
if mcu: if mcu:
system_data.append(mcu.upper()) hardware_data.append(mcu.upper())
if f_cpu: if f_cpu:
f_cpu = int("".join([c for c in str(f_cpu) if c.isdigit()])) f_cpu = int("".join([c for c in str(f_cpu) if c.isdigit()]))
system_data.append("%dMHz" % (f_cpu / 1000000)) hardware_data.append("%dMHz" % (f_cpu / 1000000))
debug_tools = None debug_tools = None
if "BOARD" in env: if "BOARD" in env:
@ -142,13 +142,14 @@ def PrintConfiguration(env):
debug_tools = board_config.get("debug", {}).get("tools") debug_tools = board_config.get("debug", {}).get("tools")
ram = board_config.get("upload", {}).get("maximum_ram_size") ram = board_config.get("upload", {}).get("maximum_ram_size")
flash = board_config.get("upload", {}).get("maximum_size") flash = board_config.get("upload", {}).get("maximum_size")
system_data.append("%s RAM (%s Flash)" % (util.format_filesize(ram), hardware_data.append(
util.format_filesize(flash))) "%s RAM (%s Flash)" % (util.format_filesize(ram),
util.format_filesize(flash)))
configuration_data.append( configuration_data.append(
"https://docs.platformio.org/page/boards/%s/%s.html" % "https://docs.platformio.org/page/boards/%s/%s.html" %
(platform.name, board_config.id)) (platform.name, board_config.id))
for data in (configuration_data, platform_data, system_data): for data in (configuration_data, platform_data, hardware_data):
if len(data) > 1: if len(data) > 1:
print(" ".join(data)) print(" ".join(data))

4
scripts/docspregen.py
View File

@ -628,8 +628,8 @@ def update_embedded_board(rst_path, board):
lines.append(""" lines.append("""
.. contents:: .. contents::
System Hardware
------ --------
Platform :ref:`platform_{platform}`: {platform_description} Platform :ref:`platform_{platform}`: {platform_description}