projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: Eliminate height requirement for coast detect
[fw/altos]
/
src
/
kernel
/
ao_gps_report_mega.c
diff --git
a/src/kernel/ao_gps_report_mega.c
b/src/kernel/ao_gps_report_mega.c
index cb0c0fd99722eb38efc3d949f79306970e501d42..85614b85bd3eea31ec2c773e85c146620adaa4a0 100644
(file)
--- a/
src/kernel/ao_gps_report_mega.c
+++ b/
src/kernel/ao_gps_report_mega.c
@@
-3,7
+3,8
@@
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-78,7
+79,8
@@
ao_gps_report_mega(void)
#if GPS_SPARSE_LOG
/* Don't log data if GPS has a fix and hasn't moved for a while */
if ((gps_data.flags & AO_GPS_VALID) &&
#if GPS_SPARSE_LOG
/* Don't log data if GPS has a fix and hasn't moved for a while */
if ((gps_data.flags & AO_GPS_VALID) &&
- !ao_gps_sparse_should_log(gps_data.latitude, gps_data.longitude, gps_data.altitude))
+ !ao_gps_sparse_should_log(gps_data.latitude, gps_data.longitude,
+ AO_TELEMETRY_LOCATION_ALTITUDE(&gps_data))
continue;
#endif
if ((new & AO_GPS_NEW_DATA) && (gps_data.flags & AO_GPS_VALID)) {
continue;
#endif
if ((new & AO_GPS_NEW_DATA) && (gps_data.flags & AO_GPS_VALID)) {
@@
-87,8
+89,8
@@
ao_gps_report_mega(void)
gps_log.type = AO_LOG_GPS_TIME;
gps_log.u.gps.latitude = gps_data.latitude;
gps_log.u.gps.longitude = gps_data.longitude;
gps_log.type = AO_LOG_GPS_TIME;
gps_log.u.gps.latitude = gps_data.latitude;
gps_log.u.gps.longitude = gps_data.longitude;
- gps_log.u.gps.altitude
= gps_data.altitude
;
-
+ gps_log.u.gps.altitude
_low = gps_data.altitude_low
;
+ gps_log.u.gps.altitude_high = gps_data.altitude_high;
gps_log.u.gps.hour = gps_data.hour;
gps_log.u.gps.minute = gps_data.minute;
gps_log.u.gps.second = gps_data.second;
gps_log.u.gps.hour = gps_data.hour;
gps_log.u.gps.minute = gps_data.minute;
gps_log.u.gps.second = gps_data.second;
@@
-103,7
+105,7
@@
ao_gps_report_mega(void)
gps_log.u.gps.hdop = gps_data.hdop;
gps_log.u.gps.vdop = gps_data.vdop;
gps_log.u.gps.mode = gps_data.mode;
gps_log.u.gps.hdop = gps_data.hdop;
gps_log.u.gps.vdop = gps_data.vdop;
gps_log.u.gps.mode = gps_data.mode;
- ao_log_
mega
(&gps_log);
+ ao_log_
write
(&gps_log);
}
if ((new & AO_GPS_NEW_TRACKING) && (n = gps_tracking_data.channels) != 0) {
gps_log.tick = ao_gps_tick;
}
if ((new & AO_GPS_NEW_TRACKING) && (n = gps_tracking_data.channels) != 0) {
gps_log.tick = ao_gps_tick;
@@
-118,7
+120,7
@@
ao_gps_report_mega(void)
break;
}
gps_log.u.gps_sat.channels = i;
break;
}
gps_log.u.gps_sat.channels = i;
- ao_log_
mega
(&gps_log);
+ ao_log_
write
(&gps_log);
}
}
}
}
}
}