From ad4df7f2897476a2b27317901e86b36400ef6a5d Mon Sep 17 00:00:00 2001
From: Ladyada <limor@ladyada.net>
Date: Tue, 27 Mar 2012 18:20:41 -0400
Subject: [PATCH] pulled interrupt stuff to sketch

---
 Adafruit_GPS.cpp | 35 +++++++----------------------------
 Adafruit_GPS.h   |  5 -----
 2 files changed, 7 insertions(+), 33 deletions(-)

diff --git a/Adafruit_GPS.cpp b/Adafruit_GPS.cpp
index 98b94a3..88abf37 100644
--- a/Adafruit_GPS.cpp
+++ b/Adafruit_GPS.cpp
@@ -13,9 +13,6 @@ All text above must be included in any redistribution
 #include <Adafruit_GPS.h>
 
 
-
-Adafruit_GPS GPS;
-
 // we double buffer: read one line in and leave one for the main program
 volatile char line1[MAXLINELENGTH];
 volatile char line2[MAXLINELENGTH];
@@ -27,19 +24,6 @@ volatile char *lastline;
 volatile boolean recvdflag;
 
 
-// a ticker to divide out 1ms rate to 10ms period instead
-static volatile uint8_t compA_Ticker = 0;
-#define compA_MAX 1
-
-SIGNAL(TIMER0_COMPA_vect) {
-   compA_Ticker++;
-  if (compA_Ticker < compA_MAX)
-    return;
-  compA_Ticker = 0;
-
-  GPS.read();
-}
-
 boolean Adafruit_GPS::parse(char *nmea) {
 
   // look for a few common sentences
@@ -218,18 +202,13 @@ Adafruit_GPS::Adafruit_GPS(void) {
   lineidx = 0;
   currentline = line1;
   lastline = line2;
-  interrupt = false; // do not use interrupt!
-}
-
-void Adafruit_GPS::interruptReads(boolean r) {
-  interrupt = r;
-  if (interrupt) {
-    OCR0A = 0x10;
-    TIMSK0 |= _BV(OCIE0A);
-  } else {
-    TIMSK0 &= ~_BV(OCIE0A);
-  }
-  compA_Ticker = 0;
+  
+  hour = minute = seconds = year = month = day = milliseconds = 0;
+  latitude = longitude = geoidheight = altitude = 0;
+  speed = angle = magvariation = HDOP = 0;
+  lat = lon = mag = 0;
+  fix = false;
+  fixquality = satellites = 0;
 }
 
 // Constructor when using SoftwareSerial or NewSoftSerial
diff --git a/Adafruit_GPS.h b/Adafruit_GPS.h
index a7c0f14..83e3b00 100644
--- a/Adafruit_GPS.h
+++ b/Adafruit_GPS.h
@@ -77,7 +77,6 @@ class Adafruit_GPS {
 
  private:
   boolean paused;
-  boolean interrupt;
   
   uint8_t parseResponse(char *response);
 #if ARDUINO >= 100
@@ -89,8 +88,4 @@ class Adafruit_GPS {
 };
 
 
-
-
-extern Adafruit_GPS GPS;
-
 #endif