From f9ec259742f8ecfa683ee6723803a758ce58741a Mon Sep 17 00:00:00 2001 From: Ivan Kravets Date: Thu, 12 Feb 2015 13:26:37 +0200 Subject: [PATCH] Avoid errors when "upload speed" and "upload protocol" are missed in board definition file --- platformio/boards/arduino.json | 2 +- platformio/builder/main.py | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/platformio/boards/arduino.json b/platformio/boards/arduino.json index f3e6e5ec..88cbe334 100644 --- a/platformio/boards/arduino.json +++ b/platformio/boards/arduino.json @@ -560,5 +560,5 @@ "use_1200bps_touch": true, "wait_for_upload_port": false } - } + } } diff --git a/platformio/builder/main.py b/platformio/builder/main.py index 3bde0b9d..88698c26 100644 --- a/platformio/builder/main.py +++ b/platformio/builder/main.py @@ -81,9 +81,11 @@ if "BOARD" in env: if "BOARD_F_CPU" not in env: env.Replace(BOARD_F_CPU="${BOARD_OPTIONS['build']['f_cpu']}") if "UPLOAD_PROTOCOL" not in env: - env.Replace(UPLOAD_PROTOCOL="${BOARD_OPTIONS['upload']['protocol']}") + env.Replace( + UPLOAD_PROTOCOL="${BOARD_OPTIONS['upload'].get('protocol', None)}") if "UPLOAD_SPEED" not in env: - env.Replace(UPLOAD_SPEED="${BOARD_OPTIONS['upload']['speed']}") + env.Replace( + UPLOAD_SPEED="${BOARD_OPTIONS['upload'].get('speed', None)}") if "IGNORE_LIBS" in env: env['IGNORE_LIBS'] = [l.strip() for l in env['IGNORE_LIBS'].split(",")]