diff options
Diffstat (limited to 'altoslib')
| -rw-r--r-- | altoslib/AltosCalData.java | 4 | ||||
| -rw-r--r-- | altoslib/AltosConfigData.java | 18 | ||||
| -rw-r--r-- | altoslib/AltosEepromRecordFull.java | 2 | ||||
| -rw-r--r-- | altoslib/AltosFlightStats.java | 4 | ||||
| -rw-r--r-- | altoslib/AltosFrequency.java | 3 | ||||
| -rw-r--r-- | altoslib/AltosPreferences.java | 2 |
6 files changed, 21 insertions, 12 deletions
diff --git a/altoslib/AltosCalData.java b/altoslib/AltosCalData.java index b49e3792..6258c1a8 100644 --- a/altoslib/AltosCalData.java +++ b/altoslib/AltosCalData.java @@ -342,8 +342,8 @@ public class AltosCalData { v = Math.ceil(v); else v = Math.floor(v); - if (v != 0) - System.out.printf("Adjusting gyro axis by %g steps\n", v); +// if (v != 0) +// System.out.printf("Adjusting gyro axis by %g steps\n", v); return v * 128.0; } diff --git a/altoslib/AltosConfigData.java b/altoslib/AltosConfigData.java index 97a80bcb..63c34310 100644 --- a/altoslib/AltosConfigData.java +++ b/altoslib/AltosConfigData.java @@ -488,14 +488,16 @@ public class AltosConfigData { public boolean mma655x_inverted() throws AltosUnknownProduct { - if (product.startsWith("EasyMega-v1")) - return false; - if (product.startsWith("TeleMetrum-v2")) - return true; - if (product.startsWith("TeleMega-v2")) - return false; - if (product.startsWith("TeleMega-v1")) - return false; + if (product != null) { + if (product.startsWith("EasyMega-v1")) + return false; + if (product.startsWith("TeleMetrum-v2")) + return true; + if (product.startsWith("TeleMega-v2")) + return false; + if (product.startsWith("TeleMega-v1")) + return false; + } throw new AltosUnknownProduct(product); } diff --git a/altoslib/AltosEepromRecordFull.java b/altoslib/AltosEepromRecordFull.java index 85709f73..32df9578 100644 --- a/altoslib/AltosEepromRecordFull.java +++ b/altoslib/AltosEepromRecordFull.java @@ -85,7 +85,7 @@ public class AltosEepromRecordFull extends AltosEepromRecord { case AltosLib.AO_LOG_GPS_SAT: gps = cal_data.make_temp_gps(tick(),true); int svid = data16(0); - int c_n0 = data16(3); + int c_n0 = data16(2); gps.add_sat(svid, c_n0); break; case AltosLib.AO_LOG_GPS_DATE: diff --git a/altoslib/AltosFlightStats.java b/altoslib/AltosFlightStats.java index 6f8732cf..c2e4e2a3 100644 --- a/altoslib/AltosFlightStats.java +++ b/altoslib/AltosFlightStats.java @@ -26,6 +26,7 @@ public class AltosFlightStats { public double max_speed; public double max_acceleration; public double[] state_speed = new double[AltosLib.ao_flight_invalid + 1]; + public double[] state_enter_speed = new double[AltosLib.ao_flight_invalid + 1]; public double[] state_accel = new double[AltosLib.ao_flight_invalid + 1]; public double[] state_time = new double[AltosLib.ao_flight_invalid + 1]; public String product; @@ -131,6 +132,8 @@ public class AltosFlightStats { private void add_times(AltosFlightSeries series, int state, double start_time, double end_time) { double delta_time = end_time - start_time; if (0 <= state && state <= AltosLib.ao_flight_invalid && delta_time > 0) { + if (state_enter_speed[state] == AltosLib.MISSING) + state_enter_speed[state] = series.speed_series.value(start_time); speeds[state].value += series.speed_series.average(start_time, end_time) * delta_time; speeds[state].time += delta_time; accels[state].value += series.accel_series.average(start_time, end_time) * delta_time; @@ -192,6 +195,7 @@ public class AltosFlightStats { for (int s = 0; s < AltosLib.ao_flight_invalid + 1; s++) { state_speed[s] = AltosLib.MISSING; + state_enter_speed[s] = AltosLib.MISSING; state_accel[s] = AltosLib.MISSING; state_time[s] = 0; speeds[s] = new AltosTimeValue(0, 0); diff --git a/altoslib/AltosFrequency.java b/altoslib/AltosFrequency.java index 6838be8a..dfe33789 100644 --- a/altoslib/AltosFrequency.java +++ b/altoslib/AltosFrequency.java @@ -62,4 +62,7 @@ public class AltosFrequency { frequency = f; description = d; } + public AltosFrequency() { + this(0, null); + } } diff --git a/altoslib/AltosPreferences.java b/altoslib/AltosPreferences.java index 0c388f1b..c511332b 100644 --- a/altoslib/AltosPreferences.java +++ b/altoslib/AltosPreferences.java @@ -139,7 +139,7 @@ public class AltosPreferences { try { AltosJson json = AltosJson.fromString(backend.getString(frequenciesPreference, null)); - frequencies = (AltosFrequency[]) json.make(frequencies.getClass()); + frequencies = (AltosFrequency[]) json.make((new AltosFrequency[1]).getClass()); } catch (Exception e) { } |