Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos

diff --git a/ao-bringup/test-easymini b/ao-bringup/test-easymini
index 7850b5502edad62fe6ff443acf8e8488592cd0e9..ddcfcd5457d18b6ea703937687c0c59fbc9d18b8 100755 (executable)
--- a/ao-bringup/test-easymini
+++ b/ao-bringup/test-easymini
@@ -21,7 +21,7 @@ while [ $found -eq 0 ]; do
                echo -e '\e[34m'Testing $product $serial $dev'\e[39m'
                echo ""
                
-               ./test-igniters "$dev" drogue main
+               ./test-igniters-nowait "$dev" drogue main
                echo ""
 
                echo "Testing baro sensor"

diff --git a/ao-bringup/test-igniters-nowait b/ao-bringup/test-igniters-nowait
new file mode 100755 (executable)
index 0000000..849f91d
--- /dev/null
+++ b/ao-bringup/test-igniters-nowait
@@ -0,0 +1,26 @@
+#!/bin/sh
+
+dev="$1"
+shift
+
+for igniter in "$@"; do
+       pass="n"
+       while [ $pass != "y" ]; do
+
+               echo "Testing $igniter igniter."
+               ../ao-tools/ao-test-igniter/ao-test-igniter --tty="$dev" $igniter
+
+               case $? in
+                   0)
+                       echo "pass"
+                       pass="y"
+                       ;;
+                   *)
+                       echo -n "Failed. Try again. Press enter to continue..."
+                       read foo < /dev/tty
+                       ;;
+               esac
+       done
+done
+
+exit 0

diff --git a/ao-bringup/turnon_chaoskey b/ao-bringup/turnon_chaoskey
index 4a255bff3d27581e1070641c5cf1f59d79ab7243..d710e5ff19a89fda20da27b6f86c47372cf4f137 100755 (executable)
--- a/ao-bringup/turnon_chaoskey
+++ b/ao-bringup/turnon_chaoskey
@@ -24,14 +24,14 @@ echo "Expectations:"
 echo "\tChaosKey v$VERSION powered from USB"
 echo
 
-FLASH_FILE=~/altusmetrumllc/Binaries/loaders/chaoskey-v1.0-altos-flash-*.bin
-ALTOS_FILE=~/altusmetrumllc/Binaries/chaoskey-v1.0-*.elf
+FLASH_FILE=~/altusmetrumllc/Binaries/chaoskey-v1.0-all-*.bin
+#ALTOS_FILE=~/altusmetrumllc/Binaries/chaoskey-v1.0-*.elf
 
 $DFU_UTIL -a 0 -s 0x08000000:leave -D $FLASH_FILE || true
 
-sleep 2
+#sleep 2
 
-$USBLOAD --serial=1 $ALTOS_FILE || exit 1
+#$USBLOAD --serial=1 $ALTOS_FILE || exit 1
 
 sleep 1
 

diff --git a/ao-bringup/turnon_easymini b/ao-bringup/turnon_easymini
index 7db726654b4d339a6aecada867ea953e1f8454ac..3bef31450ae27c28dc9c12aff323751a746db11f 100755 (executable)
--- a/ao-bringup/turnon_easymini
+++ b/ao-bringup/turnon_easymini
@@ -52,11 +52,13 @@ ALTOS_FILE=~/altusmetrumllc/Binaries/easymini-v2.0-*.elf
 #FLASH_FILE=../src/$BASE-v$VERSION/flash-loader/$BASE-v$VERSION-altos-flash-*.elf
 #ALTOS_FILE=../src/$BASE-v$VERSION/*.ihx
 
-echo $DFU_UTIL -a 0 -s 0x08000000:leave -D $FLASH_FILE
+if lsusb -d 0483:df11 | grep -q STM; then
+    echo $DFU_UTIL -v -v -R -a 0 -s 0x08000000:leave -D $FLASH_FILE
 
-$DFU_UTIL -a 0 -s 0x08000000:leave -D $FLASH_FILE || exit 1
+    $DFU_UTIL -a 0 -s 0x08000000:leave -D $FLASH_FILE
 
-sleep 2
+    sleep 2
+fi
 
 echo $USBLOAD $ALTOS_FILE
 

diff --git a/ao-tools/ao-usbload/ao-usbload.c b/ao-tools/ao-usbload/ao-usbload.c
index 758eb6961ca21a2acd5d525bf98109ce1c103a9d..31ee138a3679584779eeda813997667b8ba3ffd9 100644 (file)
--- a/ao-tools/ao-usbload/ao-usbload.c
+++ b/ao-tools/ao-usbload/ao-usbload.c
@@ -402,9 +402,9 @@ main (int argc, char **argv)
                        old_len = ucs2len(old_product);
                        if (new_len != old_len || memcmp(new_product, old_product, new_len * 2) != 0) {
                                fprintf(stderr, "USB product mismatch (device is ");
-                               putucs2str(new_product, stderr);
-                               fprintf(stderr, ", image is ");
                                putucs2str(old_product, stderr);
+                               fprintf(stderr, ", image is ");
+                               putucs2str(new_product, stderr);
                                fprintf(stderr, ")\n");
                                done(cc, 1);
                        }

