rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-02-21 11:54:15 +01:00
Code Issues Releases Activity

Removed message counter from nmea_parsers structure and made it const to

Browse Source 
save some RAM.
This commit is contained in:
Werner Backes 2012-07-19 22:35:19 +02:00
parent 15fa42058e
commit d3962f3303
1 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
flight/Modules/GPS/NMEA.c
View File

@ -67,7 +67,6 @@
struct nmea_parser { struct nmea_parser {
const char *prefix; const char *prefix;
bool(*handler) (GPSPositionData * GpsData, bool* gpsDataUpdated, char* param[], uint8_t nbParam); bool(*handler) (GPSPositionData * GpsData, bool* gpsDataUpdated, char* param[], uint8_t nbParam);
uint32_t cnt;
}; };
static bool nmeaProcessGPGGA(GPSPositionData * GpsData, bool* gpsDataUpdated, char* param[], uint8_t nbParam); static bool nmeaProcessGPGGA(GPSPositionData * GpsData, bool* gpsDataUpdated, char* param[], uint8_t nbParam);
@ -79,37 +78,31 @@ static bool nmeaProcessGPGSA(GPSPositionData * GpsData, bool* gpsDataUpdated, ch
static bool nmeaProcessGPGSV(GPSPositionData * GpsData, bool* gpsDataUpdated, char* param[], uint8_t nbParam); static bool nmeaProcessGPGSV(GPSPositionData * GpsData, bool* gpsDataUpdated, char* param[], uint8_t nbParam);
#endif //PIOS_GPS_MINIMAL #endif //PIOS_GPS_MINIMAL
static struct nmea_parser nmea_parsers[] = { const static struct nmea_parser nmea_parsers[] = {
{ {
.prefix = "GPGGA", .prefix = "GPGGA",
.handler = nmeaProcessGPGGA, .handler = nmeaProcessGPGGA,
.cnt = 0,
}, },
{ {
.prefix = "GPVTG", .prefix = "GPVTG",
.handler = nmeaProcessGPVTG, .handler = nmeaProcessGPVTG,
.cnt = 0,
}, },
{ {
.prefix = "GPGSA", .prefix = "GPGSA",
.handler = nmeaProcessGPGSA, .handler = nmeaProcessGPGSA,
.cnt = 0,
}, },
{ {
.prefix = "GPRMC", .prefix = "GPRMC",
.handler = nmeaProcessGPRMC, .handler = nmeaProcessGPRMC,
.cnt = 0,
}, },
#if !defined(PIOS_GPS_MINIMAL) #if !defined(PIOS_GPS_MINIMAL)
{ {
.prefix = "GPZDA", .prefix = "GPZDA",
.handler = nmeaProcessGPZDA, .handler = nmeaProcessGPZDA,
.cnt = 0,
}, },
{ {
.prefix = "GPGSV", .prefix = "GPGSV",
.handler = nmeaProcessGPGSV, .handler = nmeaProcessGPGSV,
.cnt = 0,
}, },
#endif //PIOS_GPS_MINIMAL #endif //PIOS_GPS_MINIMAL
}; };
@ -196,14 +189,14 @@ int parse_nmea_stream (uint8_t c, char *gps_rx_buffer, GPSPositionData *GpsData,
return PARSER_INCOMPLETE; return PARSER_INCOMPLETE;
} }
static struct nmea_parser *NMEA_find_parser_by_prefix(const char *prefix) const static struct nmea_parser *NMEA_find_parser_by_prefix(const char *prefix)
{ {
if (!prefix) { if (!prefix) {
return (NULL); return (NULL);
} }
for (uint8_t i = 0; i < NELEMENTS(nmea_parsers); i++) { for (uint8_t i = 0; i < NELEMENTS(nmea_parsers); i++) {
struct nmea_parser *parser = &nmea_parsers[i]; const struct nmea_parser *parser = &nmea_parsers[i];
/* Use strcmp to check for exact equality over the entire prefix */ /* Use strcmp to check for exact equality over the entire prefix */
if (!strcmp(prefix, parser->prefix)) { if (!strcmp(prefix, parser->prefix)) {
@ -416,7 +409,7 @@ bool NMEA_update_position(char *nmea_sentence, GPSPositionData *GpsData)
#endif #endif
// The first parameter is the message name, lets see if we find a parser for it // The first parameter is the message name, lets see if we find a parser for it
struct nmea_parser *parser; const struct nmea_parser *parser;
parser = NMEA_find_parser_by_prefix(params[0]); parser = NMEA_find_parser_by_prefix(params[0]);
if (!parser) { if (!parser) {
// No parser found // No parser found
@ -424,9 +417,8 @@ bool NMEA_update_position(char *nmea_sentence, GPSPositionData *GpsData)
return false; return false;
} }
parser->cnt++;
#ifdef DEBUG_MGSID_IN #ifdef DEBUG_MGSID_IN
DEBUG_MSG("%s %d ", params[0], parser->cnt); DEBUG_MSG("%s %d ", params[0]);
#endif #endif
// Send the message to the parser and get it update the GpsData // Send the message to the parser and get it update the GpsData
bool gpsDataUpdated = false; bool gpsDataUpdated = false;