From c9356449d4f988d726254e3d94cb61bad4f7bf6a Mon Sep 17 00:00:00 2001 From: ladyada Date: Fri, 9 Nov 2012 12:56:12 -0500 Subject: [PATCH] oof copy&paste bugs! --- examples/flora_gpstest/flora_gpstest.ino | 6 +-- examples/flora_parsing/flora_parsing.ino | 65 +++++++++++------------- 2 files changed, 32 insertions(+), 39 deletions(-) diff --git a/examples/flora_gpstest/flora_gpstest.ino b/examples/flora_gpstest/flora_gpstest.ino index 4f85cd6..c8135ec 100644 --- a/examples/flora_gpstest/flora_gpstest.ino +++ b/examples/flora_gpstest/flora_gpstest.ino @@ -1,12 +1,12 @@ // test a passthru between USB and hardware serial - + void setup() { while (!Serial); Serial.begin(9600); Serial1.begin(9600); } - + void loop() { if (Serial.available()) { char c = Serial.read(); @@ -16,4 +16,4 @@ void loop() { char c = Serial1.read(); Serial.write(c); } -} \ No newline at end of file +} diff --git a/examples/flora_parsing/flora_parsing.ino b/examples/flora_parsing/flora_parsing.ino index e68292b..c50813a 100644 --- a/examples/flora_parsing/flora_parsing.ino +++ b/examples/flora_parsing/flora_parsing.ino @@ -6,78 +6,72 @@ // desired. // // Tested and works great with the Adafruit Flora GPS module -// ------> http://adafruit.com/products/1059 -// Pick one up today at the Adafruit electronics shop -// and help support open source hardware & software! -ada - -#include <Adafruit_GPS.h> -#include <SoftwareSerial.h> -Adafruit_GPS GPS(&Serial1); - +// ------> http://adafruit.com/products/1059 +// Pick one up today at the Adafruit electronics shop +// and help support open source hardware & software! -ada + +#include +#include +Adafruit_GPS GPS(&Serial1); + // 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 #define GPSECHO false - + // this keeps track of whether we're using the interrupt // off by default! boolean usingInterrupt = false; - -void setup() + +void setup() { // connect at 115200 so we can read the GPS fast enough and echo without dropping chars // also spit it out Serial.begin(115200); Serial.println("Adafruit GPS library basic test!"); - + // 9600 NMEA is the default baud rate for Adafruit MTK GPS's- some use 4800 GPS.begin(9600); - // uncomment this line to turn on RMC (recommended minimum) and GGA (fix data) including altitude GPS.sendCommand(PMTK_SET_NMEA_OUTPUT_RMCGGA); // uncomment this line to turn on only the "minimum recommended" data //GPS.sendCommand(PMTK_SET_NMEA_OUTPUT_RMCONLY); // 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 - // 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 // print it out we don't suggest using anything higher than 1 Hz - + delay(1000); // Ask for firmware version Serial1.println(PMTK_Q_RELEASE); } - - - + + + 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' char c = GPS.read(); // if you want to debug, this is a good time to do it! 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 (GPS.newNMEAreceived()) { // 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 - 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 - return; // we can fail to parse a sentence in which case we should just wait for another + 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 + 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 (timer > millis()) timer = millis(); - + if (timer > millis()) timer = millis(); + // approximately every 2 seconds or so, print out the current stats - if (millis() - timer > 2000) { + if (millis() - timer > 2000) { timer = millis(); // reset the timer - Serial.print("\nTime: "); Serial.print(GPS.hour, 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.println(GPS.year, DEC); 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) { Serial.print("Location: "); Serial.print(GPS.latitude, 4); Serial.print(GPS.lat); - Serial.print(", "); + Serial.print(", "); Serial.print(GPS.longitude, 4); Serial.println(GPS.lon); - Serial.print("Speed (knots): "); Serial.println(GPS.speed); Serial.print("Angle: "); Serial.println(GPS.angle); Serial.print("Altitude: "); Serial.println(GPS.altitude); Serial.print("Satellites: "); Serial.println((int)GPS.satellites); } } -} \ No newline at end of file +}