X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FAltosState.java;h=0716b892a1c1b97d97b8e9337195f3b79721b086;hp=f46b12eaa7b00b3973f4b1c6f4995515093e1409;hb=fd738d47bbc46d36698350d5450abe1125d990a3;hpb=f26cfe417c6977cf1e7e75a4f050e25f64d41859

diff --git a/altoslib/AltosState.java b/altoslib/AltosState.java
index f46b12ea..0716b892 100644
--- a/altoslib/AltosState.java
+++ b/altoslib/AltosState.java
@@ -702,11 +702,9 @@ public class AltosState extends AltosDataListener {
 	public double	apogee_voltage;
 	public double	main_voltage;
 
-	public double	ignitor_voltage[];
+	public double	igniter_voltage[];
 
 	public AltosGPS	gps;
-	public AltosGPS	temp_gps;
-	public int temp_gps_sat_tick;
 	public boolean	gps_pending;
 
 	public AltosIMU	imu;
@@ -757,6 +755,7 @@ public class AltosState extends AltosDataListener {
 	public void init() {
 		set = 0;
 
+		System.out.printf("state init\n");
 		received_time = System.currentTimeMillis();
 		time = AltosLib.MISSING;
 		time_change = AltosLib.MISSING;
@@ -786,15 +785,13 @@ public class AltosState extends AltosDataListener {
 		pyro_voltage = AltosLib.MISSING;
 		apogee_voltage = AltosLib.MISSING;
 		main_voltage = AltosLib.MISSING;
-		ignitor_voltage = null;
+		igniter_voltage = null;
 
 		kalman_height = new AltosValue();
 		kalman_speed = new AltosValue();
 		kalman_acceleration = new AltosValue();
 
 		gps = null;
-		temp_gps = null;
-		temp_gps_sat_tick = 0;
 		gps_pending = false;
 
 		imu = null;
@@ -1221,8 +1218,8 @@ public class AltosState extends AltosDataListener {
 		}
 	}
 
-	public void set_ignitor_voltage(double[] voltage) {
-		this.ignitor_voltage = voltage;
+	public void set_igniter_voltage(double[] voltage) {
+		this.igniter_voltage = voltage;
 	}
 
 	public void set_pyro_fired(int fired) {