From: Bdale Garbee Date: Mon, 15 Jan 2018 17:26:45 +0000 (-0300) Subject: cleaning things up a bit X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=464c8a8b3018461c6f164f1bc0e5e7cb6682c5be cleaning things up a bit --- diff --git a/teststand/Info.plist.in b/teststand/Info.plist.in index 8dc797d6..292c6131 100644 --- a/teststand/Info.plist.in +++ b/teststand/Info.plist.in @@ -15,7 +15,7 @@ CFBundlePackageType APPL CFBundleIdentifier - org.altusmetrum.altosui + org.altusmetrum.teststand CFBundleSignature Altu CFBundleGetInfoString @@ -23,7 +23,7 @@ CFBundleInfoDictionaryVersion 6.0 CFBundleIconFile - altusmetrum-altosui.icns + altusmetrum-teststand.icns CFBundleDocumentTypes @@ -54,12 +54,12 @@ Java MainClass - altosui.AltosUI + teststand.TestStand JVMVersion 1.5+ ClassPath - $JAVAROOT/altosui.jar + $JAVAROOT/teststand.jar $JAVAROOT/freetts.jar VMOptions diff --git a/teststand/Makefile-standalone b/teststand/Makefile-standalone deleted file mode 100644 index e5f41639..00000000 --- a/teststand/Makefile-standalone +++ /dev/null @@ -1,191 +0,0 @@ -.SUFFIXES: .java .class - -CLASSPATH=classes:./*:/usr/share/java/* -CLASSFILES=\ - Altos.class \ - AltosChannelMenu.class \ - AltosConfigFC.class \ - AltosConfigFCUI.class \ - AltosConvert.class \ - AltosCRCException.class \ - AltosCSV.class \ - AltosCSVUI.class \ - AltosDebug.class \ - AltosEepromDownload.class \ - AltosEepromMonitor.class \ - AltosEepromReader.class \ - AltosEepromRecord.class \ - AltosFile.class \ - AltosFlash.class \ - AltosFlashUI.class \ - AltosFlightInfoTableModel.class \ - AltosFlightStatusTableModel.class \ - AltosGPS.class \ - AltosGreatCircle.class \ - AltosHexfile.class \ - AltosLine.class \ - AltosInfoTable.class \ - AltosLog.class \ - AltosLogfileChooser.class \ - AltosParse.class \ - AltosPreferences.class \ - AltosReader.class \ - AltosRecord.class \ - AltosSerialMonitor.class \ - AltosSerial.class \ - AltosState.class \ - AltosStatusTable.class \ - AltosTelemetry.class \ - AltosTelemetryReader.class \ - AltosUI.class \ - AltosDevice.class \ - AltosDeviceDialog.class \ - AltosRomconfig.class \ - AltosRomconfigUI.class \ - AltosVoice.class - -JAVA_ICONS=\ - ../icon/altus-metrum-16.png \ - ../icon/altus-metrum-32.png \ - ../icon/altus-metrum-48.png \ - ../icon/altus-metrum-64.png \ - ../icon/altus-metrum-128.png \ - ../icon/altus-metrum-256.png - -WINDOWS_ICON=../icon/altus-metrum.ico - -# where altosui.jar gets installed -ALTOSLIB=/usr/share/java - -# where freetts.jar is to be found -FREETTSLIB=/usr/share/java - -# all of the freetts files -FREETTSJAR= \ - $(FREETTSLIB)/cmudict04.jar \ - $(FREETTSLIB)/cmulex.jar \ - $(FREETTSLIB)/cmu_time_awb.jar \ - $(FREETTSLIB)/cmutimelex.jar \ - $(FREETTSLIB)/cmu_us_kal.jar \ - $(FREETTSLIB)/en_us.jar \ - $(FREETTSLIB)/freetts.jar - -# The current hex files -HEXLIB=../src -HEXFILES = \ - $(HEXLIB)/telemetrum-v1.0.ihx \ - $(HEXLIB)/teledongle-v0.2.ihx - -JAVAFLAGS=-Xlint:unchecked -Xlint:deprecation - -ALTOSUIJAR = altosui.jar -FATJAR = fat/altosui.jar - -OS:=$(shell uname) - -LINUX_APP=altosui - -DARWIN_ZIP=Altos-Mac.zip - -WINDOWS_EXE=Altos-Windows.exe - -LINUX_TGZ=Altos-Linux.tgz - -all: altosui.jar $(LINUX_APP) -fat: altosui.jar $(LINUX_APP) $(DARWIN_ZIP) $(WINDOWS_EXE) $(LINUX_TGZ) - -$(CLASSFILES): - -.java.class: - javac -encoding UTF8 -classpath "$(CLASSPATH)" $(JAVAFLAGS) $*.java - -altosui.jar: classes/images classes/altosui classes/libaltosJNI $(CLASSFILES) Manifest.txt - cd ./classes && jar cfm ../$@ altosui/Manifest.txt images/* altosui/*.class libaltosJNI/*.class - -Manifest.txt: Makefile $(CLASSFILES) - echo 'Main-Class: altosui.AltosUI' > $@ - echo "Class-Path: $(FREETTSLIB)/freetts.jar" >> $@ - -classes/altosui: - mkdir -p classes - ln -sf .. classes/altosui - -classes/libaltosJNI: - mkdir -p classes - ln -sf ../libaltos/libaltosJNI classes/libaltosJNI - -classes/images: - mkdir -p classes/images - ln -sf ../$(JAVA_ICONS) classes/images - -altosui: - echo "#!/bin/sh" > $@ - echo "exec java -Djava.library.path=/usr/lib/altos -jar /usr/share/java/altosui.jar" >> $@ - chmod +x ./altosui - -fat/altosui: - echo "#!/bin/sh" > $@ - echo 'ME=`which "$0"`' >> $@ - echo 'DIR=`dirname "$ME"`' >> $@ - echo 'exec java -Djava.library.path="$$DIR" -jar "$$DIR"/altosui.jar' >> $@ - chmod +x $@ - -fat/altosui.jar: $(CLASSFILES) $(JAVA_ICONS) fat/classes/Manifest.txt - mkdir -p fat/classes - test -L fat/classes/altosui || ln -sf ../.. fat/classes/altosui - mkdir -p fat/classes/images - cp $(JAVA_ICONS) fat/classes/images - test -L fat/classes/libaltosJNI || ln -sf ../../libaltos/libaltosJNI fat/classes/libaltosJNI - cd ./fat/classes && jar cfm ../../$@ Manifest.txt images/* altosui/*.class libaltosJNI/*.class - -fat/classes/Manifest.txt: $(CLASSFILES) Makefile - mkdir -p fat/classes - echo 'Main-Class: altosui.AltosUI' > $@ - echo "Class-Path: freetts.jar" >> $@ - -install: altosui.jar altosui - install -m 0644 altosui.jar $(DESTDIR)/usr/share/java/altosui.jar - install -m 0644 altosui.1 $(DESTDIR)/usr/share/man/man1/altosui.1 - install altosui $(DESTDIR)/usr/bin/altosui - -clean: - rm -f *.class altosui.jar - rm -f AltosUI.app/Contents/Resources/Java/* - rm -rf classes - rm -rf windows linux - -distclean: clean - rm -f $(DARWIN_ZIP) $(WINDOWS_EXE) $(LINUX_TGZ) - rm -rf darwin fat - -FAT_FILES=$(FATJAR) $(FREETTSJAR) $(HEXFILES) - -LINUX_FILES=$(FAT_FILES) libaltos/libaltos.so fat/altosui -$(LINUX_TGZ): $(LINUX_FILES) - rm -f $@ - mkdir -p linux/AltOS - rm -f linux/AltOS/* - cp $(LINUX_FILES) linux/AltOS - cd linux && tar czf ../$@ AltOS - -DARWIN_RESOURCES=$(FATJAR) $(FREETTSJAR) libaltos/libaltos.dylib -DARWIN_EXTRA=$(HEXFILES) -DARWIN_FILES=$(DARWIN_RESOURCES) $(DARWIN_EXTRA) - -$(DARWIN_ZIP): $(DARWIN_FILES) - rm -f $@ - cp -a AltosUI.app darwin/ - mkdir -p darwin/AltosUI.app/Contents/Resources/Java - cp $(DARWIN_RESOURCES) darwin/AltosUI.app/Contents/Resources/Java - mkdir -p darwin/AltOS - cp $(DARWIN_EXTRA) darwin/AltOS - cd darwin && zip -r ../$@ AltosUI.app AltOS - -WINDOWS_FILES = $(FAT_FILES) libaltos/altos.dll ../altusmetrum.inf $(WINDOWS_ICON) - -$(WINDOWS_EXE): $(WINDOWS_FILES) altos-windows.nsi - rm -f $@ - mkdir -p windows/AltOS - rm -f windows/AltOS/* - cp $(WINDOWS_FILES) windows/AltOS - makensis altos-windows.nsi diff --git a/teststand/Makefile.am b/teststand/Makefile.am index 1c93b88c..8e9ab3f5 100644 --- a/teststand/Makefile.am +++ b/teststand/Makefile.am @@ -270,7 +270,7 @@ Manifest-fat.txt: teststand: Makefile echo "#!/bin/sh" > $@ - echo 'exec java -Djava.library.path="$(altoslibdir)" -jar "$(altosuidir)/teststand.jar" "$$@"' >> $@ + echo 'exec java -Djava.library.path="$(altoslibdir)" -jar "$(teststanddir)/teststand.jar" "$$@"' >> $@ chmod +x $@ teststand-test: Makefile diff --git a/teststand/TestStandGraph.java b/teststand/TestStandGraph.java index f2a76cc1..14774c51 100644 --- a/teststand/TestStandGraph.java +++ b/teststand/TestStandGraph.java @@ -41,10 +41,12 @@ public class TestStandGraph extends AltosUIGraph { /* These are in 'priority' order so that earlier ones get simpler line styles, * then they are grouped so that adjacent ones get sequential colors */ + static final private AltosUILineStyle pressure_color = new AltosUILineStyle (); + static final private AltosUILineStyle thrust_color = new AltosUILineStyle(); + static final private AltosUILineStyle height_color = new AltosUILineStyle(); static final private AltosUILineStyle speed_color = new AltosUILineStyle(); - static final private AltosUILineStyle accel_color = new AltosUILineStyle(); - static final private AltosUILineStyle vert_accel_color = new AltosUILineStyle(); + static final private AltosUILineStyle vert_thrust_color = new AltosUILineStyle(); static final private AltosUILineStyle orient_color = new AltosUILineStyle(); static final private AltosUILineStyle gps_height_color = new AltosUILineStyle(); @@ -58,7 +60,7 @@ public class TestStandGraph extends AltosUIGraph { static final private AltosUILineStyle kalman_height_color = new AltosUILineStyle(); static final private AltosUILineStyle kalman_speed_color = new AltosUILineStyle(); - static final private AltosUILineStyle kalman_accel_color = new AltosUILineStyle(); + static final private AltosUILineStyle kalman_thrust_color = new AltosUILineStyle(); static final private AltosUILineStyle gps_nsat_color = new AltosUILineStyle (); static final private AltosUILineStyle gps_nsat_solution_color = new AltosUILineStyle (); @@ -73,7 +75,6 @@ public class TestStandGraph extends AltosUIGraph { static final private AltosUILineStyle temperature_color = new AltosUILineStyle (); static final private AltosUILineStyle dbm_color = new AltosUILineStyle(); - static final private AltosUILineStyle pressure_color = new AltosUILineStyle (); static final private AltosUILineStyle state_color = new AltosUILineStyle(0); static final private AltosUILineStyle accel_along_color = new AltosUILineStyle(); @@ -102,12 +103,13 @@ public class TestStandGraph extends AltosUIGraph { if (stats != null && stats.serial != AltosLib.MISSING && stats.product != null && stats.flight != AltosLib.MISSING) setName(String.format("%s %d flight %d\n", stats.product, stats.serial, stats.flight)); - height_axis = newAxis("Height", AltosConvert.height, height_color); pressure_axis = newAxis("Pressure", AltosConvert.pressure, pressure_color, 0); + thrust_axis = newAxis("Thrust", AltosConvert.force, thrust_color, 0); + + height_axis = newAxis("Height", AltosConvert.height, height_color); speed_axis = newAxis("Speed", AltosConvert.speed, speed_color); - thrust_axis = newAxis("Thrust", AltosConvert.force, accel_color); - tick_axis = newAxis("Tick", tick_units, accel_color, 0); - accel_axis = newAxis("Acceleration", AltosConvert.accel, accel_color); + tick_axis = newAxis("Tick", tick_units, thrust_color, 0); + accel_axis = newAxis("Acceleration", AltosConvert.accel, thrust_color); voltage_axis = newAxis("Voltage", AltosConvert.voltage, battery_voltage_color); temperature_axis = newAxis("Temperature", AltosConvert.temperature, temperature_color, 0); nsat_axis = newAxis("Satellites", null, gps_nsat_color, @@ -138,22 +140,22 @@ public class TestStandGraph extends AltosUIGraph { // false); flight_series.register_axis(AltosUIFlightSeries.tick_name, - accel_color, + thrust_color, false, tick_axis); flight_series.register_axis(AltosUIFlightSeries.accel_name, - accel_color, + thrust_color, false, accel_axis); flight_series.register_axis(AltosUIFlightSeries.vert_accel_name, - vert_accel_color, + vert_thrust_color, false, accel_axis); flight_series.register_axis(AltosUIFlightSeries.kalman_accel_name, - kalman_accel_color, + kalman_thrust_color, false, accel_axis); @@ -324,7 +326,7 @@ public class TestStandGraph extends AltosUIGraph { orient_axis); flight_series.register_axis(AltosUIFlightSeries.thrust_name, - accel_color, + thrust_color, true, thrust_axis); diff --git a/teststand/altosui-fat b/teststand/altosui-fat deleted file mode 100755 index 95b1c051..00000000 --- a/teststand/altosui-fat +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -me=`which "$0"` -dir=`dirname "$me"` -exec java -cp "$dir/*" -Djava.library.path="$dir" -jar "$dir"/altosui-fat.jar "$@"