oof copy&paste bugs!

This commit is contained in:
ladyada 2012-11-09 12:56:12 -05:00
parent 0658de0de0
commit c9356449d4
2 changed files with 32 additions and 39 deletions

View File

@ -1,12 +1,12 @@
// test a passthru between USB and hardware serial // test a passthru between USB and hardware serial
void setup() { void setup() {
while (!Serial); while (!Serial);
Serial.begin(9600); Serial.begin(9600);
Serial1.begin(9600); Serial1.begin(9600);
} }
void loop() { void loop() {
if (Serial.available()) { if (Serial.available()) {
char c = Serial.read(); char c = Serial.read();
@ -16,4 +16,4 @@ void loop() {
char c = Serial1.read(); char c = Serial1.read();
Serial.write(c); Serial.write(c);
} }
} }

View File

@ -6,78 +6,72 @@
// desired. // desired.
// //
// Tested and works great with the Adafruit Flora GPS module // Tested and works great with the Adafruit Flora GPS module
// ------> http://adafruit.com/products/1059 // ------> http://adafruit.com/products/1059
// 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
#include &lt;Adafruit_GPS.h&gt; #include <Adafruit_GPS.h>
#include &lt;SoftwareSerial.h&gt; #include <SoftwareSerial.h>
Adafruit_GPS GPS(&amp;Serial1); Adafruit_GPS GPS(&Serial1);
// Set GPSECHO to 'false' to turn off echoing the GPS data to the Serial console // Set GPSECHO to 'false' to turn off echoing the GPS data to the Serial console
// Set to 'true' if you want to debug and listen to the raw GPS sentences // Set to 'true' if you want to debug and listen to the raw GPS sentences
#define GPSECHO false #define GPSECHO false
// this keeps track of whether we're using the interrupt // this keeps track of whether we're using the interrupt
// off by default! // off by default!
boolean usingInterrupt = false; boolean usingInterrupt = false;
void setup() void setup()
{ {
// connect at 115200 so we can read the GPS fast enough and echo without dropping chars // connect at 115200 so we can read the GPS fast enough and echo without dropping chars
// also spit it out // also spit it out
Serial.begin(115200); Serial.begin(115200);
Serial.println("Adafruit GPS library basic test!"); Serial.println("Adafruit GPS library basic test!");
// 9600 NMEA is the default baud rate for Adafruit MTK GPS's- some use 4800 // 9600 NMEA is the default baud rate for Adafruit MTK GPS's- some use 4800
GPS.begin(9600); GPS.begin(9600);
// uncomment this line to turn on RMC (recommended minimum) and GGA (fix data) including altitude // uncomment this line to turn on RMC (recommended minimum) and GGA (fix data) including altitude
GPS.sendCommand(PMTK_SET_NMEA_OUTPUT_RMCGGA); GPS.sendCommand(PMTK_SET_NMEA_OUTPUT_RMCGGA);
// uncomment this line to turn on only the "minimum recommended" data // uncomment this line to turn on only the "minimum recommended" data
//GPS.sendCommand(PMTK_SET_NMEA_OUTPUT_RMCONLY); //GPS.sendCommand(PMTK_SET_NMEA_OUTPUT_RMCONLY);
// For parsing data, we don't suggest using anything but either RMC only or RMC+GGA since // For parsing data, we don't suggest using anything but either RMC only or RMC+GGA since
// the parser doesn't care about other sentences at this time // the parser doesn't care about other sentences at this time
// Set the update rate // Set the update rate
GPS.sendCommand(PMTK_SET_NMEA_UPDATE_1HZ); // 1 Hz update rate GPS.sendCommand(PMTK_SET_NMEA_UPDATE_1HZ); // 1 Hz update rate
// For the parsing code to work nicely and have time to sort thru the data, and // For the parsing code to work nicely and have time to sort thru the data, and
// print it out we don't suggest using anything higher than 1 Hz // print it out we don't suggest using anything higher than 1 Hz
delay(1000); delay(1000);
// Ask for firmware version // Ask for firmware version
Serial1.println(PMTK_Q_RELEASE); Serial1.println(PMTK_Q_RELEASE);
} }
uint32_t timer = millis(); uint32_t timer = millis();
void loop() // run over and over again void loop() // run over and over again
{ {
// read data from the GPS in the 'main loop' // read data from the GPS in the 'main loop'
char c = GPS.read(); char c = GPS.read();
// if you want to debug, this is a good time to do it! // if you want to debug, this is a good time to do it!
if (GPSECHO) if (GPSECHO)
if (c) Serial.print(c); if (c) Serial.print(c);
// if a sentence is received, we can check the checksum, parse it... // if a sentence is received, we can check the checksum, parse it...
if (GPS.newNMEAreceived()) { if (GPS.newNMEAreceived()) {
// a tricky thing here is if we print the NMEA sentence, or data // a tricky thing here is if we print the NMEA sentence, or data
// we end up not listening and catching other sentences! // we end up not listening and catching other sentences!
// so be very wary if using OUTPUT_ALLDATA and trytng to print out data // so be very wary if using OUTPUT_ALLDATA and trytng to print out data
Serial.println(GPS.lastNMEA()); // this also sets the newNMEAreceived() flag to false Serial.println(GPS.lastNMEA()); // this also sets the newNMEAreceived() flag to false
if (!GPS.parse(GPS.lastNMEA())) // this also sets the newNMEAreceived() flag to false
if (!GPS.parse(GPS.lastNMEA())) // this also sets the newNMEAreceived() flag to false return; // we can fail to parse a sentence in which case we should just wait for another
return; // we can fail to parse a sentence in which case we should just wait for another
} }
// if millis() or timer wraps around, we'll just reset it // if millis() or timer wraps around, we'll just reset it
if (timer &gt; millis()) timer = millis(); if (timer > millis()) timer = millis();
// approximately every 2 seconds or so, print out the current stats // approximately every 2 seconds or so, print out the current stats
if (millis() - timer &gt; 2000) { if (millis() - timer > 2000) {
timer = millis(); // reset the timer timer = millis(); // reset the timer
Serial.print("\nTime: "); Serial.print("\nTime: ");
Serial.print(GPS.hour, DEC); Serial.print(':'); Serial.print(GPS.hour, DEC); Serial.print(':');
Serial.print(GPS.minute, DEC); Serial.print(':'); Serial.print(GPS.minute, DEC); Serial.print(':');
@ -88,17 +82,16 @@ void loop() // run over and over again
Serial.print(GPS.month, DEC); Serial.print("/20"); Serial.print(GPS.month, DEC); Serial.print("/20");
Serial.println(GPS.year, DEC); Serial.println(GPS.year, DEC);
Serial.print("Fix: "); Serial.print((int)GPS.fix); Serial.print("Fix: "); Serial.print((int)GPS.fix);
Serial.print(" quality: "); Serial.println((int)GPS.fixquality); Serial.print(" quality: "); Serial.println((int)GPS.fixquality);
if (GPS.fix) { if (GPS.fix) {
Serial.print("Location: "); Serial.print("Location: ");
Serial.print(GPS.latitude, 4); Serial.print(GPS.lat); Serial.print(GPS.latitude, 4); Serial.print(GPS.lat);
Serial.print(", "); Serial.print(", ");
Serial.print(GPS.longitude, 4); Serial.println(GPS.lon); Serial.print(GPS.longitude, 4); Serial.println(GPS.lon);
Serial.print("Speed (knots): "); Serial.println(GPS.speed); Serial.print("Speed (knots): "); Serial.println(GPS.speed);
Serial.print("Angle: "); Serial.println(GPS.angle); Serial.print("Angle: "); Serial.println(GPS.angle);
Serial.print("Altitude: "); Serial.println(GPS.altitude); Serial.print("Altitude: "); Serial.println(GPS.altitude);
Serial.print("Satellites: "); Serial.println((int)GPS.satellites); Serial.print("Satellites: "); Serial.println((int)GPS.satellites);
} }
} }
} }