From 0a9d3c92c5b827a28c7b844a7fbf9c1ea0bb5d87 Mon Sep 17 00:00:00 2001
From: Mikal Hart <mikal.n.hart@intel.com>
Date: Thu, 5 Oct 2017 14:06:39 -0500
Subject: [PATCH] Version 1.0.0: reorganize per new Arduino library standard,
 fix bug with course in FullExample.ino

---
 examples/FullExample/FullExample.ino |  4 ++--
 keywords.txt                         |  6 ++---
 library.json                         | 33 ++++++++++++++++++----------
 library.properties                   |  9 ++++++++
 TinyGPS++.cpp => src/TinyGPS++.cpp   |  6 ++---
 TinyGPS++.h => src/TinyGPS++.h       |  2 +-
 6 files changed, 37 insertions(+), 23 deletions(-)
 create mode 100644 library.properties
 rename TinyGPS++.cpp => src/TinyGPS++.cpp (98%)
 rename TinyGPS++.h => src/TinyGPS++.h (99%)

diff --git a/examples/FullExample/FullExample.ino b/examples/FullExample/FullExample.ino
index e8d8085..6d4eeda 100644
--- a/examples/FullExample/FullExample.ino
+++ b/examples/FullExample/FullExample.ino
@@ -42,7 +42,7 @@ void loop()
   printFloat(gps.altitude.meters(), gps.altitude.isValid(), 7, 2);
   printFloat(gps.course.deg(), gps.course.isValid(), 7, 2);
   printFloat(gps.speed.kmph(), gps.speed.isValid(), 6, 2);
-  printStr(gps.course.isValid() ? TinyGPSPlus::cardinal(gps.course.value()) : "*** ", 6);
+  printStr(gps.course.isValid() ? TinyGPSPlus::cardinal(gps.course.deg()) : "*** ", 6);
 
   unsigned long distanceKmToLondon =
     (unsigned long)TinyGPSPlus::distanceBetween(
@@ -156,4 +156,4 @@ static void printStr(const char *str, int len)
   for (int i=0; i<len; ++i)
     Serial.print(i<slen ? str[i] : ' ');
   smartDelay(0);
-}
+}
diff --git a/keywords.txt b/keywords.txt
index 0d23d49..91d119b 100644
--- a/keywords.txt
+++ b/keywords.txt
@@ -41,10 +41,6 @@ passedChecksum	KEYWORD2
 isValid	KEYWORD2
 isUpdated	KEYWORD2
 age	KEYWORD2
-rawLatDegrees	KEYWORD2
-rawLngDegrees	KEYWORD2
-rawLatBillionths	KEYWORD2
-rawLngBillionths	KEYWORD2
 lat	KEYWORD2
 lng	KEYWORD2
 isUpdatedDate	KEYWORD2
@@ -62,6 +58,8 @@ mph	KEYWORD2
 mps	KEYWORD2
 kmph	KEYWORD2
 deg	KEYWORD2
+billionths	KEYWORD2
+negative	KEYWORD2
 meters	KEYWORD2
 miles	KEYWORD2
 kilometers	KEYWORD2
diff --git a/library.json b/library.json
index e7ce5e7..2665bed 100644
--- a/library.json
+++ b/library.json
@@ -1,12 +1,21 @@
-{
-  "name": "TinyGPSPlus",
-  "keywords": "gps",
-  "description": "A new, customizable Arduino NMEA parsing library",
-  "repository":
-  {
-    "type": "git",
-    "url": "https://github.com/mikalhart/TinyGPSPlus.git"
-  },
-  "frameworks": "arduino",
-  "platforms": "atmelavr"
-}
+{
+  "name": "TinyGPSPlus",
+  "keywords": "gps,NMEA",
+  "description": "A new, customizable Arduino NMEA parsing library",
+  "repository":
+  {
+    "type": "git",
+    "url": "https://github.com/mikalhart/TinyGPSPlus.git"
+  },
+  "authors":
+  [
+    {
+       "name": "Mikal Hart",
+       "email": "mikal@arduniana.org",
+       "url": "http://arduiniana.org",
+       "maintainer": true
+    }
+  ],
+  "frameworks": "arduino",
+  "platforms": "*"
+}
diff --git a/library.properties b/library.properties
new file mode 100644
index 0000000..b17e8b3
--- /dev/null
+++ b/library.properties
@@ -0,0 +1,9 @@
+name=TinyGPS++
+version=1.0.0
+author=Mikal Hart
+maintainer=Mikal Hart<mikal@arduniana.org>
+sentence=TinyGPS++ provides object-oriented parsing of GPS (NMEA) sentences
+paragraph=NMEA is the standard format GPS devices use to report location, time, altitude, etc. TinyGPS++ is a compact, resilient library that parses the most common NMEA 'sentences' used: GGA and RMC. It can also be customized to extract data from *any* compliant sentence.
+category=Communication
+url=https://github.com/mikalhart/TinyGPSPlus
+architectures=*
diff --git a/TinyGPS++.cpp b/src/TinyGPS++.cpp
similarity index 98%
rename from TinyGPS++.cpp
rename to src/TinyGPS++.cpp
index 296f7a0..ec23467 100644
--- a/TinyGPS++.cpp
+++ b/src/TinyGPS++.cpp
@@ -28,9 +28,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include <stdlib.h>
 
 #define _GPRMCterm   "GPRMC"
-#define _GNRMCterm   "GNRMC"
 #define _GPGGAterm   "GPGGA"
-#define _GNGGAterm   "GNGGA"
 
 TinyGPSPlus::TinyGPSPlus()
   :  parity(0)
@@ -209,9 +207,9 @@ bool TinyGPSPlus::endOfTermHandler()
   // the first term determines the sentence type
   if (curTermNumber == 0)
   {
-    if (!strcmp(term, _GPRMCterm) || !strcmp(term, _GNRMCterm))
+    if (!strcmp(term, _GPRMCterm))
       curSentenceType = GPS_SENTENCE_GPRMC;
-    else if (!strcmp(term, _GPGGAterm) || !strcmp(term, _GNGGAterm))
+    else if (!strcmp(term, _GPGGAterm))
       curSentenceType = GPS_SENTENCE_GPGGA;
     else
       curSentenceType = GPS_SENTENCE_OTHER;
diff --git a/TinyGPS++.h b/src/TinyGPS++.h
similarity index 99%
rename from TinyGPS++.h
rename to src/TinyGPS++.h
index 6998c43..b4221f4 100644
--- a/TinyGPS++.h
+++ b/src/TinyGPS++.h
@@ -31,7 +31,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #endif
 #include <limits.h>
 
-#define _GPS_VERSION "0.95" // software version of this library
+#define _GPS_VERSION "0.92" // software version of this library
 #define _GPS_MPH_PER_KNOT 1.15077945
 #define _GPS_MPS_PER_KNOT 0.51444444
 #define _GPS_KMPH_PER_KNOT 1.852