projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'mjb/android-build-update'
[fw/altos]
/
altoslib
/
AltosEepromRecordMetrum.java
diff --git
a/altoslib/AltosEepromRecordMetrum.java
b/altoslib/AltosEepromRecordMetrum.java
index 3da50544b2a56db660c619faf16cde1156e1c728..102d1407f7ce3121c7111fed312c8b084672f0f8 100644
(file)
--- a/
altoslib/AltosEepromRecordMetrum.java
+++ b/
altoslib/AltosEepromRecordMetrum.java
@@
-16,7
+16,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
2
;
+package org.altusmetrum.altoslib_1
3
;
public class AltosEepromRecordMetrum extends AltosEepromRecord {
public static final int record_length = 16;
public class AltosEepromRecordMetrum extends AltosEepromRecord {
public static final int record_length = 16;
@@
-91,7
+91,7
@@
public class AltosEepromRecordMetrum extends AltosEepromRecord {
listener.set_main_voltage(AltosConvert.mega_pyro_voltage(sense_m()));
break;
case AltosLib.AO_LOG_GPS_POS:
listener.set_main_voltage(AltosConvert.mega_pyro_voltage(sense_m()));
break;
case AltosLib.AO_LOG_GPS_POS:
- gps =
cal_data.make_temp_gps(tick(),
false);
+ gps =
listener.make_temp_gps(
false);
gps.lat = latitude() / 1e7;
gps.lon = longitude() / 1e7;
if (config_data().altitude_32())
gps.lat = latitude() / 1e7;
gps.lon = longitude() / 1e7;
if (config_data().altitude_32())
@@
-100,7
+100,7
@@
public class AltosEepromRecordMetrum extends AltosEepromRecord {
gps.alt = altitude_low();
break;
case AltosLib.AO_LOG_GPS_TIME:
gps.alt = altitude_low();
break;
case AltosLib.AO_LOG_GPS_TIME:
- gps =
cal_data.make_temp_gps(tick(),
false);
+ gps =
listener.make_temp_gps(
false);
gps.hour = hour();
gps.minute = minute();
gps.hour = hour();
gps.minute = minute();
@@
-119,7
+119,7
@@
public class AltosEepromRecordMetrum extends AltosEepromRecord {
gps.pdop = pdop() / 10.0;
break;
case AltosLib.AO_LOG_GPS_SAT:
gps.pdop = pdop() / 10.0;
break;
case AltosLib.AO_LOG_GPS_SAT:
- gps =
cal_data.make_temp_gps(tick(),
true);
+ gps =
listener.make_temp_gps(
true);
int n = nsat();
for (int i = 0; i < n; i++)
int n = nsat();
for (int i = 0; i < n; i++)