X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Fao_gps_print.c;h=8cc07c85790e5264d49bb695090cb6c66bb5af71;hp=4dced8f10474edf8087c99da6dd000b948984827;hb=91b023e7e4eeed838e0320d2ddac0f6aac39e565;hpb=7adea9c59c73acd52743446c74fb675e0a1d6d05

diff --git a/src/ao_gps_print.c b/src/ao_gps_print.c
index 4dced8f1..8cc07c85 100644
--- a/src/ao_gps_print.c
+++ b/src/ao_gps_print.c
@@ -15,31 +15,81 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
+#ifndef AO_GPS_TEST
 #include "ao.h"
+#endif
+
+struct ao_gps_split {
+	uint8_t positive;
+	uint8_t	degrees;
+	uint8_t	minutes;
+	uint16_t minutes_fraction;
+};
+
+static void
+ao_gps_split(int32_t v, __xdata struct ao_gps_split *split) __reentrant
+{
+	uint32_t minutes_e7;
+
+	split->positive = 1;
+	if (v < 0) {
+		v = -v;
+		split->positive = 0;
+	}
+	split->degrees = v / 10000000;
+	minutes_e7 = (v % 10000000) * 60;
+	split->minutes = minutes_e7 / 10000000;
+	split->minutes_fraction = (minutes_e7 % 10000000) / 1000;
+}
 
 void
 ao_gps_print(__xdata struct ao_gps_data *gps_data) __reentrant
 {
 	printf("GPS %2d sat",
-	       (gps_data->flags & AO_GPS_NUM_SAT_MASK) >> AO_GPS_NUM_SAT_SHIFT);;
+	       (gps_data->flags & AO_GPS_NUM_SAT_MASK) >> AO_GPS_NUM_SAT_SHIFT);
 	if (gps_data->flags & AO_GPS_VALID) {
-		printf(" %2d:%02d:%02d %2d°%02d.%04d'%c %2d°%02d.%04d'%c %5dm\n",
+		static __xdata struct ao_gps_split	lat, lon;
+		int16_t climb, climb_int, climb_frac;
+
+		ao_gps_split(gps_data->latitude, &lat);
+		ao_gps_split(gps_data->longitude, &lon);
+		printf(" %2d:%02d:%02d",
 		       gps_data->hour,
 		       gps_data->minute,
-		       gps_data->second,
-		       gps_data->latitude.degrees,
-		       gps_data->latitude.minutes,
-		       gps_data->latitude.minutes_fraction,
-		       (gps_data->flags & AO_GPS_LATITUDE_MASK) == AO_GPS_LATITUDE_NORTH ?
-		       'N' : 'S',
-		       gps_data->longitude.degrees,
-		       gps_data->longitude.minutes,
-		       gps_data->longitude.minutes_fraction,
-		       (gps_data->flags & AO_GPS_LONGITUDE_MASK) == AO_GPS_LONGITUDE_WEST ?
-		       'W' : 'E',
-		       gps_data->altitude,
-		       (gps_data->flags & AO_GPS_NUM_SAT_MASK) >> AO_GPS_NUM_SAT_SHIFT);
-	} else {
+		       gps_data->second);
+		printf(" %2d°%02d.%04d'%c %2d°%02d.%04d'%c %5dm",
+		       lat.degrees,
+		       lat.minutes,
+		       lat.minutes_fraction,
+		       lat.positive ? 'N' : 'S',
+		       lon.degrees,
+		       lon.minutes,
+		       lon.minutes_fraction,
+		       lon.positive ? 'E' : 'W',
+		       gps_data->altitude);
+		climb = gps_data->climb_rate;
+		if (climb >= 0) {
+			climb_int = climb / 100;
+			climb_frac = climb % 100;
+		} else {
+			climb = -climb;
+			climb_int = -(climb / 100);
+			climb_frac = climb % 100;
+		}
+		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 / 100,
+		       climb % 100);
+		printf(" %d.%d(hdop) %5u(herr) %5u(verr)\n",
+		       gps_data->hdop / 5,
+		       (gps_data->hdop * 2) % 10,
+		       gps_data->h_error,
+		       gps_data->v_error);
+	} else if (gps_data->flags & AO_GPS_RUNNING) {
 		printf(" unlocked\n");
+	} else {
+		printf (" not-connected\n");
 	}
 }