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

Fix issue when board is not specified and "idedata" target is called

Browse Source
This commit is contained in:
Ivan Kravets
2017-11-29 22:22:31 +02:00
parent f922fac9d9
commit 10d21595c6
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
platformio/builder/tools/pioide.py
View File

@ -63,9 +63,13 @@ def dump_defines(env):
# special symbol for Atmel AVR MCU # special symbol for Atmel AVR MCU
if env['PIOPLATFORM'] == "atmelavr": if env['PIOPLATFORM'] == "atmelavr":
defines.append( board_mcu = env.get("BOARD_MCU")
str("__AVR_%s__" % env.BoardConfig().get("build.mcu").upper() if not board_mcu and "BOARD" in env:
.replace("ATMEGA", "ATmega").replace("ATTINY", "ATtiny"))) board_mcu = env.BoardConfig().get("build.mcu")
if board_mcu:
defines.append(
str("__AVR_%s__" % board_mcu.upper()
.replace("ATMEGA", "ATmega").replace("ATTINY", "ATtiny")))
return defines return defines

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

@ -41,8 +41,9 @@ def PioPlatform(env):
def BoardConfig(env, board=None): def BoardConfig(env, board=None):
p = initPioPlatform(env['PLATFORM_MANIFEST']) p = initPioPlatform(env['PLATFORM_MANIFEST'])
try: try:
config = p.board_config(board if board else env['BOARD']) assert env.get("BOARD", board), "BoardConfig: Board is not defined"
except exception.UnknownBoard as e: config = p.board_config(board if board else env.get("BOARD"))
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 return config