X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Fao_gps_print.c;h=8cc07c85790e5264d49bb695090cb6c66bb5af71;hp=49041af6f452c5c188531e9d8e6ebd1602136bed;hb=91b023e7e4eeed838e0320d2ddac0f6aac39e565;hpb=28be20cf914fb34dc3c776519708d0f02091764e diff --git a/src/ao_gps_print.c b/src/ao_gps_print.c index 49041af6..8cc07c85 100644 --- a/src/ao_gps_print.c +++ b/src/ao_gps_print.c @@ -49,8 +49,7 @@ ao_gps_print(__xdata struct ao_gps_data *gps_data) __reentrant (gps_data->flags & AO_GPS_NUM_SAT_MASK) >> AO_GPS_NUM_SAT_SHIFT); if (gps_data->flags & AO_GPS_VALID) { static __xdata struct ao_gps_split lat, lon; - int16_t climb; - uint8_t climb_sign; + int16_t climb, climb_int, climb_frac; ao_gps_split(gps_data->latitude, &lat); ao_gps_split(gps_data->longitude, &lon); @@ -68,18 +67,19 @@ ao_gps_print(__xdata struct ao_gps_data *gps_data) __reentrant lon.minutes_fraction, lon.positive ? 'E' : 'W', gps_data->altitude); - if (gps_data->climb_rate >= 0) { - climb_sign = ' '; - climb = gps_data->climb_rate; + climb = gps_data->climb_rate; + if (climb >= 0) { + climb_int = climb / 100; + climb_frac = climb % 100; } else { - climb_sign = '-'; - climb = -gps_data->climb_rate; + climb = -climb; + climb_int = -(climb / 100); + climb_frac = climb % 100; } - printf(" %5u.%02dm/s(H) %d° %c%5d.%02dm/s(V)", + printf(" %5u.%02dm/s(H) %d° %5d.%02dm/s(V)", gps_data->ground_speed / 100, gps_data->ground_speed % 100, gps_data->course * 2, - climb_sign, climb / 100, climb % 100); printf(" %d.%d(hdop) %5u(herr) %5u(verr)\n",