Skip to content

Commit 4722ee9

Browse files
committed
GPS- all fillers done, compiles
1 parent 97d20ea commit 4722ee9

File tree

2 files changed

+12
-15
lines changed

2 files changed

+12
-15
lines changed

src/components/gps/model.cpp

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -91,9 +91,9 @@ GPSModel::CreateGpsDatetime(uint8_t hour, uint8_t minute, uint8_t seconds,
9191
}
9292

9393
bool GPSModel::AddGpsEventRMC(wippersnapper_gps_GPSDateTime *datetime,
94-
uint8_t fix_status, nmea_float_t lat,
95-
char *lat_dir, nmea_float_t lon, char *lon_dir,
96-
nmea_float_t speed, nmea_float_t angle) {
94+
uint8_t fix_status, float lat, char *lat_dir,
95+
float lon, char *lon_dir, float speed,
96+
float angle) {
9797
// Check if we've reached the maximum number of RMC responses
9898
if (_msg_gps_event.rmc_responses_count >= MAX_COUNT_RMC_GGA) {
9999
return false;
@@ -142,10 +142,9 @@ bool GPSModel::AddGpsEventRMC(wippersnapper_gps_GPSDateTime *datetime,
142142
}
143143

144144
bool GPSModel::AddGpsEventGGA(wippersnapper_gps_GPSDateTime *datetime,
145-
uint8_t fix_status, nmea_float_t lat,
146-
char *lat_dir, nmea_float_t lon, char *lon_dir,
147-
uint8_t num_sats, nmea_float_t hdop,
148-
nmea_float_t alt, nmea_float_t geoid_height) {
145+
uint8_t fix_status, float lat, char *lat_dir,
146+
float lon, char *lon_dir, uint8_t num_sats,
147+
float hdop, float alt, float geoid_height) {
149148

150149
// Check if we've reached the maximum number of RMC responses
151150
if (_msg_gps_event.gga_responses_count >= MAX_COUNT_RMC_GGA) {

src/components/gps/model.h

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#define WS_GPS_MODEL_H
1717
#include "Wippersnapper_V2.h"
1818
#include <protos/gps.pb.h>
19-
#define MAX_COUNT_RMC_GGA 10; ///< Maximum number of RMC or GGA responses
19+
#define MAX_COUNT_RMC_GGA 10 ///< Maximum number of RMC or GGA responses
2020

2121
/*!
2222
@brief Provides an interface for creating, encoding, and parsing
@@ -36,15 +36,13 @@ class GPSModel {
3636
uint8_t day, uint8_t month,
3737
uint8_t year);
3838
bool AddGpsEventRMC(wippersnapper_gps_GPSDateTime *datetime,
39-
uint8_t fix_status, nmea_float_t lat, char *lat_dir,
40-
nmea_float_t lon, char *lon_dir, nmea_float_t speed,
41-
nmea_float_t angle);
39+
uint8_t fix_status, float lat, char *lat_dir, float lon,
40+
char *lon_dir, float speed, float angle);
4241

4342
bool AddGpsEventGGA(wippersnapper_gps_GPSDateTime *datetime,
44-
uint8_t fix_status, nmea_float_t lat, char *lat_dir,
45-
nmea_float_t lon, char *lon_dir, uint8_t num_sats,
46-
nmea_float_t hdop, nmea_float_t alt,
47-
nmea_float_t geoid_height);
43+
uint8_t fix_status, float lat, char *lat_dir, float lon,
44+
char *lon_dir, uint8_t num_sats, float hdop, float alt,
45+
float geoid_height);
4846

4947
private:
5048
wippersnapper_gps_GPSConfig _msg_gps_config; ///< GPS configuration message

0 commit comments

Comments
 (0)