altos: Bring up basic TeleTerra v0.2 UI

Lots of fun stuff here -- multiple panes of information.

Signed-off-by: Keith Packard <[email protected]>

Author: keith-packard

src/cc1111/ao_arch.h

@@ -205,17 +205,23 @@ struct ao_adc {
 #define AO_ADC_RING	32
 
 /* ao_button.c */
+#ifdef HAS_BUTTON
 void
-ao_p2_isr(void);
+ao_p0_isr(void) ao_arch_interrupt(13);
 
 void
-ao_button_init(void);
+ao_p1_isr(void) ao_arch_interrupt(15);
 
-#if HAS_BUTTON_P0
 void
-ao_p0_isr(void) ao_arch_interrupt(13);
+ao_p2_isr(void);
+
+#define HAS_P2_ISR	1
+
 #endif
 
+void
+ao_button_init(void);
+
 char
 ao_button_get(void) __critical;
 

src/cc1111/ao_button.c

@@ -19,14 +19,22 @@
 
 volatile __xdata struct ao_fifo ao_button_fifo;
 
-#define BUTTON_1_PIN	(P0_4)
-#define BUTTON_1_MASK	(1 << 4)	/* P0_4 */
+static __code struct {
+	uint8_t	mask;
+	uint8_t	reg;
+} ao_buttons[] = {
+#ifdef BUTTON_1_MASK
+	{ BUTTON_1_MASK, BUTTON_1_REG },
+#endif
+#ifdef BUTTON_2_MASK
+	{ BUTTON_2_MASK, BUTTON_2_REG },
+#endif
+#ifdef BUTTON_3_MASK
+	{ BUTTON_3_MASK, BUTTON_3_REG },
+#endif
+};
 
-#define BUTTON_2_PIN	(P2_3)
-#define BUTTON_2_MASK	(1 << 3)	/* P2_3 */
-
-#define BUTTON_3_PIN	(P2_4)
-#define BUTTON_3_MASK	(1 << 4)	/* P2_4 */
+#define NUM_BUTTONS	((sizeof ao_buttons) / sizeof (ao_buttons[0]))
 
 static void
 ao_button_insert(char n)
@@ -35,52 +43,101 @@ ao_button_insert(char n)
 	ao_wakeup(&ao_button_fifo);
 }
 
+static void
+ao_button_isr(uint8_t flag, uint8_t reg)
+{
+	uint8_t	b;
+
+	for (b = 0; b < NUM_BUTTONS; b++)
+		if (ao_buttons[b].reg == reg && (ao_buttons[b].mask & flag))
+			ao_button_insert(b + 1);
+}
+
+static uint8_t
+ao_button_mask(uint8_t reg)
+{
+	uint8_t	b;
+	uint8_t mask = 0;
+
+	for (b = 0; b < NUM_BUTTONS; b++)
+		if (ao_buttons[b].reg == reg)
+			mask |= ao_buttons[b].mask;
+	return mask;
+}
+
 char
 ao_button_get(void) __critical
 {
 	char	b;
 
 	while (ao_fifo_empty(ao_button_fifo))
-		ao_sleep(&ao_button_fifo);
+		if (ao_sleep(&ao_button_fifo))
+			return 0;
 	ao_fifo_remove(ao_button_fifo, b);
 	return b;
 }
 
 void
-ao_p2_isr(void)
+ao_p0_isr(void) ao_arch_interrupt(13)
 {
-	if (P2IFG & BUTTON_2_MASK)
-		ao_button_insert(2);
-	if (P2IFG & BUTTON_3_MASK)
-		ao_button_insert(3);
-	P2IFG = 0;
+	P0IF = 0;
+	ao_button_isr(P0IFG, 0);
+	P0IFG = 0;
 }
 
 void
-ao_p0_isr(void) ao_arch_interrupt(13)
+ao_p1_isr(void) ao_arch_interrupt(15)
 {
-	P0IF = 0;
-	if (P0IFG & BUTTON_1_MASK)
-		ao_button_insert(1);
-	P0IFG = 0;
+	P1IF = 0;
+	ao_button_isr(P1IFG, 1);
+	P1IFG = 0;
+}
+
+/* Shared with USB */
+void
+ao_p2_isr(void)
+{
+	ao_button_isr(P2IFG, 2);
+	P2IFG = 0;
 }
 
 void
 ao_button_init(void)
 {
+	uint8_t	mask;
+
 	/* Pins are configured as inputs with pull-up by default */
 
-	/* Enable interrupts for P2_0 - P2_4
-	 * Enable interrupts for P0_4 - P0_7
-	 * Set P2 interrupts to falling edge
-	 * Set P0 interrupts to falling edge
-	 */
-	
 	/* Enable interrupts for P0 inputs */
-	IEN1 |= IEN1_P0IE;
+	mask = ao_button_mask(0);
+	if (mask) {
+		if (mask & 0x0f)
+			PICTL |= PICTL_P0IENL;
+		if (mask & 0xf0)
+			PICTL |= PICTL_P0IENH;
+		P0IFG = 0;
+		P0IF = 0;
+		IEN1 |= IEN1_P0IE;
+		PICTL |= PICTL_P0ICON;
+	}
 
-	/* Enable interrupts for P2 inputs */
-	IEN2 |= IEN2_P2IE;
+	/* Enable interrupts for P1 inputs */
+	mask = ao_button_mask(1);
+	if (mask) {
+		P1IEN |= mask;
+		P1IFG = 0;
+		P1IF = 0;
+		IEN2 |= IEN2_P1IE;
+		PICTL |= PICTL_P1ICON;
+	}
 
-	PICTL |= PICTL_P2IEN | PICTL_P0IENH | PICTL_P2ICON | PICTL_P0ICON;
+	/* Enable interrupts for P2 inputs */
+	mask = ao_button_mask(2);
+	if (mask) {
+		PICTL |= PICTL_P2IEN;
+		P2IFG = 0;
+		P2IF = 0;
+		IEN2 |= IEN2_P2IE;
+		PICTL |= PICTL_P2ICON;
+	}
 }

