aepko/Ardupilot2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ArduCopter: fixed print_latlon bug in which it would print negative lat/lon numbers incorrectly (i.e. -1234567890 would be printed as -124.xxx).

Browse Source
This commit is contained in:
rmackay9 2012-06-02 12:51:12 +09:00
parent 477aa6e47a
commit df3fb5c041
2 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ArduCopter/Log.pde
View File

@ -220,13 +220,20 @@ process_logs(uint8_t argc, const Menu::arg *argv)
return 0; return 0;
} }
// print_latlon - prints an latitude or longitude value held in an int32_t // print_latlon - prints an latitude or longitude value held in an int32_t
// probably this should be moved to AP_Common // probably this should be moved to AP_Common
void print_latlon(BetterStream *s, int32_t lat_or_lon) void print_latlon(BetterStream *s, int32_t lat_or_lon)
{ {
int32_t dec_portion = lat_or_lon / T7; int32_t dec_portion, frac_portion;
int32_t frac_portion = labs(lat_or_lon - dec_portion*T7);
// extract decimal portion (special handling of negative numbers to ensure we round towards zero)
dec_portion = labs(lat_or_lon) / T7;
if( lat_or_lon < 0 ){
dec_portion = -dec_portion;
}
// extract fractional portion
frac_portion = labs(lat_or_lon - dec_portion*T7);
s->printf("%ld.%07ld",(long)dec_portion,(long)frac_portion); s->printf("%ld.%07ld",(long)dec_portion,(long)frac_portion);
} }

16
libraries/AP_GPS/examples/GPS_AUTO_test/GPS_AUTO_test.pde
View File

@ -17,13 +17,21 @@ AP_GPS_Auto GPS(&Serial1, &gps);
#define T6 1000000 #define T6 1000000
#define T7 10000000 #define T7 10000000
// print_latlon - prints an latitude or longitude value held in an int32_t // print_latlon - prints an latitude or longitude value held in an int32_t
// probably this should be moved to AP_Common // probably this should be moved to AP_Common
void print_latlon(BetterStream *s, int32_t lat_or_lon) void print_latlon(BetterStream *s, int32_t lat_or_lon)
{ {
int32_t dec_portion = lat_or_lon / T7; int32_t dec_portion, frac_portion;
int32_t frac_portion = labs(lat_or_lon - dec_portion*T7);
s->printf("%ld.%07ld",dec_portion,frac_portion); // extract decimal portion (special handling of negative numbers to ensure we round towards zero)
dec_portion = labs(lat_or_lon) / T7;
if( lat_or_lon < 0 ){
dec_portion = -dec_portion;
}
// extract fractional portion
frac_portion = labs(lat_or_lon - dec_portion*T7);
s->printf("%ld.%07ld",(long)dec_portion,(long)frac_portion);
} }
void setup() void setup()