Add EasyTimer firmware to packages and Releasing

Make sure we include EasyTimer bits where required

Signed-off-by: Keith Packard <keithp@keithp.com>

diff --git a/Makefile.am b/Makefile.am
index a62d539a53651eecb03b7cfbf24bb23d57af7359..fcf2652c131f4d70213382c6643d5ba831f3424c 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -53,6 +53,7 @@ fat_altos = \
        src/easymega-v1.0/easymega-v1.0-$(VERSION).ihx \
        src/easymega-v2.0/easymega-v2.0-$(VERSION).ihx \
        src/easymini-v1.0/easymini-v1.0-$(VERSION).ihx \
+       src/easytimer-v1/easytimer-v1-$(VERSION).ihx \
        src/telebt-v3.0/telebt-v3.0-$(VERSION).ihx \
        src/telebt-v4.0/telebt-v4.0-$(VERSION).ihx \
        src/teledongle-v3.0/teledongle-v3.0-$(VERSION).ihx \

diff --git a/Releasing b/Releasing
index 4f649b6e79f2ea70bfe64a5b1dccb6dbb668efa5..223a14d3c902407478c3f6627deb3865e09a18ae 100644 (file)
--- a/Releasing
+++ b/Releasing
@@ -106,6 +106,7 @@ These are Bdale's notes on how to do a release.
           src/easymega-v2.0/{*.elf,*.ihx} \
           src/easymini-v1.0/{*.elf,*.ihx} \
           src/easymini-v2.0/{*.elf,*.ihx} \
+          src/easytimer-v1/{*.elf,*.ihx} \
           src/telebt-v3.0/{*.elf,*.ihx} \
           src/telebt-v4.0/{*.elf,*.ihx} \
           src/teledongle-v3.0/{*.elf,*.ihx} \
@@ -124,6 +125,7 @@ These are Bdale's notes on how to do a release.
           src/easymega-v2.0/flash-loader/*.elf \
           src/easymini-v1.0/flash-loader/*.elf \
           src/easymini-v2.0/flash-loader/{*.elf,*.bin} \
+          src/easytimer-v1/flash-loader/{*.elf,*.bin} \
           src/telebt-v3.0/flash-loader/*.elf \
           src/telebt-v4.0/flash-loader/{*.elf,*.bin} \
           src/teledongle-v3.0/flash-loader/*.elf \

diff --git a/altosui/Makefile.am b/altosui/Makefile.am
index 4bf3db120cf380bded3c04e6fd19a863e05b88b2..b172b0227603f235f3d11b9188ba82a4ce18e152 100644 (file)
--- a/altosui/Makefile.am
+++ b/altosui/Makefile.am
@@ -146,11 +146,14 @@ FIRMWARE_EMEGA_1_0=$(top_srcdir)/src/easymega-v1.0/easymega-v1.0-$(VERSION).ihx
 FIRMWARE_EMEGA_2_0=$(top_srcdir)/src/easymega-v2.0/easymega-v2.0-$(VERSION).ihx
 FIRMWARE_EMEGA=$(FIRMWARE_EMEGA_1_0) $(FIRMWARE_EMEGA_2_0)
 
+FIRMWARE_ETIMER_1=$(top_srcdir)/src/easytimer-v1/easytimer-v1-$(VERSION).ihx
+FIRMWARE_ETIMER=$(FIRMWARE_ETIMER_1)
+
 FIRMWARE_TGPS_1_0=$(top_srcdir)/src/telegps-v1.0/telegps-v1.0-$(VERSION).ihx
 FIRMWARE_TGPS_2_0=$(top_srcdir)/src/telegps-v2.0/telegps-v2.0-$(VERSION).ihx
 FIRMWARE_TGPS=$(FIRMWARE_TGPS_1_0) $(FIRMWARE_TGPS_2_0)
 
-FIRMWARE=$(FIRMWARE_TM) $(FIRMWARE_TELEMINI) $(FIRMWARE_TD) $(FIRMWARE_TBT) $(FIRMWARE_TMEGA) $(FIRMWARE_EMINI) $(FIRMWARE_TGPS) $(FIRMWARE_EMEGA)
+FIRMWARE=$(FIRMWARE_TM) $(FIRMWARE_TELEMINI) $(FIRMWARE_TD) $(FIRMWARE_TBT) $(FIRMWARE_TMEGA) $(FIRMWARE_EMINI) $(FIRMWARE_TGPS) $(FIRMWARE_EMEGA) $(FIRMWARE_ETIMER)
 
 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 9fbc845c44014714d5f2b6a900e7b8a904b12a6a..fa803c5fc566a5851f262aff271a5a2dd785d74d 100644 (file)
--- a/altosui/altos-windows.nsi.in
+++ b/altosui/altos-windows.nsi.in
@@ -136,6 +136,7 @@ Section "Firmware"
        File "../src/easymini-v2.0/easymini-v2.0-${VERSION}.ihx"
        File "../src/easymega-v1.0/easymega-v1.0-${VERSION}.ihx"
        File "../src/easymega-v2.0/easymega-v2.0-${VERSION}.ihx"
+       File "../src/easytimer-v1/easytimer-v1-${VERSION}.ihx"
 
 SectionEnd