Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-02-02 14:08:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

GPS: fixed some stdint types

Browse Source
This commit is contained in:
Andrew Tridgell 2012-03-04 20:32:56 +11:00
parent 2f5a4cdc4a
commit 02ae5358d5
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libraries/AP_GPS/AP_GPS_Auto.cpp
View File

@ -55,7 +55,7 @@ AP_GPS_Auto::read(void)
{ {
GPS *gps; GPS *gps;
uint8_t i; uint8_t i;
unsigned long then; uint32_t then;
// Loop through possible baudrates trying to detect a GPS at one of them. // Loop through possible baudrates trying to detect a GPS at one of them.
// //
@ -96,7 +96,7 @@ AP_GPS_Auto::read(void)
GPS * GPS *
AP_GPS_Auto::_detect(void) AP_GPS_Auto::_detect(void)
{ {
unsigned long then; uint32_t then;
uint8_t fingerprint[4]; uint8_t fingerprint[4];
uint8_t tries; uint8_t tries;
uint16_t charcount; uint16_t charcount;

6
libraries/AP_GPS/AP_GPS_NMEA.cpp
View File

@ -184,10 +184,10 @@ int AP_GPS_NMEA::_from_hex(char a)
return a - '0'; return a - '0';
} }
unsigned long AP_GPS_NMEA::_parse_decimal() uint32_t AP_GPS_NMEA::_parse_decimal()
{ {
char *p = _term; char *p = _term;
unsigned long ret = 100UL * atol(p); uint32_t ret = 100UL * atol(p);
while (isdigit(*p)) while (isdigit(*p))
++p; ++p;
if (*p == '.') { if (*p == '.') {
@ -200,7 +200,7 @@ unsigned long AP_GPS_NMEA::_parse_decimal()
return ret; return ret;
} }
unsigned long AP_GPS_NMEA::_parse_degrees() uint32_t AP_GPS_NMEA::_parse_degrees()
{ {
char *p, *q; char *p, *q;
uint8_t deg = 0, min = 0; uint8_t deg = 0, min = 0;

4
libraries/AP_GPS/AP_GPS_NMEA.h
View File

@ -96,7 +96,7 @@ private:
/// @returns The value expressed by the string in _term, /// @returns The value expressed by the string in _term,
/// multiplied by 100. /// multiplied by 100.
/// ///
unsigned long _parse_decimal(); uint32_t _parse_decimal();
/// Parses the current term as a NMEA-style degrees + minutes /// Parses the current term as a NMEA-style degrees + minutes
/// value with up to four decimal digits. /// value with up to four decimal digits.
@ -106,7 +106,7 @@ private:
/// @returns The value expressed by the string in _term, /// @returns The value expressed by the string in _term,
/// multiplied by 10000. /// multiplied by 10000.
/// ///
unsigned long _parse_degrees(); uint32_t _parse_degrees();
/// Processes the current term when it has been deemed to be /// Processes the current term when it has been deemed to be
/// complete. /// complete.