X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fkernel%2Fao_gps_report_metrum.c;h=e7529ee2a84740ed69d0e38208452dcc83c74390;hb=c49bd3cb0c31a51fae79ddc92237cc309be9a242;hp=e5839b36a88a50e1122ccef696ab02e3c4945e33;hpb=c11427819ca24bb77523496309b5b6f699d126c5;p=fw%2Faltos diff --git a/src/kernel/ao_gps_report_metrum.c b/src/kernel/ao_gps_report_metrum.c index e5839b36..e7529ee2 100644 --- a/src/kernel/ao_gps_report_metrum.c +++ b/src/kernel/ao_gps_report_metrum.c @@ -34,14 +34,14 @@ ao_gps_report_metrum(void) ao_sleep(&ao_gps_new); ao_mutex_get(&ao_gps_mutex); if (new & AO_GPS_NEW_DATA) - ao_xmemcpy(&gps_data, &ao_gps_data, sizeof (ao_gps_data)); + memcpy(&gps_data, &ao_gps_data, sizeof (ao_gps_data)); if (new & AO_GPS_NEW_TRACKING) - ao_xmemcpy(&gps_tracking_data, &ao_gps_tracking_data, sizeof (ao_gps_tracking_data)); + memcpy(&gps_tracking_data, &ao_gps_tracking_data, sizeof (ao_gps_tracking_data)); ao_gps_new = 0; ao_mutex_put(&ao_gps_mutex); if ((new & AO_GPS_NEW_DATA) && (gps_data.flags & AO_GPS_VALID)) { - gps_log.tick = ao_gps_tick; + gps_log.tick = (uint16_t) ao_gps_tick; gps_log.type = AO_LOG_GPS_POS; gps_log.u.gps.latitude = gps_data.latitude; gps_log.u.gps.longitude = gps_data.longitude; @@ -63,7 +63,7 @@ ao_gps_report_metrum(void) if ((new & AO_GPS_NEW_TRACKING) && (n = gps_tracking_data.channels)) { gps_log.type = AO_LOG_GPS_SAT; - gps_log.tick = ao_gps_tick; + gps_log.tick = (uint16_t) ao_gps_tick; i = 0; for (c = 0; c < n; c++) { svid = gps_tracking_data.sats[c].svid;