diff options
| -rw-r--r-- | libraries/TinyGPS/TinyGPS.cpp | 4 | ||||
| -rw-r--r-- | libraries/TinyGPS/TinyGPS.h | 6 | ||||
| -rw-r--r-- | megaloggerHD/config.h | 8 |
3 files changed, 7 insertions, 11 deletions
diff --git a/libraries/TinyGPS/TinyGPS.cpp b/libraries/TinyGPS/TinyGPS.cpp index c45ed19..3ff6635 100644 --- a/libraries/TinyGPS/TinyGPS.cpp +++ b/libraries/TinyGPS/TinyGPS.cpp @@ -166,7 +166,7 @@ unsigned long TinyGPS::parse_degrees() { char *p; unsigned long left = gpsatol(_term); - unsigned long tenk_minutes = (left % 100UL) * 100000UL; + unsigned long tenk_minutes = (left % 100UL) * 10000UL; for (p=_term; gpsisdigit(*p); ++p); if (*p == '.') { @@ -177,7 +177,7 @@ unsigned long TinyGPS::parse_degrees() mult /= 10; } } - return (left / 100) * 1000000 + tenk_minutes / 6; + return (left / 100) * 100000 + tenk_minutes / 6; } #define COMBINE(sentence_type, term_number) (((unsigned)(sentence_type) << 5) | term_number) diff --git a/libraries/TinyGPS/TinyGPS.h b/libraries/TinyGPS/TinyGPS.h index 6399d18..dad262d 100644 --- a/libraries/TinyGPS/TinyGPS.h +++ b/libraries/TinyGPS/TinyGPS.h @@ -23,11 +23,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #ifndef TinyGPS_h #define TinyGPS_h -#if defined(ARDUINO) && ARDUINO >= 100 #include "Arduino.h" -#else -#include "WProgram.h" -#endif #define _GPS_VERSION 12 // software version of this library #define _GPS_MPH_PER_KNOT 1.15077945 @@ -35,7 +31,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #define _GPS_KMPH_PER_KNOT 1.852 #define _GPS_MILES_PER_METER 0.00062137112 #define _GPS_KM_PER_METER 0.001 -//#define _GPS_NO_STATS +#define _GPS_NO_STATS class TinyGPS { diff --git a/megaloggerHD/config.h b/megaloggerHD/config.h index 46a0b88..66aa53d 100644 --- a/megaloggerHD/config.h +++ b/megaloggerHD/config.h @@ -4,8 +4,8 @@ /************************************** * OBD-II Adapter options **************************************/ -#define OBD_ADAPTER_I2C -//#define OBD_ADAPTER_UART +//#define OBD_ADAPTER_I2C +#define OBD_ADAPTER_UART #define OBD_PROTOCOL PROTO_AUTO /************************************** @@ -44,8 +44,8 @@ /************************************** * Accelerometer & Gyro **************************************/ -#define ACC_DATA_RATIO 172 -#define GYRO_DATA_RATIO 256 +#define ACC_DATA_RATIO 10 +#define GYRO_DATA_RATIO 100 /************************************** * LCD module (uncomment only one) |