From: Keith Packard <keithp@keithp.com>
Date: Tue, 9 Apr 2013 07:38:25 +0000 (-0700)
Subject: altoslib/altosui: Adapt monitor idle to new AltosListenerState
X-Git-Tag: altosdroid_v1.2-1~25
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=07fb6efc54b8575627572a2113bdbc62914bafb5

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 ec51b9c1..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;
 
@@ -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 7f58d61c..27e36dea 100644
--- 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 1ef30f0a..bbab017f 100644
--- 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);