Merge remote branch 'origin/master' into new-packet-format

diff --combined ao-tools/altosui/Makefile
index 1273e7d4990ba58b29388881e9156ea96ac366c2,bae42c9ac14cd41d565db70cbe568bf03938abc0..d3ecb889d909b3f83afd2df15d6a8ba1c15d2641
--- 1/ao-tools/altosui/Makefile
--- 2/ao-tools/altosui/Makefile
+++ b/ao-tools/altosui/Makefile
@@@ -1,56 -1,38 +1,57 @@@
  .SUFFIXES: .java .class
  
- CLASSPATH=classes:./*
+ CLASSPATH=classes:./*:/usr/share/java/*
  CLASSFILES=\
 +      Altos.class \
 +      AltosChannelMenu.class \
 +      AltosConfig.class \
 +      AltosConfigUI.class \
        AltosConvert.class \
 -      AltosEeprom.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 \
        AltosLog.class \
 +      AltosLogfileChooser.class \
        AltosParse.class \
        AltosPreferences.class \
 +      AltosRecord.class \
        AltosSerialMonitor.class \
        AltosSerial.class \
        AltosState.class \
        AltosTelemetry.class \
 +      AltosTelemetryReader.class \
        AltosUI.class \
        AltosDevice.class \
        AltosDeviceDialog.class \
 +      AltosRomconfig.class \
 +      AltosRomconfigUI.class \
        AltosVoice.class
  
- FREETTSSRC=/home/keithp/src/freetts/freetts-1.2.2
- FREETTSLIB=$(FREETTSSRC)/lib
- FREETTSJAR= \
-       cmudict04.jar \
-       cmulex.jar \
-       cmu_time_awb.jar \
-       cmutimelex.jar \
-       cmu_us_kal.jar \
-       en_us.jar \
-       freetts.jar
+ #FREETTSSRC=/home/keithp/src/freetts/freetts-1.2.2
+ #FREETTSLIB=$(FREETTSSRC)/lib
+ #FREETTSJAR=/usr/share/java/freetts.jar
+ #FREETTSJAR= \
+ #     cmudict04.jar \
+ #     cmulex.jar \
+ #     cmu_time_awb.jar \
+ #     cmutimelex.jar \
+ #     cmu_us_kal.jar \
+ #     en_us.jar \
+ #     freetts.jar
  
 -JAVAFLAGS=-Xlint:unchecked
 +JAVAFLAGS=-Xlint:unchecked -Xlint:deprecation
  
  OS:=$(shell uname)
  
@@@ -74,14 -56,14 +75,14 @@@ altosui.jar: classes/altosui classes/li
  
  classes/altosui:
        mkdir -p classes
-       ln -s .. classes/altosui
+       ln -sf .. classes/altosui
  
  classes/libaltosJNI:
        mkdir -p classes
-       ln -s ../../libaltos/libaltosJNI classes/libaltosJNI
+       ln -sf ../../libaltos/libaltosJNI classes/libaltosJNI
  
- $(FREETTSJAR):
-       ln -s $(FREETTSLIB)/$@ .
+ #$(FREETTSJAR):
+ #     ln -s $(FREETTSLIB)/$@ .
  
  ifeq ($(OS),Darwin)
  RESOURCES=altosui.jar $(FREETTSJAR) ../libaltos/libaltos.dylib
@@@ -100,6 -82,6 +101,6 @@@ altosui
  endif
  
  clean:
-       rm -f *.class $(FREETTSJAR) altosui.jar
+       rm -f *.class altosui.jar
        rm -f AltosUI.app/Contents/Resources/Java/*
        rm -rf classes