summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xao-bringup/test-easymini2
-rwxr-xr-xao-bringup/test-igniters-nowait26
-rwxr-xr-xao-bringup/turnon_chaoskey8
-rwxr-xr-xao-bringup/turnon_easymini8
-rw-r--r--ao-tools/ao-usbload/ao-usbload.c4
-rw-r--r--configure.ac6
-rw-r--r--doc/Makefile1
-rw-r--r--doc/easymini-release-notes.inc4
-rw-r--r--doc/release-notes-1.8.5.inc18
-rw-r--r--doc/release-notes.inc3
-rw-r--r--doc/telegps-release-notes.inc5
-rw-r--r--src/chaoskey-v1.0/Makefile9
-rw-r--r--src/kernel/ao_beep.h6
-rw-r--r--src/kernel/ao_panic.c8
-rw-r--r--src/stmf0/Makefile.defs4
15 files changed, 93 insertions, 19 deletions
diff --git a/ao-bringup/test-easymini b/ao-bringup/test-easymini
index 7850b550..ddcfcd54 100755
--- 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
index 00000000..849f91de
--- /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 4a255bff..d710e5ff 100755
--- 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 7db72665..3bef3145 100755
--- 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 758eb696..31ee138a 100644
--- 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 7f27dfad..82e0f3d0 100644
--- 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 7d33149d..efa7f9d3 100644
--- 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 dae928a6..2d289b12 100644
--- a/doc/easymini-release-notes.inc
+++ b/doc/easymini-release-notes.inc
@@ -1,6 +1,10 @@
[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
index 00000000..5b940efd
--- /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 50b27ab5..b7c7f5a7 100644
--- 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 5c5da8f6..f451c2c8 100644
--- 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 f2c168ba..dea5b483 100644
--- 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 085dd5b1..1306af62 100644
--- 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 3feecd5a..bd55eb9c 100644
--- 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 3da42874..a0aa558b 100644
--- 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
generated by cgit v1.2.3 (git 2.39.1) at 2025-10-15 20:35:33 +0000