X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=ao_monitor.c;h=3db5e42d8a5563c64af6cdc63b19a5c1eaaa75ee;hp=1c2d127457ebc8a5fba5cc220b42ec571a45a5e1;hb=306b28f632e21b42ab165e7944283cf9764b590e;hpb=43c8f7012102cdb591ace899420c10e4a78385ad

diff --git a/ao_monitor.c b/ao_monitor.c
index 1c2d1274..3db5e42d 100644
--- a/ao_monitor.c
+++ b/ao_monitor.c
@@ -1,25 +1,18 @@
 /*
- * $Id: $
+ * Copyright © 2009 Keith Packard <keithp@keithp.com>
  *
- * Copyright © 2009 Keith Packard
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
  *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of Keith Packard not be used in
- * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission.  Keith Packard makes no
- * representations about the suitability of this software for any purpose.  It
- * is provided "as is" without express or implied warranty.
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
  *
- * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
 #include "ao.h"
@@ -29,6 +22,8 @@ const char const * const ao_state_names[] = {
 	"apogee", "drogue", "main", "landed", "invalid"
 };
 
+__xdata uint8_t ao_monitoring;
+
 void
 ao_monitor(void)
 {
@@ -36,6 +31,8 @@ ao_monitor(void)
 	uint8_t state;
 
 	for (;;) {
+		__critical while (!ao_monitoring)
+			ao_sleep(&ao_monitoring);
 		ao_radio_recv(&recv);
 		state = recv.telemetry.flight_state;
 		if (state > ao_flight_invalid)
@@ -45,29 +42,38 @@ ao_monitor(void)
 			ao_state_names[state]);
 		if (!(recv.status & PKT_APPEND_STATUS_1_CRC_OK))
 			printf("CRC INVALID ");
-		switch (recv.telemetry.type) {
-		case AO_TELEMETRY_SENSOR:
-			printf("%5u a: %d p: %d t: %d v: %d d: %d m: %d\n",
-			       recv.telemetry.u.adc.tick,
-			       recv.telemetry.u.adc.accel,
-			       recv.telemetry.u.adc.pres,
-			       recv.telemetry.u.adc.temp,
-			       recv.telemetry.u.adc.v_batt,
-			       recv.telemetry.u.adc.sense_d,
-			       recv.telemetry.u.adc.sense_m);
-			break;
-		case AO_TELEMETRY_GPS:
-			ao_gps_print(&recv.telemetry.u.gps);
-			break;
-		}
+		printf("%5u a: %d p: %d t: %d v: %d d: %d m: %d ",
+		       recv.telemetry.adc.tick,
+		       recv.telemetry.adc.accel,
+		       recv.telemetry.adc.pres,
+		       recv.telemetry.adc.temp,
+		       recv.telemetry.adc.v_batt,
+		       recv.telemetry.adc.sense_d,
+		       recv.telemetry.adc.sense_m);
+		ao_gps_print(&recv.telemetry.gps);
 		ao_usb_flush();
 	}
 }
 
 __xdata struct ao_task ao_monitor_task;
 
+static void
+ao_set_monitor(void)
+{
+	ao_cmd_hex();
+	ao_monitoring = ao_cmd_lex_i != 0;
+	ao_wakeup(&ao_monitoring);
+}
+
+__code struct ao_cmds ao_monitor_cmds[] = {
+	{ 'M',	ao_set_monitor,	"M                                  Enable/disable radio monitoring" },
+	{ 0,	ao_set_monitor,	NULL },
+};
+
 void
 ao_monitor_init(void)
 {
+	ao_monitoring = 0;
+	ao_cmd_register(&ao_monitor_cmds[0]);
 	ao_add_task(&ao_monitor_task, ao_monitor, "monitor");
 }