X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosIdleMonitor.java;h=c379547f22e8efc480c6b14342ac41de9f87e264;hb=c6f85cb149dff8732104521cb62b355e8a0d7148;hp=f2f75bbb60f80dc21cf388a70459e7c239c76b37;hpb=2120d362cefceba69e75996b6391d9558978c01d;p=fw%2Faltos diff --git a/altoslib/AltosIdleMonitor.java b/altoslib/AltosIdleMonitor.java index f2f75bbb..c379547f 100644 --- 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(); } }