Merge branch 'lpc'

diff --git a/altosui/Makefile.am b/altosui/Makefile.am
index d59e308248000cf98c3c16d358f7770337710463..78e29cd8242fc33d1dd525b6341cfdddd399cf15 100644 (file)
--- a/altosui/Makefile.am
+++ b/altosui/Makefile.am
@@ -148,7 +148,10 @@ FIRMWARE_TM=$(FIRMWARE_TM_1_0) $(FIRMWARE_TM_1_1) $(FIRMWARE_TM_1_2)
 FIRMWARE_TELEMINI_1_0=$(top_srcdir)/src/telemini-v1.0-$(VERSION).ihx
 FIRMWARE_TELEMINI=$(FIRMWARE_TELEMINI_1_0)
 
-FIRMWARE=$(FIRMWARE_TM) $(FIRMWARE_TELEMINI) $(FIRMWARE_TD) 
+FIRMWARE_TBT_1_0=$(top_srcdir)/src/telebt-v1.0-$(VERSION).ihx
+FIRMWARE_TBT=$(FIRMWARE_TBT_1_0)
+
+FIRMWARE=$(FIRMWARE_TM) $(FIRMWARE_TELEMINI) $(FIRMWARE_TD) $(FIRMWARE_TBT)
 
 ALTUSMETRUM_DOC=$(top_srcdir)/doc/altusmetrum.pdf
 ALTOS_DOC=$(top_srcdir)/doc/altos.pdf

diff --git a/altosui/altos-windows.nsi.in b/altosui/altos-windows.nsi.in
index 9886e4a218b2a07f36799097c58a05dee3129ed7..81506bb0cfb331ffb8e6c0fe7dafe8fa291eb4af 100644 (file)
--- a/altosui/altos-windows.nsi.in
+++ b/altosui/altos-windows.nsi.in
@@ -111,7 +111,7 @@ Section "AltosUI Desktop Shortcut"
        CreateShortCut "$DESKTOP\AltusMetrum.lnk" "$INSTDIR\altosui-fat.jar"  "" "$INSTDIR\altus-metrum.ico"
 SectionEnd
 
-Section "TeleMetrum and TeleDongle Firmware"
+Section "TeleMetrum, TeleDongle and TeleBT Firmware"
 
        SetOutPath $INSTDIR
 
@@ -120,6 +120,7 @@ Section "TeleMetrum and TeleDongle Firmware"
        File "../src/telemetrum-v1.2/telemetrum-v1.2-${VERSION}.ihx"
        File "../src/telemini-v1.0/telemini-v1.0-${VERSION}.ihx"
        File "../src/teledongle-v0.2/teledongle-v0.2-${VERSION}.ihx"
+       File "../src/telebt-v1.0/telebt-v1.0-${VERSION}.ihx"
 
 SectionEnd
 

diff --git a/configure.ac b/configure.ac
index 32ab33a8f0f03f6c56d15aa40070265f84953822..4a124c901982fcf25bd209cb0db5100bb51178eb 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -18,7 +18,7 @@ dnl
 dnl Process this file with autoconf to create configure.
 
 AC_PREREQ(2.57)
-AC_INIT([altos], 1.2)
+AC_INIT([altos], 1.2.9)
 AC_CONFIG_SRCDIR([src/core/ao.h])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE

diff --git a/src/stm/Makefile.defs b/src/stm/Makefile.defs
index c8bb7d704b4573b0c306e6e03d8aaa2f8bc858b6..8ef30521ee4645e63a60afc531ea5841d0abeaf8 100644 (file)
--- a/src/stm/Makefile.defs
+++ b/src/stm/Makefile.defs
@@ -12,8 +12,8 @@ vpath ao-make-product.5c ../util
 .elf.ihx:
        objcopy -O ihex $*.elf $@
 
-CC=arm-none-eabi-gcc
 SAT=/opt/cortex
+CC=$(SAT)/bin/arm-none-eabi-gcc
 SAT_CLIB=$(SAT)/lib/pdclib-cortex-m3.a
 SAT_CFLAGS=-I$(SAT)/include