altoslib/altosui: Adapt monitor idle to new AltosListenerState

[fw/altos] / altoslib / AltosIdleMonitor.java

diff --git a/altoslib/AltosIdleMonitor.java b/altoslib/AltosIdleMonitor.java
index f2f75bbb60f80dc21cf388a70459e7c239c76b37..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;
 
@@ -116,8 +117,10 @@ public class AltosIdleMonitor extends Thread {
                } finally {
                        if (remote) {
                                link.stop_remote();
-                               if (record != null)
-                                       record.rssi = AltosRSSI();
+                               if (record != null) {
+                                       record.rssi = link.rssi();
+                                       listener_state.battery = link.monitor_battery();
+                               }
                        } else {
                                if (record != null)
                                        record.rssi = 0;
@@ -137,7 +140,7 @@ public class AltosIdleMonitor extends Thread {
        }
 
        public void post_state() {
-               listener.update(state);
+               listener.update(state, listener_state);
        }
 
        public void abort() {
@@ -172,5 +175,6 @@ public class AltosIdleMonitor extends Thread {
                link = in_link;
                remote = in_remote;
                state = null;
+               listener_state = new AltosListenerState();
        }
 }