X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FAltosIdleFetch.java;h=73717e178c38569fbe2e426cae50f04ce809fccf;hp=0095bb732899d81ffa445db1049bc5aece33efcb;hb=3544c33c2f386fb292de9e74982717a002f37440;hpb=0b0b359cbce6b818257b44b2a6aee0edcbaee40d

diff --git a/altoslib/AltosIdleFetch.java b/altoslib/AltosIdleFetch.java
index 0095bb73..73717e17 100644
--- a/altoslib/AltosIdleFetch.java
+++ b/altoslib/AltosIdleFetch.java
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,7 +16,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_10;
+package org.altusmetrum.altoslib_11;
 
 import java.io.*;
 import java.util.*;
@@ -37,8 +38,9 @@ class AltosIdler {
 	static final int	idle_sensor_metrum = 11;
 	static final int	idle_sensor_mega = 12;
 	static final int	idle_sensor_emini = 13;
-	static final int	idle_sensor_tmini = 14;
+	static final int	idle_sensor_tmini2 = 14;
 	static final int	idle_sensor_tgps = 15;
+	static final int	idle_sensor_tmini3 = 16;
 
 	public void update_state(AltosState state, AltosLink link, AltosConfigData config_data) throws InterruptedException, TimeoutException, AltosUnknownProduct {
 		for (int idler : idlers) {
@@ -71,12 +73,15 @@ class AltosIdler {
 			case idle_sensor_emini:
 				AltosSensorEMini.update_state(state, link, config_data);
 				break;
-			case idle_sensor_tmini:
-				AltosSensorTMini.update_state(state, link, config_data);
+			case idle_sensor_tmini2:
+				AltosSensorTMini2.update_state(state, link, config_data);
 				break;
 			case idle_sensor_tgps:
 				AltosSensorTGPS.update_state(state, link, config_data);
 				break;
+			case idle_sensor_tmini3:
+				AltosSensorTMini3.update_state(state, link, config_data);
+				break;
 			}
 			if (idle != null)
 				idle.update_state(state);
@@ -107,7 +112,11 @@ public class AltosIdleFetch implements AltosStateUpdate {
 
 		new AltosIdler("TeleMini-v2",
 			       AltosIdler.idle_ms5607,
-			       AltosIdler.idle_sensor_tmini),
+			       AltosIdler.idle_sensor_tmini2),
+
+		new AltosIdler("TeleMini-v3",
+			       AltosIdler.idle_ms5607,
+			       AltosIdler.idle_sensor_tmini3),
 
 		new AltosIdler("TeleMetrum-v1",
 			       AltosIdler.idle_gps,
@@ -134,9 +143,6 @@ public class AltosIdleFetch implements AltosStateUpdate {
 
 	AltosLink		link;
 
-	double			frequency;
-	String			callsign;
-
 	public void update_state(AltosState state) throws InterruptedException, AltosUnknownProduct {
 		try {
 			boolean	matched = false;
@@ -148,6 +154,8 @@ 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);