From 6b2db651a1dbc7ea97fce802b5f10b88be1ab42b Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Sat, 27 Aug 2011 12:42:10 -0700
Subject: altos: Add makefile for telelaunch

Signed-off-by: Keith Packard <keithp@keithp.com>
---
 src/product/Makefile.telelaunch | 97 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 97 insertions(+)
 create mode 100644 src/product/Makefile.telelaunch

(limited to 'src/product/Makefile.telelaunch')

diff --git a/src/product/Makefile.telelaunch b/src/product/Makefile.telelaunch
new file mode 100644
index 00000000..71781bb1
--- /dev/null
+++ b/src/product/Makefile.telelaunch
@@ -0,0 +1,97 @@
+#
+# TeleLaunch build file
+#
+# define TELELAUNCH_VER, TELELAUNCH_DEF
+# this file
+
+vpath %.c ..:../core:../cc1111:../drivers:../product
+vpath %.h ..:../core:../cc1111:../drivers:../product
+vpath ao-make-product.5c ../util
+
+ifndef VERSION
+include ../Version
+endif
+
+INC = \
+	ao.h \
+	ao_pins.h \
+	cc1111.h \
+	ao_product.h
+
+CORE_SRC = \
+	ao_cmd.c \
+	ao_config.c \
+	ao_convert.c \
+	ao_mutex.c \
+	ao_panic.c \
+	ao_stdio.c \
+	ao_storage.c \
+	ao_task.c \
+	ao_sample.c
+
+CC1111_SRC = \
+	ao_adc.c \
+	ao_beep.c \
+	ao_dbg.c \
+	ao_dma.c \
+	ao_ignite.c \
+	ao_led.c \
+	ao_packet.c \
+	ao_packet_slave.c \
+	ao_radio.c \
+	ao_romconfig.c \
+	ao_serial.c \
+	ao_spi.c \
+	ao_timer.c \
+	ao_usb.c \
+	_bp.c
+
+DRIVER_SRC =
+
+PRODUCT_SRC = \
+	ao_telelaunch.c
+
+SRC = \
+	$(CORE_SRC) \
+	$(CC1111_SRC) \
+	$(DRIVER_SRC) \
+	$(PRODUCT_SRC)
+
+PROG = telelaunch-v$(TELELAUNCH_VER)-$(VERSION).ihx
+PRODUCT=TeleLaunch-v$(TELELAUNCH_VER)
+PRODUCT_DEF=-DTELELAUNCH_V_$(TELELAUNCH_DEF)
+IDPRODUCT=0x000f
+
+include ../cc1111/Makefile.cc1111
+
+NICKLE=nickle
+CHECK_STACK=sh ../util/check-stack
+
+V=0
+# The user has explicitly enabled quiet compilation.
+ifeq ($(V),0)
+quiet = @printf "  $1 $2 $@\n"; $($1)
+endif
+# Otherwise, print the full command line.
+quiet ?= $($1)
+
+all: ../$(PROG)
+
+../$(PROG): $(REL) Makefile
+	$(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $(PROG) $(REL) && cp $(PROG) $(PMAP) ..
+	$(call quiet,CHECK_STACK) ../cc1111/ao_arch.h $(PMEM)
+
+ao_product.h: ao-make-product.5c ../Version
+	$(call quiet,NICKLE,$<) $< -m altusmetrum.org -i $(IDPRODUCT) -p $(PRODUCT) -v $(VERSION) > $@
+
+distclean:	clean
+
+clean:
+	rm -f $(ADB) $(ASM) $(LNK) $(LST) $(REL) $(RST) $(SYM)
+	rm -f $(PROG) $(PCDB) $(PLNK) $(PMAP) $(PMEM) $(PAOM)
+	rm -f ao_product.h
+	rm -f ../$(PROG) ../$(PMAP)
+
+install:
+
+uninstall:
-- 
cgit v1.2.3


From bc827699be4ed9ac60a7e862e6532791968bf685 Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Sat, 27 Aug 2011 13:28:01 -0700
Subject: altos: Fix up telelaunch Makefile

Adding all of the mising sources

Signed-off-by: Keith Packard <keithp@keithp.com>
---
 src/product/Makefile.telelaunch | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'src/product/Makefile.telelaunch')

diff --git a/src/product/Makefile.telelaunch b/src/product/Makefile.telelaunch
index 71781bb1..5da42e46 100644
--- a/src/product/Makefile.telelaunch
+++ b/src/product/Makefile.telelaunch
@@ -22,23 +22,26 @@ CORE_SRC = \
 	ao_cmd.c \
 	ao_config.c \
 	ao_convert.c \
+	ao_launch.c \
 	ao_mutex.c \
 	ao_panic.c \
 	ao_stdio.c \
 	ao_storage.c \
-	ao_task.c \
-	ao_sample.c
+	ao_task.c
 
 CC1111_SRC = \
 	ao_adc.c \
+	ao_aes.c \
 	ao_beep.c \
 	ao_dbg.c \
 	ao_dma.c \
 	ao_ignite.c \
+	ao_intflash.c \
 	ao_led.c \
 	ao_packet.c \
 	ao_packet_slave.c \
 	ao_radio.c \
+	ao_radio_cmac.c \
 	ao_romconfig.c \
 	ao_serial.c \
 	ao_spi.c \
@@ -61,6 +64,7 @@ PROG = telelaunch-v$(TELELAUNCH_VER)-$(VERSION).ihx
 PRODUCT=TeleLaunch-v$(TELELAUNCH_VER)
 PRODUCT_DEF=-DTELELAUNCH_V_$(TELELAUNCH_DEF)
 IDPRODUCT=0x000f
+CODESIZE=0x6700
 
 include ../cc1111/Makefile.cc1111
 
-- 
cgit v1.2.3


From 258b75498916183ed250d3abb3282fe3d843e7a1 Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Fri, 7 Oct 2011 09:53:09 -0600
Subject: altos: Write xdata versions of memory functions

These are significantly smaller than the general pointer versions from
libc on the cc1111.

Signed-off-by: Keith Packard <keithp@keithp.com>

Conflicts:

	src/Makefile.proto
	src/cc1111/ao_adc.c
	src/cc1111/ao_packet_master.c
	src/core/ao.h

Fix up the new makefiles
---
 src/cc1111/ao_adc.c             |  2 +-
 src/cc1111/ao_arch.h            | 17 +++++++++++++++++
 src/cc1111/ao_intflash.c        |  2 +-
 src/cc1111/ao_packet.c          |  4 ++--
 src/cc1111/ao_packet_master.c   |  2 +-
 src/cc1111/ao_packet_slave.c    |  2 +-
 src/core/ao.h                   |  6 ++++++
 src/core/ao_cmd.c               |  4 ++--
 src/core/ao_config.c            | 11 ++++++-----
 src/core/ao_ee_fake.c           |  2 +-
 src/core/ao_gps_report.c        |  4 ++--
 src/core/ao_host.h              |  4 ++++
 src/core/ao_monitor.c           |  4 ++--
 src/core/ao_telemetry.c         | 10 +++++-----
 src/drivers/ao_25lc1024.c       |  6 +++---
 src/drivers/ao_at45db161d.c     |  6 +++---
 src/drivers/ao_gps_skytraq.c    |  4 ++--
 src/product/Makefile.telebt     |  1 +
 src/product/Makefile.teledongle |  1 +
 src/product/Makefile.telelaunch |  1 +
 src/product/Makefile.telemetrum |  1 +
 src/product/Makefile.telemini   |  1 +
 src/product/Makefile.telenano   |  1 +
 src/test/ao_flight_test.c       |  8 ++++++--
 src/tidongle/Makefile           |  1 +
 25 files changed, 72 insertions(+), 33 deletions(-)

(limited to 'src/product/Makefile.telelaunch')

diff --git a/src/cc1111/ao_adc.c b/src/cc1111/ao_adc.c
index 6aa6e018..1688eceb 100644
--- a/src/cc1111/ao_adc.c
+++ b/src/cc1111/ao_adc.c
@@ -46,7 +46,7 @@ ao_adc_get(__xdata struct ao_adc *packet)
 #else
 	uint8_t	i = ao_adc_ring_prev(ao_adc_head);
 #endif
-	memcpy(packet, &ao_adc_ring[i], sizeof (struct ao_adc));
+	ao_xmemcpy(packet, &ao_adc_ring[i], sizeof (struct ao_adc));
 }
 
 void
