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

diff --git a/src/ao_gps_print.c b/src/ao_gps_print.c
index 4dced8f1..ca071b42 100644
--- a/src/ao_gps_print.c
+++ b/src/ao_gps_print.c
@@ -15,31 +15,98 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
+#ifndef AO_GPS_TEST
 #include "ao.h"
+#endif
+#include "ao_telem.h"
 
 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);;
-	if (gps_data->flags & AO_GPS_VALID) {
-		printf(" %2d:%02d:%02d %2d°%02d.%04d'%c %2d°%02d.%04d'%c %5dm\n",
-		       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 {
-		printf(" unlocked\n");
+	char	state;
+
+	if (gps_data->flags & AO_GPS_VALID)
+		state = AO_TELEM_GPS_STATE_LOCKED;
+	else if (gps_data->flags & AO_GPS_RUNNING)
+		state = AO_TELEM_GPS_STATE_UNLOCKED;
+	else
+		state = AO_TELEM_GPS_STATE_ERROR;
+	printf(AO_TELEM_GPS_STATE " %c "
+	       AO_TELEM_GPS_NUM_SAT " %d ",
+	       state,
+	       (gps_data->flags & AO_GPS_NUM_SAT_MASK) >> AO_GPS_NUM_SAT_SHIFT);
+	if (!(gps_data->flags & AO_GPS_VALID))
+		return;
+	printf(AO_TELEM_GPS_LATITUDE " %ld "
+	       AO_TELEM_GPS_LONGITUDE " %ld "
+	       AO_TELEM_GPS_ALTITUDE " %d ",
+	       gps_data->latitude,
+	       gps_data->longitude,
+	       gps_data->altitude);
+
+	if (gps_data->flags & AO_GPS_DATE_VALID)
+		printf(AO_TELEM_GPS_YEAR " %d "
+		       AO_TELEM_GPS_MONTH " %d "
+		       AO_TELEM_GPS_DAY " %d ",
+		       gps_data->year,
+		       gps_data->month,
+		       gps_data->day);
+
+	printf(AO_TELEM_GPS_HOUR " %d "
+	       AO_TELEM_GPS_MINUTE " %d "
+	       AO_TELEM_GPS_SECOND " %d ",
+	       gps_data->hour,
+	       gps_data->minute,
+	       gps_data->second);
+
+	printf(AO_TELEM_GPS_HDOP " %d ",
+	       gps_data->hdop * 2);
+
+	if (gps_data->flags & AO_GPS_COURSE_VALID) {
+		printf(AO_TELEM_GPS_HERROR " %d "
+		       AO_TELEM_GPS_VERROR " %d "
+		       AO_TELEM_GPS_VERTICAL_SPEED " %d "
+		       AO_TELEM_GPS_HORIZONTAL_SPEED " %d "
+		       AO_TELEM_GPS_COURSE " %d ",
+		       gps_data->h_error,
+		       gps_data->v_error,
+		       gps_data->climb_rate,
+		       gps_data->ground_speed,
+		       (int) gps_data->course * 2);
+	}
+}
+
+void
+ao_gps_tracking_print(__xdata struct ao_gps_tracking_data *gps_tracking_data) __reentrant
+{
+	uint8_t	c, n, v;
+	__xdata struct ao_gps_sat_data	*sat;
+
+	n = gps_tracking_data->channels;
+	if (n == 0)
+		return;
+
+	sat = gps_tracking_data->sats;
+	v = 0;
+	for (c = 0; c < n; c++) {
+		if (sat->svid)
+			v++;
+		sat++;
+	}
+
+	printf (AO_TELEM_SAT_NUM " %d ",
+		v);
+
+	sat = gps_tracking_data->sats;
+	v = 0;
+	for (c = 0; c < n; c++) {
+		if (sat->svid) {
+			printf (AO_TELEM_SAT_SVID "%d %d "
+				AO_TELEM_SAT_C_N_0 "%d %d ",
+				v, sat->svid,
+				v, sat->c_n_1);
+			v++;
+		}
+		sat++;
 	}
 }