Fixed an issue when `env.BoardConfig()` does not work for custom boards in extra scripts of libraries // Resolve #3264

This commit is contained in:
Ivan Kravets
2019-11-12 23:52:43 +02:00
parent 15f142fc70
commit a9f9f4ef04

View File

@ -40,16 +40,15 @@ def PioPlatform(env):
def BoardConfig(env, board=None): def BoardConfig(env, board=None):
p = env.PioPlatform() with fs.cd(env.subst("$PROJECT_DIR")):
try: try:
board = board or env.get("BOARD") p = env.PioPlatform()
assert board, "BoardConfig: Board is not defined" board = board or env.get("BOARD")
with fs.cd(env.subst("$PROJECT_DIR")): assert board, "BoardConfig: Board is not defined"
config = p.board_config(board) return p.board_config(board)
except (AssertionError, exception.UnknownBoard) as e: except (AssertionError, exception.UnknownBoard) as e:
sys.stderr.write("Error: %s\n" % str(e)) sys.stderr.write("Error: %s\n" % str(e))
env.Exit(1) env.Exit(1)
return config
def GetFrameworkScript(env, framework): def GetFrameworkScript(env, framework):