Merge branch 'branch-1.3' into debian

Conflicts:
	ChangeLog
	altoslib/AltosRecordMM.java
	altosui/Makefile.am
	altosui/altos-windows.nsi.in
	configure.ac
	debian/changelog
	debian/control
	doc/Makefile
	doc/altusmetrum.xsl
	doc/release-notes-1.2.1.xsl
	doc/release-notes-1.2.xsl

1 files changed, 38 insertions, 88 deletions

diff --git a/altoslib/AltosIdleMonitor.java b/altoslib/AltosIdleMonitor.java
index b3ce5b20..d9d71143 100644
--- a/altoslib/AltosIdleMonitor.java
+++ b/altoslib/AltosIdleMonitor.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_1;
+package org.altusmetrum.altoslib_2;
 
 import java.io.*;
 import java.util.concurrent.*;
@@ -24,11 +24,13 @@ import java.util.concurrent.*;
 public class AltosIdleMonitor extends Thread {
 	AltosLink		link;
 	AltosIdleMonitorListener	listener;
-	AltosState		state;
+
+	AltosIdleFetch		fetch;
+
 	boolean			remote;
 	double			frequency;
 	String			callsign;
-	AltosState		previous_state;
+
 	AltosListenerState	listener_state;
 	AltosConfigData		config_data;
 	AltosGPS		gps;
@@ -47,86 +49,35 @@ public class AltosIdleMonitor extends Thread {
 		return rssi;
 	}
 
-	boolean has_sensor_tm(AltosConfigData config_data) {
-		return config_data.product.startsWith("TeleMetrum") || config_data.product.startsWith("TeleMini");
-	}
-
-	boolean has_sensor_mm(AltosConfigData config_data) {
-		return config_data.product.startsWith("TeleMega");
+	void start_link() throws InterruptedException, TimeoutException {
+		if (remote) {
+			link.set_radio_frequency(frequency);
+			link.set_callsign(callsign);
+			link.start_remote();
+		} else
+			link.flush_input();
 	}
 
-	boolean has_gps(AltosConfigData config_data) {
-		return config_data.product.startsWith("TeleMetrum") || config_data.product.startsWith("TeleMega");
-	}
-
-	AltosRecord sensor_mm(AltosConfigData config_data) throws InterruptedException, TimeoutException {
-		AltosRecordMM record_mm = new AltosRecordMM();
-		AltosSensorMM sensor = new AltosSensorMM(link);
-		AltosMs5607 ms5607 = new AltosMs5607Query(link);
-		AltosIMU imu = new AltosIMUQuery(link);
-
-		record_mm.accel_plus_g = config_data.accel_cal_plus;
-		record_mm.accel_minus_g = config_data.accel_cal_minus;
-
-		record_mm.ground_accel = sensor.accel;
-		record_mm.accel = sensor.accel;
-		record_mm.ground_pres = ms5607.pa;
-		record_mm.pres = ms5607.pa;
-		record_mm.temp = ms5607.cc;
-
-		record_mm.v_batt = sensor.v_batt;
-		record_mm.v_pyro = sensor.v_pyro;
-		record_mm.sense = sensor.sense;
-
-		record_mm.imu = imu;
-
-		return record_mm;
+	void stop_link() throws InterruptedException, TimeoutException {
+		if (remote)
+			link.stop_remote();
 	}
 
-	void update_state() throws InterruptedException, TimeoutException {
-		AltosRecord	record = null;
+	void update_state(AltosState state) throws InterruptedException, TimeoutException {
+		boolean		worked = false;
 
 		try {
-			if (remote) {
-				link.set_radio_frequency(frequency);
-				link.set_callsign(callsign);
-				link.start_remote();
-			} else
-				link.flush_input();
-			config_data = new AltosConfigData(link);
-
-			if (has_sensor_tm(config_data))
-				record = new AltosSensorTM(link, config_data);
-			else if (has_sensor_mm(config_data))
-				record = sensor_mm(config_data);
-			else
-				record = new AltosRecordNone();
-
-			if (has_gps(config_data))
-				gps = new AltosGPSQuery(link, config_data);
-
-			record.version = 0;
-			record.callsign = config_data.callsign;
-			record.serial = config_data.serial;
-			record.flight = config_data.log_available() > 0 ? 255 : 0;
-			record.status = 0;
-			record.state = AltosLib.ao_flight_idle;
-			record.gps = gps;
-			record.gps_sequence++;
-			state = new AltosState (record, state);
+			start_link();
+			fetch.update_state(state);
+			worked = true;
 		} finally {
-			if (remote) {
-				link.stop_remote();
-				if (record != null) {
-					record.rssi = link.rssi();
-					listener_state.battery = link.monitor_battery();
-				}
-			} else {
-				if (record != null)
-					record.rssi = 0;
+			stop_link();
+			if (worked) {
+				if (remote)
+					state.set_rssi(link.rssi(), 0);
+				listener_state.battery = link.monitor_battery();
 			}
 		}
-
 	}
 
 	public void set_frequency(double in_frequency) {
@@ -139,33 +90,32 @@ public class AltosIdleMonitor extends Thread {
 		link.abort_reply();
 	}
 
-	public void post_state() {
-		listener.update(state, listener_state);
-	}
-
-	public void abort() {
-		if (isAlive()) {
+	public void abort() throws InterruptedException {
+		while (isAlive()) {
 			interrupt();
 			link.abort_reply();
-			try {
-				join();
-			} catch (InterruptedException ie) {
-			}
+			Thread.sleep(100);
 		}
+		join();
 	}
 
 	public void run() {
+		AltosState state = new AltosState();
 		try {
-			for (;;) {
+			while (!link.has_error) {
 				try {
-					update_state();
-					post_state();
+					link.config_data();
+					update_state(state);
+					listener.update(state, listener_state);
 				} catch (TimeoutException te) {
 				}
 				Thread.sleep(1000);
 			}
 		} catch (InterruptedException ie) {
+		}
+		try {
 			link.close();
+		} catch (InterruptedException ie) {
 		}
 	}
 
@@ -174,7 +124,7 @@ public class AltosIdleMonitor extends Thread {
 		listener = in_listener;
 		link = in_link;
 		remote = in_remote;
-		state = null;
 		listener_state = new AltosListenerState();
+		fetch = new AltosIdleFetch(link);
 	}
 }