* General Public License for more details.
*/
-package org.altusmetrum.altoslib_11;
+package org.altusmetrum.altoslib_14;
public class AltosEepromRecordFull extends AltosEepromRecord {
public static final int record_length = 8;
super.provide_data(listener, cal_data);
AltosGPS gps;
- /* Flush any pending GPS changes */
- if (cal_data.gps_pending()) {
- switch (cmd()) {
- case AltosLib.AO_LOG_GPS_LAT:
- case AltosLib.AO_LOG_GPS_LON:
- case AltosLib.AO_LOG_GPS_ALT:
- case AltosLib.AO_LOG_GPS_SAT:
- case AltosLib.AO_LOG_GPS_DATE:
- break;
- default:
- listener.set_gps(cal_data.temp_gps());
- cal_data.reset_temp_gps();
- break;
- }
- }
-
switch (cmd()) {
case AltosLib.AO_LOG_FLIGHT:
listener.set_state(AltosLib.ao_flight_pad);
listener.set_battery_voltage(AltosConvert.cc_battery_to_voltage(data16(2)));
break;
case AltosLib.AO_LOG_DEPLOY:
- listener.set_apogee_voltage(AltosConvert.cc_ignitor_to_voltage(data16(0)));
- listener.set_main_voltage(AltosConvert.cc_ignitor_to_voltage(data16(2)));
+ listener.set_apogee_voltage(AltosConvert.cc_igniter_to_voltage(data16(0)));
+ listener.set_main_voltage(AltosConvert.cc_igniter_to_voltage(data16(2)));
break;
case AltosLib.AO_LOG_STATE:
listener.set_state(data16(0));
break;
case AltosLib.AO_LOG_GPS_TIME:
- gps = cal_data.make_temp_gps(tick(),false);
+ gps = listener.make_temp_gps(false);
gps.hour = data8(0);
gps.minute = data8(1);
AltosLib.AO_GPS_NUM_SAT_SHIFT;
break;
case AltosLib.AO_LOG_GPS_LAT:
- gps = cal_data.make_temp_gps(tick(),false);
+ gps = listener.make_temp_gps(false);
int lat32 = data32(0);
gps.lat = (double) lat32 / 1e7;
break;
case AltosLib.AO_LOG_GPS_LON:
- gps = cal_data.make_temp_gps(tick(),false);
+ gps = listener.make_temp_gps(false);
int lon32 = data32(0);
gps.lon = (double) lon32 / 1e7;
break;
case AltosLib.AO_LOG_GPS_ALT:
- gps = cal_data.make_temp_gps(tick(),false);
+ gps = listener.make_temp_gps(false);
gps.alt = data16(0);
break;
case AltosLib.AO_LOG_GPS_SAT:
- gps = cal_data.make_temp_gps(tick(),true);
+ gps = listener.make_temp_gps(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:
- gps = cal_data.make_temp_gps(tick(),false);
+ gps = listener.make_temp_gps(false);
gps.year = data8(0) + 2000;
gps.month = data8(1);
gps.day = data8(2);
return new AltosEepromRecordFull(eeprom, s);
}
- public AltosEepromRecordFull(AltosEepromNew eeprom, int start) {
+ public AltosEepromRecordFull(AltosEeprom eeprom, int start) {
super(eeprom, start, record_length);
}
- public AltosEepromRecordFull(AltosEepromNew eeprom) {
+ public AltosEepromRecordFull(AltosEeprom eeprom) {
this(eeprom, 0);
}
}