altosui: Include EasyMega firmware in fat release
authorKeith Packard <keithp@keithp.com>
Sun, 7 Sep 2014 05:56:25 +0000 (22:56 -0700)
committerKeith Packard <keithp@keithp.com>
Sun, 7 Sep 2014 05:57:25 +0000 (22:57 -0700)
Signed-off-by: Keith Packard <keithp@keithp.com>
altosui/Makefile.am
altosui/altos-windows.nsi.in

index 77be164082d93a5b2b23e5b0163600dd77eae46a..48f58933ec0900e52483b077c0c919bebd767a87 100644 (file)
@@ -134,10 +134,13 @@ FIRMWARE_TMEGA=$(FIRMWARE_TMEGA_1_0)
 FIRMWARE_EMINI_1_0=$(top_srcdir)/src/easymini-v1.0/easymini-v1.0-$(VERSION).ihx
 FIRMWARE_EMINI=$(FIRMWARE_EMINI_1_0)
 
+FIRMWARE_EMEGA_1_0=$(top_srcdir)/src/easymega-v1.0/easymega-v1.0-$(VERSION).ihx
+FIRMWARE_EMEGA=$(FIRMWARE_EMEGA_1_0)
+
 FIRMWARE_TGPS_1_0=$(top_srcdir)/src/telegps-v1.0/telegps-v1.0-$(VERSION).ihx
 FIRMWARE_TGPS=$(FIRMWARE_TGPS_1_0)
 
-FIRMWARE=$(FIRMWARE_TM) $(FIRMWARE_TELEMINI) $(FIRMWARE_TD) $(FIRMWARE_TBT) $(FIRMWARE_TMEGA) $(FIRMWARE_EMINI) $(FIRMWARE_TGPS)
+FIRMWARE=$(FIRMWARE_TM) $(FIRMWARE_TELEMINI) $(FIRMWARE_TD) $(FIRMWARE_TBT) $(FIRMWARE_TMEGA) $(FIRMWARE_EMINI) $(FIRMWARE_TGPS) $(FIRMWARE_EMEGA)
 
 ALTUSMETRUM_DOC=$(top_srcdir)/doc/altusmetrum.pdf
 ALTOS_DOC=$(top_srcdir)/doc/altos.pdf
index 07de5b13094b78760a679f13b0c7ae75cfb6d405..11c1dc0700d0682dae16f1833258c8287ed667b1 100644 (file)
@@ -115,7 +115,7 @@ Section "${REG_NAME} Desktop Shortcut"
        CreateShortCut "$DESKTOP\${REG_NAME}.lnk" "$INSTDIR\${FAT_NAME}"  "" "$INSTDIR\${WIN_APP_ICON}"
 SectionEnd
 
-Section "TeleMetrum, TeleDongle and TeleBT Firmware"
+Section "Firmware"
 
        SetOutPath $INSTDIR
 
@@ -129,6 +129,7 @@ Section "TeleMetrum, TeleDongle and TeleBT Firmware"
        File "../src/telebt-v1.0/telebt-v1.0-${VERSION}.ihx"
        File "../src/telemega-v1.0/telemega-v1.0-${VERSION}.ihx"
        File "../src/easymini-v1.0/easymini-v1.0-${VERSION}.ihx"
+       File "../src/easymega-v1.0/easymega-v1.0-${VERSION}.ihx"
 
 SectionEnd