projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: Initialize beeper for telebt
[fw/altos]
/
src
/
ao_gps_skytraq.c
diff --git
a/src/ao_gps_skytraq.c
b/src/ao_gps_skytraq.c
index 88509a3d6c0da48a7873104520869760e3de6aa7..d286a30a8bea934aca27eb3b76811f8b499c8596 100644
(file)
--- a/
src/ao_gps_skytraq.c
+++ b/
src/ao_gps_skytraq.c
@@
-49,13
+49,6
@@
static __xdata struct ao_gps_tracking_data ao_gps_tracking_next;
STQ_S, 0,15, id, a,b,c,d,e,f,g,h,i,j,k,l,m,n, \
(id^a^b^c^d^e^f^g^h^i^j^k^l^m^n), STQ_E
STQ_S, 0,15, id, a,b,c,d,e,f,g,h,i,j,k,l,m,n, \
(id^a^b^c^d^e^f^g^h^i^j^k^l^m^n), STQ_E
-static const uint8_t ao_gps_config_serial[] = {
- SKYTRAQ_MSG_3(0x05, 0, 4, 0), /* set serial port */
- /* 0 = com1 */
- /* 0 = 4800, 1 = 9600, 2 = 19200, 3 = 38400,
- * 4 = 57600, 5 = 115200 */
-};
-
static const uint8_t ao_gps_config[] = {
SKYTRAQ_MSG_8(0x08, 1, 1, 1, 1, 1, 1, 1, 0), /* configure nmea */
/* gga interval */
static const uint8_t ao_gps_config[] = {
SKYTRAQ_MSG_8(0x08, 1, 1, 1, 1, 1, 1, 1, 0), /* configure nmea */
/* gga interval */
@@
-70,10
+63,6
@@
static const uint8_t ao_gps_config[] = {
SKYTRAQ_MSG_2(0x3c, 0x00, 0x00), /* configure navigation mode */
/* 0 = car, 1 = pedestrian */
/* 0 = update to sram, 1 = update sram + flash */
SKYTRAQ_MSG_2(0x3c, 0x00, 0x00), /* configure navigation mode */
/* 0 = car, 1 = pedestrian */
/* 0 = update to sram, 1 = update sram + flash */
-
- SKYTRAQ_MSG_2(0x0e, 10, 0), /* config nav interval */
- /* interval */
- /* 0 = update to sram, 1 = update sram */
};
static void
};
static void
@@
-455,9
+444,6
@@
ao_gps(void) __reentrant
/* 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));
- ao_skytraq_sendstruct(ao_gps_config_serial);
- ao_delay(AO_MS_TO_TICKS(1000));
- ao_serial_set_speed(AO_SERIAL_SPEED_57600);
ao_skytraq_sendstruct(ao_gps_config);
ao_skytraq_sendstruct(ao_gps_config);
@@
-485,8
+471,8
@@
gps_dump(void) __reentrant
}
__code struct ao_cmds ao_gps_cmds[] = {
}
__code struct ao_cmds ao_gps_cmds[] = {
- {
'g', gps_dump, "g
Display current GPS values" },
- { 0,
gps_dump,
NULL },
+ {
gps_dump, "g\0
Display current GPS values" },
+ { 0, NULL },
};
void
};
void