projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: Add TeleLCOTwo firmware
[fw/altos]
/
altoslib
/
AltosEepromMetrum2.java
diff --git
a/altoslib/AltosEepromMetrum2.java
b/altoslib/AltosEepromMetrum2.java
index 5a616e6cd835aeff3cf781f2569a2d64deb7410b..df0075b990e895a203fd7a0ab258e85d8138d799 100644
(file)
--- a/
altoslib/AltosEepromMetrum2.java
+++ b/
altoslib/AltosEepromMetrum2.java
@@
-15,7
+15,7
@@
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-package org.altusmetrum.altoslib_
1
;
+package org.altusmetrum.altoslib_
9
;
import java.io.*;
import java.util.*;
import java.io.*;
import java.util.*;
@@
-49,7
+49,8
@@
public class AltosEepromMetrum2 extends AltosEeprom {
/* AO_LOG_GPS_POS elements */
public int latitude() { return data32(0); }
public int longitude() { return data32(4); }
/* AO_LOG_GPS_POS elements */
public int latitude() { return data32(0); }
public int longitude() { return data32(4); }
- public int altitude() { return data16(8); }
+ public int altitude_low() { return data16(8); }
+ public int altitude_high() { return data16(10); }
/* AO_LOG_GPS_TIME elements */
public int hour() { return data8(0); }
/* AO_LOG_GPS_TIME elements */
public int hour() { return data8(0); }
@@
-59,7
+60,8
@@
public class AltosEepromMetrum2 extends AltosEeprom {
public int year() { return data8(4); }
public int month() { return data8(5); }
public int day() { return data8(6); }
public int year() { return data8(4); }
public int month() { return data8(5); }
public int day() { return data8(6); }
-
+ public int pdop() { return data8(7); }
+
/* AO_LOG_GPS_SAT elements */
public int nsat() { return data8(0); }
public int more() { return data8(1); }
/* AO_LOG_GPS_SAT elements */
public int nsat() { return data8(0); }
public int more() { return data8(1); }
@@
-71,6
+73,8
@@
public class AltosEepromMetrum2 extends AltosEeprom {
}
public void update_state(AltosState state) {
}
public void update_state(AltosState state) {
+ super.update_state(state);
+
AltosGPS gps;
/* Flush any pending GPS changes */
AltosGPS gps;
/* Flush any pending GPS changes */
@@
-89,11
+93,8
@@
public class AltosEepromMetrum2 extends AltosEeprom {
}
}
}
}
- if (cmd != AltosLib.AO_LOG_FLIGHT)
- state.set_tick(tick);
switch (cmd) {
case AltosLib.AO_LOG_FLIGHT:
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());
state.set_flight(flight());
state.set_ground_accel(ground_accel());
state.set_ground_pressure(ground_pres());
@@
-115,13
+116,16
@@
public class AltosEepromMetrum2 extends AltosEeprom {
break;
case AltosLib.AO_LOG_GPS_POS:
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.lat = latitude() / 1e7;
gps.lon = longitude() / 1e7;
- gps.alt = altitude();
+ if (state.altitude_32())
+ gps.alt = (altitude_low() & 0xffff) | (altitude_high() << 16);
+ else
+ gps.alt = altitude_low();
break;
case AltosLib.AO_LOG_GPS_TIME:
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.hour = hour();
gps.minute = minute();
@@
-134,13
+138,13
@@
public class AltosEepromMetrum2 extends AltosEeprom {
gps.nsat = (flags & AltosLib.AO_GPS_NUM_SAT_MASK) >>
AltosLib.AO_GPS_NUM_SAT_SHIFT;
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();
gps.month = month();
gps.day = day();
+ gps.pdop = pdop() / 10.0;
break;
case AltosLib.AO_LOG_GPS_SAT:
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++)
int n = nsat();
for (int i = 0; i < n; i++)
@@
-154,7
+158,7
@@
public class AltosEepromMetrum2 extends AltosEeprom {
}
static public LinkedList<AltosEeprom> read(FileInputStream input) {
}
static public LinkedList<AltosEeprom> read(FileInputStream input) {
- LinkedList<AltosEeprom> me
ga
s = new LinkedList<AltosEeprom>();
+ LinkedList<AltosEeprom> me
trum
s = new LinkedList<AltosEeprom>();
for (;;) {
try {
for (;;) {
try {
@@
-162,9
+166,10
@@
public class AltosEepromMetrum2 extends AltosEeprom {
if (line == null)
break;
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");
}
} catch (Exception e) {
System.out.printf ("exception\n");
}
@@
-173,6
+178,6
@@
public class AltosEepromMetrum2 extends AltosEeprom {
}
}
}
}
- return me
ga
s;
+ return me
trum
s;
}
}
}
}