diff options
| -rw-r--r-- | altosui/Makefile.am | 5 | ||||
| -rw-r--r-- | altosui/altos-windows.nsi.in | 3 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | src/stm/Makefile.defs | 2 |
4 files changed, 8 insertions, 4 deletions
diff --git a/altosui/Makefile.am b/altosui/Makefile.am index d59e3082..78e29cd8 100644 --- 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 9886e4a2..81506bb0 100644 --- 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 32ab33a8..4a124c90 100644 --- 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 c8bb7d70..8ef30521 100644 --- 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 |