diff options
| -rw-r--r-- | altosui/.gitignore (renamed from ao-tools/altosui/.gitignore) | 0 | ||||
| -rw-r--r-- | altosui/AltOS Package Configuration.pmdoc/01altosui-contents.xml (renamed from ao-tools/altosui/AltOS Package Configuration.pmdoc/01altosui-contents.xml) | 0 | ||||
| -rw-r--r-- | altosui/AltOS Package Configuration.pmdoc/01altosui.xml (renamed from ao-tools/altosui/AltOS Package Configuration.pmdoc/01altosui.xml) | 0 | ||||
| -rw-r--r-- | altosui/AltOS Package Configuration.pmdoc/index.xml (renamed from ao-tools/altosui/AltOS Package Configuration.pmdoc/index.xml) | 0 | ||||
| -rw-r--r-- | altosui/Altos.java (renamed from ao-tools/altosui/Altos.java) | 0 | ||||
| -rw-r--r-- | altosui/AltosAscent.java (renamed from ao-tools/altosui/AltosAscent.java) | 0 | ||||
| -rw-r--r-- | altosui/AltosCRCException.java (renamed from ao-tools/altosui/AltosCRCException.java) | 0 | ||||
| -rw-r--r-- | altosui/AltosCSV.java (renamed from ao-tools/altosui/AltosCSV.java) | 0 | ||||
| -rw-r--r-- | altosui/AltosCSVUI.java (renamed from ao-tools/altosui/AltosCSVUI.java) | 0 | ||||
| -rw-r--r-- | altosui/AltosChannelMenu.java (renamed from ao-tools/altosui/AltosChannelMenu.java) | 0 | ||||
| -rw-r--r-- | altosui/AltosConfig.java (renamed from ao-tools/altosui/AltosConfig.java) | 0 | ||||
| -rw-r--r-- | altosui/AltosConfigUI.java (renamed from ao-tools/altosui/AltosConfigUI.java) | 0 | ||||
| -rw-r--r-- | altosui/AltosConfigureUI.java (renamed from ao-tools/altosui/AltosConfigureUI.java) | 0 | ||||
| -rw-r--r-- | altosui/AltosConvert.java (renamed from ao-tools/altosui/AltosConvert.java) | 0 | ||||
| -rw-r--r-- | altosui/AltosDataChooser.java (renamed from ao-tools/altosui/AltosDataChooser.java) | 0 | ||||
| -rw-r--r-- | altosui/AltosDataPoint.java (renamed from ao-tools/altosui/AltosDataPoint.java) | 0 | ||||
| -rw-r--r-- | altosui/AltosDataPointReader.java (renamed from ao-tools/altosui/AltosDataPointReader.java) | 0 | ||||
| -rw-r--r-- | altosui/AltosDebug.java (renamed from ao-tools/altosui/AltosDebug.java) | 0 | ||||
| -rw-r--r-- | altosui/AltosDescent.java (renamed from ao-tools/altosui/AltosDescent.java) | 0 | ||||
| -rw-r--r-- | altosui/AltosDevice.java (renamed from ao-tools/altosui/AltosDevice.java) | 0 | ||||
| -rw-r--r-- | altosui/AltosDeviceDialog.java (renamed from ao-tools/altosui/AltosDeviceDialog.java) | 0 | ||||
| -rw-r--r-- | altosui/AltosDisplayThread.java (renamed from ao-tools/altosui/AltosDisplayThread.java) | 0 | ||||
| -rw-r--r-- | altosui/AltosEepromDownload.java (renamed from ao-tools/altosui/AltosEepromDownload.java) | 0 | ||||
| -rw-r--r-- | altosui/AltosEepromIterable.java (renamed from ao-tools/altosui/AltosEepromIterable.java) | 0 | ||||
| -rw-r--r-- | altosui/AltosEepromMonitor.java (renamed from ao-tools/altosui/AltosEepromMonitor.java) | 0 | ||||
| -rw-r--r-- | altosui/AltosEepromRecord.java (renamed from ao-tools/altosui/AltosEepromRecord.java) | 0 | ||||
| -rw-r--r-- | altosui/AltosFile.java (renamed from ao-tools/altosui/AltosFile.java) | 0 | ||||
| -rw-r--r-- | altosui/AltosFlash.java (renamed from ao-tools/altosui/AltosFlash.java) | 0 | ||||
| -rw-r--r-- | altosui/AltosFlashUI.java (renamed from ao-tools/altosui/AltosFlashUI.java) | 0 | ||||
| -rw-r--r-- | altosui/AltosFlightDisplay.java (renamed from ao-tools/altosui/AltosFlightDisplay.java) | 0 | ||||
| -rw-r--r-- | altosui/AltosFlightInfoTableModel.java (renamed from ao-tools/altosui/AltosFlightInfoTableModel.java) | 0 | ||||
| -rw-r--r-- | altosui/AltosFlightReader.java (renamed from ao-tools/altosui/AltosFlightReader.java) | 0 | ||||
| -rw-r--r-- | altosui/AltosFlightStatus.java (renamed from ao-tools/altosui/AltosFlightStatus.java) | 0 | ||||
| -rw-r--r-- | altosui/AltosFlightStatusTableModel.java (renamed from ao-tools/altosui/AltosFlightStatusTableModel.java) | 0 | ||||
| -rw-r--r-- | altosui/AltosFlightUI.java (renamed from ao-tools/altosui/AltosFlightUI.java) | 0 | ||||
| -rw-r--r-- | altosui/AltosGPS.java (renamed from ao-tools/altosui/AltosGPS.java) | 0 | ||||
| -rw-r--r-- | altosui/AltosGraph.java (renamed from ao-tools/altosui/AltosGraph.java) | 0 | ||||
| -rw-r--r-- | altosui/AltosGraphTime.java (renamed from ao-tools/altosui/AltosGraphTime.java) | 0 | ||||
| -rw-r--r-- | altosui/AltosGraphUI.java (renamed from ao-tools/altosui/AltosGraphUI.java) | 0 | ||||
| -rw-r--r-- | altosui/AltosGreatCircle.java (renamed from ao-tools/altosui/AltosGreatCircle.java) | 0 | ||||
| -rw-r--r-- | altosui/AltosHexfile.java (renamed from ao-tools/altosui/AltosHexfile.java) | 0 | ||||
| -rw-r--r-- | altosui/AltosIgnite.java (renamed from ao-tools/altosui/AltosIgnite.java) | 0 | ||||
| -rw-r--r-- | altosui/AltosIgniteUI.java (renamed from ao-tools/altosui/AltosIgniteUI.java) | 0 | ||||
| -rw-r--r-- | altosui/AltosInfoTable.java (renamed from ao-tools/altosui/AltosInfoTable.java) | 0 | ||||
| -rw-r--r-- | altosui/AltosKML.java (renamed from ao-tools/altosui/AltosKML.java) | 0 | ||||
| -rw-r--r-- | altosui/AltosLanded.java (renamed from ao-tools/altosui/AltosLanded.java) | 0 | ||||
| -rw-r--r-- | altosui/AltosLed.java (renamed from ao-tools/altosui/AltosLed.java) | 0 | ||||
| -rw-r--r-- | altosui/AltosLights.java (renamed from ao-tools/altosui/AltosLights.java) | 0 | ||||
| -rw-r--r-- | altosui/AltosLine.java (renamed from ao-tools/altosui/AltosLine.java) | 0 | ||||
| -rw-r--r-- | altosui/AltosLog.java (renamed from ao-tools/altosui/AltosLog.java) | 0 | ||||
| -rw-r--r-- | altosui/AltosPad.java (renamed from ao-tools/altosui/AltosPad.java) | 0 | ||||
| -rw-r--r-- | altosui/AltosParse.java (renamed from ao-tools/altosui/AltosParse.java) | 0 | ||||
| -rw-r--r-- | altosui/AltosPreferences.java (renamed from ao-tools/altosui/AltosPreferences.java) | 0 | ||||
| -rw-r--r-- | altosui/AltosReader.java (renamed from ao-tools/altosui/AltosReader.java) | 0 | ||||
| -rw-r--r-- | altosui/AltosRecord.java (renamed from ao-tools/altosui/AltosRecord.java) | 0 | ||||
| -rw-r--r-- | altosui/AltosRecordIterable.java (renamed from ao-tools/altosui/AltosRecordIterable.java) | 0 | ||||
| -rw-r--r-- | altosui/AltosReplayReader.java (renamed from ao-tools/altosui/AltosReplayReader.java) | 0 | ||||
| -rw-r--r-- | altosui/AltosRomconfig.java (renamed from ao-tools/altosui/AltosRomconfig.java) | 0 | ||||
| -rw-r--r-- | altosui/AltosRomconfigUI.java (renamed from ao-tools/altosui/AltosRomconfigUI.java) | 0 | ||||
| -rw-r--r-- | altosui/AltosSerial.java (renamed from ao-tools/altosui/AltosSerial.java) | 0 | ||||
| -rw-r--r-- | altosui/AltosSerialInUseException.java (renamed from ao-tools/altosui/AltosSerialInUseException.java) | 0 | ||||
| -rw-r--r-- | altosui/AltosSerialMonitor.java (renamed from ao-tools/altosui/AltosSerialMonitor.java) | 0 | ||||
| -rw-r--r-- | altosui/AltosSiteMap.java (renamed from ao-tools/altosui/AltosSiteMap.java) | 0 | ||||
| -rw-r--r-- | altosui/AltosSiteMapCache.java (renamed from ao-tools/altosui/AltosSiteMapCache.java) | 0 | ||||
| -rw-r--r-- | altosui/AltosSiteMapTile.java (renamed from ao-tools/altosui/AltosSiteMapTile.java) | 0 | ||||
| -rw-r--r-- | altosui/AltosState.java (renamed from ao-tools/altosui/AltosState.java) | 0 | ||||
| -rw-r--r-- | altosui/AltosTelemetry.java (renamed from ao-tools/altosui/AltosTelemetry.java) | 0 | ||||
| -rw-r--r-- | altosui/AltosTelemetryIterable.java (renamed from ao-tools/altosui/AltosTelemetryIterable.java) | 0 | ||||
| -rw-r--r-- | altosui/AltosTelemetryReader.java (renamed from ao-tools/altosui/AltosTelemetryReader.java) | 0 | ||||
| -rw-r--r-- | altosui/AltosUI.app/Contents/Info.plist (renamed from ao-tools/altosui/AltosUI.app/Contents/Info.plist) | 0 | ||||
| -rwxr-xr-x | altosui/AltosUI.app/Contents/MacOS/JavaApplicationStub (renamed from ao-tools/altosui/AltosUI.app/Contents/MacOS/JavaApplicationStub) | bin | 61296 -> 61296 bytes | |||
| -rw-r--r-- | altosui/AltosUI.app/Contents/PkgInfo (renamed from ao-tools/altosui/AltosUI.app/Contents/PkgInfo) | 0 | ||||
| -rw-r--r-- | altosui/AltosUI.app/Contents/Resources/AltosUIIcon.icns (renamed from ao-tools/altosui/AltosUI.app/Contents/Resources/AltosUIIcon.icns) | bin | 129010 -> 129010 bytes | |||
| -rw-r--r-- | altosui/AltosUI.java (renamed from ao-tools/altosui/AltosUI.java) | 0 | ||||
| -rw-r--r-- | altosui/AltosVoice.java (renamed from ao-tools/altosui/AltosVoice.java) | 0 | ||||
| -rw-r--r-- | altosui/AltosWriter.java (renamed from ao-tools/altosui/AltosWriter.java) | 0 | ||||
| -rw-r--r-- | altosui/GrabNDrag.java (renamed from ao-tools/altosui/GrabNDrag.java) | 0 | ||||
| -rw-r--r-- | altosui/Instdrv/NSIS/Contrib/InstDrv/Example.nsi (renamed from ao-tools/altosui/Instdrv/NSIS/Contrib/InstDrv/Example.nsi) | 0 | ||||
| -rw-r--r-- | altosui/Instdrv/NSIS/Contrib/InstDrv/InstDrv-Test.exe (renamed from ao-tools/altosui/Instdrv/NSIS/Contrib/InstDrv/InstDrv-Test.exe) | bin | 51831 -> 51831 bytes | |||
| -rw-r--r-- | altosui/Instdrv/NSIS/Contrib/InstDrv/InstDrv.c (renamed from ao-tools/altosui/Instdrv/NSIS/Contrib/InstDrv/InstDrv.c) | 0 | ||||
| -rw-r--r-- | altosui/Instdrv/NSIS/Contrib/InstDrv/InstDrv.dsp (renamed from ao-tools/altosui/Instdrv/NSIS/Contrib/InstDrv/InstDrv.dsp) | 0 | ||||
| -rw-r--r-- | altosui/Instdrv/NSIS/Contrib/InstDrv/InstDrv.dsw (renamed from ao-tools/altosui/Instdrv/NSIS/Contrib/InstDrv/InstDrv.dsw) | 0 | ||||
| -rw-r--r-- | altosui/Instdrv/NSIS/Contrib/InstDrv/Readme.txt (renamed from ao-tools/altosui/Instdrv/NSIS/Contrib/InstDrv/Readme.txt) | 0 | ||||
| -rw-r--r-- | altosui/Instdrv/NSIS/Contrib/InstDrv/ircomm2k.inf (renamed from ao-tools/altosui/Instdrv/NSIS/Contrib/InstDrv/ircomm2k.inf) | 0 | ||||
| -rw-r--r-- | altosui/Instdrv/NSIS/Contrib/InstDrv/ircomm2k.sys (renamed from ao-tools/altosui/Instdrv/NSIS/Contrib/InstDrv/ircomm2k.sys) | bin | 30464 -> 30464 bytes | |||
| -rw-r--r-- | altosui/Instdrv/NSIS/Plugins/InstDrv.dll (renamed from ao-tools/altosui/Instdrv/NSIS/Plugins/InstDrv.dll) | bin | 6656 -> 6656 bytes | |||
| -rw-r--r-- | altosui/Makefile-standalone (renamed from ao-tools/altosui/Makefile-standalone) | 0 | ||||
| -rw-r--r-- | altosui/Makefile.am (renamed from ao-tools/altosui/Makefile.am) | 17 | ||||
| -rw-r--r-- | altosui/altos-windows.nsi (renamed from ao-tools/altosui/altos-windows.nsi) | 0 | ||||
| -rwxr-xr-x | altosui/altosui-fat (renamed from ao-tools/altosui/altosui-fat) | 0 | ||||
| -rw-r--r-- | altosui/altosui.1 (renamed from ao-tools/altosui/altosui.1) | 0 | ||||
| -rw-r--r-- | altosui/altusmetrum.jpg (renamed from ao-tools/altosui/altusmetrum.jpg) | bin | 72868 -> 72868 bytes | |||
| -rw-r--r-- | altosui/libaltos/.gitignore (renamed from ao-tools/libaltos/.gitignore) | 0 | ||||
| -rw-r--r-- | altosui/libaltos/Makefile-standalone (renamed from ao-tools/libaltos/Makefile-standalone) | 0 | ||||
| -rw-r--r-- | altosui/libaltos/Makefile.am (renamed from ao-tools/libaltos/Makefile.am) | 0 | ||||
| -rwxr-xr-x | altosui/libaltos/altos.dll (renamed from ao-tools/libaltos/altos.dll) | bin | 31765 -> 31765 bytes | |||
| -rw-r--r-- | altosui/libaltos/cjnitest.c (renamed from ao-tools/libaltos/cjnitest.c) | 0 | ||||
| -rw-r--r-- | altosui/libaltos/libaltos.c (renamed from ao-tools/libaltos/libaltos.c) | 0 | ||||
| -rwxr-xr-x | altosui/libaltos/libaltos.dylib (renamed from ao-tools/libaltos/libaltos.dylib) | bin | 54176 -> 54176 bytes | |||
| -rw-r--r-- | altosui/libaltos/libaltos.h (renamed from ao-tools/libaltos/libaltos.h) | 0 | ||||
| -rw-r--r-- | altosui/libaltos/libaltos.i0 (renamed from ao-tools/libaltos/libaltos.i0) | 0 | ||||
| -rw-r--r-- | ao-tools/Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 4 |
103 files changed, 12 insertions, 11 deletions
diff --git a/ao-tools/altosui/.gitignore b/altosui/.gitignore index 89be1d53..89be1d53 100644 --- a/ao-tools/altosui/.gitignore +++ b/altosui/.gitignore diff --git a/ao-tools/altosui/AltOS Package Configuration.pmdoc/01altosui-contents.xml b/altosui/AltOS Package Configuration.pmdoc/01altosui-contents.xml index 18e00fe4..18e00fe4 100644 --- a/ao-tools/altosui/AltOS Package Configuration.pmdoc/01altosui-contents.xml +++ b/altosui/AltOS Package Configuration.pmdoc/01altosui-contents.xml diff --git a/ao-tools/altosui/AltOS Package Configuration.pmdoc/01altosui.xml b/altosui/AltOS Package Configuration.pmdoc/01altosui.xml index 6170931b..6170931b 100644 --- a/ao-tools/altosui/AltOS Package Configuration.pmdoc/01altosui.xml +++ b/altosui/AltOS Package Configuration.pmdoc/01altosui.xml diff --git a/ao-tools/altosui/AltOS Package Configuration.pmdoc/index.xml b/altosui/AltOS Package Configuration.pmdoc/index.xml index fabe54a6..fabe54a6 100644 --- a/ao-tools/altosui/AltOS Package Configuration.pmdoc/index.xml +++ b/altosui/AltOS Package Configuration.pmdoc/index.xml diff --git a/ao-tools/altosui/Altos.java b/altosui/Altos.java index 8ee94e04..8ee94e04 100644 --- a/ao-tools/altosui/Altos.java +++ b/altosui/Altos.java diff --git a/ao-tools/altosui/AltosAscent.java b/altosui/AltosAscent.java index 64bdcf30..64bdcf30 100644 --- a/ao-tools/altosui/AltosAscent.java +++ b/altosui/AltosAscent.java diff --git a/ao-tools/altosui/AltosCRCException.java b/altosui/AltosCRCException.java index 4a529bcf..4a529bcf 100644 --- a/ao-tools/altosui/AltosCRCException.java +++ b/altosui/AltosCRCException.java diff --git a/ao-tools/altosui/AltosCSV.java b/altosui/AltosCSV.java index df98b2b4..df98b2b4 100644 --- a/ao-tools/altosui/AltosCSV.java +++ b/altosui/AltosCSV.java diff --git a/ao-tools/altosui/AltosCSVUI.java b/altosui/AltosCSVUI.java index e1b6002d..e1b6002d 100644 --- a/ao-tools/altosui/AltosCSVUI.java +++ b/altosui/AltosCSVUI.java diff --git a/ao-tools/altosui/AltosChannelMenu.java b/altosui/AltosChannelMenu.java index abbb86f4..abbb86f4 100644 --- a/ao-tools/altosui/AltosChannelMenu.java +++ b/altosui/AltosChannelMenu.java diff --git a/ao-tools/altosui/AltosConfig.java b/altosui/AltosConfig.java index 1c42870f..1c42870f 100644 --- a/ao-tools/altosui/AltosConfig.java +++ b/altosui/AltosConfig.java diff --git a/ao-tools/altosui/AltosConfigUI.java b/altosui/AltosConfigUI.java index cfa5d7b9..cfa5d7b9 100644 --- a/ao-tools/altosui/AltosConfigUI.java +++ b/altosui/AltosConfigUI.java diff --git a/ao-tools/altosui/AltosConfigureUI.java b/altosui/AltosConfigureUI.java index 153c59fd..153c59fd 100644 --- a/ao-tools/altosui/AltosConfigureUI.java +++ b/altosui/AltosConfigureUI.java diff --git a/ao-tools/altosui/AltosConvert.java b/altosui/AltosConvert.java index 8cc1df27..8cc1df27 100644 --- a/ao-tools/altosui/AltosConvert.java +++ b/altosui/AltosConvert.java diff --git a/ao-tools/altosui/AltosDataChooser.java b/altosui/AltosDataChooser.java index 15de05c2..15de05c2 100644 --- a/ao-tools/altosui/AltosDataChooser.java +++ b/altosui/AltosDataChooser.java diff --git a/ao-tools/altosui/AltosDataPoint.java b/altosui/AltosDataPoint.java index 66313e03..66313e03 100644 --- a/ao-tools/altosui/AltosDataPoint.java +++ b/altosui/AltosDataPoint.java diff --git a/ao-tools/altosui/AltosDataPointReader.java b/altosui/AltosDataPointReader.java index 7704310b..7704310b 100644 --- a/ao-tools/altosui/AltosDataPointReader.java +++ b/altosui/AltosDataPointReader.java diff --git a/ao-tools/altosui/AltosDebug.java b/altosui/AltosDebug.java index 8d435b66..8d435b66 100644 --- a/ao-tools/altosui/AltosDebug.java +++ b/altosui/AltosDebug.java diff --git a/ao-tools/altosui/AltosDescent.java b/altosui/AltosDescent.java index 16ccd458..16ccd458 100644 --- a/ao-tools/altosui/AltosDescent.java +++ b/altosui/AltosDescent.java diff --git a/ao-tools/altosui/AltosDevice.java b/altosui/AltosDevice.java index f0fda57b..f0fda57b 100644 --- a/ao-tools/altosui/AltosDevice.java +++ b/altosui/AltosDevice.java diff --git a/ao-tools/altosui/AltosDeviceDialog.java b/altosui/AltosDeviceDialog.java index 2966ad1e..2966ad1e 100644 --- a/ao-tools/altosui/AltosDeviceDialog.java +++ b/altosui/AltosDeviceDialog.java diff --git a/ao-tools/altosui/AltosDisplayThread.java b/altosui/AltosDisplayThread.java index 3e719130..3e719130 100644 --- a/ao-tools/altosui/AltosDisplayThread.java +++ b/altosui/AltosDisplayThread.java diff --git a/ao-tools/altosui/AltosEepromDownload.java b/altosui/AltosEepromDownload.java index 02fc36f2..02fc36f2 100644 --- a/ao-tools/altosui/AltosEepromDownload.java +++ b/altosui/AltosEepromDownload.java diff --git a/ao-tools/altosui/AltosEepromIterable.java b/altosui/AltosEepromIterable.java index f8e6d7e5..f8e6d7e5 100644 --- a/ao-tools/altosui/AltosEepromIterable.java +++ b/altosui/AltosEepromIterable.java diff --git a/ao-tools/altosui/AltosEepromMonitor.java b/altosui/AltosEepromMonitor.java index 7ff00ead..7ff00ead 100644 --- a/ao-tools/altosui/AltosEepromMonitor.java +++ b/altosui/AltosEepromMonitor.java diff --git a/ao-tools/altosui/AltosEepromRecord.java b/altosui/AltosEepromRecord.java index 5a673817..5a673817 100644 --- a/ao-tools/altosui/AltosEepromRecord.java +++ b/altosui/AltosEepromRecord.java diff --git a/ao-tools/altosui/AltosFile.java b/altosui/AltosFile.java index 06360572..06360572 100644 --- a/ao-tools/altosui/AltosFile.java +++ b/altosui/AltosFile.java diff --git a/ao-tools/altosui/AltosFlash.java b/altosui/AltosFlash.java index 3af25c23..3af25c23 100644 --- a/ao-tools/altosui/AltosFlash.java +++ b/altosui/AltosFlash.java diff --git a/ao-tools/altosui/AltosFlashUI.java b/altosui/AltosFlashUI.java index f63097ac..f63097ac 100644 --- a/ao-tools/altosui/AltosFlashUI.java +++ b/altosui/AltosFlashUI.java diff --git a/ao-tools/altosui/AltosFlightDisplay.java b/altosui/AltosFlightDisplay.java index d18d1d1f..d18d1d1f 100644 --- a/ao-tools/altosui/AltosFlightDisplay.java +++ b/altosui/AltosFlightDisplay.java diff --git a/ao-tools/altosui/AltosFlightInfoTableModel.java b/altosui/AltosFlightInfoTableModel.java index e23eff68..e23eff68 100644 --- a/ao-tools/altosui/AltosFlightInfoTableModel.java +++ b/altosui/AltosFlightInfoTableModel.java diff --git a/ao-tools/altosui/AltosFlightReader.java b/altosui/AltosFlightReader.java index 3d59de9a..3d59de9a 100644 --- a/ao-tools/altosui/AltosFlightReader.java +++ b/altosui/AltosFlightReader.java diff --git a/ao-tools/altosui/AltosFlightStatus.java b/altosui/AltosFlightStatus.java index 59c9e9db..59c9e9db 100644 --- a/ao-tools/altosui/AltosFlightStatus.java +++ b/altosui/AltosFlightStatus.java diff --git a/ao-tools/altosui/AltosFlightStatusTableModel.java b/altosui/AltosFlightStatusTableModel.java index 4c24b6ac..4c24b6ac 100644 --- a/ao-tools/altosui/AltosFlightStatusTableModel.java +++ b/altosui/AltosFlightStatusTableModel.java diff --git a/ao-tools/altosui/AltosFlightUI.java b/altosui/AltosFlightUI.java index 7fcfb8be..7fcfb8be 100644 --- a/ao-tools/altosui/AltosFlightUI.java +++ b/altosui/AltosFlightUI.java diff --git a/ao-tools/altosui/AltosGPS.java b/altosui/AltosGPS.java index 83821842..83821842 100644 --- a/ao-tools/altosui/AltosGPS.java +++ b/altosui/AltosGPS.java diff --git a/ao-tools/altosui/AltosGraph.java b/altosui/AltosGraph.java index 58c27979..58c27979 100644 --- a/ao-tools/altosui/AltosGraph.java +++ b/altosui/AltosGraph.java diff --git a/ao-tools/altosui/AltosGraphTime.java b/altosui/AltosGraphTime.java index a5451280..a5451280 100644 --- a/ao-tools/altosui/AltosGraphTime.java +++ b/altosui/AltosGraphTime.java diff --git a/ao-tools/altosui/AltosGraphUI.java b/altosui/AltosGraphUI.java index cd158651..cd158651 100644 --- a/ao-tools/altosui/AltosGraphUI.java +++ b/altosui/AltosGraphUI.java diff --git a/ao-tools/altosui/AltosGreatCircle.java b/altosui/AltosGreatCircle.java index fb1b6ab3..fb1b6ab3 100644 --- a/ao-tools/altosui/AltosGreatCircle.java +++ b/altosui/AltosGreatCircle.java diff --git a/ao-tools/altosui/AltosHexfile.java b/altosui/AltosHexfile.java index 19e35ae1..19e35ae1 100644 --- a/ao-tools/altosui/AltosHexfile.java +++ b/altosui/AltosHexfile.java diff --git a/ao-tools/altosui/AltosIgnite.java b/altosui/AltosIgnite.java index 3cbd8a75..3cbd8a75 100644 --- a/ao-tools/altosui/AltosIgnite.java +++ b/altosui/AltosIgnite.java diff --git a/ao-tools/altosui/AltosIgniteUI.java b/altosui/AltosIgniteUI.java index d542729c..d542729c 100644 --- a/ao-tools/altosui/AltosIgniteUI.java +++ b/altosui/AltosIgniteUI.java diff --git a/ao-tools/altosui/AltosInfoTable.java b/altosui/AltosInfoTable.java index 723f8301..723f8301 100644 --- a/ao-tools/altosui/AltosInfoTable.java +++ b/altosui/AltosInfoTable.java diff --git a/ao-tools/altosui/AltosKML.java b/altosui/AltosKML.java index d586033f..d586033f 100644 --- a/ao-tools/altosui/AltosKML.java +++ b/altosui/AltosKML.java diff --git a/ao-tools/altosui/AltosLanded.java b/altosui/AltosLanded.java index d34efe6d..d34efe6d 100644 --- a/ao-tools/altosui/AltosLanded.java +++ b/altosui/AltosLanded.java diff --git a/ao-tools/altosui/AltosLed.java b/altosui/AltosLed.java index e08e9960..e08e9960 100644 --- a/ao-tools/altosui/AltosLed.java +++ b/altosui/AltosLed.java diff --git a/ao-tools/altosui/AltosLights.java b/altosui/AltosLights.java index 2fa38412..2fa38412 100644 --- a/ao-tools/altosui/AltosLights.java +++ b/altosui/AltosLights.java diff --git a/ao-tools/altosui/AltosLine.java b/altosui/AltosLine.java index 86e9d4c6..86e9d4c6 100644 --- a/ao-tools/altosui/AltosLine.java +++ b/altosui/AltosLine.java diff --git a/ao-tools/altosui/AltosLog.java b/altosui/AltosLog.java index dd147d21..dd147d21 100644 --- a/ao-tools/altosui/AltosLog.java +++ b/altosui/AltosLog.java diff --git a/ao-tools/altosui/AltosPad.java b/altosui/AltosPad.java index 66954347..66954347 100644 --- a/ao-tools/altosui/AltosPad.java +++ b/altosui/AltosPad.java diff --git a/ao-tools/altosui/AltosParse.java b/altosui/AltosParse.java index fbfcaaee..fbfcaaee 100644 --- a/ao-tools/altosui/AltosParse.java +++ b/altosui/AltosParse.java diff --git a/ao-tools/altosui/AltosPreferences.java b/altosui/AltosPreferences.java index e2a3df3b..e2a3df3b 100644 --- a/ao-tools/altosui/AltosPreferences.java +++ b/altosui/AltosPreferences.java diff --git a/ao-tools/altosui/AltosReader.java b/altosui/AltosReader.java index b9280a0c..b9280a0c 100644 --- a/ao-tools/altosui/AltosReader.java +++ b/altosui/AltosReader.java diff --git a/ao-tools/altosui/AltosRecord.java b/altosui/AltosRecord.java index 1160a273..1160a273 100644 --- a/ao-tools/altosui/AltosRecord.java +++ b/altosui/AltosRecord.java diff --git a/ao-tools/altosui/AltosRecordIterable.java b/altosui/AltosRecordIterable.java index a7df92d1..a7df92d1 100644 --- a/ao-tools/altosui/AltosRecordIterable.java +++ b/altosui/AltosRecordIterable.java diff --git a/ao-tools/altosui/AltosReplayReader.java b/altosui/AltosReplayReader.java index 4e5e1d93..4e5e1d93 100644 --- a/ao-tools/altosui/AltosReplayReader.java +++ b/altosui/AltosReplayReader.java diff --git a/ao-tools/altosui/AltosRomconfig.java b/altosui/AltosRomconfig.java index 55056b5e..55056b5e 100644 --- a/ao-tools/altosui/AltosRomconfig.java +++ b/altosui/AltosRomconfig.java diff --git a/ao-tools/altosui/AltosRomconfigUI.java b/altosui/AltosRomconfigUI.java index e1dc974e..e1dc974e 100644 --- a/ao-tools/altosui/AltosRomconfigUI.java +++ b/altosui/AltosRomconfigUI.java diff --git a/ao-tools/altosui/AltosSerial.java b/altosui/AltosSerial.java index b19143e5..b19143e5 100644 --- a/ao-tools/altosui/AltosSerial.java +++ b/altosui/AltosSerial.java diff --git a/ao-tools/altosui/AltosSerialInUseException.java b/altosui/AltosSerialInUseException.java index 4b108c7c..4b108c7c 100644 --- a/ao-tools/altosui/AltosSerialInUseException.java +++ b/altosui/AltosSerialInUseException.java diff --git a/ao-tools/altosui/AltosSerialMonitor.java b/altosui/AltosSerialMonitor.java index ad0e9295..ad0e9295 100644 --- a/ao-tools/altosui/AltosSerialMonitor.java +++ b/altosui/AltosSerialMonitor.java diff --git a/ao-tools/altosui/AltosSiteMap.java b/altosui/AltosSiteMap.java index d4a4cbf4..d4a4cbf4 100644 --- a/ao-tools/altosui/AltosSiteMap.java +++ b/altosui/AltosSiteMap.java diff --git a/ao-tools/altosui/AltosSiteMapCache.java b/altosui/AltosSiteMapCache.java index 2e62cc45..2e62cc45 100644 --- a/ao-tools/altosui/AltosSiteMapCache.java +++ b/altosui/AltosSiteMapCache.java diff --git a/ao-tools/altosui/AltosSiteMapTile.java b/altosui/AltosSiteMapTile.java index 8301f42b..8301f42b 100644 --- a/ao-tools/altosui/AltosSiteMapTile.java +++ b/altosui/AltosSiteMapTile.java diff --git a/ao-tools/altosui/AltosState.java b/altosui/AltosState.java index ec499d5a..ec499d5a 100644 --- a/ao-tools/altosui/AltosState.java +++ b/altosui/AltosState.java diff --git a/ao-tools/altosui/AltosTelemetry.java b/altosui/AltosTelemetry.java index bdb6466a..bdb6466a 100644 --- a/ao-tools/altosui/AltosTelemetry.java +++ b/altosui/AltosTelemetry.java diff --git a/ao-tools/altosui/AltosTelemetryIterable.java b/altosui/AltosTelemetryIterable.java index a71ab872..a71ab872 100644 --- a/ao-tools/altosui/AltosTelemetryIterable.java +++ b/altosui/AltosTelemetryIterable.java diff --git a/ao-tools/altosui/AltosTelemetryReader.java b/altosui/AltosTelemetryReader.java index 6c5a9397..6c5a9397 100644 --- a/ao-tools/altosui/AltosTelemetryReader.java +++ b/altosui/AltosTelemetryReader.java diff --git a/ao-tools/altosui/AltosUI.app/Contents/Info.plist b/altosui/AltosUI.app/Contents/Info.plist index 97b1b59c..97b1b59c 100644 --- a/ao-tools/altosui/AltosUI.app/Contents/Info.plist +++ b/altosui/AltosUI.app/Contents/Info.plist diff --git a/ao-tools/altosui/AltosUI.app/Contents/MacOS/JavaApplicationStub b/altosui/AltosUI.app/Contents/MacOS/JavaApplicationStub Binary files differindex c661d3e1..c661d3e1 100755 --- a/ao-tools/altosui/AltosUI.app/Contents/MacOS/JavaApplicationStub +++ b/altosui/AltosUI.app/Contents/MacOS/JavaApplicationStub diff --git a/ao-tools/altosui/AltosUI.app/Contents/PkgInfo b/altosui/AltosUI.app/Contents/PkgInfo index 8a43480f..8a43480f 100644 --- a/ao-tools/altosui/AltosUI.app/Contents/PkgInfo +++ b/altosui/AltosUI.app/Contents/PkgInfo diff --git a/ao-tools/altosui/AltosUI.app/Contents/Resources/AltosUIIcon.icns b/altosui/AltosUI.app/Contents/Resources/AltosUIIcon.icns Binary files differindex fe49f362..fe49f362 100644 --- a/ao-tools/altosui/AltosUI.app/Contents/Resources/AltosUIIcon.icns +++ b/altosui/AltosUI.app/Contents/Resources/AltosUIIcon.icns diff --git a/ao-tools/altosui/AltosUI.java b/altosui/AltosUI.java index 94c4dd2a..94c4dd2a 100644 --- a/ao-tools/altosui/AltosUI.java +++ b/altosui/AltosUI.java diff --git a/ao-tools/altosui/AltosVoice.java b/altosui/AltosVoice.java index ac13ee14..ac13ee14 100644 --- a/ao-tools/altosui/AltosVoice.java +++ b/altosui/AltosVoice.java diff --git a/ao-tools/altosui/AltosWriter.java b/altosui/AltosWriter.java index a172dff0..a172dff0 100644 --- a/ao-tools/altosui/AltosWriter.java +++ b/altosui/AltosWriter.java diff --git a/ao-tools/altosui/GrabNDrag.java b/altosui/GrabNDrag.java index e6b87b58..e6b87b58 100644 --- a/ao-tools/altosui/GrabNDrag.java +++ b/altosui/GrabNDrag.java diff --git a/ao-tools/altosui/Instdrv/NSIS/Contrib/InstDrv/Example.nsi b/altosui/Instdrv/NSIS/Contrib/InstDrv/Example.nsi index 3ed821eb..3ed821eb 100644 --- a/ao-tools/altosui/Instdrv/NSIS/Contrib/InstDrv/Example.nsi +++ b/altosui/Instdrv/NSIS/Contrib/InstDrv/Example.nsi diff --git a/ao-tools/altosui/Instdrv/NSIS/Contrib/InstDrv/InstDrv-Test.exe b/altosui/Instdrv/NSIS/Contrib/InstDrv/InstDrv-Test.exe Binary files differindex 615bae15..615bae15 100644 --- a/ao-tools/altosui/Instdrv/NSIS/Contrib/InstDrv/InstDrv-Test.exe +++ b/altosui/Instdrv/NSIS/Contrib/InstDrv/InstDrv-Test.exe diff --git a/ao-tools/altosui/Instdrv/NSIS/Contrib/InstDrv/InstDrv.c b/altosui/Instdrv/NSIS/Contrib/InstDrv/InstDrv.c index efe866e9..efe866e9 100644 --- a/ao-tools/altosui/Instdrv/NSIS/Contrib/InstDrv/InstDrv.c +++ b/altosui/Instdrv/NSIS/Contrib/InstDrv/InstDrv.c diff --git a/ao-tools/altosui/Instdrv/NSIS/Contrib/InstDrv/InstDrv.dsp b/altosui/Instdrv/NSIS/Contrib/InstDrv/InstDrv.dsp index 874e66c7..874e66c7 100644 --- a/ao-tools/altosui/Instdrv/NSIS/Contrib/InstDrv/InstDrv.dsp +++ b/altosui/Instdrv/NSIS/Contrib/InstDrv/InstDrv.dsp diff --git a/ao-tools/altosui/Instdrv/NSIS/Contrib/InstDrv/InstDrv.dsw b/altosui/Instdrv/NSIS/Contrib/InstDrv/InstDrv.dsw index b3d02f0e..b3d02f0e 100644 --- a/ao-tools/altosui/Instdrv/NSIS/Contrib/InstDrv/InstDrv.dsw +++ b/altosui/Instdrv/NSIS/Contrib/InstDrv/InstDrv.dsw diff --git a/ao-tools/altosui/Instdrv/NSIS/Contrib/InstDrv/Readme.txt b/altosui/Instdrv/NSIS/Contrib/InstDrv/Readme.txt index e5877aa6..e5877aa6 100644 --- a/ao-tools/altosui/Instdrv/NSIS/Contrib/InstDrv/Readme.txt +++ b/altosui/Instdrv/NSIS/Contrib/InstDrv/Readme.txt diff --git a/ao-tools/altosui/Instdrv/NSIS/Contrib/InstDrv/ircomm2k.inf b/altosui/Instdrv/NSIS/Contrib/InstDrv/ircomm2k.inf index ccda1d87..ccda1d87 100644 --- a/ao-tools/altosui/Instdrv/NSIS/Contrib/InstDrv/ircomm2k.inf +++ b/altosui/Instdrv/NSIS/Contrib/InstDrv/ircomm2k.inf diff --git a/ao-tools/altosui/Instdrv/NSIS/Contrib/InstDrv/ircomm2k.sys b/altosui/Instdrv/NSIS/Contrib/InstDrv/ircomm2k.sys Binary files differindex 7882583b..7882583b 100644 --- a/ao-tools/altosui/Instdrv/NSIS/Contrib/InstDrv/ircomm2k.sys +++ b/altosui/Instdrv/NSIS/Contrib/InstDrv/ircomm2k.sys diff --git a/ao-tools/altosui/Instdrv/NSIS/Plugins/InstDrv.dll b/altosui/Instdrv/NSIS/Plugins/InstDrv.dll Binary files differindex 482e955e..482e955e 100644 --- a/ao-tools/altosui/Instdrv/NSIS/Plugins/InstDrv.dll +++ b/altosui/Instdrv/NSIS/Plugins/InstDrv.dll diff --git a/ao-tools/altosui/Makefile-standalone b/altosui/Makefile-standalone index a95a5aa8..a95a5aa8 100644 --- a/ao-tools/altosui/Makefile-standalone +++ b/altosui/Makefile-standalone diff --git a/ao-tools/altosui/Makefile.am b/altosui/Makefile.am index 93a43b12..e2ff55af 100644 --- a/ao-tools/altosui/Makefile.am +++ b/altosui/Makefile.am @@ -1,3 +1,4 @@ +SUBDIRS=libaltos JAVAROOT=classes AM_JAVACFLAGS=-encoding UTF-8 @@ -5,7 +6,7 @@ man_MANS=altosui.1 altoslibdir=$(libdir)/altos -CLASSPATH_ENV=mkdir -p $(JAVAROOT); CLASSPATH=".:classes:../libaltos:$(FREETTS)/*:/usr/share/java/*" +CLASSPATH_ENV=mkdir -p $(JAVAROOT); CLASSPATH=".:classes:libaltos:$(FREETTS)/*:/usr/share/java/*" bin_SCRIPTS=altosui @@ -190,13 +191,13 @@ $(JAR): classaltosui.stamp Manifest.txt $(JAVA_ICON) jar cfm $@ Manifest.txt \ $(ICONJAR) \ -C classes altosui \ - -C ../libaltos libaltosJNI + -C libaltos libaltosJNI $(FATJAR): classaltosui.stamp Manifest-fat.txt $(FREETTS_CLASS) $(JFREECHART_CLASS) $(JCOMMON_CLASS) $(LIBALTOS) $(JAVA_ICON) jar cfm $@ Manifest-fat.txt \ $(ICONJAR) \ -C classes altosui \ - -C ../libaltos libaltosJNI + -C libaltos libaltosJNI Manifest.txt: Makefile echo 'Main-Class: altosui.AltosUI' > $@ @@ -213,25 +214,25 @@ altosui: Makefile altosui-test: Makefile echo "#!/bin/sh" > $@ - echo 'exec java -cp "$(FREETTS)/*:$(JFREECHART)/*:$(JCOMMON)/*" -Djava.library.path="../libaltos/.libs" -jar altosui.jar "$$@"' >> $@ + echo 'exec java -cp "$(FREETTS)/*:$(JFREECHART)/*:$(JCOMMON)/*" -Djava.library.path="libaltos/.libs" -jar altosui.jar "$$@"' >> $@ chmod +x $@ altosui-jdb: Makefile echo "#!/bin/sh" > $@ - echo 'exec jdb -classpath "classes:../libaltos:$(FREETTS)/*:$(JFREECHART)/*:$(JCOMMON)/*" -Djava.library.path="../libaltos/.libs" altosui/AltosUI "$$@"' >> $@ + echo 'exec jdb -classpath "classes:libaltos:$(FREETTS)/*:$(JFREECHART)/*:$(JCOMMON)/*" -Djava.library.path="libaltos/.libs" altosui/AltosUI "$$@"' >> $@ chmod +x $@ libaltos.so: -rm -f "$@" - $(LN_S) ../libaltos/.libs/"$@" . + $(LN_S) libaltos/.libs/"$@" . libaltos.dylib: -rm -f "$@" - $(LN_S) ../libaltos/"$@" . + $(LN_S) libaltos/"$@" . altos.dll: -rm -f "$@" - $(LN_S) ../libaltos/"$@" . + $(LN_S) libaltos/"$@" . $(FREETTS_CLASS): -rm -f "$@" diff --git a/ao-tools/altosui/altos-windows.nsi b/altosui/altos-windows.nsi index 37777fd6..37777fd6 100644 --- a/ao-tools/altosui/altos-windows.nsi +++ b/altosui/altos-windows.nsi diff --git a/ao-tools/altosui/altosui-fat b/altosui/altosui-fat index 95b1c051..95b1c051 100755 --- a/ao-tools/altosui/altosui-fat +++ b/altosui/altosui-fat diff --git a/ao-tools/altosui/altosui.1 b/altosui/altosui.1 index 57fa4489..57fa4489 100644 --- a/ao-tools/altosui/altosui.1 +++ b/altosui/altosui.1 diff --git a/ao-tools/altosui/altusmetrum.jpg b/altosui/altusmetrum.jpg Binary files differindex 04027921..04027921 100644 --- a/ao-tools/altosui/altusmetrum.jpg +++ b/altosui/altusmetrum.jpg diff --git a/ao-tools/libaltos/.gitignore b/altosui/libaltos/.gitignore index c490e6f8..c490e6f8 100644 --- a/ao-tools/libaltos/.gitignore +++ b/altosui/libaltos/.gitignore diff --git a/ao-tools/libaltos/Makefile-standalone b/altosui/libaltos/Makefile-standalone index 4e438050..4e438050 100644 --- a/ao-tools/libaltos/Makefile-standalone +++ b/altosui/libaltos/Makefile-standalone diff --git a/ao-tools/libaltos/Makefile.am b/altosui/libaltos/Makefile.am index 388d2104..388d2104 100644 --- a/ao-tools/libaltos/Makefile.am +++ b/altosui/libaltos/Makefile.am diff --git a/ao-tools/libaltos/altos.dll b/altosui/libaltos/altos.dll Binary files differindex 28e9b4ad..28e9b4ad 100755 --- a/ao-tools/libaltos/altos.dll +++ b/altosui/libaltos/altos.dll diff --git a/ao-tools/libaltos/cjnitest.c b/altosui/libaltos/cjnitest.c index c6d6e069..c6d6e069 100644 --- a/ao-tools/libaltos/cjnitest.c +++ b/altosui/libaltos/cjnitest.c diff --git a/ao-tools/libaltos/libaltos.c b/altosui/libaltos/libaltos.c index 465f0ac8..465f0ac8 100644 --- a/ao-tools/libaltos/libaltos.c +++ b/altosui/libaltos/libaltos.c diff --git a/ao-tools/libaltos/libaltos.dylib b/altosui/libaltos/libaltos.dylib Binary files differindex 89aa12e7..89aa12e7 100755 --- a/ao-tools/libaltos/libaltos.dylib +++ b/altosui/libaltos/libaltos.dylib diff --git a/ao-tools/libaltos/libaltos.h b/altosui/libaltos/libaltos.h index 6e94899e..6e94899e 100644 --- a/ao-tools/libaltos/libaltos.h +++ b/altosui/libaltos/libaltos.h diff --git a/ao-tools/libaltos/libaltos.i0 b/altosui/libaltos/libaltos.i0 index d06468f5..d06468f5 100644 --- a/ao-tools/libaltos/libaltos.i0 +++ b/altosui/libaltos/libaltos.i0 diff --git a/ao-tools/Makefile.am b/ao-tools/Makefile.am index 54dc777a..2850e909 100644 --- a/ao-tools/Makefile.am +++ b/ao-tools/Makefile.am @@ -1 +1 @@ -SUBDIRS=lib ao-rawload ao-dbg ao-dumplog ao-bitbang ao-eeprom ao-list ao-load ao-postflight ao-view libaltos altosui +SUBDIRS=lib ao-rawload ao-dbg ao-dumplog ao-bitbang ao-eeprom ao-list ao-load ao-postflight ao-view diff --git a/configure.ac b/configure.ac index 903c5765..22af00ab 100644 --- a/configure.ac +++ b/configure.ac @@ -133,6 +133,8 @@ PKG_CHECK_MODULES([SNDFILE], [sndfile]) AC_OUTPUT([ Makefile +altosui/Makefile +altosui/libaltos/Makefile ao-tools/Makefile ao-tools/lib/Makefile ao-tools/ao-rawload/Makefile @@ -144,8 +146,6 @@ ao-tools/ao-list/Makefile ao-tools/ao-load/Makefile ao-tools/ao-postflight/Makefile ao-tools/ao-view/Makefile -ao-tools/libaltos/Makefile -ao-tools/altosui/Makefile ao-utils/Makefile src/Version ]) |
