Mercurial > louis > kiibohd-controller
changeset 282:a133945a31a8
Merge branch 'smasher816-master'
| author | Jacob Alexander <haata@kiibohd.com> |
|---|---|
| date | Sun, 15 Feb 2015 00:44:09 -0800 |
| parents | 42e801e0b444 (current diff) 71882cd1c362 (diff) |
| children | b42eb01994ef |
| files | |
| diffstat | 3 files changed, 23 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/LoadFile/load.dfu Wed Feb 11 23:10:00 2015 -0800 +++ b/LoadFile/load.dfu Sun Feb 15 00:44:09 2015 -0800 @@ -54,13 +54,23 @@ # Load via dfu-util # Used for McHCK based uCs -dfu-util -D @TARGET_BIN@ -EXIT_STATUS=$? +if type dfu-util &>/dev/null; then + dfu-util -D @TARGET_BIN@ + EXIT_STATUS=$? +else + echo "dfu-util is required to reprogram the device" + exit 3 +fi # Load Screen Session if specified if (( "$EXIT_STATUS" == "0" )) && [[ "$AUTO_SCREEN_SESSION" != "" ]]; then - sleep 0.1 - screen $AUTO_SCREEN_SESSION + if type screen &>/dev/null; then + sleep 0.1 + screen $AUTO_SCREEN_SESSION + else + echo "screen is not installed" + exit 3 + fi fi exit $EXIT_STATUS
--- a/LoadFile/load.teensy Wed Feb 11 23:10:00 2015 -0800 +++ b/LoadFile/load.teensy Sun Feb 15 00:44:09 2015 -0800 @@ -50,7 +50,7 @@ mkdir -p teensy-loader-cli cd teensy-loader-cli cmake -G "Unix Makefiles" @CMAKE_SOURCE_DIR@/LoadFile - make + make || exit 3 cd - fi @@ -68,8 +68,13 @@ # Load Screen Session if specified if (( "$EXIT_STATUS" == "0" )) && [[ "$AUTO_SCREEN_SESSION" != "" ]]; then - sleep 0.1 - screen $AUTO_SCREEN_SESSION + if type screen &>/dev/null; then + sleep 0.1 + screen $AUTO_SCREEN_SESSION + else + echo "screen is not installed" + exit 3 + fi fi exit $EXIT_STATUS