X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosIdleFetch.java;h=5102c16b3f6f92f0cb50478d26500944899a0dff;hb=7175774c4f60ed3efd54417f2035b50ea0108c7b;hp=9ff5a53ed35d54ece442520c126970586d70beb2;hpb=75682a5a18f28acf8f4a61a0d45dad461218186e;p=fw%2Faltos

diff --git a/altoslib/AltosIdleFetch.java b/altoslib/AltosIdleFetch.java
index 9ff5a53e..5102c16b 100644
--- a/altoslib/AltosIdleFetch.java
+++ b/altoslib/AltosIdleFetch.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_7;
+package org.altusmetrum.altoslib_11;
 
 import java.io.*;
 import java.util.*;
@@ -40,7 +40,7 @@ class AltosIdler {
 	static final int	idle_sensor_tmini = 14;
 	static final int	idle_sensor_tgps = 15;
 
-	public void update_state(AltosState state, AltosLink link, AltosConfigData config_data) throws InterruptedException, TimeoutException {
+	public void update_state(AltosState state, AltosLink link, AltosConfigData config_data) throws InterruptedException, TimeoutException, AltosUnknownProduct {
 		for (int idler : idlers) {
 			AltosIdle idle = null;
 			switch (idler) {
@@ -134,11 +134,9 @@ public class AltosIdleFetch implements AltosStateUpdate {
 
 	AltosLink		link;
 
-	double			frequency;
-	String			callsign;
-
-	public void update_state(AltosState state) throws InterruptedException {
+	public void update_state(AltosState state) throws InterruptedException, AltosUnknownProduct {
 		try {
+			boolean	matched = false;
 			/* Fetch config data from remote */
 			AltosConfigData config_data = new AltosConfigData(link);
 			state.set_state(AltosLib.ao_flight_stateless);
@@ -147,12 +145,17 @@ public class AltosIdleFetch implements AltosStateUpdate {
 			state.set_ground_accel(config_data.accel_cal_plus);
 			state.set_accel_g(config_data.accel_cal_plus, config_data.accel_cal_minus);
 			state.set_product(config_data.product);
+			state.set_firmware_version(config_data.version);
+			state.set_log_space(config_data.log_space);
 			for (AltosIdler idler : idlers) {
 				if (idler.matches(config_data)) {
 					idler.update_state(state, link, config_data);
+					matched = true;
 					break;
 				}
 			}
+			if (!matched)
+				throw new AltosUnknownProduct(config_data.product);
 			state.set_received_time(System.currentTimeMillis());
 		} catch (TimeoutException te) {
 		}