projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altosui/telegps: Undo the frequency/telemetry menu changes
[fw/altos]
/
altoslib
/
AltosConfigData.java
diff --git
a/altoslib/AltosConfigData.java
b/altoslib/AltosConfigData.java
index e104395803c7dd2cc3ba63b36fe8d8081d99c350..3bf8ea43d2ad4b0601fa975612947f0ea2ac5006 100644
(file)
--- a/
altoslib/AltosConfigData.java
+++ b/
altoslib/AltosConfigData.java
@@
-15,7
+15,7
@@
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-package org.altusmetrum.altoslib_
4
;
+package org.altusmetrum.altoslib_
5
;
import java.util.*;
import java.text.*;
import java.util.*;
import java.text.*;
@@
-71,6
+71,7
@@
public class AltosConfigData implements Iterable<String> {
/* HAS_APRS */
public int aprs_interval;
/* HAS_APRS */
public int aprs_interval;
+ public int aprs_ssid;
/* HAS_BEEP */
public int beep;
/* HAS_BEEP */
public int beep;
@@
-250,6
+251,7
@@
public class AltosConfigData implements Iterable<String> {
pyro_firing_time = -1;
aprs_interval = -1;
pyro_firing_time = -1;
aprs_interval = -1;
+ aprs_ssid = -1;
beep = -1;
beep = -1;
@@
-333,6
+335,7
@@
public class AltosConfigData implements Iterable<String> {
/* HAS_APRS */
try { aprs_interval = get_int(line, "APRS interval:"); } catch (Exception e) {}
/* HAS_APRS */
try { aprs_interval = get_int(line, "APRS interval:"); } catch (Exception e) {}
+ try { aprs_ssid = get_int(line, "APRS SSID:"); } catch (Exception e) {}
/* HAS_BEEP */
try { beep = get_int(line, "Beeper setting:"); } catch (Exception e) {}
/* HAS_BEEP */
try { beep = get_int(line, "Beeper setting:"); } catch (Exception e) {}
@@
-459,6
+462,8
@@
public class AltosConfigData implements Iterable<String> {
/* HAS_APRS */
if (aprs_interval >= 0)
aprs_interval = source.aprs_interval();
/* HAS_APRS */
if (aprs_interval >= 0)
aprs_interval = source.aprs_interval();
+ if (aprs_ssid >= 0)
+ aprs_ssid = source.aprs_ssid();
/* HAS_BEEP */
if (beep >= 0)
/* HAS_BEEP */
if (beep >= 0)
@@
-507,6
+512,7
@@
public class AltosConfigData implements Iterable<String> {
dest.set_pyros(null);
dest.set_pyro_firing_time(pyro_firing_time);
dest.set_aprs_interval(aprs_interval);
dest.set_pyros(null);
dest.set_pyro_firing_time(pyro_firing_time);
dest.set_aprs_interval(aprs_interval);
+ dest.set_aprs_ssid(aprs_ssid);
dest.set_beep(beep);
dest.set_tracker_motion(tracker_motion);
dest.set_tracker_interval(tracker_interval);
dest.set_beep(beep);
dest.set_tracker_motion(tracker_motion);
dest.set_tracker_interval(tracker_interval);
@@
-577,6
+583,8
@@
public class AltosConfigData implements Iterable<String> {
/* HAS_APRS */
if (aprs_interval >= 0)
link.printf("c A %d\n", aprs_interval);
/* HAS_APRS */
if (aprs_interval >= 0)
link.printf("c A %d\n", aprs_interval);
+ if (aprs_ssid >= 0)
+ link.printf("c S %d\n", aprs_ssid);
/* HAS_BEEP */
if (beep >= 0)
/* HAS_BEEP */
if (beep >= 0)