diff --git a/configure.ac b/configure.ac
index 7f27dfadc70548ab9d395e1fdb7b52a9052e38d2..82e0f3d03966aeca5e1f14cdcbec485e82f264f8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -18,13 +18,13 @@ dnl
 dnl Process this file with autoconf to create configure.
 
 AC_PREREQ(2.57)
-AC_INIT([altos], 1.8.4)
-ANDROID_VERSION=16
+AC_INIT([altos], 1.8.5)
+ANDROID_VERSION=17
 AC_CONFIG_SRCDIR([src/kernel/ao.h])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE
 
-RELEASE_DATE=2017-12-21
+RELEASE_DATE=2018-03-17
 AC_SUBST(RELEASE_DATE)
 
 VERSION_DASH=`echo $VERSION | sed 's/\./-/g'`

diff --git a/doc/Makefile b/doc/Makefile
index 7d33149dc8642af5c9ec9dc53a90a1a218e98a66..efa7f9d37c75e56534ebf788803336e5fcc12375 100644 (file)
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -3,6 +3,7 @@
 #
 
 RELNOTES_INC=\
+       release-notes-1.8.5.inc \
        release-notes-1.8.4.inc \
        release-notes-1.8.3.inc \
        release-notes-1.8.2.inc \

diff --git a/doc/easymini-release-notes.inc b/doc/easymini-release-notes.inc
index dae928a624a6eefe05546cea42f818ef936c04b8..2d289b1264af872a8f46a26b9c1ba1f8505c63ee 100644 (file)
--- a/doc/easymini-release-notes.inc
+++ b/doc/easymini-release-notes.inc
@@ -1,5 +1,9 @@
 [appendix]
 == Release Notes
+       :leveloffset: 2
+       include::release-notes-1.8.5.raw[]
+
+       <<<<
        :leveloffset: 2
        include::release-notes-1.8.4.raw[]
 

diff --git a/doc/release-notes-1.8.5.inc b/doc/release-notes-1.8.5.inc
new file mode 100644 (file)
index 0000000..5b940ef
--- /dev/null
+++ b/doc/release-notes-1.8.5.inc
@@ -0,0 +1,18 @@
+= Release Notes for Version 1.8.5
+:toc!:
+:doctype: article
+
+       Version 1.8.5 includes fixes to the ground software support
+       for TeleBT v4, along with a few other minor updates.
+
+       == AltOS
+
+       * Fix startup beeps that indicate sensor failures.
+
+       == AltosUI, TeleGPS
+
+       * When updating device firmware, make sure selected firmware
+          matches target device.
+
+       * Correct Bluetooth device matching when looking for TeleBT
+          devices.

diff --git a/doc/release-notes.inc b/doc/release-notes.inc
index 50b27ab516e5cc532eda0764a3f2535e7fe491e1..b7c7f5a7a0dc5786375320f35ca61ffb4276337f 100644 (file)
--- a/doc/release-notes.inc
+++ b/doc/release-notes.inc
@@ -1,6 +1,9 @@
 [appendix]
 == Release Notes
+       :leveloffset: 2
+       include::release-notes-1.8.5.raw[]
 
+       <<<<
        :leveloffset: 2
        include::release-notes-1.8.4.raw[]
 

diff --git a/doc/telegps-release-notes.inc b/doc/telegps-release-notes.inc
index 5c5da8f65bcd2cfa8c314c322a201c03d4761195..f451c2c844787c7949c954a4d98b69157292ccaf 100644 (file)
--- a/doc/telegps-release-notes.inc
+++ b/doc/telegps-release-notes.inc
@@ -2,10 +2,13 @@
 == Release Notes
 
        :leveloffset: 2
-       include::release-notes-1.8.4.raw[]
+       include::release-notes-1.8.5.raw[]
 
        <<<<
+       :leveloffset: 2
+       include::release-notes-1.8.4.raw[]
 
+       <<<<
        :leveloffset: 2
        include::release-notes-1.8.3.raw[]
 

diff --git a/src/chaoskey-v1.0/Makefile b/src/chaoskey-v1.0/Makefile
index f2c168baf3cf1a99f3fe7cc55b5c9b1aaf01e1aa..dea5b483f5158e719cf63dcf0d49c018f5e67fef 100644 (file)
--- a/src/chaoskey-v1.0/Makefile
+++ b/src/chaoskey-v1.0/Makefile
@@ -51,12 +51,13 @@ CFLAGS = $(PRODUCT_DEF) $(STMF0_CFLAGS) -g -Os
 PROGNAME=chaoskey-v1.0
 PROG=$(PROGNAME)-$(VERSION).elf
 HEX=$(PROGNAME)-$(VERSION).ihx