diff --git a/src/cc1111/ao_arch.h b/src/cc1111/ao_arch.h
index 8a41791f..02e36189 100644
--- a/src/cc1111/ao_arch.h
+++ b/src/cc1111/ao_arch.h
@@ -204,4 +204,21 @@ struct ao_adc {
 
 #define AO_ADC_RING	32
 
+/* ao_string.c */
+
+void
+_ao_xmemcpy(__xdata uint8_t *dst, __xdata uint8_t *src, uint8_t count);
+
+#define ao_xmemcpy(d,s,c) _ao_xmemcpy((__xdata uint8_t *) (d), (__xdata uint8_t *) (s), (c))
+
+void
+_ao_xmemset(__xdata uint8_t *dst, uint8_t value, uint8_t count);
+
+#define ao_xmemset(d,v,c) _ao_xmemset((__xdata uint8_t *) (d), (v), (c))
+
+int8_t
+_ao_xmemcmp(__xdata uint8_t *a, __xdata uint8_t *b, uint8_t count);
+
+#define ao_xmemcmp(d,s,c) _ao_xmemcmp((__xdata uint8_t *) (d), (__xdata uint8_t *) (s), (c))
+
 #endif /* _AO_ARCH_H_ */
diff --git a/src/cc1111/ao_intflash.c b/src/cc1111/ao_intflash.c
index d76d954e..632e2a85 100644
--- a/src/cc1111/ao_intflash.c
+++ b/src/cc1111/ao_intflash.c
@@ -180,7 +180,7 @@ ao_storage_device_read(uint32_t pos, __xdata void *d, uint16_t len) __reentrant
 {
 	if (pos >= ao_storage_total || pos + len > ao_storage_total)
 		return 0;
-	memcpy(d, ao_intflash+pos, len);
+	ao_xmemcpy(d, ao_intflash+pos, len);
 	return 1;
 }
 
diff --git a/src/cc1111/ao_packet.c b/src/cc1111/ao_packet.c
index f627e02b..37ba92e0 100644
--- a/src/cc1111/ao_packet.c
+++ b/src/cc1111/ao_packet.c
@@ -35,7 +35,7 @@ ao_packet_send(void)
 	ao_led_on(AO_LED_RED);
 	/* If any tx data is pending then copy it into the tx packet */
 	if (ao_packet_tx_used && ao_tx_packet.len == 0) {
-		memcpy(&ao_tx_packet.d, tx_data, ao_packet_tx_used);
+		ao_xmemcpy(&ao_tx_packet.d, tx_data, ao_packet_tx_used);
 		ao_tx_packet.len = ao_packet_tx_used;
 		ao_tx_packet.seq++;
 		ao_packet_tx_used = 0;
@@ -80,7 +80,7 @@ ao_packet_recv(void)
 			/* Copy data to the receive data buffer and set up the
 			 * offsets
 			 */
-			memcpy(rx_data, ao_rx_packet.packet.d, ao_rx_packet.packet.len);
+			ao_xmemcpy(rx_data, ao_rx_packet.packet.d, ao_rx_packet.packet.len);
 			ao_packet_rx_used = 0;
 			ao_packet_rx_len = ao_rx_packet.packet.len;
 
diff --git a/src/cc1111/ao_packet_master.c b/src/cc1111/ao_packet_master.c
index 0d0be30e..ab19f979 100644
--- a/src/cc1111/ao_packet_master.c
+++ b/src/cc1111/ao_packet_master.c
@@ -81,7 +81,7 @@ ao_packet_master(void)
 	ao_packet_master_delay = AO_PACKET_MASTER_DELAY_SHORT;
 	while (ao_packet_enable) {
 		uint8_t	r;
-		memcpy(ao_tx_packet.callsign, ao_config.callsign, AO_MAX_CALLSIGN);
+		ao_xmemcpy(ao_tx_packet.callsign, ao_config.callsign, AO_MAX_CALLSIGN);
 		ao_packet_send();
 		if (ao_tx_packet.len)
 			ao_packet_master_busy();
diff --git a/src/cc1111/ao_packet_slave.c b/src/cc1111/ao_packet_slave.c
index d7cafa68..fd5d443e 100644
--- a/src/cc1111/ao_packet_slave.c
+++ b/src/cc1111/ao_packet_slave.c
@@ -24,7 +24,7 @@ ao_packet_slave(void)
 	ao_tx_packet.len = AO_PACKET_SYN;
 	while (ao_packet_enable) {
 		if (ao_packet_recv()) {
-			memcpy(&ao_tx_packet.callsign, &ao_rx_packet.packet.callsign, AO_MAX_CALLSIGN);
+			ao_xmemcpy(&ao_tx_packet.callsign, &ao_rx_packet.packet.callsign, AO_MAX_CALLSIGN);
 #if HAS_FLIGHT
 			ao_flight_force_idle = TRUE;
 #endif
diff --git a/src/core/ao.h b/src/core/ao.h
index 04610fea..c0474729 100644
--- a/src/core/ao.h
+++ b/src/core/ao.h
@@ -1817,4 +1817,10 @@ ao_log_single(void);
 
 #define AO_TELEPYRO_NUM_ADC	9
 
+#ifndef ao_xmemcpy
+#define ao_xmemcpy(d,s,c) memcpy(d,s,c)
+#define ao_xmemset(d,v,c) memset(d,v,c)
+#define ao_xmemcmp(d,s,c) memcmp(d,s,c)
+#endif
+
 #endif /* _AO_H_ */
diff --git a/src/core/ao_cmd.c b/src/core/ao_cmd.c
index 2b64b8ca..0c902f6b 100644
--- a/src/core/ao_cmd.c
+++ b/src/core/ao_cmd.c
@@ -265,8 +265,8 @@ help(void)
 		cs = ao_cmds[cmds];
 		for (cmd = 0; cs[cmd].func; cmd++)
 			printf("%-45s %s\n",
-				cs[cmd].help,
-				cs[cmd].help+1+strlen(cs[cmd].help));
+			       cs[cmd].help,
+			       cs[cmd].help+1+strlen(cs[cmd].help));
 	}
 }
 
diff --git a/src/core/ao_config.c b/src/core/ao_config.c
index a653bed2..08cc79b1 100644
--- a/src/core/ao_config.c
+++ b/src/core/ao_config.c
@@ -78,8 +78,8 @@ _ao_config_get(void)
 		/* Version 0 stuff */
 		ao_config.main_deploy = AO_CONFIG_DEFAULT_MAIN_DEPLOY;
 		ao_config.radio_channel = AO_CONFIG_DEFAULT_RADIO_CHANNEL;
-		memset(&ao_config.callsign, '\0', sizeof (ao_config.callsign));
-		memcpy(&ao_config.callsign, AO_CONFIG_DEFAULT_CALLSIGN,
+		ao_xmemset(&ao_config.callsign, '\0', sizeof (ao_config.callsign));
+		ao_xmemcpy(&ao_config.callsign, AO_CONFIG_DEFAULT_CALLSIGN,
 		       sizeof(AO_CONFIG_DEFAULT_CALLSIGN) - 1);
 		ao_config_dirty = 1;
 	}
@@ -148,7 +148,7 @@ ao_config_callsign_set(void) __reentrant
 	uint8_t	c;
 	static __xdata char callsign[AO_MAX_CALLSIGN + 1];
 
-	memset(callsign, '\0', sizeof callsign);
+	ao_xmemset(callsign, '\0', sizeof callsign);
 	ao_cmd_white();
 	c = 0;
 	while (ao_cmd_lex_c != '\n') {
@@ -161,7 +161,7 @@ ao_config_callsign_set(void) __reentrant
 	if (ao_cmd_status != ao_cmd_success)
 		return;
 	_ao_config_edit_start();
-	memcpy(&ao_config.callsign, &callsign,
+	ao_xmemcpy(&ao_config.callsign, &callsign,
 	       AO_MAX_CALLSIGN + 1);
 	_ao_config_edit_finish();
 }
@@ -535,7 +535,8 @@ ao_config_help(void) __reentrant
 	for (cmd = 0; ao_config_vars[cmd].str != NULL; cmd++)
 		printf("%-20s %s\n",
 		       ao_config_vars[cmd].str,
-		       ao_config_vars[cmd].str+1+strlen(ao_config_vars[cmd].str));
+		       ao_config_vars[cmd].str+1+
+		       strlen(ao_config_vars[cmd].str));
 }
 
 static void
diff --git a/src/core/ao_ee_fake.c b/src/core/ao_ee_fake.c
index b0c1d61e..7fcfcab0 100644
--- a/src/core/ao_ee_fake.c
+++ b/src/core/ao_ee_fake.c
@@ -32,6 +32,6 @@ ao_ee_write_config(uint8_t *buf, uint16_t len) __reentrant
 uint8_t
 ao_ee_read_config(uint8_t *buf, uint16_t len) __reentrant
 {
-	memset(buf, '\0', len);
+	ao_xmemset(buf, '\0', len);
 	return 1;
 }
diff --git a/src/core/ao_gps_report.c b/src/core/ao_gps_report.c
index e57f8744..c52ef621 100644
--- a/src/core/ao_gps_report.c
+++ b/src/core/ao_gps_report.c
@@ -27,7 +27,7 @@ ao_gps_report(void)
 	for (;;) {
 		ao_sleep(&ao_gps_data);
 		ao_mutex_get(&ao_gps_mutex);
-		memcpy(&gps_data, &ao_gps_data, sizeof (ao_gps_data));
+		ao_xmemcpy(&gps_data, &ao_gps_data, sizeof (ao_gps_data));
 		ao_mutex_put(&ao_gps_mutex);
 
 		if (!(gps_data.flags & AO_GPS_VALID))
@@ -72,7 +72,7 @@ ao_gps_tracking_report(void)
 		ao_sleep(&ao_gps_tracking_data);
 		ao_mutex_get(&ao_gps_mutex);
 		gps_log.tick = ao_gps_tick;
-		memcpy(&gps_tracking_data, &ao_gps_tracking_data, sizeof (ao_gps_tracking_data));
+		ao_xmemcpy(&gps_tracking_data, &ao_gps_tracking_data, sizeof (ao_gps_tracking_data));
 		ao_mutex_put(&ao_gps_mutex);
 
 		if (!(n = gps_tracking_data.channels))
diff --git a/src/core/ao_host.h b/src/core/ao_host.h
index 65c25fe5..f2b2f0c9 100644
--- a/src/core/ao_host.h
+++ b/src/core/ao_host.h
@@ -125,3 +125,7 @@ struct ao_config {
 #define ao_config_get()
 
 struct ao_config ao_config = { 250, 16000 };
+
+#define ao_xmemcpy(d,s,c) memcpy(d,s,c)
+#define ao_xmemset(d,v,c) memset(d,v,c)
+#define ao_xmemcmp(d,s,c) memcmp(d,s,c)
diff --git a/src/core/ao_monitor.c b/src/core/ao_monitor.c
index 56d7604d..1a8bb52a 100644
--- a/src/core/ao_monitor.c
+++ b/src/core/ao_monitor.c
@@ -94,7 +94,7 @@ ao_monitor_put(void)
 
 			/* Typical RSSI offset for 38.4kBaud at 433 MHz is 74 */
 			rssi = (int16_t) (recv_orig.rssi >> 1) - 74;
-			memcpy(callsign, recv_orig.telemetry_orig.callsign, AO_MAX_CALLSIGN);
+			ao_xmemcpy(callsign, recv_orig.telemetry_orig.callsign, AO_MAX_CALLSIGN);
 			if (state > ao_flight_invalid)
 				state = ao_flight_invalid;
 			if (recv_orig.status & PKT_APPEND_STATUS_1_CRC_OK) {
@@ -171,7 +171,7 @@ ao_monitor_put(void)
 
 			/* Typical RSSI offset for 38.4kBaud at 433 MHz is 74 */
 			rssi = (int16_t) (recv_tiny.rssi >> 1) - 74;
-			memcpy(callsign, recv_tiny.telemetry_tiny.callsign, AO_MAX_CALLSIGN);
+			ao_xmemcpy(callsign, recv_tiny.telemetry_tiny.callsign, AO_MAX_CALLSIGN);
 			if (state > ao_flight_invalid)
 				state = ao_flight_invalid;
 			if (recv_tiny.status & PKT_APPEND_STATUS_1_CRC_OK) {
diff --git a/src/core/ao_telemetry.c b/src/core/ao_telemetry.c
index 26e4e2a0..95e53917 100644
--- a/src/core/ao_telemetry.c
+++ b/src/core/ao_telemetry.c
@@ -131,10 +131,10 @@ ao_send_configuration(void)
 		telemetry.configuration.apogee_delay = ao_config.apogee_delay;
 		telemetry.configuration.main_deploy = ao_config.main_deploy;
 		telemetry.configuration.flight_log_max = ao_config.flight_log_max >> 10;
-		memcpy (telemetry.configuration.callsign,
+		ao_xmemcpy (telemetry.configuration.callsign,
 			ao_config.callsign,
 			AO_MAX_CALLSIGN);
-		memcpy (telemetry.configuration.version,
+		ao_xmemcpy (telemetry.configuration.version,
 			ao_version,
 			AO_MAX_VERSION);
 		ao_radio_send(&telemetry, sizeof (telemetry));
@@ -150,7 +150,7 @@ ao_send_location(void)
 	{
 		telemetry.generic.type = AO_TELEMETRY_LOCATION;
 		ao_mutex_get(&ao_gps_mutex);
-		memcpy(&telemetry.location.flags,
+		ao_xmemcpy(&telemetry.location.flags,
 		       &ao_gps_data.flags,
 		       26);
 		ao_mutex_put(&ao_gps_mutex);
@@ -167,7 +167,7 @@ ao_send_satellite(void)
 		telemetry.generic.type = AO_TELEMETRY_SATELLITE;
 		ao_mutex_get(&ao_gps_mutex);
 		telemetry.satellite.channels = ao_gps_tracking_data.channels;
-		memcpy(&telemetry.satellite.sats,
+		ao_xmemcpy(&telemetry.satellite.sats,
 		       &ao_gps_tracking_data.sats,
 		       AO_MAX_GPS_TRACKING * sizeof (struct ao_telemetry_satellite_info));
 		ao_mutex_put(&ao_gps_mutex);
@@ -187,7 +187,7 @@ ao_send_companion(void)
 		telemetry.companion.update_period = ao_companion_setup.update_period;
 		telemetry.companion.channels = ao_companion_setup.channels;
 		ao_mutex_get(&ao_companion_mutex);
-		memcpy(&telemetry.companion.companion_data,
+		ao_xmemcpy(&telemetry.companion.companion_data,
 		       ao_companion_data,
 		       ao_companion_setup.channels * 2);
 		ao_mutex_put(&ao_companion_mutex);
diff --git a/src/drivers/ao_25lc1024.c b/src/drivers/ao_25lc1024.c
index 738f8ce6..2d047a44 100644
--- a/src/drivers/ao_25lc1024.c
+++ b/src/drivers/ao_25lc1024.c
@@ -167,7 +167,7 @@ ao_storage_device_write(uint32_t pos, __xdata void *buf, uint16_t len) __reentra
 			ao_ee_flush_internal();
 			ao_ee_block = block;
 		}
-		memcpy(ao_ee_data + (uint16_t) (pos & 0xff), buf, len);
+		ao_xmemcpy(ao_ee_data + (uint16_t) (pos & 0xff), buf, len);
 		ao_ee_block_dirty = 1;
 	} ao_mutex_put(&ao_ee_mutex);
 	return 1;
@@ -181,7 +181,7 @@ ao_storage_device_read(uint32_t pos, __xdata void *buf, uint16_t len) __reentran
 	/* Transfer the data */
 	ao_mutex_get(&ao_ee_mutex); {
 		ao_ee_fill(block);
-		memcpy(buf, ao_ee_data + (uint16_t) (pos & 0xff), len);
+		ao_xmemcpy(buf, ao_ee_data + (uint16_t) (pos & 0xff), len);
 	} ao_mutex_put(&ao_ee_mutex);
 	return 1;
 }
@@ -200,7 +200,7 @@ ao_storage_erase(uint32_t pos) __reentrant
 	ao_mutex_get(&ao_ee_mutex); {
 		ao_ee_flush_internal();
 		ao_ee_block = (uint16_t) (pos >> EE_BLOCK_SHIFT);
-		memset(ao_ee_data, 0xff, EE_BLOCK_SIZE);
+		ao_xmemset(ao_ee_data, 0xff, EE_BLOCK_SIZE);
 		ao_ee_block_dirty = 1;
 	} ao_mutex_put(&ao_ee_mutex);
 	return 1;
diff --git a/src/drivers/ao_at45db161d.c b/src/drivers/ao_at45db161d.c
index aee9877a..6cd689e5 100644
--- a/src/drivers/ao_at45db161d.c
+++ b/src/drivers/ao_at45db161d.c
@@ -245,7 +245,7 @@ ao_storage_device_write(uint32_t pos, __xdata void *buf, uint16_t len) __reentra
 			ao_flash_flush_internal();
 			ao_flash_block = block;
 		}
-		memcpy(ao_flash_data + (uint16_t) (pos & ao_flash_block_mask),
+		ao_xmemcpy(ao_flash_data + (uint16_t) (pos & ao_flash_block_mask),
 		       buf,
 		       len);
 		ao_flash_block_dirty = 1;
@@ -261,7 +261,7 @@ ao_storage_device_read(uint32_t pos, __xdata void *buf, uint16_t len) __reentran
 	/* Transfer the data */
 	ao_mutex_get(&ao_flash_mutex); {
 		ao_flash_fill(block);
-		memcpy(buf,
+		ao_xmemcpy(buf,
 		       ao_flash_data + (uint16_t) (pos & ao_flash_block_mask),
 		       len);
 	} ao_mutex_put(&ao_flash_mutex);
@@ -282,7 +282,7 @@ ao_storage_erase(uint32_t pos) __reentrant
 	ao_mutex_get(&ao_flash_mutex); {
 		ao_flash_flush_internal();
 		ao_flash_block = (uint16_t) (pos >> ao_flash_block_shift);
-		memset(ao_flash_data, 0xff, ao_flash_block_size);
+		ao_xmemset(ao_flash_data, 0xff, ao_flash_block_size);
 		ao_flash_block_dirty = 1;
 	} ao_mutex_put(&ao_flash_mutex);
 	return 1;
diff --git a/src/drivers/ao_gps_skytraq.c b/src/drivers/ao_gps_skytraq.c
index 7ac26946..6e65d651 100644
--- a/src/drivers/ao_gps_skytraq.c
+++ b/src/drivers/ao_gps_skytraq.c
@@ -265,7 +265,7 @@ ao_nmea_gga()
 	if (!ao_gps_error) {
 		ao_mutex_get(&ao_gps_mutex);
 		ao_gps_tick = ao_gps_next_tick;
-		memcpy(&ao_gps_data, &ao_gps_next, sizeof (ao_gps_data));
+		ao_xmemcpy(&ao_gps_data, &ao_gps_next, sizeof (ao_gps_data));
 		ao_mutex_put(&ao_gps_mutex);
 		ao_wakeup(&ao_gps_data);
 	}
@@ -327,7 +327,7 @@ ao_nmea_gsv(void)
 		ao_gps_tracking_next.channels = 0;
 	else if (done) {
 		ao_mutex_get(&ao_gps_mutex);
-		memcpy(&ao_gps_tracking_data, &ao_gps_tracking_next,
+		ao_xmemcpy(&ao_gps_tracking_data, &ao_gps_tracking_next,
 		       sizeof(ao_gps_tracking_data));
 		ao_mutex_put(&ao_gps_mutex);
 		ao_wakeup(&ao_gps_tracking_data);
diff --git a/src/product/Makefile.telebt b/src/product/Makefile.telebt
index 46c87db0..8f7c7429 100644
--- a/src/product/Makefile.telebt
+++ b/src/product/Makefile.telebt
@@ -41,6 +41,7 @@ CC1111_SRC = \
 	ao_radio_cmac.c \
 	ao_romconfig.c \
 	ao_serial.c \
+	ao_string.c \
 	ao_timer.c \
 	ao_usb.c \
 	_bp.c
diff --git a/src/product/Makefile.teledongle b/src/product/Makefile.teledongle
index 56182b84..c1b422c0 100644
--- a/src/product/Makefile.teledongle
+++ b/src/product/Makefile.teledongle
@@ -43,6 +43,7 @@ CC1111_SRC = \
 	ao_radio.c \
 	ao_radio_cmac.c \
 	ao_romconfig.c \
+	ao_string.c \
 	ao_timer.c \
 	ao_usb.c \
 	_bp.c
diff --git a/src/product/Makefile.telelaunch b/src/product/Makefile.telelaunch
index 5da42e46..b40f61a2 100644
--- a/src/product/Makefile.telelaunch
+++ b/src/product/Makefile.telelaunch
@@ -45,6 +45,7 @@ CC1111_SRC = \
 	ao_romconfig.c \
 	ao_serial.c \
 	ao_spi.c \
+	ao_string.c \
 	ao_timer.c \
 	ao_usb.c \
 	_bp.c
diff --git a/src/product/Makefile.telemetrum b/src/product/Makefile.telemetrum
index 2759ac52..4f4195a9 100644
--- a/src/product/Makefile.telemetrum
+++ b/src/product/Makefile.telemetrum
@@ -54,6 +54,7 @@ CC1111_SRC = \
 	ao_radio.c \
 	ao_romconfig.c \
 	ao_serial.c \
+	ao_string.c \
 	ao_spi.c \
 	ao_timer.c \
 	ao_usb.c \
diff --git a/src/product/Makefile.telemini b/src/product/Makefile.telemini
index 7f251897..9f90b01f 100644
--- a/src/product/Makefile.telemini
+++ b/src/product/Makefile.telemini
@@ -45,6 +45,7 @@ CC1111_SRC = \
 	ao_packet_slave.c \
 	ao_radio.c \
 	ao_romconfig.c \
+	ao_string.c \
 	ao_timer.c \
 	_bp.c
 
diff --git a/src/product/Makefile.telenano b/src/product/Makefile.telenano
index c47e95ff..eff3ea97 100644
--- a/src/product/Makefile.telenano
+++ b/src/product/Makefile.telenano
@@ -44,6 +44,7 @@ CC1111_SRC = \
 	ao_packet_slave.c \
 	ao_radio.c \
 	ao_romconfig.c \
+	ao_string.c \
 	ao_timer.c \
 	_bp.c
 
diff --git a/src/test/ao_flight_test.c b/src/test/ao_flight_test.c
index 56733c89..921d44e7 100644
--- a/src/test/ao_flight_test.c
+++ b/src/test/ao_flight_test.c
@@ -173,6 +173,10 @@ struct ao_cmds {
 	const char	*help;
 };
 
+#define ao_xmemcpy(d,s,c) memcpy(d,s,c)
+#define ao_xmemset(d,v,c) memset(d,v,c)
+#define ao_xmemcmp(d,s,c) memcmp(d,s,c)
+
 #include "ao_convert.c"
 
 struct ao_config {
@@ -542,7 +546,7 @@ ao_sleep(void *wchan)
 					ao_flight_started = 1;
 				}
 			} else if (nword == 2 && strcmp(words[0], "TELEM") == 0) {
-				char	*hex = words[1];
+				__xdata char	*hex = words[1];
 				char	elt[3];
 				int	i, len;
 				uint8_t	sum;
@@ -574,7 +578,7 @@ ao_sleep(void *wchan)
 					continue;
 				}
 				if (len == 36) {
-					memcpy(&telem, bytes + 1, 32);
+					ao_xmemcpy(&telem, bytes + 1, 32);
 					tick = telem.generic.tick;
 					switch (telem.generic.type) {
 					case AO_TELEMETRY_SENSOR_TELEMETRUM:
diff --git a/src/tidongle/Makefile b/src/tidongle/Makefile
index 057e420b..58b9d735 100644
--- a/src/tidongle/Makefile
+++ b/src/tidongle/Makefile
@@ -38,6 +38,7 @@ CC1111_SRC = \
 	ao_radio.c \
 	ao_radio_cmac.c \
 	ao_romconfig.c \
+	ao_string.c \
 	ao_timer.c \
 	ao_usb.c \
 	_bp.c
-- 
cgit v1.2.3


From ef7f86453d686a49882e8c1b88a59228c4c631a9 Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Sat, 12 Nov 2011 18:37:53 -0800
Subject: altos: Check pdata+xdata memory usage during build

The sdcc linker doesn't check the sum of pdata+xdata memory usage, it
only ensures that xdata itself is small enough. This doesn't keep
xdata below the end of usable ram on the cc1111 though (0xfe000).

Fix up the check-stack program to also make sure all of xdata fits in
available memory.

Signed-off-by: Keith Packard <keithp@keithp.com>
---
 src/product/Makefile.telebt     |  2 +-
 src/product/Makefile.teledongle |  2 +-
 src/product/Makefile.telelaunch |  2 +-
 src/product/Makefile.telemetrum |  2 +-
 src/product/Makefile.telemini   |  2 +-
 src/product/Makefile.telenano   |  2 +-
 src/teleballoon-v1.1/Makefile   |  2 +-
 src/teleterra-v0.2/Makefile     |  5 +----
 src/tidongle/Makefile           |  2 +-
 src/util/check-stack            | 10 ++++++++--
 10 files changed, 17 insertions(+), 14 deletions(-)

(limited to 'src/product/Makefile.telelaunch')

diff --git a/src/product/Makefile.telebt b/src/product/Makefile.telebt
index 8f7c7429..ea18ff18 100644
--- a/src/product/Makefile.telebt
+++ b/src/product/Makefile.telebt
@@ -81,7 +81,7 @@ all: ../$(PROG)
 
 ../$(PROG): $(REL) Makefile
 	$(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $(PROG) $(REL) && cp $(PROG) $(PMAP) ..
-	$(call quiet,CHECK_STACK) ../cc1111/ao_arch.h $(PMEM)
+	$(call quiet,CHECK_STACK) ../cc1111/ao_arch.h $(PMEM) || rm $@
 
 ao_product.h: ao-make-product.5c ../Version
 	$(call quiet,NICKLE,$<) $< -m altusmetrum.org -i $(IDPRODUCT) -p $(PRODUCT) -v $(VERSION) > $@
diff --git a/src/product/Makefile.teledongle b/src/product/Makefile.teledongle
index c1b422c0..cf33d1f1 100644
--- a/src/product/Makefile.teledongle
+++ b/src/product/Makefile.teledongle
@@ -81,7 +81,7 @@ all: ../$(PROG)
 
 ../$(PROG): $(REL) Makefile
 	$(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $(PROG) $(REL) && cp $(PROG) $(PMAP) ..
-	$(call quiet,CHECK_STACK) ../cc1111/ao_arch.h $(PMEM)
+	$(call quiet,CHECK_STACK) ../cc1111/ao_arch.h $(PMEM) || rm $@
 
 ao_product.h: ao-make-product.5c ../Version
 	$(call quiet,NICKLE,$<) $< -m altusmetrum.org -i $(IDPRODUCT) -p $(PRODUCT) -v $(VERSION) > $@
diff --git a/src/product/Makefile.telelaunch b/src/product/Makefile.telelaunch
index b40f61a2..97764517 100644
--- a/src/product/Makefile.telelaunch
+++ b/src/product/Makefile.telelaunch
@@ -84,7 +84,7 @@ all: ../$(PROG)
 
 ../$(PROG): $(REL) Makefile
 	$(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $(PROG) $(REL) && cp $(PROG) $(PMAP) ..
-	$(call quiet,CHECK_STACK) ../cc1111/ao_arch.h $(PMEM)
+	$(call quiet,CHECK_STACK) ../cc1111/ao_arch.h $(PMEM)  || rm $@
 
 ao_product.h: ao-make-product.5c ../Version
 	$(call quiet,NICKLE,$<) $< -m altusmetrum.org -i $(IDPRODUCT) -p $(PRODUCT) -v $(VERSION) > $@
diff --git a/src/product/Makefile.telemetrum b/src/product/Makefile.telemetrum
index 40fc6bc2..52c723ca 100644
--- a/src/product/Makefile.telemetrum
+++ b/src/product/Makefile.telemetrum
@@ -94,7 +94,7 @@ all: ../$(PROG)
 
 ../$(PROG): $(REL) Makefile
 	$(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $(PROG) $(REL) && cp $(PROG) $(PMAP) ..
-	$(call quiet,CHECK_STACK) ../cc1111/ao_arch.h $(PMEM)
+	$(call quiet,CHECK_STACK) ../cc1111/ao_arch.h $(PMEM) || rm $@
 
 ao_product.h: ao-make-product.5c ../Version
 	$(call quiet,NICKLE,$<) $< -m altusmetrum.org -i $(IDPRODUCT) -p $(PRODUCT) -v $(VERSION) > $@
diff --git a/src/product/Makefile.telemini b/src/product/Makefile.telemini
index 9f90b01f..75beeae4 100644
--- a/src/product/Makefile.telemini
+++ b/src/product/Makefile.telemini
@@ -83,7 +83,7 @@ all: ../$(PROG)
 
 ../$(PROG): $(REL) Makefile
 	$(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $(PROG) $(REL) && cp $(PROG) $(PMAP) ..
-	$(call quiet,CHECK_STACK) ../cc1111/ao_arch.h $(PMEM)
+	$(call quiet,CHECK_STACK) ../cc1111/ao_arch.h $(PMEM) || rm $@
 
 ao_product.h: ao-make-product.5c ../Version
 	$(call quiet,NICKLE,$<) $< -m altusmetrum.org -i $(IDPRODUCT) -p $(PRODUCT) -v $(VERSION) > $@
diff --git a/src/product/Makefile.telenano b/src/product/Makefile.telenano
index eff3ea97..b30ca789 100644
--- a/src/product/Makefile.telenano
+++ b/src/product/Makefile.telenano
@@ -82,7 +82,7 @@ all: ../$(PROG)
 
 ../$(PROG): $(REL) Makefile
 	$(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $(PROG) $(REL) && cp $(PROG) $(PMAP) ..
-	$(call quiet,CHECK_STACK) ../cc1111/ao_arch.h $(PMEM)
+	$(call quiet,CHECK_STACK) ../cc1111/ao_arch.h $(PMEM) || rm $@
 
 ao_product.h: ao-make-product.5c ../Version
 	$(call quiet,NICKLE,$<) $< -m altusmetrum.org -i $(IDPRODUCT) -p $(PRODUCT) -v $(VERSION) > $@
diff --git a/src/teleballoon-v1.1/Makefile b/src/teleballoon-v1.1/Makefile
index 89471cf4..fb88787b 100644
--- a/src/teleballoon-v1.1/Makefile
+++ b/src/teleballoon-v1.1/Makefile
@@ -103,7 +103,7 @@ all: ../$(PROG)
 
 ../$(PROG): $(REL) Makefile
 	$(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $(PROG) $(REL) && cp $(PROG) $(PMAP) ..
-	$(call quiet,CHECK_STACK) ../cc1111/ao_arch.h $(PMEM)
+	$(call quiet,CHECK_STACK) ../cc1111/ao_arch.h $(PMEM) || rm $@
 
 ao_product.h: ao-make-product.5c ../Version
 	$(call quiet,NICKLE,$<) $< -m altusmetrum.org -i $(IDPRODUCT) -p $(PRODUCT) -v $(VERSION) > $@
diff --git a/src/teleterra-v0.2/Makefile b/src/teleterra-v0.2/Makefile
index 583805f6..0747bfbf 100644
--- a/src/teleterra-v0.2/Makefile
+++ b/src/teleterra-v0.2/Makefile
@@ -25,9 +25,7 @@ CORE_SRC = \
 	ao_mutex.c \
 	ao_panic.c \
 	ao_report.c \
-	ao_rssi.c \
 	ao_sqrt.c \
-	ao_state.c \
 	ao_stdio.c \
 	ao_storage.c \
 	ao_task.c
@@ -38,7 +36,6 @@ CC1111_SRC = \
 	ao_button.c \
 	ao_dbg.c \
 	ao_dma.c \
-	ao_led.c \
 	ao_packet.c \
 	ao_packet_master.c \
 	ao_radio.c \
@@ -90,7 +87,7 @@ all: ../$(PROG)
 
 ../$(PROG): $(REL) Makefile
 	$(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $(PROG) $(REL) && cp $(PROG) $(PMAP) ..
-	$(call quiet,CHECK_STACK) ../cc1111/ao_arch.h $(PMEM)
+	$(call quiet,CHECK_STACK) ../cc1111/ao_arch.h $(PMEM) || rm $@
 
 ao_product.h: ao-make-product.5c ../Version
 	$(call quiet,NICKLE,$<) $< -m altusmetrum.org -i $(IDPRODUCT) -p $(PRODUCT) -v $(VERSION) > $@
diff --git a/src/tidongle/Makefile b/src/tidongle/Makefile
index 58b9d735..698d612c 100644
--- a/src/tidongle/Makefile
+++ b/src/tidongle/Makefile
@@ -76,7 +76,7 @@ all: ../$(PROG)
 
 ../$(PROG): $(REL) Makefile
 	$(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $(PROG) $(REL) && cp $(PROG) $(PMAP) ..
-	$(call quiet,CHECK_STACK) ../cc1111/ao_arch.h $(PMEM)
+	$(call quiet,CHECK_STACK) ../cc1111/ao_arch.h $(PMEM) || rm $@
 
 ao_product.h: ao-make-product.5c ../Version
 	$(call quiet,NICKLE,$<) $< -m altusmetrum.org -i $(IDPRODUCT) -p $(PRODUCT) -v $(VERSION) > $@
diff --git a/src/util/check-stack b/src/util/check-stack
index 1e8044e0..3b639d70 100755
--- a/src/util/check-stack
+++ b/src/util/check-stack
@@ -4,10 +4,16 @@ MEM=$2
 
 HEADER_STACK=`awk '/#define AO_STACK_START/ {print strtonum($3)}' $HEADER`
 MEM_STACK=`awk '/Stack starts at/ {print strtonum ($4)}' $MEM`
+XRAM_END=`awk '/EXTERNAL RAM/ { print strtonum ($4)}' $MEM`
 
 if [ "$HEADER_STACK" -lt "$MEM_STACK" ]; then
         echo $MEM_STACK | awk '{ printf ("Set AO_STACK_START to at least 0x%x\n", $1); }'
 	exit 1
-else
-	exit 0
 fi
+if [ "$XRAM_END" -ge 65024 ]; then
+    echo $XRAM_END | awk '{ printf ("Uses too much XRAM, 0x%x >= 0x%x\n", $1, 65024); }'
+    exit 1
+fi
+
+exit 0
+
-- 
cgit v1.2.3


From c1d12a117b36de7fe8dd992959b890bfd1163e81 Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Mon, 26 Mar 2012 23:35:35 -0700
Subject: Do radio settings solely by frequency

Compute the radio setting needed based on the calibration value
provided and the requested frequency.

Signed-off-by: Keith Packard <keithp@keithp.com>
---
 src/core/ao.h                   |  8 ++++-
 src/core/ao_cmd.c               |  6 ++--
 src/core/ao_config.c            | 68 ++++++++++++++++++++++-------------------
 src/core/ao_freq.c              | 52 +++++++++++++++++++++++++++++++
 src/product/Makefile.telebt     |  3 +-
 src/product/Makefile.teledongle |  3 +-
 src/product/Makefile.telelaunch |  3 +-
 src/product/Makefile.telemetrum |  3 +-
 src/product/Makefile.telemini   |  3 +-
 src/product/Makefile.telenano   |  3 +-
 src/product/ao_terraui.c        |  2 +-
 src/teleshield-v0.1/Makefile    |  3 +-
 src/teleterra-v0.2/Makefile     |  3 +-
 src/tidongle/Makefile           |  3 +-
 14 files changed, 117 insertions(+), 46 deletions(-)
 create mode 100644 src/core/ao_freq.c

(limited to 'src/product/Makefile.telelaunch')

diff --git a/src/core/ao.h b/src/core/ao.h
index 8c5335c4..ce9a1f70 100644
--- a/src/core/ao.h
+++ b/src/core/ao.h
@@ -1539,7 +1539,6 @@ ao_igniter_init(void);
 struct ao_radio_channel {
 	char		name[AO_CHANNEL_NAME_LEN];
 	uint32_t	kHz;
-	uint32_t	radio_setting;
 };
 #endif
 
@@ -1559,6 +1558,7 @@ struct ao_config {
 	uint32_t	radio_setting;		/* minor version 7 */
 	uint8_t		radio_enable;		/* minor version 8 */
 	uint8_t		aes_key[AO_AES_LEN];	/* minor version 9 */
+	uint32_t	frequency;		/* minor version 10 */
 #if HAS_RADIO_CHANNELS
 	struct ao_radio_channel	radio_channels[AO_NUM_CHANNELS];	/* minor version 10 */
 #endif
@@ -1959,4 +1959,10 @@ ao_battery_init(void);
 uint32_t
 ao_sqrt(uint32_t op);
 
+/*
+ * ao_freq.c
+ */
+
+int32_t ao_freq_to_set(int32_t freq, int32_t cal);
+
 #endif /* _AO_H_ */
diff --git a/src/core/ao_cmd.c b/src/core/ao_cmd.c
index 14cb7569..cde68b39 100644
--- a/src/core/ao_cmd.c
+++ b/src/core/ao_cmd.c
@@ -263,9 +263,9 @@ static __pdata uint8_t		ao_ncmds;
 static void
 help(void)
 {
-	register uint8_t cmds;
-	register uint8_t cmd;
-	register __code struct ao_cmds * cs;
+	__pdata uint8_t cmds;
+	__pdata uint8_t cmd;
+	__code struct ao_cmds * __pdata cs;
 
 	for (cmds = 0; cmds < ao_ncmds; cmds++) {
 		cs = ao_cmds[cmds];
diff --git a/src/core/ao_config.c b/src/core/ao_config.c
index 86bbc473..6fcebe1e 100644
--- a/src/core/ao_config.c
+++ b/src/core/ao_config.c
@@ -64,6 +64,12 @@ ao_config_put(void)
 }
 #endif
 
+static void
+ao_config_set_radio(void)
+{
+	ao_config.radio_setting = ao_freq_to_set(ao_config.frequency, ao_config.radio_cal);
+}
+
 static void
 _ao_config_get(void)
 {
@@ -105,24 +111,23 @@ _ao_config_get(void)
 			ao_config.ignite_mode = AO_CONFIG_DEFAULT_IGNITE_MODE;
 		if (ao_config.minor < 6)
 			ao_config.pad_orientation = AO_CONFIG_DEFAULT_PAD_ORIENTATION;
-		if (ao_config.minor < 7)
-			ao_config.radio_setting = ao_config.radio_cal;
 		if (ao_config.minor < 8)
 			ao_config.radio_enable = TRUE;
 		if (ao_config.minor < 9)
 			memset(&ao_config.aes_key, 0, AO_AES_LEN);
-#if HAS_RADIO_CHANNELS
 		if (ao_config.minor < 10) {
+			ao_config.frequency = 434550;
+#if HAS_RADIO_CHANNELS
 			ao_xmemset(&ao_config.radio_channels, '\0', sizeof (ao_config.radio_channels));
 			ao_xmemcpy(&ao_config.radio_channels[0].name[0],
 				   CODE_TO_XDATA("Channel 0"), sizeof("Channel 0"));
 			ao_config.radio_channels[0].kHz = 434550;
-			ao_config.radio_channels[0].radio_setting = ao_config.radio_cal;
-		}
 #endif				   
+		}
 		ao_config.minor = AO_CONFIG_MINOR;
 		ao_config_dirty = 1;
 	}
+	ao_config_set_radio();
 	ao_config_loaded = 1;
 }
 
@@ -196,6 +201,26 @@ ao_config_radio_channel_set(void) __reentrant
 	ao_radio_recv_abort();
 }
 
+void
+ao_config_frequency_show(void) __reentrant
+{
+	printf("Frequency: %ld\n",
+	       ao_config.frequency);
+}
+
+void
+ao_config_frequency_set(void) __reentrant
+{
+	ao_cmd_decimal();
+	if (ao_cmd_status != ao_cmd_success)
+		return;
+	_ao_config_edit_start();
+	ao_config.frequency = ao_cmd_lex_u32;
+	ao_config_set_radio();
+	_ao_config_edit_finish();
+	ao_radio_recv_abort();
+}
+
 #if HAS_ADC
 
 void
@@ -315,7 +340,8 @@ ao_config_radio_cal_set(void) __reentrant
 	if (ao_cmd_status != ao_cmd_success)
 		return;
 	_ao_config_edit_start();
-	ao_config.radio_setting = ao_config.radio_cal = ao_cmd_lex_u32;
+	ao_config.radio_cal = ao_cmd_lex_u32;
+	ao_config_set_radio();
 	_ao_config_edit_finish();
 }
 
@@ -394,25 +420,6 @@ ao_config_pad_orientation_set(void) __reentrant
 }
 #endif
 
-void
-ao_config_radio_setting_show(void) __reentrant
-{
-	printf("Radio setting: %ld\n", ao_config.radio_setting);
-}
-
-void
-ao_config_radio_setting_set(void) __reentrant
-{
-	ao_cmd_decimal();
-	if (ao_cmd_status != ao_cmd_success)
-		return;
-	_ao_config_edit_start();
-	ao_config.radio_setting = ao_cmd_lex_u32;
-	ao_config.radio_channel = 0;
-	_ao_config_edit_finish();
-	ao_radio_recv_abort();
-}
-
 void
 ao_config_radio_enable_show(void) __reentrant
 {
@@ -464,11 +471,10 @@ ao_config_radio_config_show(void) __reentrant
 	uint8_t	i;
 	for (i = 0; i < AO_NUM_CHANNELS; i++)
 		if (ao_config.radio_channels[i].name[0]) {
-			printf("%2d %-16.16s %ld %ld\n",
+			printf("%2d %-16.16s %ld\n",
 			       i,
 			       ao_config.radio_channels[i].name,
-			       ao_config.radio_channels[i].kHz,
-			       ao_config.radio_channels[i].radio_setting);
+			       ao_config.radio_channels[i].kHz);
 		}
 }
 
@@ -498,8 +504,6 @@ ao_config_radio_config_set(void) __reentrant
 	}
 	ao_cmd_decimal();
 	ch->kHz = ao_cmd_lex_u32;
-	ao_cmd_decimal();
-	ch->radio_setting = ao_cmd_lex_u32;
 	_ao_config_edit_finish();
 }
 #endif
@@ -528,10 +532,10 @@ __code struct ao_config_var ao_config_vars[] = {
 #endif /* HAS_ADC */
 	{ "r <channel>\0Radio channel (freq = 434.550 + chan * .1)",
 	  ao_config_radio_channel_set,	ao_config_radio_channel_show },
+	{ "F <freq>\0Frequency (kHz)",
+	  ao_config_frequency_set, ao_config_frequency_show },
 	{ "c <call>\0Callsign (8 char max)",
 	  ao_config_callsign_set,	ao_config_callsign_show },
-	{ "R <setting>\0Radio freq control (freq = 434.550 * setting/cal)",
-	  ao_config_radio_setting_set,	ao_config_radio_setting_show },
 	{ "e <0 disable, 1 enable>\0Enable telemetry and RDF",
 	  ao_config_radio_enable_set, ao_config_radio_enable_show },
 #if HAS_ACCEL
diff --git a/src/core/ao_freq.c b/src/core/ao_freq.c
new file mode 100644
index 00000000..13bcb383
--- /dev/null
+++ b/src/core/ao_freq.c
@@ -0,0 +1,52 @@
+/*
+ * Copyright © 2012 Keith Packard <keithp@keithp.com>
+ *
+ * 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>
+
+/*
+ * The provided 'calibration' value is
+ * that needed to tune the radio to precisely 434550kHz.
+ * Use that to 'walk' to the target frequency by following
+ * a 'bresenham' line from 434550kHz to the target
+ * frequency, and updating the radio setting along the way
+ */
+
+int32_t ao_freq_to_set(int32_t freq, int32_t cal) {
+	__pdata int32_t	set = 0;
+	uint8_t	neg = 0;
+	__pdata int32_t	error = -434550 / 2;
+
+	freq -= 434550;
+	if (freq < 0) {
+		neg = 1;
+		freq = -freq;
+	}
+	for (;;) {
+		if (freq == 0 && error <= 0)
+			break;
+		if (error > 0) {
+			error -= 434550;
+			set++;
+		} else {
+			error += cal;
+			freq--;
+		}
+	}
+	if (neg)
+		set = -set;
+	return cal + set;
+}
diff --git a/src/product/Makefile.telebt b/src/product/Makefile.telebt
index ea18ff18..e53aa2c4 100644
--- a/src/product/Makefile.telebt
+++ b/src/product/Makefile.telebt
@@ -28,7 +28,8 @@ CORE_SRC = \
 	ao_panic.c \
 	ao_state.c \
 	ao_stdio.c \
-	ao_task.c
+	ao_task.c \
+	ao_freq.c
 
 CC1111_SRC = \
 	ao_aes.c \
diff --git a/src/product/Makefile.teledongle b/src/product/Makefile.teledongle
index cf33d1f1..27e7d24b 100644
--- a/src/product/Makefile.teledongle
+++ b/src/product/Makefile.teledongle
@@ -31,7 +31,8 @@ CORE_SRC = \
 	ao_rssi.c \
 	ao_state.c \
 	ao_stdio.c \
-	ao_task.c
+	ao_task.c \
+	ao_freq.c
 
 CC1111_SRC = \
 	ao_aes.c \
diff --git a/src/product/Makefile.telelaunch b/src/product/Makefile.telelaunch
index 97764517..8aab50e0 100644
--- a/src/product/Makefile.telelaunch
+++ b/src/product/Makefile.telelaunch
@@ -27,7 +27,8 @@ CORE_SRC = \
 	ao_panic.c \
 	ao_stdio.c \
 	ao_storage.c \
-	ao_task.c
+	ao_task.c \
+	ao_freq.c
 
 CC1111_SRC = \
 	ao_adc.c \
diff --git a/src/product/Makefile.telemetrum b/src/product/Makefile.telemetrum
index 52c723ca..e4f55f88 100644
--- a/src/product/Makefile.telemetrum
+++ b/src/product/Makefile.telemetrum
@@ -40,7 +40,8 @@ CORE_SRC = \
 	ao_log.c \
 	ao_log_big.c \
 	ao_report.c \
-	ao_telemetry.c
+	ao_telemetry.c \
+	ao_freq.c
 
 CC1111_SRC = \
 	ao_adc.c \
diff --git a/src/product/Makefile.telemini b/src/product/Makefile.telemini
index 75beeae4..82ec42a2 100644
--- a/src/product/Makefile.telemini
+++ b/src/product/Makefile.telemini
@@ -33,7 +33,8 @@ CORE_SRC = \
 	ao_stdio.c \
 	ao_storage.c \
 	ao_task.c \
-	ao_telemetry.c
+	ao_telemetry.c \
+	ao_freq.c
 
 CC1111_SRC = \
 	ao_adc.c \
diff --git a/src/product/Makefile.telenano b/src/product/Makefile.telenano
index b30ca789..cf27527c 100644
--- a/src/product/Makefile.telenano
+++ b/src/product/Makefile.telenano
@@ -33,7 +33,8 @@ CORE_SRC = \
 	ao_stdio.c \
 	ao_storage.c \
 	ao_task.c \
-	ao_telemetry.c
+	ao_telemetry.c \
+	ao_freq.c
 
 CC1111_SRC = \
 	ao_adc.c \
diff --git a/src/product/ao_terraui.c b/src/product/ao_terraui.c
index 05157cb1..9b40c42a 100644
--- a/src/product/ao_terraui.c
+++ b/src/product/ao_terraui.c
@@ -459,7 +459,7 @@ ao_terraui_config(void) __reentrant
 	
 
 	for (chan = 0; chan < AO_NUM_CHANNELS; chan++)
-		if (ao_config.radio_channels[chan].radio_setting == ao_config.radio_setting)
+		if (ao_config.radio_channels[chan].kHz == ao_config.frequency)
 			break;
 	if (chan == AO_NUM_CHANNELS)
 		chan = 0;
diff --git a/src/teleshield-v0.1/Makefile b/src/teleshield-v0.1/Makefile
index a21a6052..44780476 100644
--- a/src/teleshield-v0.1/Makefile
+++ b/src/teleshield-v0.1/Makefile
@@ -41,7 +41,8 @@ CORE_SRC = \
 	ao_state.c \
 	ao_storage.c \
 	ao_stdio.c \
-	ao_task.c
+	ao_task.c \
+	ao_freq.c
 
 CC1111_SRC = \
 	ao_dbg.c \
diff --git a/src/teleterra-v0.2/Makefile b/src/teleterra-v0.2/Makefile
index 0747bfbf..4967d187 100644
--- a/src/teleterra-v0.2/Makefile
+++ b/src/teleterra-v0.2/Makefile
@@ -28,7 +28,8 @@ CORE_SRC = \
 	ao_sqrt.c \
 	ao_stdio.c \
 	ao_storage.c \
-	ao_task.c
+	ao_task.c \
+	ao_freq.c
 
 CC1111_SRC = \
 	ao_battery.c \
diff --git a/src/tidongle/Makefile b/src/tidongle/Makefile
index 698d612c..149b00c5 100644
--- a/src/tidongle/Makefile
+++ b/src/tidongle/Makefile
@@ -26,7 +26,8 @@ CORE_SRC = \
 	ao_rssi.c \
 	ao_state.c \
 	ao_stdio.c \
-	ao_task.c
+	ao_task.c \
+	ao_freq.c
 
 CC1111_SRC = \
 	ao_aes.c \
-- 
cgit v1.2.3


From 0667261e03b3fd403e97d02ea6204b007bb13f58 Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Fri, 13 Apr 2012 09:39:20 -0700
Subject: altos: Pull more interfaces out of ao.h and move to separate files

This moves the aes, btm, companion, lcd and packet interfaces out of ao.h

Signed-off-by: Keith Packard <keithp@keithp.com>
---
 src/core/ao.h                   | 199 +++-------------------------------------
 src/core/ao_aes.h               |  69 ++++++++++++++
 src/core/ao_btm.h               |  36 ++++++++
 src/core/ao_companion.h         |  51 ++++++++++
 src/core/ao_lcd.h               |  60 ++++++++++++
 src/core/ao_log_telescience.c   |   2 +
 src/core/ao_packet.h            |  88 ++++++++++++++++++
 src/drivers/ao_pyro_slave.c     |   5 +-
 src/drivers/ao_science_slave.c  |   1 +
 src/product/Makefile.telelaunch |   2 -
 src/teleterra-v0.2/ao_pins.h    |   1 +
 11 files changed, 323 insertions(+), 191 deletions(-)
 create mode 100644 src/core/ao_aes.h
 create mode 100644 src/core/ao_btm.h
 create mode 100644 src/core/ao_companion.h
 create mode 100644 src/core/ao_lcd.h
 create mode 100644 src/core/ao_packet.h

(limited to 'src/product/Makefile.telelaunch')

diff --git a/src/core/ao.h b/src/core/ao.h
index 28d0ba87..27b9c5c4 100644
--- a/src/core/ao.h
+++ b/src/core/ao.h
@@ -900,201 +900,26 @@ struct ao_fifo {
 #define ao_fifo_full(f)		((((f).insert + 1) & (AO_FIFO_SIZE-1)) == (f).remove)
 #define ao_fifo_empty(f)	((f).insert == (f).remove)
 
-/*
- * ao_packet.c
- *
- * Packet-based command interface
- */
-
-#define AO_PACKET_MAX		64
-#define AO_PACKET_SYN		(uint8_t) 0xff
-
-struct ao_packet {
-	uint8_t		addr;
-	uint8_t		len;
-	uint8_t		seq;
-	uint8_t		ack;
-	uint8_t		d[AO_PACKET_MAX];
-	uint8_t		callsign[AO_MAX_CALLSIGN];
-};
-
-struct ao_packet_recv {
-	struct ao_packet	packet;
-	int8_t			rssi;
-	uint8_t			status;
-};
-
-extern __xdata struct ao_packet_recv ao_rx_packet;
-extern __xdata struct ao_packet ao_tx_packet;
-extern __xdata struct ao_task	ao_packet_task;
-extern __xdata uint8_t ao_packet_enable;
-extern __xdata uint8_t ao_packet_master_sleeping;
-extern __pdata uint8_t ao_packet_rx_len, ao_packet_rx_used, ao_packet_tx_used;
-
-void
-ao_packet_send(void);
-
-uint8_t
-ao_packet_recv(void);
-
-void
-ao_packet_flush(void);
-
-void
-ao_packet_putchar(char c) __reentrant;
-
-char
-ao_packet_pollchar(void) __critical;
-
-/* ao_packet_master.c */
-
-void
-ao_packet_master_init(void);
-
-/* ao_packet_slave.c */
-
-void
-ao_packet_slave_start(void);
-
-void
-ao_packet_slave_stop(void);
-
-void
-ao_packet_slave_init(uint8_t enable);
-
-/* ao_btm.c */
-
-/* If bt_link is on P2, this interrupt is shared by USB, so the USB
- * code calls this function. Otherwise, it's a regular ISR.
- */
-
-void
-ao_btm_isr(void)
-#if BT_LINK_ON_P1
-	__interrupt 15
+#if PACKET_HAS_MASTER || PACKET_HAS_SLAVE
+#include <ao_packet.h>
 #endif
-	;
-
-void
-ao_btm_init(void);
-
-/* ao_companion.c */
-
-#define AO_COMPANION_SETUP		1
-#define AO_COMPANION_FETCH		2
-#define AO_COMPANION_NOTIFY		3
-
-struct ao_companion_command {
-	uint8_t		command;
-	uint8_t		flight_state;
-	uint16_t	tick;
-	uint16_t	serial;
-	uint16_t	flight;
-};
-
-struct ao_companion_setup {
-	uint16_t	board_id;
-	uint16_t	board_id_inverse;
-	uint8_t		update_period;
-	uint8_t		channels;
-};
-
-extern __pdata uint8_t				ao_companion_running;
-extern __xdata uint8_t				ao_companion_mutex;
-extern __xdata struct ao_companion_command	ao_companion_command;
-extern __xdata struct ao_companion_setup	ao_companion_setup;
-extern __xdata uint16_t				ao_companion_data[AO_COMPANION_MAX_CHANNELS];
-
-void
-ao_companion_init(void);
-
-/* ao_lcd.c */
-  
-void
-ao_lcd_putchar(uint8_t d);
-
-void
-ao_lcd_putstring(char *string);
-
-void
-ao_lcd_contrast_set(uint8_t contrast);
-
-void
-ao_lcd_clear(void);
-
-void
-ao_lcd_cursor_on(void);
-
-void
-ao_lcd_cursor_off(void);
-
-#define AO_LCD_ADDR(row,col)	((row << 6) | (col))
-
-void
-ao_lcd_goto(uint8_t addr);
-
-void
-ao_lcd_start(void);
-
-void
-ao_lcd_init(void);
-
-/* ao_lcd_port.c */
-
-void
-ao_lcd_port_put_nibble(uint8_t rs, uint8_t d);
-
-void
-ao_lcd_port_init(void);
-
-/* ao_aes.c */
 
-extern __xdata uint8_t ao_aes_mutex;
+#if HAS_BTM
+#include <ao_btm.h>
+#endif
 
-/* AES keys and blocks are 128 bits */
+#if HAS_COMPANION
+#include <ao_companion.h>
+#endif
 
-enum ao_aes_mode {
-	ao_aes_mode_cbc_mac
-};
+#if HAS_LCD
+#include <ao_lcd.h>
+#endif
 
 #if HAS_AES
-void
-ao_aes_isr(void) __interrupt 4;
+#include <ao_aes.h>
 #endif
 
-void
-ao_aes_set_mode(enum ao_aes_mode mode);
-
-void
-ao_aes_set_key(__xdata uint8_t *in);
-
-void
-ao_aes_zero_iv(void);
-
-void
-ao_aes_run(__xdata uint8_t *in,
-	   __xdata uint8_t *out);
-
-void
-ao_aes_init(void);
-
-/* ao_radio_cmac.c */
-
-int8_t
-ao_radio_cmac_send(__xdata void *packet, uint8_t len) __reentrant;
-
-#define AO_RADIO_CMAC_OK	0
-#define AO_RADIO_CMAC_LEN_ERROR	-1
-#define AO_RADIO_CMAC_CRC_ERROR	-2
-#define AO_RADIO_CMAC_MAC_ERROR	-3
-#define AO_RADIO_CMAC_TIMEOUT	-4
-
-int8_t
-ao_radio_cmac_recv(__xdata void *packet, uint8_t len, uint16_t timeout) __reentrant;
-
-void
-ao_radio_cmac_init(void);
-
 /* ao_launch.c */
 
 struct ao_launch_command {
diff --git a/src/core/ao_aes.h b/src/core/ao_aes.h
new file mode 100644
index 00000000..7f67374d
--- /dev/null
+++ b/src/core/ao_aes.h
@@ -0,0 +1,69 @@
+/*
+ * Copyright © 2012 Keith Packard <keithp@keithp.com>
+ *
+ * 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.
+ */
+
+#ifndef _AO_AES_H_
+#define _AO_AES_H_
+
+/* ao_aes.c */
+
+extern __xdata uint8_t ao_aes_mutex;
+
+/* AES keys and blocks are 128 bits */
+
+enum ao_aes_mode {
+	ao_aes_mode_cbc_mac
+};
+
+#if HAS_AES
+void
+ao_aes_isr(void) __interrupt 4;
+#endif
+
+void
+ao_aes_set_mode(enum ao_aes_mode mode);
+
+void
+ao_aes_set_key(__xdata uint8_t *in);
+
+void
+ao_aes_zero_iv(void);
+
+void
+ao_aes_run(__xdata uint8_t *in,
+	   __xdata uint8_t *out);
+
+void
+ao_aes_init(void);
+
+/* ao_radio_cmac.c */
+
+int8_t
+ao_radio_cmac_send(__xdata void *packet, uint8_t len) __reentrant;
+
+#define AO_RADIO_CMAC_OK	0
+#define AO_RADIO_CMAC_LEN_ERROR	-1
+#define AO_RADIO_CMAC_CRC_ERROR	-2
+#define AO_RADIO_CMAC_MAC_ERROR	-3
+#define AO_RADIO_CMAC_TIMEOUT	-4
+
+int8_t
+ao_radio_cmac_recv(__xdata void *packet, uint8_t len, uint16_t timeout) __reentrant;
+
+void
+ao_radio_cmac_init(void);
+
+#endif /* _AO_AES_H_ */
diff --git a/src/core/ao_btm.h b/src/core/ao_btm.h
new file mode 100644
index 00000000..484e5d7f
--- /dev/null
+++ b/src/core/ao_btm.h
@@ -0,0 +1,36 @@
+/*
+ * Copyright © 2012 Keith Packard <keithp@keithp.com>
+ *
+ * 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.
+ */
+
+#ifndef _AO_BTM_H_
+#define _AO_BTM_H_
+
+/* ao_btm.c */
+
+/* If bt_link is on P2, this interrupt is shared by USB, so the USB
+ * code calls this function. Otherwise, it's a regular ISR.
+ */
+
+void
+ao_btm_isr(void)
+#if BT_LINK_ON_P1
+	__interrupt 15
+#endif
+	;
+void
+ao_btm_init(void);
+
+#endif /* _AO_BTM_H_ */
diff --git a/src/core/ao_companion.h b/src/core/ao_companion.h
new file mode 100644
index 00000000..47e0acf5
--- /dev/null
+++ b/src/core/ao_companion.h
@@ -0,0 +1,51 @@
+/*
+ * Copyright © 2012 Keith Packard <keithp@keithp.com>
+ *
+ * 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.
+ */
+
+#ifndef _AO_COMPANION_H_
+#define _AO_COMPANION_H_
+
+/* ao_companion.c */
+
+#define AO_COMPANION_SETUP		1
+#define AO_COMPANION_FETCH		2
+#define AO_COMPANION_NOTIFY		3
+
+struct ao_companion_command {
+	uint8_t		command;
+	uint8_t		flight_state;
+	uint16_t	tick;
+	uint16_t	serial;
+	uint16_t	flight;
+};
+
+struct ao_companion_setup {
+	uint16_t	board_id;
+	uint16_t	board_id_inverse;
+	uint8_t		update_period;
+	uint8_t		channels;
+};
+
+extern __pdata uint8_t				ao_companion_running;
+extern __xdata uint8_t				ao_companion_mutex;
+extern __xdata struct ao_companion_command	ao_companion_command;
+extern __xdata struct ao_companion_setup	ao_companion_setup;
+extern __xdata uint16_t				ao_companion_data[AO_COMPANION_MAX_CHANNELS];
+
+void
+ao_companion_init(void);
+
+#endif /* _AO_COMPANION_H_ */
diff --git a/src/core/ao_lcd.h b/src/core/ao_lcd.h
new file mode 100644
index 00000000..f7e1391a
--- /dev/null
+++ b/src/core/ao_lcd.h
@@ -0,0 +1,60 @@
+/*
+ * Copyright © 2012 Keith Packard <keithp@keithp.com>
+ *
+ * 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.
+ */
+
+#ifndef _AO_LCD_H_
+#define _AO_LCD_H_
+
+/* ao_lcd.c */
+  
+void
+ao_lcd_putchar(uint8_t d);
+
+void
+ao_lcd_putstring(char *string);
+
+void
+ao_lcd_contrast_set(uint8_t contrast);
+
+void
+ao_lcd_clear(void);
+
+void
+ao_lcd_cursor_on(void);
+
+void
+ao_lcd_cursor_off(void);
+
+#define AO_LCD_ADDR(row,col)	((row << 6) | (col))
+
+void
+ao_lcd_goto(uint8_t addr);
+
+void
+ao_lcd_start(void);
+
+void
+ao_lcd_init(void);
+
+/* ao_lcd_port.c */
+
+void
+ao_lcd_port_put_nibble(uint8_t rs, uint8_t d);
+
+void
+ao_lcd_port_init(void);
+
+#endif /* _AO_LCD_H_ */
diff --git a/src/core/ao_log_telescience.c b/src/core/ao_log_telescience.c
index 31eda381..ae045281 100644
--- a/src/core/ao_log_telescience.c
+++ b/src/core/ao_log_telescience.c
@@ -17,6 +17,8 @@
 
 #include "ao.h"
 #include "ao_product.h"
+#include "ao_log.h"
+#include "ao_companion.h"
 
 static uint8_t	ao_log_adc_pos;
 
diff --git a/src/core/ao_packet.h b/src/core/ao_packet.h
new file mode 100644
index 00000000..618ccda4
--- /dev/null
+++ b/src/core/ao_packet.h
@@ -0,0 +1,88 @@
+/*
+ * Copyright © 2012 Keith Packard <keithp@keithp.com>
+ *
+ * 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.
+ */
+
+#ifndef _AO_PACKET_H_
+#define _AO_PACKET_H_
+
+/*
+ * ao_packet.c
+ *
+ * Packet-based command interface
+ */
+
+#define AO_PACKET_MAX		64
+#define AO_PACKET_SYN		(uint8_t) 0xff
+
+struct ao_packet {
+	uint8_t		addr;
+	uint8_t		len;
+	uint8_t		seq;
+	uint8_t		ack;
+	uint8_t		d[AO_PACKET_MAX];
+	uint8_t		callsign[AO_MAX_CALLSIGN];
+};
+
+struct ao_packet_recv {
+	struct ao_packet	packet;
+	int8_t			rssi;
+	uint8_t			status;
+};
+
+extern __xdata struct ao_packet_recv ao_rx_packet;
+extern __xdata struct ao_packet ao_tx_packet;
+extern __xdata struct ao_task	ao_packet_task;
+extern __xdata uint8_t ao_packet_enable;
+extern __xdata uint8_t ao_packet_master_sleeping;
+extern __pdata uint8_t ao_packet_rx_len, ao_packet_rx_used, ao_packet_tx_used;
+
+void
+ao_packet_send(void);
+
+uint8_t
+ao_packet_recv(void);
+
+void
+ao_packet_flush(void);
+
+void
+ao_packet_putchar(char c) __reentrant;
+
+char
+ao_packet_pollchar(void) __critical;
+
+#if PACKET_HAS_MASTER
+/* ao_packet_master.c */
+
+void
+ao_packet_master_init(void);
+#endif
+
+#if PACKET_HAS_SLAVE
+/* ao_packet_slave.c */
+
+void
+ao_packet_slave_start(void);
+
+void
+ao_packet_slave_stop(void);
+
+void
+ao_packet_slave_init(uint8_t enable);
+
+#endif
+
+#endif /* _AO_PACKET_H_ */
diff --git a/src/drivers/ao_pyro_slave.c b/src/drivers/ao_pyro_slave.c
index 5ef42b5a..5a8ab922 100644
--- a/src/drivers/ao_pyro_slave.c
+++ b/src/drivers/ao_pyro_slave.c
@@ -15,8 +15,9 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-#include "ao.h"
-#include "ao_product.h"
+#include <ao.h>
+#include <ao_product.h>
+#include <ao_companion.h>
 
 struct ao_companion_command	ao_companion_command;
 
diff --git a/src/drivers/ao_science_slave.c b/src/drivers/ao_science_slave.c
index fa9db98b..a86b5151 100644
--- a/src/drivers/ao_science_slave.c
+++ b/src/drivers/ao_science_slave.c
@@ -18,6 +18,7 @@
 #include "ao.h"
 #include "ao_product.h"
 #include "ao_flight.h"
+#include "ao_companion.h"
 
 struct ao_companion_command	ao_companion_command;
 
diff --git a/src/product/Makefile.telelaunch b/src/product/Makefile.telelaunch
index 8aab50e0..688ac5f3 100644
--- a/src/product/Makefile.telelaunch
+++ b/src/product/Makefile.telelaunch
@@ -39,8 +39,6 @@ CC1111_SRC = \
 	ao_ignite.c \
 	ao_intflash.c \
 	ao_led.c \
-	ao_packet.c \
-	ao_packet_slave.c \
 	ao_radio.c \
 	ao_radio_cmac.c \
 	ao_romconfig.c \
diff --git a/src/teleterra-v0.2/ao_pins.h b/src/teleterra-v0.2/ao_pins.h
index 2bea4e04..bcabdfee 100644
--- a/src/teleterra-v0.2/ao_pins.h
+++ b/src/teleterra-v0.2/ao_pins.h
@@ -25,6 +25,7 @@
 	#define HAS_GPS			1
 	#define HAS_SERIAL_1		1
 	#define HAS_ADC			0
+	#define HAS_LCD			1
 	#define HAS_EEPROM		1
 	#define HAS_LOG			1
 	#define USE_INTERNAL_FLASH	0
-- 
cgit v1.2.3


From 705891be53e298ac6ced4ba02b87d2f6d1085b34 Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Mon, 4 Jun 2012 20:54:36 -0700
Subject: altos: Make cc1111 products all depend on ao_arch.h and
 ao_arch_func.h

Ensures that files get recompiled as needed

Signed-off-by: Keith Packard <keithp@keithp.com>
---
 src/product/Makefile.telelaunch | 2 ++
 src/product/Makefile.telemetrum | 2 ++
 src/product/Makefile.telemini   | 2 ++
 src/product/Makefile.telenano   | 2 ++
 4 files changed, 8 insertions(+)

(limited to 'src/product/Makefile.telelaunch')

diff --git a/src/product/Makefile.telelaunch b/src/product/Makefile.telelaunch
index 688ac5f3..3753f3c9 100644
--- a/src/product/Makefile.telelaunch
+++ b/src/product/Makefile.telelaunch
@@ -15,6 +15,8 @@ endif
 INC = \
 	ao.h \
 	ao_pins.h \
+	ao_arch.h \
+	ao_arch_funcs.h \
 	cc1111.h \
 	ao_product.h
 
diff --git a/src/product/Makefile.telemetrum b/src/product/Makefile.telemetrum
index b1111053..fba2c19a 100644
--- a/src/product/Makefile.telemetrum
+++ b/src/product/Makefile.telemetrum
@@ -18,6 +18,8 @@ endif
 INC = \
 	ao.h \
 	ao_pins.h \
+	ao_arch.h \
+	ao_arch_funcs.h \
 	cc1111.h \
 	altitude.h \
 	ao_kalman.h \
diff --git a/src/product/Makefile.telemini b/src/product/Makefile.telemini
index 9506eb65..f0ab2b14 100644
--- a/src/product/Makefile.telemini
+++ b/src/product/Makefile.telemini
@@ -15,6 +15,8 @@ endif
 INC = \
 	ao.h \
 	ao_pins.h \
+	ao_arch.h \
+	ao_arch_funcs.h \
 	cc1111.h \
 	ao_product.h
 
diff --git a/src/product/Makefile.telenano b/src/product/Makefile.telenano
index 56db1c2c..a55bcf95 100644
--- a/src/product/Makefile.telenano
+++ b/src/product/Makefile.telenano
@@ -15,6 +15,8 @@ endif
 INC = \
 	ao.h \
 	ao_pins.h \
+	ao_arch.h \
+	ao_arch_funcs.h \
 	cc1111.h \
 	ao_product.h
 
-- 
cgit v1.2.3


From 18431c88c8a6cb267922b97192e8b7ddb88d0e7e Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Wed, 11 Jul 2012 13:49:26 -0700
Subject: altos: Have 'make clean' remove all programs, even old ones

This makes sure that changing version numbers doesn't leave old
compiled output lying around.

Signed-off-by: Keith Packard <keithp@keithp.com>
---
 src/cc1111/Makefile.cc1111      |  8 ++++++++
 src/megametrum-v0.1/Makefile    |  5 +++--
 src/product/Makefile.telebt     | 13 +++++--------
 src/product/Makefile.teledongle |  9 +++------
 src/product/Makefile.telelaunch |  9 +++------
 src/product/Makefile.telemetrum |  9 +++------
 src/product/Makefile.telemini   |  9 +++------
 src/product/Makefile.telenano   |  9 +++------
 src/stm-demo/Makefile           |  2 +-
 src/teleballoon-v1.1/Makefile   | 13 +++++--------
 src/telescience-v0.1/Makefile   |  2 +-
 src/teleshield-v0.1/Makefile    |  9 +++------
 src/teleterra-v0.2/Makefile     |  9 +++------
 src/test/Makefile               |  2 +-
 src/tidongle/Makefile           |  9 +++------
 15 files changed, 48 insertions(+), 69 deletions(-)

(limited to 'src/product/Makefile.telelaunch')

diff --git a/src/cc1111/Makefile.cc1111 b/src/cc1111/Makefile.cc1111
index 8de4a9b2..f7ecce33 100644
--- a/src/cc1111/Makefile.cc1111
+++ b/src/cc1111/Makefile.cc1111
@@ -25,3 +25,11 @@ PAOM=$(PROG:.ihx=)
 
 %.rel : %.c $(INC)
 	$(call quiet,CC,$(PRODUCT_DEF)) $(CFLAGS) -c -o$@ $<
+
+all:
+
+clean-cc1111:
+	rm -f *.adb *.asm *.lnk *.lst *.rel *.rst *.sym
+	rm -f $(PROGNAME)-*
+	rm -f ao_product.h
+	rm -f ../$(PROGNAME)-*
diff --git a/src/megametrum-v0.1/Makefile b/src/megametrum-v0.1/Makefile
index 13e46c97..59cfb64d 100644
--- a/src/megametrum-v0.1/Makefile
+++ b/src/megametrum-v0.1/Makefile
@@ -82,7 +82,8 @@ IDPRODUCT=0x0023
 
 CFLAGS = $(PRODUCT_DEF) $(STM_CFLAGS) $(PROFILE_DEF) -Os -g
 
-PROG=megametrum-v0.1-$(VERSION).elf
+PROGNAME=megametrum-v0.1
+PROG=$(PROGNAME)-$(VERSION).elf
 
 SRC=$(ALTOS_SRC) ao_megametrum.c
 OBJ=$(SRC:.c=.o)
@@ -103,7 +104,7 @@ ao_product.h: ao-make-product.5c ../Version
 distclean:	clean
 
 clean:
-	rm -f $(OBJ)
+	rm -f *.o $(PROGNAME)-*.elf
 	rm -f ao_product.h
 
 install:
diff --git a/src/product/Makefile.telebt b/src/product/Makefile.telebt
index 90525d63..fd52cec4 100644
--- a/src/product/Makefile.telebt
+++ b/src/product/Makefile.telebt
@@ -60,7 +60,8 @@ SRC = \
 	$(PRODUCT_SRC) \
 	$(TELEBT_SRC)
 
-PROG = telebt-v$(TELEBT_VER)-$(VERSION).ihx
+PROGNAME = telebt-v$(TELEBT_VER)
+PROG = $(PROGNAME)-$(VERSION).ihx
 PRODUCT=TeleBT-v$(TELEBT_VER)
 PRODUCT_DEF=-DTELEBT_V_$(TELEBT_DEF)
 IDPRODUCT=0x000e
@@ -78,9 +79,9 @@ endif
 # Otherwise, print the full command line.
 quiet ?= $($1)
 
-all: ../$(PROG)
+all: $(PROG)
 
-../$(PROG): $(REL) Makefile
+$(PROG): $(REL) Makefile
 	$(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $(PROG) $(REL) && cp $(PROG) $(PMAP) ..
 	$(call quiet,CHECK_STACK) ../cc1111/ao_arch.h $(PMEM) || rm $@
 
@@ -89,11 +90,7 @@ ao_product.h: ao-make-product.5c ../Version
 
 distclean:	clean
 
-clean:
-	rm -f $(ADB) $(ASM) $(LNK) $(LST) $(REL) $(RST) $(SYM)
-	rm -f $(PROG) $(PCDB) $(PLNK) $(PMAP) $(PMEM) $(PAOM)
-	rm -f ao_product.h
-	rm -f ../$(PROG) ../$(PMAP)
+clean: clean-cc1111
 
 install:
 
diff --git a/src/product/Makefile.teledongle b/src/product/Makefile.teledongle
index fbf14a04..5105b567 100644
--- a/src/product/Makefile.teledongle
+++ b/src/product/Makefile.teledongle
@@ -60,7 +60,8 @@ SRC = \
 	$(DRIVER_SRC) \
 	$(PRODUCT_SRC)
 
-PROG = teledongle-v$(TD_VER)-$(VERSION).ihx
+PROGNAME = teledongle-v$(TD_VER)
+PROG = $(PROGNAME)-$(VERSION).ihx
 PRODUCT=TeleDongle-v$(TD_VER)
 PRODUCT_DEF=-DTELEDONGLE_V_$(TD_DEF)
 IDPRODUCT=0x000c
@@ -89,11 +90,7 @@ ao_product.h: ao-make-product.5c ../Version
 
 distclean:	clean
 
-clean:
-	rm -f $(ADB) $(ASM) $(LNK) $(LST) $(REL) $(RST) $(SYM)
-	rm -f $(PROG) $(PCDB) $(PLNK) $(PMAP) $(PMEM) $(PAOM)
-	rm -f ao_product.h
-	rm -f ../$(PROG) ../$(PMAP)
+clean: clean-cc1111
 
 install:
 
diff --git a/src/product/Makefile.telelaunch b/src/product/Makefile.telelaunch
index 3753f3c9..1e55989c 100644
--- a/src/product/Makefile.telelaunch
+++ b/src/product/Makefile.telelaunch
@@ -62,7 +62,8 @@ SRC = \
 	$(DRIVER_SRC) \
 	$(PRODUCT_SRC)
 
-PROG = telelaunch-v$(TELELAUNCH_VER)-$(VERSION).ihx
+PROGNAME = telelaunch-v$(TELELAUNCH_VER)
+PROG = $(PROGNAME)-$(VERSION).ihx
 PRODUCT=TeleLaunch-v$(TELELAUNCH_VER)
 PRODUCT_DEF=-DTELELAUNCH_V_$(TELELAUNCH_DEF)
 IDPRODUCT=0x000f
@@ -92,11 +93,7 @@ ao_product.h: ao-make-product.5c ../Version
 
 distclean:	clean
 
-clean:
-	rm -f $(ADB) $(ASM) $(LNK) $(LST) $(REL) $(RST) $(SYM)
-	rm -f $(PROG) $(PCDB) $(PLNK) $(PMAP) $(PMEM) $(PAOM)
-	rm -f ao_product.h
-	rm -f ../$(PROG) ../$(PMAP)
+clean: clean-cc1111
 
 install:
 
diff --git a/src/product/Makefile.telemetrum b/src/product/Makefile.telemetrum
index 57586c95..5e3eed7f 100644
--- a/src/product/Makefile.telemetrum
+++ b/src/product/Makefile.telemetrum
@@ -75,7 +75,8 @@ SRC = \
 	$(DRIVER_SRC) \
 	$(PRODUCT_SRC)
 
-PROG = telemetrum-v$(TM_VER)-$(VERSION)$(TM_EXTRA).ihx
+PROGNAME = telemetrum-v$(TM_VER)$(TM_EXTRA)
+PROG = $(PROGNAME)-$(VERSION).ihx
 PRODUCT=TeleMetrum-v$(TM_VER)
 PRODUCT_DEF=-DTELEMETRUM_V_$(TM_DEF)
 IDPRODUCT=0x000b
@@ -104,11 +105,7 @@ ao_product.h: ao-make-product.5c ../Version
 
 distclean:	clean
 
-clean:
-	rm -f $(ADB) $(ASM) $(LNK) $(LST) $(REL) $(RST) $(SYM)
-	rm -f $(PROG) $(PCDB) $(PLNK) $(PMAP) $(PMEM) $(PAOM)
-	rm -f ao_product.h
-	rm -f ../$(PROG) ../$(PMAP)
+clean: clean-cc1111
 
 install:
 
diff --git a/src/product/Makefile.telemini b/src/product/Makefile.telemini
index 23aed1c7..ef8906ba 100644
--- a/src/product/Makefile.telemini
+++ b/src/product/Makefile.telemini
@@ -63,7 +63,8 @@ SRC = \
 	$(DRIVER_SRC) \
 	$(PRODUCT_SRC)
 
-PROG = telemini-v$(TELEMINI_VER)-$(VERSION).ihx
+PROGNAME = telemini-v$(TELEMINI_VER)
+PROG = $(PROGNAME)-$(VERSION).ihx
 PRODUCT=TeleMini-v$(TELEMINI_VER)
 PRODUCT_DEF=-DTELEMINI_V_$(TELEMINI_DEF)
 IDPRODUCT=0x000a
@@ -93,11 +94,7 @@ ao_product.h: ao-make-product.5c ../Version
 
 distclean:	clean
 
-clean:
-	rm -f $(ADB) $(ASM) $(LNK) $(LST) $(REL) $(RST) $(SYM)
-	rm -f $(PROG) $(PCDB) $(PLNK) $(PMAP) $(PMEM) $(PAOM)
-	rm -f ao_product.h
-	rm -f ../$(PROG) ../$(PMAP)
+clean: clean-cc1111
 
 install:
 
diff --git a/src/product/Makefile.telenano b/src/product/Makefile.telenano
index ca719bbf..67410ae0 100644
--- a/src/product/Makefile.telenano
+++ b/src/product/Makefile.telenano
@@ -62,7 +62,8 @@ SRC = \
 	$(DRIVER_SRC) \
 	$(PRODUCT_SRC)
 
-PROG = telenano-v$(TELENANO_VER)-$(VERSION).ihx
+PROGNAME = telenano-v$(TELENANO_VER)
+PROG = $(PROGNAME)-$(VERSION).ihx
 PRODUCT=TeleNano-v$(TELENANO_VER)
 PRODUCT_DEF=-DTELENANO_V_$(TELENANO_DEF)
 IDPRODUCT=0x000a
@@ -92,11 +93,7 @@ ao_product.h: ao-make-product.5c ../Version
 
 distclean:	clean
 
-clean:
-	rm -f $(ADB) $(ASM) $(LNK) $(LST) $(REL) $(RST) $(SYM)
-	rm -f $(PROG) $(PCDB) $(PLNK) $(PMAP) $(PMEM) $(PAOM)
-	rm -f ao_product.h
-	rm -f ../$(PROG) ../$(PMAP)
+clean: clean-cc1111
 
 install:
 
diff --git a/src/stm-demo/Makefile b/src/stm-demo/Makefile
index dd7e6e02..055a73af 100644
--- a/src/stm-demo/Makefile
+++ b/src/stm-demo/Makefile
@@ -61,7 +61,7 @@ $(OBJ): $(INC)
 distclean:	clean
 
 clean:
-	rm -f $(OBJ)
+	rm -f *.o $(PROG)
 	rm -f ao_product.h
 
 install:
diff --git a/src/teleballoon-v1.1/Makefile b/src/teleballoon-v1.1/Makefile
index fb88787b..2eea996e 100644
--- a/src/teleballoon-v1.1/Makefile
+++ b/src/teleballoon-v1.1/Makefile
@@ -81,7 +81,8 @@ SRC = \
 	$(DRIVER_SRC) \
 	$(PRODUCT_SRC)
 
-PROG = teleballoon-v$(TELEBALLOON_VER)-$(VERSION).ihx
+PROGNAME = teleballoon-v$(TELEBALLOON_VER)
+PROG = $(PROGNAME)-$(VERSION).ihx
 PRODUCT=TeleBalloon-v$(TELEBALLOON_VER)
 PRODUCT_DEF=-DTELEBALLOON_V_$(TELEBALLOON_DEF)
 IDPRODUCT=0x000b
@@ -99,9 +100,9 @@ endif
 # Otherwise, print the full command line.
 quiet ?= $($1)
 
-all: ../$(PROG)
+all: $(PROG)
 
-../$(PROG): $(REL) Makefile
+$(PROG): $(REL) Makefile
 	$(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $(PROG) $(REL) && cp $(PROG) $(PMAP) ..
 	$(call quiet,CHECK_STACK) ../cc1111/ao_arch.h $(PMEM) || rm $@
 
@@ -110,11 +111,7 @@ ao_product.h: ao-make-product.5c ../Version
 
 distclean:	clean
 
-clean:
-	rm -f $(ADB) $(ASM) $(LNK) $(LST) $(REL) $(RST) $(SYM)
-	rm -f $(PROG) $(PCDB) $(PLNK) $(PMAP) $(PMEM) $(PAOM)
-	rm -f ao_product.h
-	rm -f ../$(PROG) ../$(PMAP)
+clean: clean-cc1111
 
 install:
 
diff --git a/src/telescience-v0.1/Makefile b/src/telescience-v0.1/Makefile
index 10e4a2a3..d24128ef 100644
--- a/src/telescience-v0.1/Makefile
+++ b/src/telescience-v0.1/Makefile
@@ -105,7 +105,7 @@ ao_product.o: ao_product.c ao_product.h
 distclean:	clean
 
 clean:
-	rm -f $(OBJ)
+	rm -f *.o $(PROG) $(PROG).hex
 	rm -f ao_product.h
 
 install:
diff --git a/src/teleshield-v0.1/Makefile b/src/teleshield-v0.1/Makefile
index c1f45f37..ab2a025f 100644
--- a/src/teleshield-v0.1/Makefile
+++ b/src/teleshield-v0.1/Makefile
@@ -72,7 +72,8 @@ SRC = \
 	$(DRIVER_SRC) \
 	$(PRODUCT_SRC)
 
-PROG = teleshield-v$(TELESHIELD_VER)-$(VERSION).ihx
+PROGNAME = teleshield-v$(TELESHIELD_VER)
+PROG = $(PROGNAME)-$(VERSION).ihx
 PRODUCT=TeleShield-v$(TELESHIELD_VER)
 PRODUCT_DEF=-DTELESHIELD_V_$(TELESHIELD_DEF)
 IDPRODUCT=0x0013
@@ -102,11 +103,7 @@ ao_product.h: ao-make-product.5c ../Version
 
 distclean:	clean
 
-clean:
-	rm -f $(ADB) $(ASM) $(LNK) $(LST) $(REL) $(RST) $(SYM)
-	rm -f $(PROG) $(PCDB) $(PLNK) $(PMAP) $(PMEM) $(PAOM)
-	rm -f ao_product.h
-	rm -f ../$(PROG) ../$(PMAP)
+clean: clean-cc1111
 
 install:
 
diff --git a/src/teleterra-v0.2/Makefile b/src/teleterra-v0.2/Makefile
index 4967d187..65db57ce 100644
--- a/src/teleterra-v0.2/Makefile
+++ b/src/teleterra-v0.2/Makefile
@@ -66,7 +66,8 @@ SRC = \
 
 TELETERRA_VER=0.2
 TELETERRA_DEF=0_2
-PROG = teleterra-v$(TELETERRA_VER)-$(VERSION).ihx
+PROGNAME = teleterra-v$(TELETERRA_VER)
+PROG = $(PROGNAME)-$(VERSION).ihx
 PRODUCT=TeleTerra-v$(TELETERRA_VER)
 PRODUCT_DEF=-DTELETERRA_V_$(TELETERRA_DEF)
 IDPRODUCT=0x000d
@@ -95,11 +96,7 @@ ao_product.h: ao-make-product.5c ../Version
 
 distclean:	clean
 
-clean:
-	rm -f $(ADB) $(ASM) $(LNK) $(LST) $(REL) $(RST) $(SYM)
-	rm -f $(PROG) $(PCDB) $(PLNK) $(PMAP) $(PMEM) $(PAOM)
-	rm -f ao_product.h
-	rm -f ../$(PROG) ../$(PMAP)
+clean: clean-cc1111
 
 install:
 
diff --git a/src/test/Makefile b/src/test/Makefile
index 963f4131..db3cc04b 100644
--- a/src/test/Makefile
+++ b/src/test/Makefile
@@ -9,7 +9,7 @@ CFLAGS=-I.. -I. -I../core -I../drivers -O3 -g -Wall
 all: $(PROGS)
 
 clean:
-	rm -f $(PROGS)
+	rm -f $(PROGS) run-out.baro run-out.full
 
 install:
 
diff --git a/src/tidongle/Makefile b/src/tidongle/Makefile
index 0bb2ce32..1514c4df 100644
--- a/src/tidongle/Makefile
+++ b/src/tidongle/Makefile
@@ -53,7 +53,8 @@ SRC = \
 	$(DRIVER_SRC) \
 	$(PRODUCT_SRC)
 
-PROG = tidongle-$(VERSION).ihx
+PROGNAME = tidongle
+PROG = $(PROGNAME)-$(VERSION).ihx
 PRODUCT=TIDongle
 PRODUCT_DEF=-DTIDONGLE
 IDPRODUCT=0x000a
@@ -82,11 +83,7 @@ ao_product.h: ao-make-product.5c ../Version
 
 distclean:	clean
 
-clean:
-	rm -f $(ADB) $(ASM) $(LNK) $(LST) $(REL) $(RST) $(SYM)
-	rm -f $(PROG) $(PCDB) $(PLNK) $(PMAP) $(PMEM) $(PAOM)
-	rm -f ao_product.h
-	rm -f ../$(PROG) ../$(PMAP)
+clean: clean-cc1111
 
 install:
 
-- 
cgit v1.2.3