X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosTelemetrySensor.java;h=fc3fe8589040c6af8d25a02b3495b451ef3b8061;hb=HEAD;hp=37589397ea6d68966526f544de0c5bb664ca3547;hpb=f26cfe417c6977cf1e7e75a4f050e25f64d41859;p=fw%2Faltos

diff --git a/altoslib/AltosTelemetrySensor.java b/altoslib/AltosTelemetrySensor.java
index 37589397..89797662 100644
--- a/altoslib/AltosTelemetrySensor.java
+++ b/altoslib/AltosTelemetrySensor.java
@@ -16,7 +16,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_11;
+package org.altusmetrum.altoslib_14;
 
 
 public class AltosTelemetrySensor extends AltosTelemetryStandard {
@@ -32,8 +32,8 @@ public class AltosTelemetrySensor extends AltosTelemetryStandard {
 	int	speed() { return int16(20); }
 	int	height_16() { return int16(22); }
 
-	int	ground_accel() { return int16(24); }
-	int	ground_pres() { return int16(26); }
+	int	ground_pres() { return int16(24); }
+	int	ground_accel() { return int16(26); }
 	int	accel_plus_g() { return int16(28); }
 	int	accel_minus_g() { return int16(30); }
 
@@ -41,11 +41,12 @@ public class AltosTelemetrySensor extends AltosTelemetryStandard {
 		super(bytes);
 	}
 
-	public void provide_data(AltosDataListener listener, AltosCalData cal_data) {
-		super.provide_data(listener, cal_data);
+	public void provide_data(AltosDataListener listener) {
+		super.provide_data(listener);
 
 		listener.set_state(state());
-		cal_data.set_state(state());
+
+		AltosCalData	cal_data = listener.cal_data();
 
 		if (type() == packet_type_TM_sensor) {
 			cal_data.set_ground_accel(ground_accel());
@@ -57,8 +58,8 @@ public class AltosTelemetrySensor extends AltosTelemetryStandard {
 		listener.set_temperature(AltosConvert.thermometer_to_temperature(temp()));
 		listener.set_battery_voltage(AltosConvert.cc_battery_to_voltage(v_batt()));
 		if (type() == packet_type_TM_sensor || type() == packet_type_Tm_sensor) {
-			listener.set_apogee_voltage(AltosConvert.cc_ignitor_to_voltage(sense_d()));
-			listener.set_main_voltage(AltosConvert.cc_ignitor_to_voltage(sense_m()));
+			listener.set_apogee_voltage(AltosConvert.cc_igniter_to_voltage(sense_d()));
+			listener.set_main_voltage(AltosConvert.cc_igniter_to_voltage(sense_m()));
 		}
 
 		listener.set_kalman(height_16(), speed()/16.0, acceleration()/16.0);