From a37b687670dd1ccb0274e5fe6bf6145c4fc5acc8 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Mon, 5 Sep 2016 20:45:12 -0600 Subject: [PATCH 1/1] altosui: Don't ship TeleMetrum v3.0 firmware (yet) We haven't finished this yet, so don't deliver firmware for it. Signed-off-by: Keith Packard --- altosui/Makefile.am | 6 ++++-- altosui/altos-windows.nsi.in | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/altosui/Makefile.am b/altosui/Makefile.am index 48e6037e..1e0364d2 100644 --- a/altosui/Makefile.am +++ b/altosui/Makefile.am @@ -32,6 +32,7 @@ altosui_JAVA = \ AltosLaunchUI.java \ AltosLanded.java \ AltosPad.java \ + AltosPyroWizard.java \ AltosUI.java \ AltosGraphUI.java @@ -126,8 +127,9 @@ FIRMWARE_TM_1_0=$(top_srcdir)/src/telemetrum-v1.0/telemetrum-v1.0-$(VERSION).ihx FIRMWARE_TM_1_1=$(top_srcdir)/src/telemetrum-v1.1/telemetrum-v1.1-$(VERSION).ihx FIRMWARE_TM_1_2=$(top_srcdir)/src/telemetrum-v1.2/telemetrum-v1.2-$(VERSION).ihx FIRMWARE_TM_2_0=$(top_srcdir)/src/telemetrum-v2.0/telemetrum-v2.0-$(VERSION).ihx -FIRMWARE_TM_3_0=$(top_srcdir)/src/telemetrum-v3.0/telemetrum-v3.0-$(VERSION).ihx -FIRMWARE_TM=$(FIRMWARE_TM_1_0) $(FIRMWARE_TM_1_1) $(FIRMWARE_TM_1_2) $(FIRMWARE_TM_2_0) $(FIRMWARE_TM_3_0) +#FIRMWARE_TM_3_0=$(top_srcdir)/src/telemetrum-v3.0/telemetrum-v3.0-$(VERSION).ihx +#FIRMWARE_TM=$(FIRMWARE_TM_1_0) $(FIRMWARE_TM_1_1) $(FIRMWARE_TM_1_2) $(FIRMWARE_TM_2_0) $(FIRMWARE_TM_3_0) +FIRMWARE_TM=$(FIRMWARE_TM_1_0) $(FIRMWARE_TM_1_1) $(FIRMWARE_TM_1_2) $(FIRMWARE_TM_2_0) FIRMWARE_TELEMINI_1_0=$(top_srcdir)/src/telemini-v1.0/telemini-v1.0-$(VERSION).ihx FIRMWARE_TELEMINI=$(FIRMWARE_TELEMINI_1_0) diff --git a/altosui/altos-windows.nsi.in b/altosui/altos-windows.nsi.in index c3d273fc..e96250d7 100644 --- a/altosui/altos-windows.nsi.in +++ b/altosui/altos-windows.nsi.in @@ -124,7 +124,7 @@ Section "Firmware" File "../src/telemetrum-v1.1/telemetrum-v1.1-${VERSION}.ihx" File "../src/telemetrum-v1.2/telemetrum-v1.2-${VERSION}.ihx" File "../src/telemetrum-v2.0/telemetrum-v2.0-${VERSION}.ihx" - File "../src/telemetrum-v3.0/telemetrum-v3.0-${VERSION}.ihx" +; File "../src/telemetrum-v3.0/telemetrum-v3.0-${VERSION}.ihx" File "../src/telemini-v1.0/telemini-v1.0-${VERSION}.ihx" File "../src/telegps-v1.0/telegps-v1.0-${VERSION}.ihx" File "../src/teledongle-v0.2/teledongle-v0.2-${VERSION}.ihx" -- 2.30.2