1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-24 00:35:39 +03:00

Merge pull request #10904 from DusKing1/fix-typo-in-gps-conversion

Fix typo in gps_conversion.c
This commit is contained in:
J Blackman 2021-09-06 09:13:40 +10:00 committed by GitHub
commit c41bf054e7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -32,7 +32,7 @@
uint32_t GPS_coord_to_degrees(const char* coordinateString) uint32_t GPS_coord_to_degrees(const char* coordinateString)
{ {
const char *fieldSeparator, *remainingString; const char *fieldSeparator, *remainingString;
uint8_t degress = 0, minutes = 0; uint8_t degrees = 0, minutes = 0;
uint16_t fractionalMinutes = 0; uint16_t fractionalMinutes = 0;
uint8_t digitIndex; uint8_t digitIndex;
@ -45,9 +45,9 @@ uint32_t GPS_coord_to_degrees(const char* coordinateString)
// convert degrees // convert degrees
while ((fieldSeparator - remainingString) > 2) { while ((fieldSeparator - remainingString) > 2) {
if (degress) if (degrees)
degress *= 10; degrees *= 10;
degress += DIGIT_TO_VAL(*remainingString++); degrees += DIGIT_TO_VAL(*remainingString++);
} }
// convert minutes // convert minutes
while (fieldSeparator > remainingString) { while (fieldSeparator > remainingString) {
@ -66,6 +66,6 @@ uint32_t GPS_coord_to_degrees(const char* coordinateString)
fractionalMinutes += *remainingString++ - '0'; fractionalMinutes += *remainingString++ - '0';
} }
} }
return degress * 10000000UL + (minutes * 1000000UL + fractionalMinutes * 100UL) / 6; return degrees * 10000000UL + (minutes * 1000000UL + fractionalMinutes * 100UL) / 6;
} }
#endif #endif