update TeleMega turn-on script and Releasing for new stable firmware home

diff --git a/Releasing b/Releasing
index fdd681bdf59184f81325495c922a651f05f11302..965c93cf6fc22673cfd01c30824d172a01354163 100644 (file)
--- a/Releasing
+++ b/Releasing
@@ -6,7 +6,6 @@ These are Bdale's notes on how to do a release.
        - make sure that doc/altusmetrum.xsl has the right copyright year,
          and add release to the revision history at the front (release notes
          will be pulled in automatically)
-       - do the same for doc/micropeak.xsl
 
        - update the version in configure.ac
         git log > ChangeLog
@@ -57,6 +56,17 @@ These are Bdale's notes on how to do a release.
 
                this pushes packages for each platform to web site
 
+       # store a stable copy of ARM binaries for production use
+       cp src/easymini-v1.0/*.elf \
+          src/telemega-v1.0/*.elf \
+          src/telemetrum-v2.0/*.elf \
+          ~/altusmetrumllc/Binaries/
+       cp src/easymini-v1.0/flash-loader/*.elf \
+          src/telemega-v1.0/flash-loader/*.elf \
+          src/telemetrum-v2.0/flash-loader/*.elf \
+          ~/altusmetrumllc/Binaries/loaders/
+       (cd ~/altusmetrumllc ; git commit -a) 
+
        - copy the relevant release notes file from doc/ to 
            /home/bdale/web/altusmetrum/AltOS/releases/<rev>
 

diff --git a/ao-bringup/turnon_telemega b/ao-bringup/turnon_telemega
index 3880b197f62183aa04e67f7bb12e56cb9d99f4e9..39a636420a5ada339aff493498526073208413ac 100755 (executable)
--- a/ao-bringup/turnon_telemega
+++ b/ao-bringup/turnon_telemega
@@ -1,17 +1,13 @@
 #!/bin/sh
 
-if [ -x ../ao-tools/ao-stmload/ao-stmload ]; then
-       STMLOAD=../ao-tools/ao-stmload/ao-stmload
-elif [ -x /usr/bin/ao-stmload ]; then
-       STMLOAD=/usr/bin/ao-stmload
+if [ -x /usr/bin/ao-flash-stm ]; then
+       STMLOAD=/usr/bin/ao-flash-stm
 else
-       echo "Can't find ao-stmload!  Aborting."
+       echo "Can't find ao-flash-stm!  Aborting."
        exit 1
 fi
 
-if [ -x ../ao-tools/ao-usbload/ao-usbload ]; then
-       USBLOAD=../ao-tools/ao-usbload/ao-usbload
-elif [ -x /usr/bin/ao-usbload ]; then
+if [ -x /usr/bin/ao-usbload ]; then
        USBLOAD=/usr/bin/ao-usbload
 else
        echo "Can't find ao-usbload!  Aborting."
@@ -19,10 +15,10 @@ else
 fi
 
 VERSION=1.0
-#VERSION=0.1
+REPO=~/altusmetrumllc/Binaries
 
 echo "TeleMega v$VERSION Turn-On and Calibration Program"
-echo "Copyright 2010 by Bdale Garbee.  Released under GPL v2"
+echo "Copyright 2014 by Bdale Garbee.  Released under GPL v2"
 echo
 echo "Expectations:"
 echo "\tTeleMega v$VERSIOn powered from USB"
@@ -34,12 +30,11 @@ read SERIAL
 
 echo $STMLOAD
 
-$STMLOAD --raw ../src/telemega-v$VERSION/flash-loader/*.elf || exit 1
+$STMLOAD $REPO/loaders/telemega-v$VERSION*.elf || exit 1
 
 sleep 2
 
-#$USBLOAD --serial=$SERIAL ../src/telemega-v$VERSION/*.ihx || exit 1
-$USBLOAD --serial=$SERIAL /usr/share/altos/telemega-v$VERSION*.ihx || exit 1
+$USBLOAD --serial=$SERIAL $REPO/telemega-v$VERSION*.elf || exit 1
 
 sleep 2