X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosCalData.java;h=d448fdfe5d468edc586d8d61c23dcd0a9f71cae7;hb=444fdd96515cc7163c49942ac2435ace8e7bb5bf;hp=fdea5e214948da1bdad80f60ad43cc8c9fde0475;hpb=749400fd244eba38806c623d2a35722642230698;p=fw%2Faltos

diff --git a/altoslib/AltosCalData.java b/altoslib/AltosCalData.java
index fdea5e21..d448fdfe 100644
--- a/altoslib/AltosCalData.java
+++ b/altoslib/AltosCalData.java
@@ -12,7 +12,7 @@
  * General Public License for more details.
  */
 
-package org.altusmetrum.altoslib_12;
+package org.altusmetrum.altoslib_13;
 
 /*
  * Calibration and other data needed to construct 'real' values from various data
@@ -241,6 +241,8 @@ public class AltosCalData {
 
 	public AltosGPS		gps_pad = null;
 
+	public AltosGPS		prev_gps = null;
+
 	public double		gps_pad_altitude = AltosLib.MISSING;
 
 	public void set_cal_gps(AltosGPS gps) {
@@ -251,6 +253,7 @@ public class AltosCalData {
 				gps_pad_altitude = gps.alt;
 		}
 		temp_gps = null;
+		prev_gps = gps;
 	}
 
 	/*
@@ -275,7 +278,7 @@ public class AltosCalData {
 
 	public AltosGPS make_temp_cal_gps(int tick, boolean sats) {
 		if (temp_gps == null)
-			temp_gps = new AltosGPS();
+			temp_gps = new AltosGPS(prev_gps);
 		if (sats) {
 			if (tick != temp_gps_sat_tick)
 				temp_gps.cc_gps_sat = null;
@@ -394,7 +397,7 @@ public class AltosCalData {
 		set_flight_params(config_data.apogee_delay / ticks_per_sec, config_data.apogee_lockout / ticks_per_sec);
 		set_pad_orientation(config_data.pad_orientation);
 		set_product(config_data.product);
-		set_accel_plus_minus(config_data.accel_cal_plus, config_data.accel_cal_minus);
+		set_accel_plus_minus(config_data.accel_cal_plus(config_data.pad_orientation), config_data.accel_cal_minus(config_data.pad_orientation));
 		set_accel_zero(config_data.accel_zero_along, config_data.accel_zero_across, config_data.accel_zero_through);
 		set_ms5607(config_data.ms5607);
 		try {