projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update changelogs for Debian build
[fw/altos]
/
src
/
ao_gps.c
diff --git
a/src/ao_gps.c
b/src/ao_gps.c
index 78957cb386dc6aeff05f2f19af1971128ff1a0d1..c4c434fdba41885384d2ffa8fbf638b42018f3d8 100644
(file)
--- a/
src/ao_gps.c
+++ b/
src/ao_gps.c
@@
-22,9
+22,10
@@
__xdata uint8_t ao_gps_mutex;
__xdata struct ao_gps_data ao_gps_data;
__xdata uint8_t ao_gps_mutex;
__xdata struct ao_gps_data ao_gps_data;
-static const char ao_gps_set_nmea[] = "$PSRF100,0,57600,8,1,0*37\r\n";
+static const char ao_gps_set_nmea[] = "
\r\n
$PSRF100,0,57600,8,1,0*37\r\n";
const char ao_gps_config[] = {
const char ao_gps_config[] = {
+
0xa0, 0xa2, 0x00, 0x0e, /* length: 14 bytes */
136, /* mode control */
0, 0, /* reserved */
0xa0, 0xa2, 0x00, 0x0e, /* length: 14 bytes */
136, /* mode control */
0, 0, /* reserved */
@@
-224,17
+225,18
@@
ao_sirf_parse_41(void)
}
}
}
}
-void
+
static
void
ao_gps_setup(void) __reentrant
{
ao_gps_setup(void) __reentrant
{
- uint8_t i;
+ uint8_t i
, k
;
ao_serial_set_speed(AO_SERIAL_SPEED_4800);
ao_serial_set_speed(AO_SERIAL_SPEED_4800);
- for (i = 0; i <
16
; i++)
+ for (i = 0; i <
64
; i++)
ao_serial_putchar(0x00);
ao_serial_putchar(0x00);
- for (i = 0; i < sizeof (ao_gps_set_nmea) - 1; i++)
- ao_serial_putchar(ao_gps_set_nmea[i]);
+ for (k = 0; k < 3; k++)
+ for (i = 0; i < sizeof (ao_gps_set_nmea); i++)
+ ao_serial_putchar(ao_gps_set_nmea[i]);
ao_serial_set_speed(AO_SERIAL_SPEED_57600);
ao_serial_set_speed(AO_SERIAL_SPEED_57600);
- for (i = 0; i <
16
; i++)
+ for (i = 0; i <
64
; i++)
ao_serial_putchar(0x00);
}
ao_serial_putchar(0x00);
}
@@
-279,6
+281,7
@@
ao_gps(void) __reentrant
uint8_t i, k;
uint16_t cksum;
uint8_t i, k;
uint16_t cksum;
+ ao_gps_setup();
for (k = 0; k < 5; k++)
{
for (i = 0; i < sizeof (ao_gps_config); i++)
for (k = 0; k < 5; k++)
{
for (i = 0; i < sizeof (ao_gps_config); i++)