From 1c5d34cb5f6099669872251066406fb833df0337 Mon Sep 17 00:00:00 2001 From: Valeriy Koval Date: Mon, 9 Nov 2015 20:24:41 +0200 Subject: [PATCH] Update nordicnrf51 platform for RFduino. --- platformio/builder/scripts/frameworks/arduino.py | 6 +++++- platformio/builder/scripts/nordicnrf51.py | 6 +++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/platformio/builder/scripts/frameworks/arduino.py b/platformio/builder/scripts/frameworks/arduino.py index a04e5643..607065b2 100644 --- a/platformio/builder/scripts/frameworks/arduino.py +++ b/platformio/builder/scripts/frameworks/arduino.py @@ -60,7 +60,11 @@ elif env.get("PLATFORM") == "nordicnrf51": join("$PLATFORMFW_DIR", "system", "RFduino"), join("$PLATFORMFW_DIR", "system", "RFduino", "include") ], - LIBPATH=[join("$PLATFORMFW_DIR", "variants", "${BOARD_OPTIONS['build']['variant']}")], + LIBPATH=[join( + "$PLATFORMFW_DIR", + "variants", + "${BOARD_OPTIONS['build']['variant']}") + ], LIBS=["RFduino", "RFduinoBLE", "RFduinoGZLL", "RFduinoSystem"] ) diff --git a/platformio/builder/scripts/nordicnrf51.py b/platformio/builder/scripts/nordicnrf51.py index 01b336a3..fd4e1661 100644 --- a/platformio/builder/scripts/nordicnrf51.py +++ b/platformio/builder/scripts/nordicnrf51.py @@ -51,10 +51,10 @@ AlwaysBuild(target_size) # Target: Upload by default .bin file # -if "mbed" in env.subst("$FRAMEWORK"): - upload = env.Alias(["upload", "uploadlazy"], target_firm, env.UploadToDisk) -else: +if env.subst("$BOARD") == "rfduino": upload = env.Alias(["upload", "uploadlazy"], target_firm, "$UPLOADCMD") +else: + upload = env.Alias(["upload", "uploadlazy"], target_firm, env.UploadToDisk) AlwaysBuild(upload) #