Merge branch 'master' of ssh://sw.multitech.prv/git/mdot/mtdot-box-evb

3 files changed, 18 insertions, 7 deletions

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)
diff --git a/libs/MTS-Serial b/libs/MTS-Serial
-Subproject b189bcdef358eb760dd2d09c66abbc14c78a3e8
+Subproject 0d8cd8a7d493d8ed785e7a4162fb4e2dc7b79c6
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"