omarojo · Jun 6, 2014 · Jun 6, 2014 · Jun 6, 2014 · Jun 6, 2014 · Jun 6, 2014
diff --git a/GPRMC.cpp b/GPRMC.cpp
@@ -1,36 +1,42 @@
 /*
  Copyright 2013 Daniele Faugiana
- 
+
  This file is part of "WiGPS Arduino Library".
- 
+
  "WiGPS Arduino Library" is free software: you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
  the Free Software Foundation, either version 3 of the License, or
  (at your option) any later version.
- 
+
  "WiGPS Arduino Library" is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  GNU General Public License for more details.
- 
+
  You should have received a copy of the GNU General Public License
  along with "WiGPS Arduino Library". If not, see <http://www.gnu.org/licenses/>.
  */
+/*
+ * MODIFIED BY:   Geoffrey Card
+ * FILE:          GPRMC.h
+ * PROGRAM:       rover
+ * PURPOSE:       parse NMEA GPRMC strings
+ * DATE:          2014-06-14 -
+ * NOTES:
+ * MODIFICATIONS: Converted to Arduino IDE
+ */
 
 #include "GPRMC.h"
-#include "application.h"
-//#include "arduino.h"
-
 
 GPRMC::GPRMC(char* gprmc) : String(gprmc){
     /*
      * Initialize the oject and parse the incoming String
      * looking for all commas in the String.
      */
-    
+
     int p = 0;
     int* c = commas;
-    
+
     for(int i = 0; i<COMMAS_NUMBER; i++){
         p = this->indexOf(',', p);
         if(p == -1){
@@ -43,7 +49,7 @@ GPRMC::GPRMC(char* gprmc) : String(gprmc){
             *(c++) = (p++);
         }
     }
-    
+
     p = this->indexOf('*') + 1;
     if(p > 0){
         stringChecksum = this->substring(p).toInt();
@@ -63,11 +69,11 @@ int GPRMC::checksum(void){
         ret_value = CHECKSUM_NOT_PERFORMED;
     }
     else{
-        
+
         // Perform the checksum and select what to return
-        
+
     }
-    
+
     return ret_value;
 }
 
@@ -78,7 +84,7 @@ String GPRMC::findElements(int elementNumber){
      * from the raw GPRMC String. Then, extract
      * a subString and return it
      */
-    
+
     // Get the comma right BEFORE the selected element
     int startComma = commas[elementNumber-1];
     // Get the comma right AFTER the selected element
@@ -135,4 +141,4 @@ String GPRMC::speed(void){
 
 String GPRMC::opMode(void){
     return findElements(OPERATION_MODE);
-}
+}
diff --git a/GPRMC.h b/GPRMC.h
@@ -1,27 +1,36 @@
 /*
  Copyright 2013 Daniele Faugiana
- 
+
  This file is part of "WiGPS Arduino Library".
- 
+
  "WiGPS Arduino Library" is free software: you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
  the Free Software Foundation, either version 3 of the License, or
  (at your option) any later version.
- 
+
  "WiGPS Arduino Library" is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  GNU General Public License for more details.
- 
+
  You should have received a copy of the GNU General Public License
  along with "WiGPS Arduino Library". If not, see <http://www.gnu.org/licenses/>.
  */
-#include "application.h"
+/*
+ * MODIFIED BY:   Geoffrey Card
+ * FILE:          GPRMC.h
+ * PROGRAM:       rover
+ * PURPOSE:       parse NMEA GPRMC strings
+ * DATE:          2014-06-14 -
+ * NOTES:
+ * MODIFICATIONS: Converted to Arduino IDE
+ */
 
 #ifndef _GPRMC_H
 #define _GPRMC_H
 
-//#include <arduino.h>
+#include <Arduino.h>
+#include <WString.h>
 
 #define COMMAS_NUMBER 12
 
@@ -48,39 +57,39 @@ typedef unsigned int uint;
 
 
 class GPRMC: public String {
-    
+
     /*
      * This class inherits from the C++
      * String class and expands it to manipulate
      * particular types of Strings which are
      * GPRMC String from the NMEA protocol.
      */
-    
+
 private:
-    
+
     int commas[COMMAS_NUMBER];  // Array of commas positions in the raw String
     int stringChecksum;         // The String checksum received value
-    
+
     String findElements(int);       // Internal element finder for the parsing
-    
+
 public:
-    
+
     GPRMC(char*);
-    
+
     int checksum(void);         // Check if the String is valid or not
-    
+
     String UTCtime(void);       // Return the UTC time
     String dataValid(void);     // Return the data valid character
     String UTCdate(void);       // Return the UTC date
-    String latitudeDeg(void);   // Return the latitude degrees
+    String latitudeDeg(void);   // Return the latitude degrees ddmm.mmmmm
     String latitudeRef(void);   // Return the latitude reference N/S
     String longitudeDeg(void);  // Return the longitude degrees
     String longitudeRef(void);  // Return the longitude reference W/E
     String course(void);        // Return the course degrees
     String speed(void);         // Return the speed in knots
     String opMode(void);        // Return the operation mode
-    
-    
+
+
 };
 
-#endif
+#endif // _GPRMC_H