projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update Releasing with changes discovered in 1.8.3 release process
[fw/altos]
/
src
/
kernel
/
ao_gps_report_metrum.c
diff --git
a/src/kernel/ao_gps_report_metrum.c
b/src/kernel/ao_gps_report_metrum.c
index 696a833b8147afd45d23dbbba2e9a9b0cdefed2e..523fb17fe8529615ce4932d45e3c35012e11d86a 100644
(file)
--- a/
src/kernel/ao_gps_report_metrum.c
+++ b/
src/kernel/ao_gps_report_metrum.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
@@
-44,8
+45,9
@@
ao_gps_report_metrum(void)
gps_log.type = AO_LOG_GPS_POS;
gps_log.u.gps.latitude = gps_data.latitude;
gps_log.u.gps.longitude = gps_data.longitude;
gps_log.type = AO_LOG_GPS_POS;
gps_log.u.gps.latitude = gps_data.latitude;
gps_log.u.gps.longitude = gps_data.longitude;
- gps_log.u.gps.altitude = gps_data.altitude;
- ao_log_metrum(&gps_log);
+ gps_log.u.gps.altitude_low = gps_data.altitude_low;
+ gps_log.u.gps.altitude_high = gps_data.altitude_high;
+ ao_log_write(&gps_log);
gps_log.type = AO_LOG_GPS_TIME;
gps_log.u.gps_time.hour = gps_data.hour;
gps_log.type = AO_LOG_GPS_TIME;
gps_log.u.gps_time.hour = gps_data.hour;
@@
-55,7
+57,8
@@
ao_gps_report_metrum(void)
gps_log.u.gps_time.year = gps_data.year;
gps_log.u.gps_time.month = gps_data.month;
gps_log.u.gps_time.day = gps_data.day;
gps_log.u.gps_time.year = gps_data.year;
gps_log.u.gps_time.month = gps_data.month;
gps_log.u.gps_time.day = gps_data.day;
- ao_log_metrum(&gps_log);
+ gps_log.u.gps_time.pdop = gps_data.pdop;
+ ao_log_write(&gps_log);
}
if ((new & AO_GPS_NEW_TRACKING) && (n = gps_tracking_data.channels)) {
}
if ((new & AO_GPS_NEW_TRACKING) && (n = gps_tracking_data.channels)) {
@@
-68,7
+71,7
@@
ao_gps_report_metrum(void)
if (i == 4) {
gps_log.u.gps_sat.channels = i;
gps_log.u.gps_sat.more = 1;
if (i == 4) {
gps_log.u.gps_sat.channels = i;
gps_log.u.gps_sat.more = 1;
- ao_log_
metrum
(&gps_log);
+ ao_log_
write
(&gps_log);
i = 0;
}
gps_log.u.gps_sat.sats[i].svid = svid;
i = 0;
}
gps_log.u.gps_sat.sats[i].svid = svid;
@@
-79,7
+82,7
@@
ao_gps_report_metrum(void)
if (i) {
gps_log.u.gps_sat.channels = i;
gps_log.u.gps_sat.more = 0;
if (i) {
gps_log.u.gps_sat.channels = i;
gps_log.u.gps_sat.more = 0;
- ao_log_
metrum
(&gps_log);
+ ao_log_
write
(&gps_log);
}
}
}
}
}
}