src/cc1111/ao_lcd_port.c

@@ -17,15 +17,24 @@
 
 #include "ao.h"
 
+static void
+ao_lcd_port_delay(void)
+{
+	uint8_t	i;
+
+	for (i = 0; i < 100; i++)
+		ao_arch_nop();
+}
+
 void
 ao_lcd_port_put_nibble(uint8_t rs, uint8_t nibble)
 {
 	P0 = (P0 & 0xf0) | (nibble & 0x0f);
 	P1_1 = rs;
 	P1_0 = 1;
-	ao_delay(1);
+	ao_lcd_port_delay();
 	P1_0 = 0;
-	ao_delay(1);
+	ao_lcd_port_delay();
 }
 
 void

src/core/ao.h

@@ -996,7 +996,11 @@ ao_spi_slave(void);
  */
 #define AO_MAX_CALLSIGN			8
 #define AO_MAX_VERSION			8
+#if LEGACY_MONITOR
 #define AO_MAX_TELEMETRY		128
+#else
+#define AO_MAX_TELEMETRY		32
+#endif
 
 struct ao_telemetry_generic {
 	uint16_t	serial;		/* 0 */
@@ -1156,6 +1160,12 @@ union ao_telemetry_all {
 	struct ao_telemetry_baro		baro;
 };
 
+struct ao_telemetry_all_recv {
+	union ao_telemetry_all		telemetry;
+	int8_t				rssi;
+	uint8_t				status;
+};
+
 /*
  * ao_gps.c
  */
@@ -1372,9 +1382,10 @@ extern const char const * const ao_state_names[];
 #define AO_MONITOR_RING	8
 
 union ao_monitor {
-		struct ao_telemetry_raw_recv	raw;
-		struct ao_telemetry_orig_recv	orig;
-		struct ao_telemetry_tiny_recv	tiny;
+	struct ao_telemetry_raw_recv	raw;
+	struct ao_telemetry_all_recv	all;
+	struct ao_telemetry_orig_recv	orig;
+	struct ao_telemetry_tiny_recv	tiny;
 };
 
 extern __xdata union ao_monitor ao_monitor_ring[AO_MONITOR_RING];
@@ -1873,4 +1884,11 @@ void
 ao_battery_init(void);
 #endif /* BATTERY_PIN */
 
+/*
+ * ao_sqrt.c
+ */
+
+uint32_t
+ao_sqrt(uint32_t op);
+
 #endif /* _AO_H_ */

src/core/ao_monitor.c

@@ -26,6 +26,10 @@
 #error Must define LEGACY_MONITOR
 #endif
 
+#ifndef HAS_MONITOR_PUT
+#define HAS_MONIOTOR_PUT 1
+#endif
+
 __data uint8_t ao_monitoring;
 __pdata uint8_t ao_monitor_led;
 
@@ -73,6 +77,7 @@ ao_monitor_blink(void)
 	}
 }
 
+#if HAS_MONITOR_PUT
 void
 ao_monitor_put(void)
 {
@@ -260,9 +265,10 @@ ao_monitor_put(void)
 		ao_usb_flush();
 	}
 }
+__xdata struct ao_task ao_monitor_put_task;
+#endif
 
 __xdata struct ao_task ao_monitor_get_task;
-__xdata struct ao_task ao_monitor_put_task;
 __xdata struct ao_task ao_monitor_blink_task;
 
 void
@@ -293,7 +299,9 @@ ao_monitor_init(uint8_t monitor_led, uint8_t monitoring) __reentrant
 	ao_monitoring = monitoring;
 	ao_cmd_register(&ao_monitor_cmds[0]);
 	ao_add_task(&ao_monitor_get_task, ao_monitor_get, "monitor_get");
+#if HAS_MONITOR_PUT
 	ao_add_task(&ao_monitor_put_task, ao_monitor_put, "monitor_put");
+#endif
 	if (ao_monitor_led)
 		ao_add_task(&ao_monitor_blink_task, ao_monitor_blink, "monitor_blink");
 }

src/core/ao_sqrt.c

@@ -0,0 +1,46 @@
+/*
+ * Copyright © 2011 Keith Packard <[email protected]>
+ *
+ * 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.
+ *
+ * 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.
+ *
+ * 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"
+
+/* Adapted from int_sqrt.c in the linux kernel, which is licensed GPLv2 */
+/**
+ * int_sqrt - rough approximation to sqrt
+ * @x: integer of which to calculate the sqrt
+ *
+ * A very rough approximation to the sqrt() function.
+ */
+
+uint32_t
+ao_sqrt(uint32_t op)
+{
+	uint32_t	res = 0;
+	uint32_t	one = 1UL << (sizeof (one) * 8 - 2);
+
+	while (one > op)
+		one >>= 2;
+
+	while (one != 0) {
+		if (op >= res + one) {
+			op = op - (res + one);
+			res = res +  2 * one;
+		}
+		res /= 2;
+		one /= 4;
+	}
+	return res;
+}