platformio/platformio-core
1
0
Fork 1
mirror of https://github.com/platformio/platformio-core.git synced 2025-07-30 10:07:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Move "Board" Options to "Platform

Browse Source
This commit is contained in:
Ivan Kravets
2019-11-26 14:44:54 +02:00
parent fdd73552ea
commit 2fbe33bca0
3 changed files with 25 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs

Submodule docs updated: a8416e56cf...02d20c83d2

10
platformio/project/options.py
View File

@ -293,34 +293,34 @@ ProjectOptions = OrderedDict(
), ),
# Board # Board
ConfigEnvOption( ConfigEnvOption(
group="board", group="platform",
name="board", name="board",
description="A board ID", description="A board ID",
buildenvvar="BOARD", buildenvvar="BOARD",
), ),
ConfigEnvOption( ConfigEnvOption(
group="board", group="platform",
name="board_build.mcu", name="board_build.mcu",
description="A custom board MCU", description="A custom board MCU",
oldnames=["board_mcu"], oldnames=["board_mcu"],
buildenvvar="BOARD_MCU", buildenvvar="BOARD_MCU",
), ),
ConfigEnvOption( ConfigEnvOption(
group="board", group="platform",
name="board_build.f_cpu", name="board_build.f_cpu",
description="A custom MCU frequency", description="A custom MCU frequency",
oldnames=["board_f_cpu"], oldnames=["board_f_cpu"],
buildenvvar="BOARD_F_CPU", buildenvvar="BOARD_F_CPU",
), ),
ConfigEnvOption( ConfigEnvOption(
group="board", group="platform",
name="board_build.f_flash", name="board_build.f_flash",
description="A custom flash frequency", description="A custom flash frequency",
oldnames=["board_f_flash"], oldnames=["board_f_flash"],
buildenvvar="BOARD_F_FLASH", buildenvvar="BOARD_F_FLASH",
), ),
ConfigEnvOption( ConfigEnvOption(
group="board", group="platform",
name="board_build.flash_mode", name="board_build.flash_mode",
description="A custom flash mode", description="A custom flash mode",
oldnames=["board_flash_mode"], oldnames=["board_flash_mode"],

23
tests/test_projectconf.py
View File

@ -65,7 +65,11 @@ extends = strict_settings
EXTRA_ENVS_CONFIG = """ EXTRA_ENVS_CONFIG = """
[env:extra_1] [env:extra_1]
build_flags = ${custom.lib_flags} ${custom.debug_flags} build_flags =
-fdata-sections
-Wl,--gc-sections
${custom.lib_flags}
${custom.debug_flags}
lib_install = 574 lib_install = 574
[env:extra_2] [env:extra_2]
@ -226,7 +230,10 @@ def test_getraw_value(config):
# known # known
assert config.getraw("env:base", "targets") == "" assert config.getraw("env:base", "targets") == ""
assert config.getraw("env:extra_1", "lib_deps") == "574" assert config.getraw("env:extra_1", "lib_deps") == "574"
assert config.getraw("env:extra_1", "build_flags") == "-lc -lm -D DEBUG=1" assert (
config.getraw("env:extra_1", "build_flags")
== "\n-fdata-sections\n-Wl,--gc-sections\n-lc -lm\n-D DEBUG=1"
)
# extended # extended
assert config.getraw("env:test_extends", "lib_ldf_mode") == "chain+" assert config.getraw("env:test_extends", "lib_ldf_mode") == "chain+"
@ -236,7 +243,12 @@ def test_getraw_value(config):
def test_get_value(config): def test_get_value(config):
assert config.get("custom", "debug_flags") == "-D DEBUG=1" assert config.get("custom", "debug_flags") == "-D DEBUG=1"
assert config.get("env:extra_1", "build_flags") == ["-lc -lm -D DEBUG=1"] assert config.get("env:extra_1", "build_flags") == [
"-fdata-sections",
"-Wl,--gc-sections",
"-lc -lm",
"-D DEBUG=1",
]
assert config.get("env:extra_2", "build_flags") == ["-Og"] assert config.get("env:extra_2", "build_flags") == ["-Og"]
assert config.get("env:extra_2", "monitor_speed") == 9600 assert config.get("env:extra_2", "monitor_speed") == 9600
assert config.get("env:base", "build_flags") == ["-D DEBUG=1"] assert config.get("env:base", "build_flags") == ["-D DEBUG=1"]
@ -259,7 +271,10 @@ def test_items(config):
("lib_ignore", ["LibIgnoreCustom"]), ("lib_ignore", ["LibIgnoreCustom"]),
] ]
assert config.items(env="extra_1") == [ assert config.items(env="extra_1") == [
("build_flags", ["-lc -lm -D DEBUG=1"]), (
"build_flags",
["-fdata-sections", "-Wl,--gc-sections", "-lc -lm", "-D DEBUG=1"],
),
("lib_deps", ["574"]), ("lib_deps", ["574"]),
("monitor_speed", 9600), ("monitor_speed", 9600),
("custom_monitor_speed", "115200"), ("custom_monitor_speed", "115200"),