projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
doc: Complete initial telemetry description
[fw/altos]
/
altosui
/
Makefile.am
diff --git
a/altosui/Makefile.am
b/altosui/Makefile.am
index e2ff55af0e8c04dac56bc0e199332a24c92c8d1d..6a4d9d17503a9945d3f09a424369722e1d712eb6 100644
(file)
--- a/
altosui/Makefile.am
+++ b/
altosui/Makefile.am
@@
-1,6
+1,6
@@
SUBDIRS=libaltos
JAVAROOT=classes
SUBDIRS=libaltos
JAVAROOT=classes
-AM_JAVACFLAGS=-encoding UTF-8
+AM_JAVACFLAGS=-encoding UTF-8
-Xlint:deprecation
man_MANS=altosui.1
man_MANS=altosui.1
@@
-15,6
+15,7
@@
altosui_JAVA = \
AltosAscent.java \
AltosChannelMenu.java \
AltosConfig.java \
AltosAscent.java \
AltosChannelMenu.java \
AltosConfig.java \
+ AltosConfigData.java \
AltosConfigUI.java \
AltosConfigureUI.java \
AltosConvert.java \
AltosConfigUI.java \
AltosConfigureUI.java \
AltosConvert.java \
@@
-25,11
+26,22
@@
altosui_JAVA = \
AltosDescent.java \
AltosDeviceDialog.java \
AltosDevice.java \
AltosDescent.java \
AltosDeviceDialog.java \
AltosDevice.java \
+ AltosUSBDevice.java \
+ AltosBTDevice.java \
+ AltosBTDeviceIterator.java \
+ AltosBTManage.java \
+ AltosBTKnown.java \
AltosDisplayThread.java \
AltosDisplayThread.java \
+ AltosEepromChunk.java \
+ AltosEepromDelete.java \
AltosEepromDownload.java \
AltosEepromDownload.java \
+ AltosEepromList.java \
+ AltosEepromLog.java \
+ AltosEepromManage.java \
AltosEepromMonitor.java \
AltosEepromIterable.java \
AltosEepromRecord.java \
AltosEepromMonitor.java \
AltosEepromIterable.java \
AltosEepromRecord.java \
+ AltosEepromSelect.java \
AltosFile.java \
AltosFlash.java \
AltosFlashUI.java \
AltosFile.java \
AltosFlash.java \
AltosFlashUI.java \
@@
-39,6
+51,7
@@
altosui_JAVA = \
AltosFlightStatus.java \
AltosFlightUI.java \
AltosGPS.java \
AltosFlightStatus.java \
AltosFlightUI.java \
AltosGPS.java \
+ AltosGPSSat.java \
AltosGreatCircle.java \
AltosHexfile.java \
Altos.java \
AltosGreatCircle.java \
AltosHexfile.java \
Altos.java \
@@
-58,6
+71,12
@@
altosui_JAVA = \
AltosRecord.java \
AltosRecordIterable.java \
AltosTelemetryReader.java \
AltosRecord.java \
AltosRecordIterable.java \
AltosTelemetryReader.java \
+ AltosTelemetryRecord.java \
+ AltosTelemetryRecordGeneral.java \
+ AltosTelemetryRecordRaw.java \
+ AltosTelemetryRecordSensor.java \
+ AltosTelemetryRecordLegacy.java \
+ AltosTelemetryMap.java \
AltosReplayReader.java \
AltosRomconfig.java \
AltosRomconfigUI.java \
AltosReplayReader.java \
AltosRomconfig.java \
AltosRomconfigUI.java \
@@
-78,6
+97,7
@@
altosui_JAVA = \
AltosGraphTime.java \
AltosGraphUI.java \
AltosDataChooser.java \
AltosGraphTime.java \
AltosGraphUI.java \
AltosDataChooser.java \
+ AltosVersion.java \
AltosVoice.java
JFREECHART_CLASS= \
AltosVoice.java
JFREECHART_CLASS= \
@@
-122,10
+142,21
@@
ICONJAR= -C $(ICONDIR) altus-metrum-16x16.jpg \
WINDOWS_ICON=$(ICONDIR)/altus-metrum.ico
# Firmware
WINDOWS_ICON=$(ICONDIR)/altus-metrum.ico
# Firmware
-FIRMWARE_TD=$(top_srcdir)/src/teledongle-v0.2-$(VERSION).ihx
-FIRMWARE_TM=$(top_srcdir)/src/telemetrum-v1.0-$(VERSION).ihx
+FIRMWARE_TD_0_2=$(top_srcdir)/src/teledongle-v0.2-$(VERSION).ihx
+FIRMWARE_TD=$(FIRMWARE_TD_0_2)
+
+FIRMWARE_TM_1_0=$(top_srcdir)/src/telemetrum-v1.0-$(VERSION).ihx
+FIRMWARE_TM_1_1=$(top_srcdir)/src/telemetrum-v1.1-$(VERSION).ihx
+FIRMWARE_TM=$(FIRMWARE_TM_1_0) $(FIRMWARE_TM_1_1)
+
FIRMWARE=$(FIRMWARE_TM) $(FIRMWARE_TD)
FIRMWARE=$(FIRMWARE_TM) $(FIRMWARE_TD)
+ALTUSMETRUM_DOC=$(top_srcdir)/doc/altusmetrum.pdf
+ALTOS_DOC=$(top_srcdir)/doc/altos.pdf
+TEMPLATE_DOC=$(top_srcdir)/doc/telemetrum-outline.pdf
+
+DOC=$(ALTUSMETRUM_DOC) $(ALTOS_DOC) $(TEMPLATE_DOC)
+
# Distribution targets
LINUX_DIST=Altos-Linux-$(VERSION).tar.bz2
MACOSX_DIST=Altos-Mac-$(VERSION).zip
# Distribution targets
LINUX_DIST=Altos-Linux-$(VERSION).tar.bz2
MACOSX_DIST=Altos-Mac-$(VERSION).zip
@@
-133,7
+164,7
@@
WINDOWS_DIST=Altos-Windows-$(VERSION_DASH).exe
FAT_FILES=$(FATJAR) $(FREETTS_CLASS) $(JFREECHART_CLASS) $(JCOMMON_CLASS)
FAT_FILES=$(FATJAR) $(FREETTS_CLASS) $(JFREECHART_CLASS) $(JCOMMON_CLASS)
-LINUX_FILES=$(FAT_FILES) libaltos.so $(FIRMWARE)
+LINUX_FILES=$(FAT_FILES) libaltos.so $(FIRMWARE)
$(DOC)
LINUX_EXTRA=altosui-fat
MACOSX_FILES=$(FAT_FILES) libaltos.dylib
LINUX_EXTRA=altosui-fat
MACOSX_FILES=$(FAT_FILES) libaltos.dylib
@@
-264,6
+295,7
@@
$(MACOSX_DIST): $(MACOSX_FILES) $(MACOSX_EXTRA)
cp -p $(FATJAR) macosx/AltosUI.app/Contents/Resources/Java/altosui.jar
cp -p $(FREETTS_CLASS) libaltos.dylib macosx/AltosUI.app/Contents/Resources/Java
cp -p $(JFREECHART_CLASS) libaltos.dylib macosx/AltosUI.app/Contents/Resources/Java
cp -p $(FATJAR) macosx/AltosUI.app/Contents/Resources/Java/altosui.jar
cp -p $(FREETTS_CLASS) libaltos.dylib macosx/AltosUI.app/Contents/Resources/Java
cp -p $(JFREECHART_CLASS) libaltos.dylib macosx/AltosUI.app/Contents/Resources/Java
+ cp -p $(JCOMMON_CLASS) libaltos.dylib macosx/AltosUI.app/Contents/Resources/Java
cp -p $(MACOSX_EXTRA) macosx/AltOS
cd macosx && zip -r ../$@ AltosUI.app AltOS
cp -p $(MACOSX_EXTRA) macosx/AltOS
cd macosx && zip -r ../$@ AltosUI.app AltOS