From: Keith Packard <keithp@keithp.com>
Date: Sat, 27 Feb 2010 23:19:33 +0000 (-0800)
Subject: Merge remote branch 'origin/master'
X-Git-Tag: debian/0.6+106+ga1478f6~1
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=a1478f65538fdaac7b58ffbd958a035b74956099;hp=bbf8c9f1748af3f1fac08ddf80ae98da2e9b5727

Merge remote branch 'origin/master'
---

diff --git a/ao-bringup/.gitignore b/ao-bringup/.gitignore
new file mode 100644
index 00000000..dc7beb52
--- /dev/null
+++ b/ao-bringup/.gitignore
@@ -0,0 +1,2 @@
+ao_led_blink
+ao_radio_xmit
diff --git a/src/Makefile.proto b/src/Makefile.proto
index 6cb6e0de..106333a6 100644
--- a/src/Makefile.proto
+++ b/src/Makefile.proto
@@ -207,7 +207,7 @@ quiet ?= $($1)
 all: ../$(PROG)
 
 ../$(PROG): $(REL) Makefile Makefile.defs ../Makefile.proto
-	$(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $(PROG) $(REL) && mv $(PROG) $(PMAP) ..
+	$(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $(PROG) $(REL) && cp $(PROG) $(PMAP) ..
 	$(call quiet,CHECK_STACK) ../ao.h $(PMEM)
 
 ../altitude.h: make-altitude
diff --git a/src/ao.h b/src/ao.h
index b43f5ecd..aefefa46 100644
--- a/src/ao.h
+++ b/src/ao.h
@@ -263,8 +263,6 @@ ao_beep_init(void);
  */
 
 #define AO_LED_NONE	0
-#define AO_LED_GREEN	1
-#define AO_LED_RED	2
 
 /* Turn on the specified LEDs */
 void
diff --git a/src/ao_config.c b/src/ao_config.c
index f8ea27fe..8df994a6 100644
--- a/src/ao_config.c
+++ b/src/ao_config.c
@@ -377,13 +377,18 @@ ao_config_show(void) __reentrant
 void
 ao_config_write(void) __reentrant
 {
+	uint8_t saved = 0;
 	ao_mutex_get(&ao_config_mutex);
 	if (ao_config_dirty) {
 		_ao_config_put();
 		ao_config_dirty = 0;
-		printf("Saved\n");
+		saved = 1;
 	}
 	ao_mutex_put(&ao_config_mutex);
+	if (saved)
+		puts("Saved");
+	else
+		puts("Nothing to save");
 }
 #endif
 
diff --git a/src/ao_led.c b/src/ao_led.c
index 6c698b4b..5beed58d 100644
--- a/src/ao_led.c
+++ b/src/ao_led.c
@@ -17,8 +17,6 @@
 
 #include "ao.h"
 
-#define AO_LED_ALL	(AO_LED_GREEN|AO_LED_RED)
-
 __pdata uint8_t ao_led_enable;
 
 void
diff --git a/src/ao_packet.c b/src/ao_packet.c
index dcd1647c..d52f2a68 100644
--- a/src/ao_packet.c
+++ b/src/ao_packet.c
@@ -67,7 +67,9 @@ ao_packet_recv(void)
 {
 	uint8_t	dma_done;
 
+#ifdef AO_LED_GREEN
 	ao_led_on(AO_LED_GREEN);
+#endif
 	ao_radio_get();
 	ao_dma_set_transfer(ao_radio_dma,
 			    &RFDXADDR,
@@ -86,7 +88,9 @@ ao_packet_recv(void)
 				   ao_radio_abort();
 	dma_done = ao_radio_dma_done;
 	ao_radio_put();
+#ifdef AO_LED_GREEN
 	ao_led_off(AO_LED_GREEN);
+#endif
 
 	if (dma_done & AO_DMA_DONE) {
 		if (!(ao_rx_packet.status & PKT_APPEND_STATUS_1_CRC_OK))
diff --git a/src/ao_pins.h b/src/ao_pins.h
index 84d8a1a1..771d9c7f 100644
--- a/src/ao_pins.h
+++ b/src/ao_pins.h
@@ -28,6 +28,7 @@
 	#define PACKET_HAS_MASTER	0
 	#define PACKET_HAS_SLAVE	1
 
+	#define AO_LED_RED		1
 	#define LEDS_AVAILABLE		(AO_LED_RED)
 	#define HAS_EXTERNAL_TEMP	0
 #endif
@@ -41,7 +42,9 @@
 	#define DBG_ON_P0 		0
 	#define PACKET_HAS_MASTER	1
 	#define PACKET_HAS_SLAVE	0
-	#define LEDS_AVAILABLE		(AO_LED_RED)
+	#define AO_LED_RED		1
+	#define AO_LED_GREEN		2
+	#define LEDS_AVAILABLE		(AO_LED_RED|AO_LED_GREEN)
 #endif
 
 #if defined(TELEMETRUM_V_0_1)
@@ -53,6 +56,8 @@
 	#define DBG_ON_P0 		1
 	#define PACKET_HAS_MASTER	0
 	#define PACKET_HAS_SLAVE	1
+	#define AO_LED_RED		2
+	#define AO_LED_GREEN		1
 	#define LEDS_AVAILABLE		(AO_LED_RED|AO_LED_GREEN)
 	#define HAS_EXTERNAL_TEMP	1
 #endif
@@ -66,6 +71,8 @@
 	#define DBG_ON_P0 		1
 	#define PACKET_HAS_MASTER	1
 	#define PACKET_HAS_SLAVE	0
+	#define AO_LED_RED		2
+	#define AO_LED_GREEN		1
 	#define LEDS_AVAILABLE		(AO_LED_RED|AO_LED_GREEN)
 #endif
 
@@ -78,6 +85,7 @@
 	#define DBG_ON_P0		1
 	#define PACKET_HAS_MASTER	1
 	#define PACKET_HAS_SLAVE	0
+	#define AO_LED_RED		2
 	#define LEDS_AVAILABLE		(AO_LED_RED)
 #endif
 
diff --git a/src/ao_teledongle.c b/src/ao_teledongle.c
index b07b1746..505dc0cb 100644
--- a/src/ao_teledongle.c
+++ b/src/ao_teledongle.c
@@ -23,7 +23,7 @@ main(void)
 	ao_clock_init();
 
 	/* Turn on the LED until the system is stable */
-	ao_led_init(AO_LED_RED|AO_LED_GREEN);
+	ao_led_init(LEDS_AVAILABLE);
 	ao_led_on(AO_LED_RED);
 	ao_timer_init();
 	ao_cmd_init();