altoslib/altosui: Adapt monitor idle to new AltosListenerState

Move the receiver battery monitoring to the new spot

Signed-off-by: Keith Packard <keithp@keithp.com>

diff --git a/altoslib/AltosIdleMonitor.java b/altoslib/AltosIdleMonitor.java
index ec51b9c1906ecb63f63dad3b1555650db5a2dcca..c379547f22e8efc480c6b14342ac41de9f87e264 100644 (file)
--- a/altoslib/AltosIdleMonitor.java
+++ b/altoslib/AltosIdleMonitor.java
@@ -29,6 +29,7 @@ public class AltosIdleMonitor extends Thread {
        double                  frequency;
        String                  callsign;
        AltosState              previous_state;
+       AltosListenerState      listener_state;
        AltosConfigData         config_data;
        AltosGPS                gps;
 
@@ -118,7 +119,7 @@ public class AltosIdleMonitor extends Thread {
                                link.stop_remote();
                                if (record != null) {
                                        record.rssi = link.rssi();
-                                       record.monitor_battery = link.monitor_battery();
+                                       listener_state.battery = link.monitor_battery();
                                }
                        } else {
                                if (record != null)
@@ -139,7 +140,7 @@ public class AltosIdleMonitor extends Thread {
        }
 
        public void post_state() {
-               listener.update(state);
+               listener.update(state, listener_state);
        }
 
        public void abort() {
@@ -174,5 +175,6 @@ public class AltosIdleMonitor extends Thread {
                link = in_link;
                remote = in_remote;
                state = null;
+               listener_state = new AltosListenerState();
        }
 }

diff --git a/altoslib/AltosIdleMonitorListener.java b/altoslib/AltosIdleMonitorListener.java
index 7f58d61c5d78740464a78a8419b082b986249a7e..27e36dea2ce6b4f673bc47f3623c4e0e0d07810b 100644 (file)
--- a/altoslib/AltosIdleMonitorListener.java
+++ b/altoslib/AltosIdleMonitorListener.java
@@ -18,5 +18,5 @@
 package org.altusmetrum.altoslib_1;
 
 public interface AltosIdleMonitorListener {
-       public void update(AltosState state);
+       public void update(AltosState state, AltosListenerState listener_state);
 }
\ No newline at end of file

diff --git a/altosui/AltosIdleMonitorUI.java b/altosui/AltosIdleMonitorUI.java
index 1ef30f0a29a17dcd7db0a7e70932b9d305ca989b..bbab017f1c525779c622e1623f1db541c8d72fba 100644 (file)
--- a/altosui/AltosIdleMonitorUI.java
+++ b/altosui/AltosIdleMonitorUI.java
@@ -74,10 +74,10 @@ public class AltosIdleMonitorUI extends AltosUIFrame implements AltosFlightDispl
                }
        }
 
-       public void update(final AltosState state) {
+       public void update(final AltosState state, final AltosListenerState listener_state) {
                Runnable r = new Runnable() {
                                public void run() {
-                                       show(state, null);
+                                       show(state, listener_state);
                                }
                        };
                SwingUtilities.invokeLater(r);