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

diff --git a/altoslib/AltosTelemetrySensor.java b/altoslib/AltosTelemetrySensor.java
index 37589397..dc8efa9b 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_12;
 
 
 public class AltosTelemetrySensor extends AltosTelemetryStandard {
@@ -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);