* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-package org.altusmetrum.altoslib_1;
+package org.altusmetrum.altoslib_3;
import java.io.*;
import java.util.*;
public int year() { return data8(4); }
public int month() { return data8(5); }
public int day() { return data8(6); }
-
+
/* AO_LOG_GPS_SAT elements */
public int nsat() { return data8(0); }
public int more() { return data8(1); }
}
public void update_state(AltosState state) {
+ super.update_state(state);
+
AltosGPS gps;
/* Flush any pending GPS changes */
}
}
- if (cmd != AltosLib.AO_LOG_FLIGHT)
- state.set_tick(tick);
switch (cmd) {
case AltosLib.AO_LOG_FLIGHT:
- state.set_boost_tick(tick);
state.set_flight(flight());
state.set_ground_accel(ground_accel());
state.set_ground_pressure(ground_pres());
break;
case AltosLib.AO_LOG_GPS_POS:
- gps = state.make_temp_gps();
+ gps = state.make_temp_gps(false);
gps.lat = latitude() / 1e7;
gps.lon = longitude() / 1e7;
gps.alt = altitude();
break;
case AltosLib.AO_LOG_GPS_TIME:
- gps = state.make_temp_gps();
+ gps = state.make_temp_gps(false);
gps.hour = hour();
gps.minute = minute();
gps.nsat = (flags & AltosLib.AO_GPS_NUM_SAT_MASK) >>
AltosLib.AO_GPS_NUM_SAT_SHIFT;
- gps.year = year();
+ gps.year = 2000 + year();
gps.month = month();
gps.day = day();
break;
case AltosLib.AO_LOG_GPS_SAT:
- state.set_tick(tick);
- gps = state.make_temp_gps();
+ gps = state.make_temp_gps(true);
int n = nsat();
for (int i = 0; i < n; i++)
}
static public LinkedList<AltosEeprom> read(FileInputStream input) {
- LinkedList<AltosEeprom> megas = new LinkedList<AltosEeprom>();
+ LinkedList<AltosEeprom> metrums = new LinkedList<AltosEeprom>();
for (;;) {
try {
if (line == null)
break;
try {
- AltosEepromMetrum2 mega = new AltosEepromMetrum2(line);
- if (mega.cmd != AltosLib.AO_LOG_INVALID)
- megas.add(mega);
+ AltosEepromMetrum2 metrum = new AltosEepromMetrum2(line);
+
+ if (metrum.cmd != AltosLib.AO_LOG_INVALID)
+ metrums.add(metrum);
} catch (Exception e) {
System.out.printf ("exception\n");
}
}
}
- return megas;
+ return metrums;
}
}