altos: include EasyMotor v2 firmware in upcoming release

diff --git a/Makefile.am b/Makefile.am
index 328d5700cfd1fbbdc74d2b8a8be8ec7d3bc194e2..fa38cf2fcdd1031aa2dba6f957f70b665b5db173 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/easymotor-v2/easymotor-v2-$(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 \

diff --git a/Releasing b/Releasing
index 4c8e4970fb1f4d823e1c097bd52857c5b347b8b3..b54e236f552eade76a526cf05254ec6ac4b77663 100644 (file)
--- a/Releasing
+++ b/Releasing
@@ -109,6 +109,7 @@ These are Bdale's notes on how to do a release.
           src/easymega-v2.0/{*.elf,*.ihx,*.map} \
           src/easymini-v1.0/{*.elf,*.ihx,*.map} \
           src/easymini-v2.0/{*.elf,*.ihx,*.map} \
+          src/easymotor-v2/{*.elf,*.ihx,*.map} \
           src/easytimer-v1/{*.elf,*.ihx,*.map} \
           src/telebt-v3.0/{*.elf,*.ihx,*.map} \
           src/telebt-v4.0/{*.elf,*.ihx,*.map} \
@@ -128,6 +129,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,*.map} \
+          src/easymotor-v2/flash-loader/*.elf \
           src/easytimer-v1/flash-loader/*.elf \
           src/telebt-v3.0/flash-loader/*.elf \
           src/telebt-v4.0/flash-loader/{*.elf,*.bin,*.map} \

diff --git a/altosui/Makefile.am b/altosui/Makefile.am
index 78d3ec15b011adad2f5e87976ca1dfe3e36f8bc2..1cbb919f16ce299310014934bbd23e86cd0f46ec 100644 (file)
--- a/altosui/Makefile.am
+++ b/altosui/Makefile.am
@@ -146,6 +146,9 @@ 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_EMOTOR_2=$(top_srcdir)/src/easymotor-v2/easymotor-v2-$(VERSION).ihx
+FIRMWARE_EMOTOR=$(FIRMWARE_EMOTOR_2)
+
 FIRMWARE_ETIMER_1=$(top_srcdir)/src/easytimer-v1/easytimer-v1-$(VERSION).ihx
 FIRMWARE_ETIMER=$(FIRMWARE_ETIMER_1)
 
@@ -160,7 +163,7 @@ FIRMWARE_TFIRE8_1_0=$(top_srcdir)/src/telefireeight-v1.0/telefireeight-v1.0-$(VE
 FIRMWARE_TFIRE8_2_0=$(top_srcdir)/src/telefireeight-v2.0/telefireeight-v2.0-$(VERSION).ihx
 FIRMWARE_TFIRE8=$(FIRMWARE_TFIRE8_1_0) $(FIRMWARE_TFIRE8_2_0)
 
-FIRMWARE=$(FIRMWARE_TM) $(FIRMWARE_TELEMINI) $(FIRMWARE_TD) $(FIRMWARE_TBT) $(FIRMWARE_TMEGA) $(FIRMWARE_EMINI) $(FIRMWARE_TGPS) $(FIRMWARE_EMEGA) $(FIRMWARE_ETIMER) $(FIRMWARE_TLCO) $(FIRMWARE_TFIRE8)
+FIRMWARE=$(FIRMWARE_TM) $(FIRMWARE_TELEMINI) $(FIRMWARE_TD) $(FIRMWARE_TBT) $(FIRMWARE_TMEGA) $(FIRMWARE_EMINI) $(FIRMWARE_TGPS) $(FIRMWARE_EMEGA) $(FIRMWARE_EMOTOR) $(FIRMWARE_ETIMER) $(FIRMWARE_TLCO) $(FIRMWARE_TFIRE8)
 
 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 ad155a2c4ff387aeed0a5bceea335d229cfab34f..196dd7411d9e7f0d75777643c34041391c98d295 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/easymotor-v2/easymotor-v2-${VERSION}.ihx"
        File "../src/easytimer-v1/easytimer-v1-${VERSION}.ihx"
        File "../src/telelco-v2.0/telelco-v2.0-${VERSION}.ihx"
        File "../src/telefireeight-v1.0/telefireeight-v1.0-${VERSION}.ihx"

diff --git a/src/Makefile b/src/Makefile
index 3443ec8ac394cbd5f630f7d678e23f5dc9239189..0b6a7e278b020c45cf4fa1f105d2947a527b411b 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -19,6 +19,7 @@ include Makedefs
 ARMM3DIRS=\
        easymega-v1.0 easymega-v1.0/flash-loader \
        easymega-v2.0 easymega-v2.0/flash-loader \
+       easymotor-v2 easymotor-v2/flash-loader \
        easytimer-v1 easytimer-v1/flash-loader \
        telemega-v0.1 telemega-v0.1/flash-loader \
        telemega-v1.0 telemega-v1.0/flash-loader \