projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos/fox: Enable M25 driver for MRAM.
[fw/altos]
/
altoslib
/
AltosEepromRecordMega.java
diff --git
a/altoslib/AltosEepromRecordMega.java
b/altoslib/AltosEepromRecordMega.java
index d0da1b7ccf4b48f31f10b4ab9626c036fad08804..86343fe058c4f112d2f91bd9faf0446bac15722d 100644
(file)
--- a/
altoslib/AltosEepromRecordMega.java
+++ b/
altoslib/AltosEepromRecordMega.java
@@
-12,7
+12,7
@@
* General Public License for more details.
*/
* General Public License for more details.
*/
-package org.altusmetrum.altoslib_1
1
;
+package org.altusmetrum.altoslib_1
2
;
public class AltosEepromRecordMega extends AltosEepromRecord {
public static final int record_length = 32;
public class AltosEepromRecordMega extends AltosEepromRecord {
public static final int record_length = 32;
@@
-31,6
+31,7
@@
public class AltosEepromRecordMega extends AltosEepromRecord {
private int ground_roll() {
switch (log_format) {
case AltosLib.AO_LOG_FORMAT_TELEMEGA:
private int ground_roll() {
switch (log_format) {
case AltosLib.AO_LOG_FORMAT_TELEMEGA:
+ case AltosLib.AO_LOG_FORMAT_TELEMEGA_3:
return data32(16);
case AltosLib.AO_LOG_FORMAT_TELEMEGA_OLD:
return data16(14);
return data32(16);
case AltosLib.AO_LOG_FORMAT_TELEMEGA_OLD:
return data16(14);
@@
-41,6
+42,7
@@
public class AltosEepromRecordMega extends AltosEepromRecord {
private int ground_pitch() {
switch (log_format) {
case AltosLib.AO_LOG_FORMAT_TELEMEGA:
private int ground_pitch() {
switch (log_format) {
case AltosLib.AO_LOG_FORMAT_TELEMEGA:
+ case AltosLib.AO_LOG_FORMAT_TELEMEGA_3:
return data32(20);
case AltosLib.AO_LOG_FORMAT_TELEMEGA_OLD:
return data16(16);
return data32(20);
case AltosLib.AO_LOG_FORMAT_TELEMEGA_OLD:
return data16(16);
@@
-51,6
+53,7
@@
public class AltosEepromRecordMega extends AltosEepromRecord {
private int ground_yaw() {
switch (log_format) {
case AltosLib.AO_LOG_FORMAT_TELEMEGA:
private int ground_yaw() {
switch (log_format) {
case AltosLib.AO_LOG_FORMAT_TELEMEGA:
+ case AltosLib.AO_LOG_FORMAT_TELEMEGA_3:
return data32(24);
case AltosLib.AO_LOG_FORMAT_TELEMEGA_OLD:
return data16(18);
return data32(24);
case AltosLib.AO_LOG_FORMAT_TELEMEGA_OLD:
return data16(18);
@@
-188,7
+191,7
@@
public class AltosEepromRecordMega extends AltosEepromRecord {
listener.set_pyro_fired(pyro());
break;
case AltosLib.AO_LOG_GPS_TIME:
listener.set_pyro_fired(pyro());
break;
case AltosLib.AO_LOG_GPS_TIME:
- gps =
cal_data.make_temp_gps(tick(),
false);
+ gps =
listener.make_temp_gps(
false);
gps.lat = latitude() / 1e7;
gps.lon = longitude() / 1e7;
gps.lat = latitude() / 1e7;
gps.lon = longitude() / 1e7;
@@
-231,7
+234,7
@@
public class AltosEepromRecordMega extends AltosEepromRecord {
}
break;
case AltosLib.AO_LOG_GPS_SAT:
}
break;
case AltosLib.AO_LOG_GPS_SAT:
- gps =
cal_data.make_temp_gps(tick(),
true);
+ gps =
listener.make_temp_gps(
true);
int n = nsat();
if (n > max_sat)
int n = nsat();
if (n > max_sat)
@@
-249,12
+252,12
@@
public class AltosEepromRecordMega extends AltosEepromRecord {
return new AltosEepromRecordMega(eeprom, s);
}
return new AltosEepromRecordMega(eeprom, s);
}
- public AltosEepromRecordMega(AltosEeprom
New
eeprom, int start) {
+ public AltosEepromRecordMega(AltosEeprom eeprom, int start) {
super(eeprom, start, record_length);
log_format = eeprom.config_data().log_format;
}
super(eeprom, start, record_length);
log_format = eeprom.config_data().log_format;
}
- public AltosEepromRecordMega(AltosEeprom
New
eeprom) {
+ public AltosEepromRecordMega(AltosEeprom eeprom) {
this(eeprom, 0);
}
}
this(eeprom, 0);
}
}