From 5f2029bd4e31289fb03e6af39abdbc16f8b8fa78 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Tue, 10 Jun 2014 10:14:07 -0700 Subject: [PATCH] altoslib/altosui/telegps: Switch TeleGPS config to motion/interval TeleGPS had configurable boost-detect values; those have been replaced with a configurable stop-tracking motion limit and logging/telemetry interval value. Signed-off-by: Keith Packard --- altoslib/AltosConfigData.java | 35 ++++--- altoslib/AltosConfigValues.java | 24 +++-- altosui/AltosConfigUI.java | 165 ++++++++++++-------------------- telegps/TeleGPSConfigUI.java | 165 ++++++++++++-------------------- 4 files changed, 160 insertions(+), 229 deletions(-) diff --git a/altoslib/AltosConfigData.java b/altoslib/AltosConfigData.java index 9462ae6f..563bef4b 100644 --- a/altoslib/AltosConfigData.java +++ b/altoslib/AltosConfigData.java @@ -82,7 +82,8 @@ public class AltosConfigData implements Iterable { public int stored_flight; /* HAS_TRACKER */ - public int[] tracker_distances; + public int tracker_motion; + public int tracker_interval; public static String get_string(String line, String label) throws ParseException { if (line.startsWith(label)) { @@ -107,15 +108,15 @@ public class AltosConfigData implements Iterable { throw new ParseException("mismatch", 0); } - public static int[] get_distances(String line, String label) throws NumberFormatException, ParseException { + public static int[] get_values(String line, String label) throws NumberFormatException, ParseException { if (line.startsWith(label)) { String tail = line.substring(label.length()).trim(); String[] tokens = tail.split("\\s+"); if (tokens.length > 1) { - int[] distances = new int[2]; - distances[0] = Integer.parseInt(tokens[0]); - distances[1] = Integer.parseInt(tokens[1]); - return distances; + int[] values = new int[2]; + values[0] = Integer.parseInt(tokens[0]); + values[1] = Integer.parseInt(tokens[1]); + return values; } } throw new ParseException("mismatch", 0); @@ -250,7 +251,8 @@ public class AltosConfigData implements Iterable { beep = -1; - tracker_distances = null; + tracker_motion = -1; + tracker_interval = -1; storage_size = -1; storage_erase_unit = -1; @@ -333,7 +335,11 @@ public class AltosConfigData implements Iterable { try { beep = get_int(line, "Beeper setting:"); } catch (Exception e) {} /* HAS_TRACKER */ - try { tracker_distances = get_distances(line, "Tracker setting:"); } catch (Exception e) {} + try { + int[] values = get_values(line, "Tracker setting:"); + tracker_motion = values[0]; + tracker_interval = values[1]; + } catch (Exception e) {} /* Storage info replies */ try { storage_size = get_int(line, "Storage size:"); } catch (Exception e) {} @@ -453,8 +459,10 @@ public class AltosConfigData implements Iterable { if (beep >= 0) beep = source.beep(); /* HAS_TRACKER */ - if (tracker_distances != null) - tracker_distances = source.tracker_distances(); + if (tracker_motion >= 0) + tracker_motion = source.tracker_motion(); + if (tracker_interval >= 0) + tracker_interval = source.tracker_interval(); } public void set_values(AltosConfigValues dest) { @@ -494,7 +502,8 @@ public class AltosConfigData implements Iterable { dest.set_pyros(null); dest.set_aprs_interval(aprs_interval); dest.set_beep(beep); - dest.set_tracker_distances(tracker_distances); + dest.set_tracker_motion(tracker_motion); + dest.set_tracker_interval(tracker_interval); } public void save(AltosLink link, boolean remote) throws InterruptedException, TimeoutException { @@ -566,8 +575,8 @@ public class AltosConfigData implements Iterable { link.printf("c b %d\n", beep); /* HAS_TRACKER */ - if (tracker_distances != null) - link.printf("c t %d %d\n", tracker_distances[0], tracker_distances[1]); + if (tracker_motion >= 0 && tracker_interval >= 0) + link.printf("c t %d %d\n", tracker_motion, tracker_interval); link.printf("c w\n"); link.flush_output(); diff --git a/altoslib/AltosConfigValues.java b/altoslib/AltosConfigValues.java index 6ca1f5c6..778f1222 100644 --- a/altoslib/AltosConfigValues.java +++ b/altoslib/AltosConfigValues.java @@ -27,23 +27,23 @@ public interface AltosConfigValues { public abstract void set_main_deploy(int new_main_deploy); - public abstract int main_deploy(); + public abstract int main_deploy() throws AltosConfigDataException; public abstract void set_apogee_delay(int new_apogee_delay); - public abstract int apogee_delay(); + public abstract int apogee_delay() throws AltosConfigDataException; public abstract void set_apogee_lockout(int new_apogee_lockout); - public abstract int apogee_lockout(); + public abstract int apogee_lockout() throws AltosConfigDataException; public abstract void set_radio_frequency(double new_radio_frequency); - public abstract double radio_frequency(); + public abstract double radio_frequency() throws AltosConfigDataException; public abstract void set_radio_calibration(int new_radio_calibration); - public abstract int radio_calibration(); + public abstract int radio_calibration() throws AltosConfigDataException; public abstract void set_radio_enable(int new_radio_enable); @@ -57,7 +57,7 @@ public interface AltosConfigValues { public abstract void set_flight_log_max_enabled(boolean enable); - public abstract int flight_log_max(); + public abstract int flight_log_max() throws AltosConfigDataException; public abstract void set_flight_log_max_limit(int flight_log_max_limit); @@ -73,15 +73,19 @@ public interface AltosConfigValues { public abstract AltosPyro[] pyros() throws AltosConfigDataException; - public abstract int aprs_interval(); + public abstract int aprs_interval() throws AltosConfigDataException; public abstract void set_aprs_interval(int new_aprs_interval); - public abstract int beep(); + public abstract int beep() throws AltosConfigDataException; public abstract void set_beep(int new_beep); - public abstract int[] tracker_distances(); + public abstract int tracker_motion() throws AltosConfigDataException; - public abstract void set_tracker_distances(int[] tracker_distances); + public abstract void set_tracker_motion(int tracker_motion); + + public abstract int tracker_interval() throws AltosConfigDataException; + + public abstract void set_tracker_interval(int tracker_motion); } diff --git a/altosui/AltosConfigUI.java b/altosui/AltosConfigUI.java index f936d92c..ee54e31e 100644 --- a/altosui/AltosConfigUI.java +++ b/altosui/AltosConfigUI.java @@ -46,8 +46,8 @@ public class AltosConfigUI JLabel pad_orientation_label; JLabel callsign_label; JLabel beep_label; - JLabel tracker_horiz_label; - JLabel tracker_vert_label; + JLabel tracker_motion_label; + JLabel tracker_interval_label; public boolean dirty; @@ -67,8 +67,8 @@ public class AltosConfigUI JComboBox pad_orientation_value; JTextField callsign_value; JComboBox beep_value; - JComboBox tracker_horiz_value; - JComboBox tracker_vert_value; + JComboBox tracker_motion_value; + JComboBox tracker_interval_value; JButton pyro; @@ -123,32 +123,25 @@ public class AltosConfigUI "Antenna Down", }; - static String[] tracker_horiz_values_m = { - "250", - "500", - "1000", - "2000" - }; - - static String[] tracker_horiz_values_ft = { - "500", - "1000", - "2500", - "5000" + static String[] tracker_motion_values_m = { + "2", + "5", + "10", + "25", }; - static String[] tracker_vert_values_m = { - "25", + static String[] tracker_motion_values_ft = { + "5", + "20", "50", - "100", - "200" + "100" }; - static String[] tracker_vert_values_ft = { - "50", - "100", - "250", - "500" + static String[] tracker_interval_values = { + "1", + "2", + "5", + "10" }; /* A window listener to catch closing events and tell the config code */ @@ -644,8 +637,8 @@ public class AltosConfigUI c.anchor = GridBagConstraints.LINE_START; c.insets = il; c.ipady = 5; - tracker_horiz_label = new JLabel(get_tracker_horiz_label()); - pane.add(tracker_horiz_label, c); + tracker_motion_label = new JLabel(get_tracker_motion_label()); + pane.add(tracker_motion_label, c); c = new GridBagConstraints(); c.gridx = 4; c.gridy = row; @@ -655,10 +648,10 @@ public class AltosConfigUI c.anchor = GridBagConstraints.LINE_START; c.insets = ir; c.ipady = 5; - tracker_horiz_value = new JComboBox(tracker_horiz_values()); - tracker_horiz_value.setEditable(true); - tracker_horiz_value.addItemListener(this); - pane.add(tracker_horiz_value, c); + tracker_motion_value = new JComboBox(tracker_motion_values()); + tracker_motion_value.setEditable(true); + tracker_motion_value.addItemListener(this); + pane.add(tracker_motion_value, c); row++; /* Tracker triger vert distances */ @@ -669,8 +662,8 @@ public class AltosConfigUI c.anchor = GridBagConstraints.LINE_START; c.insets = il; c.ipady = 5; - tracker_vert_label = new JLabel(get_tracker_vert_label()); - pane.add(tracker_vert_label, c); + tracker_interval_label = new JLabel("Position Reporting Interval(s):"); + pane.add(tracker_interval_label, c); c = new GridBagConstraints(); c.gridx = 4; c.gridy = row; @@ -680,10 +673,10 @@ public class AltosConfigUI c.anchor = GridBagConstraints.LINE_START; c.insets = ir; c.ipady = 5; - tracker_vert_value = new JComboBox(tracker_vert_values()); - tracker_vert_value.setEditable(true); - tracker_vert_value.addItemListener(this); - pane.add(tracker_vert_value, c); + tracker_interval_value = new JComboBox(tracker_interval_values); + tracker_interval_value.setEditable(true); + tracker_interval_value.addItemListener(this); + pane.add(tracker_interval_value, c); set_tracker_tool_tip(); row++; @@ -892,18 +885,11 @@ public class AltosConfigUI int m = (int) (AltosConvert.height.parse(v, !imperial_units) + 0.5); set_main_deploy(m); - if (tracker_horiz_value.isEnabled() && tracker_vert_value.isEnabled()) { - String th = tracker_horiz_value.getSelectedItem().toString(); - String tv = tracker_vert_value.getSelectedItem().toString(); - tracker_horiz_label.setText(get_tracker_horiz_label()); - tracker_vert_label.setText(get_tracker_vert_label()); - set_tracker_horiz_values(); - set_tracker_vert_values(); - int[] t = { - (int) (AltosConvert.height.parse(th, !imperial_units) + 0.5), - (int) (AltosConvert.height.parse(tv, !imperial_units) + 0.5) - }; - set_tracker_distances(t); + if (tracker_motion_value.isEnabled()) { + String motion = tracker_motion_value.getSelectedItem().toString(); + tracker_motion_label.setText(get_tracker_motion_label()); + set_tracker_motion_values(); + set_tracker_motion((int) (AltosConvert.height.parse(motion, !imperial_units) + 0.5)); } } @@ -1084,78 +1070,51 @@ public class AltosConfigUI return -1; } - String[] tracker_horiz_values() { + String[] tracker_motion_values() { if (AltosConvert.imperial_units) - return tracker_horiz_values_ft; + return tracker_motion_values_ft; else - return tracker_horiz_values_m; + return tracker_motion_values_m; } - void set_tracker_horiz_values() { - String[] v = tracker_horiz_values(); - while (tracker_horiz_value.getItemCount() > 0) - tracker_horiz_value.removeItemAt(0); + void set_tracker_motion_values() { + String[] v = tracker_motion_values(); + while (tracker_motion_value.getItemCount() > 0) + tracker_motion_value.removeItemAt(0); for (int i = 0; i < v.length; i++) - tracker_horiz_value.addItem(v[i]); - tracker_horiz_value.setMaximumRowCount(v.length); + tracker_motion_value.addItem(v[i]); + tracker_motion_value.setMaximumRowCount(v.length); } - String get_tracker_horiz_label() { - return String.format("Logging Trigger Horizontal (%s):", AltosConvert.height.show_units()); - } - - String[] tracker_vert_values() { - if (AltosConvert.imperial_units) - return tracker_vert_values_ft; - else - return tracker_vert_values_m; - } - - void set_tracker_vert_values() { - String[] v = tracker_vert_values(); - while (tracker_vert_value.getItemCount() > 0) - tracker_vert_value.removeItemAt(0); - for (int i = 0; i < v.length; i++) - tracker_vert_value.addItem(v[i]); - tracker_vert_value.setMaximumRowCount(v.length); + String get_tracker_motion_label() { + return String.format("Logging Trigger Motion (%s):", AltosConvert.height.show_units()); } void set_tracker_tool_tip() { - if (tracker_horiz_value.isEnabled()) - tracker_horiz_value.setToolTipText("How far the device must move before logging is enabled"); + if (tracker_motion_value.isEnabled()) + tracker_motion_value.setToolTipText("How far the device must move before logging"); else - tracker_horiz_value.setToolTipText("This device doesn't disable logging before motion"); - if (tracker_vert_value.isEnabled()) - tracker_vert_value.setToolTipText("How far the device must move before logging is enabled"); + tracker_motion_value.setToolTipText("This device doesn't disable logging when stationary"); + if (tracker_interval_value.isEnabled()) + tracker_interval_value.setToolTipText("How often to report GPS position"); else - tracker_vert_value.setToolTipText("This device doesn't disable logging before motion"); + tracker_interval_value.setToolTipText("This device can't configure interval"); } - String get_tracker_vert_label() { - return String.format("Logging Trigger Vertical (%s):", AltosConvert.height.show_units()); + public void set_tracker_motion(int tracker_motion) { + tracker_motion_value.setSelectedItem(AltosConvert.height.say(tracker_motion)); } - public void set_tracker_distances(int[] tracker_distances) { - if (tracker_distances != null) { - tracker_horiz_value.setSelectedItem(AltosConvert.height.say(tracker_distances[0])); - tracker_vert_value.setSelectedItem(AltosConvert.height.say(tracker_distances[1])); - tracker_horiz_value.setEnabled(true); - tracker_vert_value.setEnabled(true); - } else { - tracker_horiz_value.setEnabled(false); - tracker_vert_value.setEnabled(false); - } + public int tracker_motion() throws AltosConfigDataException { + return (int) AltosConvert.height.parse(tracker_motion_value.getSelectedItem().toString()); } - public int[] tracker_distances() { - if (tracker_horiz_value.isEnabled() && tracker_vert_value.isEnabled()) { - int[] t = { - (int) (AltosConvert.height.parse(tracker_horiz_value.getSelectedItem().toString()) + 0.5), - (int) (AltosConvert.height.parse(tracker_vert_value.getSelectedItem().toString()) + 0.5), - }; - return t; - } - return null; + public void set_tracker_interval(int tracker_interval) { + tracker_interval_value.setSelectedItem(String.format("%d", tracker_interval)); + } + + public int tracker_interval() throws AltosConfigDataException { + return parse_int ("tracker interval", tracker_interval_value.getSelectedItem().toString(), false); } public void set_pyros(AltosPyro[] new_pyros) { diff --git a/telegps/TeleGPSConfigUI.java b/telegps/TeleGPSConfigUI.java index 03666036..325ca7b9 100644 --- a/telegps/TeleGPSConfigUI.java +++ b/telegps/TeleGPSConfigUI.java @@ -40,8 +40,8 @@ public class TeleGPSConfigUI JLabel aprs_interval_label; JLabel flight_log_max_label; JLabel callsign_label; - JLabel tracker_horiz_label; - JLabel tracker_vert_label; + JLabel tracker_motion_label; + JLabel tracker_interval_label; public boolean dirty; @@ -55,8 +55,8 @@ public class TeleGPSConfigUI JComboBox aprs_interval_value; JComboBox flight_log_max_value; JTextField callsign_value; - JComboBox tracker_horiz_value; - JComboBox tracker_vert_value; + JComboBox tracker_motion_value; + JComboBox tracker_interval_value; JButton save; JButton reset; @@ -72,32 +72,25 @@ public class TeleGPSConfigUI "10" }; - static String[] tracker_horiz_values_m = { - "250", - "500", - "1000", - "2000" - }; - - static String[] tracker_horiz_values_ft = { - "500", - "1000", - "2500", - "5000" + static String[] tracker_motion_values_m = { + "2", + "5", + "10", + "25", }; - static String[] tracker_vert_values_m = { - "25", + static String[] tracker_motion_values_ft = { + "5", + "20", "50", - "100", - "200" + "100" }; - static String[] tracker_vert_values_ft = { - "50", - "100", - "250", - "500" + static String[] tracker_interval_values = { + "1", + "2", + "5", + "10" }; /* A window listener to catch closing events and tell the config code */ @@ -396,8 +389,8 @@ public class TeleGPSConfigUI c.anchor = GridBagConstraints.LINE_START; c.insets = il; c.ipady = 5; - tracker_horiz_label = new JLabel(get_tracker_horiz_label()); - pane.add(tracker_horiz_label, c); + tracker_motion_label = new JLabel(get_tracker_motion_label()); + pane.add(tracker_motion_label, c); c = new GridBagConstraints(); c.gridx = 4; c.gridy = row; @@ -407,10 +400,10 @@ public class TeleGPSConfigUI c.anchor = GridBagConstraints.LINE_START; c.insets = ir; c.ipady = 5; - tracker_horiz_value = new JComboBox(tracker_horiz_values()); - tracker_horiz_value.setEditable(true); - tracker_horiz_value.addItemListener(this); - pane.add(tracker_horiz_value, c); + tracker_motion_value = new JComboBox(tracker_motion_values()); + tracker_motion_value.setEditable(true); + tracker_motion_value.addItemListener(this); + pane.add(tracker_motion_value, c); row++; /* Tracker triger vert distances */ @@ -421,8 +414,8 @@ public class TeleGPSConfigUI c.anchor = GridBagConstraints.LINE_START; c.insets = il; c.ipady = 5; - tracker_vert_label = new JLabel(get_tracker_vert_label()); - pane.add(tracker_vert_label, c); + tracker_interval_label = new JLabel("Position Reporting Interval (s):"); + pane.add(tracker_interval_label, c); c = new GridBagConstraints(); c.gridx = 4; c.gridy = row; @@ -432,10 +425,10 @@ public class TeleGPSConfigUI c.anchor = GridBagConstraints.LINE_START; c.insets = ir; c.ipady = 5; - tracker_vert_value = new JComboBox(tracker_vert_values()); - tracker_vert_value.setEditable(true); - tracker_vert_value.addItemListener(this); - pane.add(tracker_vert_value, c); + tracker_interval_value = new JComboBox(tracker_interval_values); + tracker_interval_value.setEditable(true); + tracker_interval_value.addItemListener(this); + pane.add(tracker_interval_value, c); set_tracker_tool_tip(); row++; @@ -566,18 +559,11 @@ public class TeleGPSConfigUI } public void units_changed(boolean imperial_units) { - if (tracker_horiz_value.isEnabled() && tracker_vert_value.isEnabled()) { - String th = tracker_horiz_value.getSelectedItem().toString(); - String tv = tracker_vert_value.getSelectedItem().toString(); - tracker_horiz_label.setText(get_tracker_horiz_label()); - tracker_vert_label.setText(get_tracker_vert_label()); - set_tracker_horiz_values(); - set_tracker_vert_values(); - int[] t = { - (int) (AltosConvert.height.parse(th, !imperial_units) + 0.5), - (int) (AltosConvert.height.parse(tv, !imperial_units) + 0.5) - }; - set_tracker_distances(t); + if (tracker_motion_value.isEnabled()) { + String motion = tracker_motion_value.getSelectedItem().toString(); + tracker_motion_label.setText(get_tracker_motion_label()); + set_tracker_motion_values(); + set_tracker_motion((int) (AltosConvert.height.parse(motion, !imperial_units) + 0.5)); } } @@ -723,78 +709,51 @@ public class TeleGPSConfigUI public int beep() { return -1; } - String[] tracker_horiz_values() { + String[] tracker_motion_values() { if (AltosConvert.imperial_units) - return tracker_horiz_values_ft; + return tracker_motion_values_ft; else - return tracker_horiz_values_m; + return tracker_motion_values_m; } - void set_tracker_horiz_values() { - String[] v = tracker_horiz_values(); - while (tracker_horiz_value.getItemCount() > 0) - tracker_horiz_value.removeItemAt(0); + void set_tracker_motion_values() { + String[] v = tracker_motion_values(); + while (tracker_motion_value.getItemCount() > 0) + tracker_motion_value.removeItemAt(0); for (int i = 0; i < v.length; i++) - tracker_horiz_value.addItem(v[i]); - tracker_horiz_value.setMaximumRowCount(v.length); - } - - String get_tracker_horiz_label() { - return String.format("Logging Trigger Horizontal (%s):", AltosConvert.height.show_units()); - } - - String[] tracker_vert_values() { - if (AltosConvert.imperial_units) - return tracker_vert_values_ft; - else - return tracker_vert_values_m; + tracker_motion_value.addItem(v[i]); + tracker_motion_value.setMaximumRowCount(v.length); } - void set_tracker_vert_values() { - String[] v = tracker_vert_values(); - while (tracker_vert_value.getItemCount() > 0) - tracker_vert_value.removeItemAt(0); - for (int i = 0; i < v.length; i++) - tracker_vert_value.addItem(v[i]); - tracker_vert_value.setMaximumRowCount(v.length); + String get_tracker_motion_label() { + return String.format("Logging Trigger Motion (%s):", AltosConvert.height.show_units()); } void set_tracker_tool_tip() { - if (tracker_horiz_value.isEnabled()) - tracker_horiz_value.setToolTipText("How far the device must move before logging is enabled"); + if (tracker_motion_value.isEnabled()) + tracker_motion_value.setToolTipText("How far the device must move before logging"); else - tracker_horiz_value.setToolTipText("This device doesn't disable logging before motion"); - if (tracker_vert_value.isEnabled()) - tracker_vert_value.setToolTipText("How far the device must move before logging is enabled"); + tracker_motion_value.setToolTipText("This device doesn't disable logging when stationary"); + if (tracker_interval_value.isEnabled()) + tracker_interval_value.setToolTipText("How often to report GPS position"); else - tracker_vert_value.setToolTipText("This device doesn't disable logging before motion"); + tracker_interval_value.setToolTipText("This device can't configure interval"); } - String get_tracker_vert_label() { - return String.format("Logging Trigger Vertical (%s):", AltosConvert.height.show_units()); + public void set_tracker_motion(int tracker_motion) { + tracker_motion_value.setSelectedItem(AltosConvert.height.say(tracker_motion)); } - public void set_tracker_distances(int[] tracker_distances) { - if (tracker_distances != null) { - tracker_horiz_value.setSelectedItem(AltosConvert.height.say(tracker_distances[0])); - tracker_vert_value.setSelectedItem(AltosConvert.height.say(tracker_distances[1])); - tracker_horiz_value.setEnabled(true); - tracker_vert_value.setEnabled(true); - } else { - tracker_horiz_value.setEnabled(false); - tracker_vert_value.setEnabled(false); - } + public int tracker_motion() throws AltosConfigDataException { + return (int) AltosConvert.height.parse(tracker_motion_value.getSelectedItem().toString()); } - public int[] tracker_distances() { - if (tracker_horiz_value.isEnabled() && tracker_vert_value.isEnabled()) { - int[] t = { - (int) (AltosConvert.height.parse(tracker_horiz_value.getSelectedItem().toString()) + 0.5), - (int) (AltosConvert.height.parse(tracker_vert_value.getSelectedItem().toString()) + 0.5), - }; - return t; - } - return null; + public void set_tracker_interval(int tracker_interval) { + tracker_interval_value.setSelectedItem(String.format("%d", tracker_interval)); + } + + public int tracker_interval() throws AltosConfigDataException { + return parse_int ("tracker interval", tracker_interval_value.getSelectedItem().toString(), false); } public void set_aprs_interval(int new_aprs_interval) { -- 2.30.2