diff options
| -rw-r--r-- | altosui/AltosUI.java | 2 | ||||
| -rw-r--r-- | altosui/Makefile.am | 4 | ||||
| -rw-r--r-- | altosuilib/AltosEepromDelete.java (renamed from altosui/AltosEepromDelete.java) | 3 | ||||
| -rw-r--r-- | altosuilib/AltosEepromManage.java (renamed from altosui/AltosEepromManage.java) | 9 | ||||
| -rw-r--r-- | altosuilib/AltosEepromMonitor.java (renamed from altosui/AltosEepromMonitor.java) | 3 | ||||
| -rw-r--r-- | altosuilib/AltosEepromMonitorUI.java (renamed from altosui/AltosEepromMonitorUI.java) | 3 | ||||
| -rw-r--r-- | altosuilib/AltosEepromSelect.java (renamed from altosui/AltosEepromSelect.java) | 3 | ||||
| -rw-r--r-- | altosuilib/Makefile.am | 4 | ||||
| -rw-r--r-- | telegps/TeleGPS.java | 1 |
9 files changed, 14 insertions, 18 deletions
diff --git a/altosui/AltosUI.java b/altosui/AltosUI.java index ad7964e9..302f623f 100644 --- a/altosui/AltosUI.java +++ b/altosui/AltosUI.java @@ -306,7 +306,7 @@ public class AltosUI extends AltosUIFrame { * a TeleDongle over the packet link */ private void SaveFlightData() { - new AltosEepromManage(AltosUI.this); + new AltosEepromManage(AltosUI.this, AltosLib.product_any); } /* Load a flight log file and write out a CSV file containing diff --git a/altosui/Makefile.am b/altosui/Makefile.am index cd6af84b..c834646d 100644 --- a/altosui/Makefile.am +++ b/altosui/Makefile.am @@ -22,10 +22,6 @@ altosui_JAVA = \ AltosConfigTDUI.java \ AltosCSVUI.java \ AltosDescent.java \ - AltosEepromDelete.java \ - AltosEepromManage.java \ - AltosEepromMonitorUI.java \ - AltosEepromSelect.java \ AltosFlashUI.java \ AltosFlightInfoTableModel.java \ AltosFlightStatsTable.java \ diff --git a/altosui/AltosEepromDelete.java b/altosuilib/AltosEepromDelete.java index df2ade78..981daddf 100644 --- a/altosui/AltosEepromDelete.java +++ b/altosuilib/AltosEepromDelete.java @@ -15,13 +15,12 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -package altosui; +package org.altusmetrum.altosuilib_2; import java.awt.event.*; import javax.swing.*; import java.io.*; import java.util.concurrent.*; -import org.altusmetrum.altosuilib_2.*; import org.altusmetrum.altoslib_4.*; public class AltosEepromDelete implements Runnable { diff --git a/altosui/AltosEepromManage.java b/altosuilib/AltosEepromManage.java index aa43ab9e..2b967339 100644 --- a/altosui/AltosEepromManage.java +++ b/altosuilib/AltosEepromManage.java @@ -15,14 +15,13 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -package altosui; +package org.altusmetrum.altosuilib_2; import java.awt.event.*; import javax.swing.*; import java.io.*; import java.util.concurrent.*; import org.altusmetrum.altoslib_4.*; -import org.altusmetrum.altosuilib_2.*; public class AltosEepromManage implements ActionListener { @@ -205,19 +204,19 @@ public class AltosEepromManage implements ActionListener { } } - public AltosEepromManage(JFrame given_frame) { + public AltosEepromManage(JFrame given_frame, int product) { //boolean running = false; frame = given_frame; - device = AltosDeviceUIDialog.show(frame, Altos.product_any); + device = AltosDeviceUIDialog.show(frame, product); remote = false; if (device != null) { try { serial_line = new AltosSerial(device); - if (device.matchProduct(Altos.product_basestation)) + if (device.matchProduct(AltosLib.product_basestation)) remote = true; serial_line.set_frame(frame); diff --git a/altosui/AltosEepromMonitor.java b/altosuilib/AltosEepromMonitor.java index ce1c1625..b1e85622 100644 --- a/altosui/AltosEepromMonitor.java +++ b/altosuilib/AltosEepromMonitor.java @@ -15,12 +15,11 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -package altosui; +package org.altusmetrum.altosuilib_2; import java.awt.*; import java.awt.event.*; import javax.swing.*; -import org.altusmetrum.altosuilib_2.*; public class AltosEepromMonitor extends AltosUIDialog { diff --git a/altosui/AltosEepromMonitorUI.java b/altosuilib/AltosEepromMonitorUI.java index c1c1eb25..02c71cd9 100644 --- a/altosui/AltosEepromMonitorUI.java +++ b/altosuilib/AltosEepromMonitorUI.java @@ -15,12 +15,11 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -package altosui; +package org.altusmetrum.altosuilib_2; import java.awt.*; import java.awt.event.*; import javax.swing.*; -import org.altusmetrum.altosuilib_2.*; import org.altusmetrum.altoslib_4.*; public class AltosEepromMonitorUI extends AltosUIDialog implements AltosEepromMonitor { diff --git a/altosui/AltosEepromSelect.java b/altosuilib/AltosEepromSelect.java index 66a197c9..293d3045 100644 --- a/altosui/AltosEepromSelect.java +++ b/altosuilib/AltosEepromSelect.java @@ -15,14 +15,13 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -package altosui; +package org.altusmetrum.altosuilib_2; import javax.swing.*; import javax.swing.border.*; import java.awt.*; import java.awt.event.*; import org.altusmetrum.altoslib_4.*; -import org.altusmetrum.altosuilib_2.*; class AltosEepromItem implements ActionListener { AltosEepromLog log; diff --git a/altosuilib/Makefile.am b/altosuilib/Makefile.am index b4c4f79f..4dc4c47f 100644 --- a/altosuilib/Makefile.am +++ b/altosuilib/Makefile.am @@ -46,6 +46,10 @@ altosuilib_JAVA = \ AltosSerialInUseException.java \ AltosConfigFreqUI.java \ AltosScanUI.java \ + AltosEepromDelete.java \ + AltosEepromManage.java \ + AltosEepromMonitorUI.java \ + AltosEepromSelect.java \ AltosBTDevice.java \ AltosBTDeviceIterator.java \ AltosBTManage.java \ diff --git a/telegps/TeleGPS.java b/telegps/TeleGPS.java index 34509e4e..ad46fbdd 100644 --- a/telegps/TeleGPS.java +++ b/telegps/TeleGPS.java @@ -217,6 +217,7 @@ public class TeleGPS extends AltosUIFrame implements AltosFlightDisplay, AltosFo } void download(){ + new AltosEepromManage(this, AltosLib.product_telegps); } void configure() { |