projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: Get cc1120 packet reception working
[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 050573e877282012acf1776668396f980822bfdf..84616a05d0a8729de7e7379387e7cf898424dd5f 100644
(file)
--- a/
src/drivers/ao_gps_skytraq.c
+++ b/
src/drivers/ao_gps_skytraq.c
@@
-19,6
+19,18
@@
#include "ao.h"
#endif
#include "ao.h"
#endif
+#ifndef ao_gps_getchar
+#define ao_gps_getchar ao_serial1_getchar
+#endif
+
+#ifndef ao_gps_putchar
+#define ao_gps_putchar ao_serial1_putchar
+#endif
+
+#ifndef ao_gps_set_speed
+#define ao_gps_set_speed ao_serial1_set_speed
+#endif
+
__xdata uint8_t ao_gps_mutex;
static __data char ao_gps_char;
static __data uint8_t ao_gps_cksum;
__xdata uint8_t ao_gps_mutex;
static __data char ao_gps_char;
static __data uint8_t ao_gps_cksum;
@@
-68,7
+80,7
@@
ao_gps_lexchar(void)
if (ao_gps_error)
c = '\n';
else
if (ao_gps_error)
c = '\n';
else
- c = ao_
serial
_getchar();
+ c = ao_
gps
_getchar();
ao_gps_cksum ^= c;
ao_gps_char = c;
}
ao_gps_cksum ^= c;
ao_gps_char = c;
}
@@
-402,7
+414,7
@@
ao_skytraq_sendbytes(__code uint8_t *b, uint8_t l)
uint8_t c = *b++;
if (c == 0xa0)
ao_delay(AO_MS_TO_TICKS(500));
uint8_t c = *b++;
if (c == 0xa0)
ao_delay(AO_MS_TO_TICKS(500));
- ao_
serial
_putchar(c);
+ ao_
gps
_putchar(c);
}
}
}
}
@@
-444,7
+456,7
@@
ao_gps_nmea_parse(void)
void
ao_gps(void) __reentrant
{
void
ao_gps(void) __reentrant
{
- ao_
serial
_set_speed(AO_SERIAL_SPEED_9600);
+ ao_
gps
_set_speed(AO_SERIAL_SPEED_9600);
/* give skytraq time to boot in case of cold start */
ao_delay(AO_MS_TO_TICKS(2000));
/* give skytraq time to boot in case of cold start */
ao_delay(AO_MS_TO_TICKS(2000));
@@
-453,7
+465,7
@@
ao_gps(void) __reentrant
for (;;) {
/* Locate the begining of the next record */
for (;;) {
/* Locate the begining of the next record */
- if (ao_
serial
_getchar() == '$') {
+ if (ao_
gps
_getchar() == '$') {
ao_gps_nmea_parse();
}
}
ao_gps_nmea_parse();
}
}