projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altosui: Rename AltosConfig -> AltosConfigFC
[fw/altos]
/
altosui
/
Makefile.am
diff --git
a/altosui/Makefile.am
b/altosui/Makefile.am
index 1e0364d2b1296004e319542e9c9c940f573e9fd9..720cae7f086f93411e63c3ed4c2abbb822f88b47 100644
(file)
--- a/
altosui/Makefile.am
+++ b/
altosui/Makefile.am
@@
-14,8
+14,8
@@
altosui_JAVA = \
AltosAscent.java \
AltosChannelMenu.java \
AltosCompanionInfo.java \
AltosAscent.java \
AltosChannelMenu.java \
AltosCompanionInfo.java \
- AltosConfig.java \
- AltosConfigUI.java \
+ AltosConfig
FC
.java \
+ AltosConfig
FC
UI.java \
AltosConfigPyroUI.java \
AltosConfigureUI.java \
AltosConfigTD.java \
AltosConfigPyroUI.java \
AltosConfigureUI.java \
AltosConfigTD.java \
@@
-32,7
+32,6
@@
altosui_JAVA = \
AltosLaunchUI.java \
AltosLanded.java \
AltosPad.java \
AltosLaunchUI.java \
AltosLanded.java \
AltosPad.java \
- AltosPyroWizard.java \
AltosUI.java \
AltosGraphUI.java
AltosUI.java \
AltosGraphUI.java
@@
-132,7
+131,8
@@
FIRMWARE_TM_2_0=$(top_srcdir)/src/telemetrum-v2.0/telemetrum-v2.0-$(VERSION).ihx
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_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)
+FIRMWARE_TELEMINI_3_0=$(top_srcdir)/src/telemini-v3.0/telemini-v3.0-$(VERSION).ihx
+FIRMWARE_TELEMINI=$(FIRMWARE_TELEMINI_1_0) $(FIRMWARE_TELEMINI_3_0)
FIRMWARE_TBT_1_0=$(top_srcdir)/src/telebt-v1.0/telebt-v1.0-$(VERSION).ihx
FIRMWARE_TBT_3_0=$(top_srcdir)/src/telebt-v3.0/telebt-v3.0-$(VERSION).ihx
FIRMWARE_TBT_1_0=$(top_srcdir)/src/telebt-v1.0/telebt-v1.0-$(VERSION).ihx
FIRMWARE_TBT_3_0=$(top_srcdir)/src/telebt-v3.0/telebt-v3.0-$(VERSION).ihx
@@
-160,7
+160,8
@@
TEMPLATE_DOC=\
$(top_srcdir)/doc/telemetrum-outline.pdf \
$(top_srcdir)/doc/easymini-outline.pdf \
$(top_srcdir)/doc/telemega-outline.pdf \
$(top_srcdir)/doc/telemetrum-outline.pdf \
$(top_srcdir)/doc/easymini-outline.pdf \
$(top_srcdir)/doc/telemega-outline.pdf \
- $(top_srcdir)/doc/telemini-outline.pdf
+ $(top_srcdir)/doc/telemini-v1-outline.pdf \
+ $(top_srcdir)/doc/telemini-v3-outline.pdf
DOC=$(ALTUSMETRUM_DOC) $(ALTOS_DOC) $(TELEMETRY_DOC) $(TEMPLATE_DOC)
DOC=$(ALTUSMETRUM_DOC) $(ALTOS_DOC) $(TELEMETRY_DOC) $(TEMPLATE_DOC)