X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fkernel%2Fao_gps_report_mega.c;h=37f1beaa9b1d5d1314c87a7fe2f8b8926bd60d56;hb=2de8922b505f0358a36933721fbddf6a9ef7e9a4;hp=cb0c0fd99722eb38efc3d949f79306970e501d42;hpb=177d3c0333fd4218f01e05c78cbc5f186c8e32c0;p=fw%2Faltos

diff --git a/src/kernel/ao_gps_report_mega.c b/src/kernel/ao_gps_report_mega.c
index cb0c0fd9..37f1beaa 100644
--- 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
@@ -58,9 +59,9 @@ ao_gps_sparse_should_log(int32_t lat, int32_t lon, int16_t alt)
 void
 ao_gps_report_mega(void)
 {
-	static __xdata struct ao_log_mega		gps_log;
-	static __xdata struct ao_telemetry_location	gps_data;
-	static __xdata struct ao_telemetry_satellite	gps_tracking_data;
+	static struct ao_log_mega		gps_log;
+	static struct ao_telemetry_location	gps_data;
+	static struct ao_telemetry_satellite	gps_tracking_data;
 	uint8_t	new;
 	uint8_t	c, n, i;
 
@@ -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;
@@ -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;
-			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;
@@ -118,12 +120,12 @@ ao_gps_report_mega(void)
 						break;
 				}
 			gps_log.u.gps_sat.channels = i;
-			ao_log_mega(&gps_log);
+			ao_log_write(&gps_log);
 		}
 	}
 }
 
-__xdata struct ao_task ao_gps_report_mega_task;
+struct ao_task ao_gps_report_mega_task;
 
 void
 ao_gps_report_mega_init(void)