Switch from GPLv2 to GPLv2+

[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..8a29865577b19a31ec0a7970031a69b20dd9dc4d 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
- * 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
@@ -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) &&
-                   !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)) {
@@ -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.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;