+BIN=$(PROGNAME)-all-$(VERSION).bin
 METAINFO=org.altusmetrum.ChaosKey.metainfo.xml
 
 SRC=$(ALTOS_SRC) ao_chaoskey.c
 OBJ=$(SRC:.c=.o)
 
-all: $(PROG) $(HEX)
+all: $(PROG) $(HEX) $(BIN)
 
 $(PROG): Makefile $(OBJ) altos.ld
        $(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $(PROG) $(OBJ) $(LIBS)
@@ -66,6 +67,12 @@ ao_product.h: ao-make-product.5c ../Version
 
 $(OBJ): $(INC)
 
+$(BIN): $(PROG) $(LOADER)
+       $(MAKEBIN) --output=$@ --base=$(FLASH_ADDR) $(LOADER) $(PROG)
+
+$(LOADER):
+       +cd flash-loader && make
+
 %.cab: $(PROG) $(HEX) $(METAINFO)
        gcab --create --nopath $@ $(PROG) $(HEX) $(METAINFO)
 

diff --git a/src/kernel/ao_beep.h b/src/kernel/ao_beep.h
index 085dd5b12f42d27ff27745eb6adf4c4ba81bcad2..1306af627e5a630e8ef286eb20ad5af289a8bf09 100644 (file)
--- a/src/kernel/ao_beep.h
+++ b/src/kernel/ao_beep.h
@@ -42,9 +42,15 @@
 #else
 #define AO_BEEP_MID    AO_BEEP_MID_DEFAULT
 #endif
+
+#define AO_BEEP_MID_PANIC      AO_BEEP_MID_DEFAULT
+
 #define AO_BEEP_LOW    AO_BEEP_MID * 150 / 94  /* 2500Hz */
 #define AO_BEEP_HIGH   AO_BEEP_MID * 75 / 94   /* 5000Hz */
 
+#define AO_BEEP_LOW_PANIC      (AO_BEEP_MID_PANIC * 150 / 94)
+#define AO_BEEP_HIGH_PANIC     (AO_BEEP_MID_PANIC * 75 / 94)
+
 #define AO_BEEP_OFF    0       /* off */
 
 #define AO_BEEP_g      240     /* 1562.5Hz */

diff --git a/src/kernel/ao_panic.c b/src/kernel/ao_panic.c
index 3feecd5afd219c91b53877a971c0a3740db47196..bd55eb9cc8d148549fded82cb352a3f716039834 100644 (file)
--- a/src/kernel/ao_panic.c
+++ b/src/kernel/ao_panic.c
@@ -64,9 +64,9 @@ ao_panic(uint8_t reason)
                ao_panic_delay(20);
 #if HAS_BEEP
                for (n = 0; n < 5; n++) {
-                       ao_beep(AO_BEEP_HIGH);
+                       ao_beep(AO_BEEP_HIGH_PANIC);
                        ao_panic_delay(1);
-                       ao_beep(AO_BEEP_LOW);
+                       ao_beep(AO_BEEP_LOW_PANIC);
                        ao_panic_delay(1);
                }
                ao_beep(AO_BEEP_OFF);
@@ -78,7 +78,7 @@ ao_panic(uint8_t reason)
 #endif
                if (reason & 0x40) {
                        ao_led_on(AO_LED_PANIC);
-                       ao_beep(AO_BEEP_HIGH);
+                       ao_beep(AO_BEEP_HIGH_PANIC);
                        ao_panic_delay(40);
                        ao_led_off(AO_LED_PANIC);
                        ao_beep(AO_BEEP_OFF);
@@ -86,7 +86,7 @@ ao_panic(uint8_t reason)
                }
                for (n = 0; n < (reason & 0x3f); n++) {
                        ao_led_on(AO_LED_PANIC);
-                       ao_beep(AO_BEEP_MID);
+                       ao_beep(AO_BEEP_MID_PANIC);
                        ao_panic_delay(10);
                        ao_led_off(AO_LED_PANIC);
                        ao_beep(AO_BEEP_OFF);

diff --git a/src/stmf0/Makefile.defs b/src/stmf0/Makefile.defs
index 3da42874620a92756d3eea2025d7ae8486e8c085..a0aa558bef5caff38e570c9bf856c0ed50fa53ac 100644 (file)
--- a/src/stmf0/Makefile.defs
+++ b/src/stmf0/Makefile.defs
@@ -4,6 +4,10 @@ endif
 
 include $(TOPDIR)/stmf0/Makefile-stmf0.defs
 
+LOADER=flash-loader/$(PROGNAME)-altos-flash-$(VERSION).elf
+MAKEBIN=$(TOPDIR)/../ao-tools/ao-makebin/ao-makebin
+FLASH_ADDR=0x08000000
+
 LDFLAGS=$(CFLAGS) -L$(TOPDIR)/stmf0 -Wl,-Taltos.ld -n
 
 .DEFAULT_GOAL=all