Board Definition Updates (#121)

BootLoaders/Boards/stm32/tools/linux/do_version

@@ -0,0 +1,47 @@
+#!/bin/bash
+
+BUILD_PATH=$1
+PROJECT_NAME=$2
+SKETCH_PATH=$3
+MULTI_BOARD=$4
+EXPORT_FLAG=$5
+
+MULTI_TYPE=stm
+
+if [ -e "$BUILD_PATH/sketch/Multiprotocol.h" ]; then
+        MAJOR_VERSION=$(grep "VERSION_MAJOR" "$BUILD_PATH/sketch/Multiprotocol.h" | awk -v N=3 '{print $N}')
+        MINOR_VERSION=$(grep "VERSION_MINOR" "$BUILD_PATH/sketch/Multiprotocol.h" | awk -v N=3 '{print $N}')
+        REVISION_VERSION=$(grep "VERSION_REVISION" "$BUILD_PATH/sketch/Multiprotocol.h" | awk -v N=3 '{print $N}')
+        PATCH_VERSION=$(grep "VERSION_PATCH" "$BUILD_PATH/sketch/Multiprotocol.h" | awk -v N=3 '{print $N}')
+
+        MULTI_VERSION=$MAJOR_VERSION.$MINOR_VERSION.$REVISION_VERSION.$PATCH_VERSION
+else
+        MULTI_VERSION=
+fi
+
+if [ -e "$BUILD_PATH/$PROJECT_NAME.hex" ]; then
+        cp "$BUILD_PATH/$PROJECT_NAME.hex" "$BUILD_PATH/multi-$MULTI_TYPE-$MULTI_VERSION.hex"
+fi
+
+if [ -e "$BUILD_PATH/$PROJECT_NAME.bin" ]; then
+        cp "$BUILD_PATH/$PROJECT_NAME.bin" "$BUILD_PATH/multi-$MULTI_TYPE-$MULTI_VERSION.bin"
+fi
+
+if [ $# -eq 5 ]; then
+        if [ $EXPORT_FLAG == "EXPORT" ]; then
+
+                if [ -e "$BUILD_PATH/$PROJECT_NAME.hex" ]; then
+                        cp "$BUILD_PATH/$PROJECT_NAME.hex" "$SKETCH_PATH/multi-$MULTI_TYPE-$MULTI_VERSION.hex"
+                fi
+                if [ -e "$BUILD_PATH/$PROJECT_NAME.bin" ]; then
+                        cp "$BUILD_PATH/$PROJECT_NAME.bin" "$SKETCH_PATH/multi-$MULTI_TYPE-$MULTI_VERSION.bin"
+                fi
+
+                if [ -e "$SKETCH_PATH/multi-$MULTI_TYPE.hex" ]; then
+                        rm "$SKETCH_PATH/multi-$MULTI_TYPE.hex"
+                fi
+                if [ -e "$SKETCH_PATH/multi-$MULTI_TYPE.bin" ]; then
+                        rm "$SKETCH_PATH/multi-$MULTI_TYPE.bin"
+                fi
+        fi
+fi

BootLoaders/Boards/stm32/tools/linux/maple_upload

@@ -2,23 +2,32 @@
 
 #set -e
 
-
-
 if [ $# -lt 4 ]; then
     echo "Usage: $0 $# <dummy_port> <altID> <usbID> <binfile>" >&2
     exit 1
 fi
+
 dummy_port="$1"; altID="$2"; usbID="$3"; binfile="$4"; dummy_port_fullpath="/dev/$1"
+
 if [ $# -eq 5 ]; then
     dfuse_addr="--dfuse-address $5"
 else
     dfuse_addr=""
 fi
 
-
 # Get the directory where the script is running.
 DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
 
+# Get the right upload-reset tool
+uname -m | grep "x86_64" 2>&1 1>/dev/null
+if [ $? -eq 0 ]; then
+  # Do 64-bit stuff
+  RESET_UTIL=${DIR}/../linux64/upload-reset
+else
+  # Do 32-bit stuff
+  RESET_UTIL=${DIR}/upload-reset
+fi
+
 #  ----------------- IMPORTANT -----------------
 # The 2nd parameter to upload-reset is the delay after resetting before it exits
 # This value is in milliseonds
@@ -26,7 +35,7 @@ DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
 # 750ms to 1500ms seems to work on my Mac
 
 
-"${DIR}/upload-reset" ${dummy_port_fullpath} 750
+"${RESET_UTIL}" ${dummy_port_fullpath} 750
 
 
 #DFU_UTIL=$(dirname $0)/dfu-util/dfu-util

BootLoaders/Boards/stm32/tools/linux/serial_upload

@@ -1,2 +1,13 @@
 #!/bin/bash
-$(dirname $0)/stm32flash/stm32flash -g 0x8000000 -b 115200 -w "$4" /dev/"$1" 
+port=$1
+addr=$2
+file=$3
+
+uname -m | grep "x86_64" 2>&1 1>/dev/null
+if [ $? -eq 0 ]; then
+  # Do 64-bit stuff
+  $(dirname $0)/../linux64/stm32flash/stm32flash -g $addr -b 57600 -w "$file" /dev/"$port"
+else
+  # Do 32-bit stuff
+  $(dirname $0)/stm32flash/stm32flash -g $addr -b 57600 -w "$file" /dev/"$port"
+fi