gps mtk: moved some defines from header to c file, as we don't want/need them to be defined everywhere where we include gps.h

This commit is contained in:
Felix Ruess
2012-03-16 12:27:55 +01:00
parent 09ea6f1b1f
commit bf6a0b4932
2 changed files with 23 additions and 21 deletions
+23
View File
@@ -63,6 +63,12 @@
#define GPS_MTK_ERR_UNEXPECTED 4
#define GPS_MTK_ERR_OUT_OF_SYNC 5
/* mediatek gps fix mask */
#define MTK_DIY_FIX_3D 3
#define MTK_DIY_FIX_2D 2
#define MTK_DIY_FIX_NONE 1
/* defines for UTC-GPS time conversion */
#define SECS_MINUTE (60)
#define SECS_HOUR (60*60)
@@ -76,6 +82,23 @@ const int8_t DAYS_MONTH[12] = { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 }
struct GpsMtk gps_mtk;
#ifdef GPS_CONFIGURE
#define MTK_DIY_SET_BINARY "$PGCMD,16,0,0,0,0,0*6A\r\n"
#define MTK_DIY_SET_NMEA "$PGCMD,16,1,1,1,1,1*6B\r\n"
#define MTK_DIY_OUTPUT_1HZ "$PMTK220,1000*1F\r\n"
#define MTK_DIY_OUTPUT_2HZ "$PMTK220,500*2B\r\n"
#define MTK_DIY_OUTPUT_4HZ "$PMTK220,250*29\r\n"
#define MTK_DIY_OTUPUT_5HZ "$PMTK220,200*2C\r\n"
#define MTK_DIY_OUTPUT_10HZ "$PMTK220,100*2F\r\n"
#define MTK_BAUD_RATE_38400 "$PMTK251,38400*27\r\n"
#define MTK_DIY_SBAS_ON "$PMTK313,1*2E\r\n"
#define MTK_DIY_SBAS_OFF "$PMTK313,0*2F\r\n"
#define MTK_DIY_WAAS_ON "$PSRF151,1*3F\r\n"
#define MTK_DIY_WAAS_OFF "$PSRF151,0*3E\r\n"
bool_t gps_configuring;
static uint8_t gps_status_config;
#endif
-21
View File
@@ -105,31 +105,10 @@ extern bool_t gps_configuring;
extern void gps_mtk_read_message(void);
extern void gps_mtk_parse(uint8_t c);
#define MTK_DIY_FIX_3D 3
#define MTK_DIY_FIX_2D 2
#define MTK_DIY_FIX_NONE 1
/*
* dynamic GPS configuration
*/
#ifdef GPS_CONFIGURE
#define MTK_DIY_SET_BINARY "$PGCMD,16,0,0,0,0,0*6A\r\n"
#define MTK_DIY_SET_NMEA "$PGCMD,16,1,1,1,1,1*6B\r\n"
#define MTK_DIY_OUTPUT_1HZ "$PMTK220,1000*1F\r\n"
#define MTK_DIY_OUTPUT_2HZ "$PMTK220,500*2B\r\n"
#define MTK_DIY_OUTPUT_4HZ "$PMTK220,250*29\r\n"
#define MTK_DIY_OTUPUT_5HZ "$PMTK220,200*2C\r\n"
#define MTK_DIY_OUTPUT_10HZ "$PMTK220,100*2F\r\n"
#define MTK_BAUD_RATE_38400 "$PMTK251,38400*27\r\n"
#define MTK_DIY_SBAS_ON "$PMTK313,1*2E\r\n"
#define MTK_DIY_SBAS_OFF "$PMTK313,0*2F\r\n"
#define MTK_DIY_WAAS_ON "$PSRF151,1*3F\r\n"
#define MTK_DIY_WAAS_OFF "$PSRF151,0*3E\r\n"
extern void gps_configure(void);
extern void gps_configure_uart(void);
#endif