projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: Remove *_TO_DATA macros
[fw/altos]
/
src
/
drivers
/
ao_gps_skytraq.c
diff --git
a/src/drivers/ao_gps_skytraq.c
b/src/drivers/ao_gps_skytraq.c
index 81178051b0e0416a5a758973fe9ab691ee7753fa..3ecae435bfe52e7ed2cb4fd1a8e402fe4b7ac27f 100644
(file)
--- a/
src/drivers/ao_gps_skytraq.c
+++ b/
src/drivers/ao_gps_skytraq.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
@@
-278,10
+279,10
@@
ao_nmea_gga(void)
ao_gps_lexchar();
i = ao_gps_decimal(0xff);
ao_gps_lexchar();
i = ao_gps_decimal(0xff);
- if (i <=
50
) {
- i = (uint8_t)
5
* i;
+ if (i <=
25
) {
+ i = (uint8_t)
10
* i;
if (ao_gps_char == '.')
if (ao_gps_char == '.')
- i = (i + ((uint8_t) ao_gps_decimal(1)
>> 1
));
+ i = (i + ((uint8_t) ao_gps_decimal(1)));
} else
i = 255;
ao_gps_next.hdop = i;
} else
i = 255;
ao_gps_next.hdop = i;
@@
-297,7
+298,7
@@
ao_nmea_gga(void)
ao_mutex_get(&ao_gps_mutex);
ao_gps_new |= AO_GPS_NEW_DATA;
ao_gps_tick = ao_gps_next_tick;
ao_mutex_get(&ao_gps_mutex);
ao_gps_new |= AO_GPS_NEW_DATA;
ao_gps_tick = ao_gps_next_tick;
- ao_xmemcpy(&ao_gps_data,
PDATA_TO_XDATA(&ao_gps_next)
, sizeof (ao_gps_data));
+ ao_xmemcpy(&ao_gps_data,
&ao_gps_next
, sizeof (ao_gps_data));
ao_mutex_put(&ao_gps_mutex);
ao_wakeup(&ao_gps_new);
}
ao_mutex_put(&ao_gps_mutex);
ao_wakeup(&ao_gps_new);
}
@@
-356,7
+357,7
@@
ao_nmea_gsv(void)
else if (done) {
ao_mutex_get(&ao_gps_mutex);
ao_gps_new |= AO_GPS_NEW_TRACKING;
else if (done) {
ao_mutex_get(&ao_gps_mutex);
ao_gps_new |= AO_GPS_NEW_TRACKING;
- ao_xmemcpy(&ao_gps_tracking_data,
PDATA_TO_XDATA(&ao_gps_tracking_next)
, sizeof(ao_gps_tracking_data));
+ ao_xmemcpy(&ao_gps_tracking_data,
&ao_gps_tracking_next
, sizeof(ao_gps_tracking_data));
ao_mutex_put(&ao_gps_mutex);
ao_wakeup(&ao_gps_new);
}
ao_mutex_put(&ao_gps_mutex);
ao_wakeup(&ao_gps_new);
}