Merge pull request #30 from flybob/master

Ultimate GPS
This commit is contained in:
Tony DiCola 2014-08-15 18:37:42 -07:00
commit f72d2acb50
2 changed files with 7 additions and 2 deletions

View File

@ -16,6 +16,7 @@ Written by Limor Fried/Ladyada for Adafruit Industries.
BSD license, check license.txt for more information BSD license, check license.txt for more information
All text above must be included in any redistribution All text above must be included in any redistribution
****************************************/ ****************************************/
// Fllybob added lines 34,35 and 40,41 to add 100mHz logging capability
#ifndef _ADAFRUIT_GPS_H #ifndef _ADAFRUIT_GPS_H
#define _ADAFRUIT_GPS_H #define _ADAFRUIT_GPS_H
@ -31,10 +32,14 @@ All text above must be included in any redistribution
// different commands to set the update rate from once a second (1 Hz) to 10 times a second (10Hz) // different commands to set the update rate from once a second (1 Hz) to 10 times a second (10Hz)
// Note that these only control the rate at which the position is echoed, to actually speed up the // Note that these only control the rate at which the position is echoed, to actually speed up the
// position fix you must also send one of the position fix rate commands below too. // position fix you must also send one of the position fix rate commands below too.
// added line below for 10 sec update
#define PMTK_SET_NMEA_UPDATE_100mHZ "$PMTK220,10000*2F"
#define PMTK_SET_NMEA_UPDATE_1HZ "$PMTK220,1000*1F" #define PMTK_SET_NMEA_UPDATE_1HZ "$PMTK220,1000*1F"
#define PMTK_SET_NMEA_UPDATE_5HZ "$PMTK220,200*2C" #define PMTK_SET_NMEA_UPDATE_5HZ "$PMTK220,200*2C"
#define PMTK_SET_NMEA_UPDATE_10HZ "$PMTK220,100*2F" #define PMTK_SET_NMEA_UPDATE_10HZ "$PMTK220,100*2F"
// Position fix update rate commands. // Position fix update rate commands.
// added line below for 10 sec update
#define PMTK_API_SET_FIX_CTL_100mHZ "$PMTK300,10000,0,0,0,0*2C"
#define PMTK_API_SET_FIX_CTL_1HZ "$PMTK300,1000,0,0,0,0*1C" #define PMTK_API_SET_FIX_CTL_1HZ "$PMTK300,1000,0,0,0,0*1C"
#define PMTK_API_SET_FIX_CTL_5HZ "$PMTK300,200,0,0,0,0*2F" #define PMTK_API_SET_FIX_CTL_5HZ "$PMTK300,200,0,0,0,0*2F"
// Can't fix position faster than 5 times a second! // Can't fix position faster than 5 times a second!

View File

@ -16,7 +16,7 @@
// ------> http://www.adafruit.com/products/ // ------> http://www.adafruit.com/products/
// Pick one up today at the Adafruit electronics shop // Pick one up today at the Adafruit electronics shop
// and help support open source hardware & software! -ada // and help support open source hardware & software! -ada
// Fllybob added 10 sec logging option
SoftwareSerial mySerial(8, 7); SoftwareSerial mySerial(8, 7);
Adafruit_GPS GPS(&mySerial); Adafruit_GPS GPS(&mySerial);
@ -124,7 +124,7 @@ void setup() {
// For logging data, we don't suggest using anything but either RMC only or RMC+GGA // For logging data, we don't suggest using anything but either RMC only or RMC+GGA
// to keep the log files at a reasonable size // to keep the log files at a reasonable size
// Set the update rate // Set the update rate
GPS.sendCommand(PMTK_SET_NMEA_UPDATE_1HZ); // 1 or 5 Hz update rate GPS.sendCommand(PMTK_SET_NMEA_UPDATE_1HZ); // 100mHz,1Hz or 5Hz update rate
// Turn off updates on antenna status, if the firmware permits it // Turn off updates on antenna status, if the firmware permits it
GPS.sendCommand(PGCMD_NOANTENNA); GPS.sendCommand(PGCMD_NOANTENNA);