From 4a3b068776193d3487548bd6facadb2c06c0de2d Mon Sep 17 00:00:00 2001 From: Mike Fiore Date: Wed, 9 Dec 2015 14:41:09 -0600 Subject: update setup script - clone mbed libs if they don't exist, otherwise update them --- setup.sh | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/setup.sh b/setup.sh index 6bc3110..1c34019 100755 --- a/setup.sh +++ b/setup.sh @@ -1,15 +1,26 @@ #!/bin/bash +DIR=$(pwd) +LIB="libs/" +LIBS=("ISL29011" "MMA845x" "MPL3115A2" "NCP5623B" "GpsParser" "DOGS102") + echo "creating libs directory..." mkdir -p libs/ -hg clone https://developer.mbed.org/teams/Multi-Hackers/code/ISL29011/ libs/ISL29011 -hg clone https://developer.mbed.org/teams/Multi-Hackers/code/MMA845x/ libs/MMA845x -hg clone https://developer.mbed.org/teams/Multi-Hackers/code/MPL3115A2/ libs/MPL3115A2 -hg clone https://developer.mbed.org/teams/Multi-Hackers/code/NCP5623B/ libs/NCP5623B -hg clone https://developer.mbed.org/teams/Multi-Hackers/code/GpsParser/ libs/GpsParser -hg clone https://developer.mbed.org/teams/Multi-Hackers/code/DOGS102/ libs/DOGS102 + +for i in ${LIBS[@]}; do + cd $DIR + if [ ! -d "$LIB/${i}" ]; then + echo "cloning ${i}" + hg clone https://developer.mbed.org/teams/Multi-Hackers/code/${i} $LIB/${i} + else + cd $LIB/${i} + echo "updating ${i}" + hg pull + fi +done echo "generating version header..." +cd $DIR ./version.sh echo "done" -- cgit v1.2.3 From 76601ced410e73a16fe9fe53997a594955ff3eb3 Mon Sep 17 00:00:00 2001 From: Mike Fiore Date: Wed, 9 Dec 2015 14:41:53 -0600 Subject: update MTS-Serial --- libs/MTS-Serial | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/MTS-Serial b/libs/MTS-Serial index b189bcd..fa54e82 160000 --- a/libs/MTS-Serial +++ b/libs/MTS-Serial @@ -1 +1 @@ -Subproject commit b189bcdef358eb760dd2d09c66abbc14c78a3e80 +Subproject commit fa54e823f99702799b617cc877b1d7cc65b329ab -- cgit v1.2.3 From 1591080215485a8f734833f1121c52dfe66fc470 Mon Sep 17 00:00:00 2001 From: Mike Fiore Date: Wed, 9 Dec 2015 14:56:14 -0600 Subject: update MTS-Serial --- libs/MTS-Serial | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/MTS-Serial b/libs/MTS-Serial index fa54e82..0d8cd8a 160000 --- a/libs/MTS-Serial +++ b/libs/MTS-Serial @@ -1 +1 @@ -Subproject commit fa54e823f99702799b617cc877b1d7cc65b329ab +Subproject commit 0d8cd8a7d493d8ed785e7a4162fb4e2dc7b79c6a -- cgit v1.2.3 From 0a4338f48bf14ef1156c5a77effda20472a9cf5e Mon Sep 17 00:00:00 2001 From: Mike Fiore Date: Wed, 9 Dec 2015 14:56:31 -0600 Subject: fix bug in LayoutDemoSampling countdown update --- Layout/LayoutDemoSampling.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Layout/LayoutDemoSampling.cpp b/Layout/LayoutDemoSampling.cpp index 14a4cf7..c88acee 100644 --- a/Layout/LayoutDemoSampling.cpp +++ b/Layout/LayoutDemoSampling.cpp @@ -67,7 +67,7 @@ void LayoutDemoSampling::updateInterval(uint32_t seconds) { size_t size; memset(buf, ' ', sizeof(buf)); - writeField(_fInfo, buf, size, true); + writeField(_fInfo, buf, sizeof(buf), true); memset(buf, 0, sizeof(buf)); if (seconds < 60) -- cgit v1.2.3