From ff4deb417a460d96645fb6934890c2c195142be3 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Fri, 28 Mar 2014 23:33:25 -0700 Subject: [PATCH] altos: HAS_LED is useless; remove it ao_flight was trying to decide whether to turn off the red LED by checking whether HAS_LED was defined. And yet, none of the flight firmware defines that anymore, except for easymini which defines it to zero. Remove all uses and defines of this value, substituting AO_LED_RED in ao_flight.c, which has to be defined for the ao_led_off call to work. Signed-off-by: Keith Packard --- src/core/ao_flight.c | 4 ++-- src/easymini-v1.0/ao_pins.h | 1 - src/lpcxpresso/ao_pins.h | 1 - src/usbtrng/ao_pins.h | 1 - 4 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/core/ao_flight.c b/src/core/ao_flight.c index 702c3403..24099347 100644 --- a/src/core/ao_flight.c +++ b/src/core/ao_flight.c @@ -143,7 +143,7 @@ ao_flight(void) ao_rdf_set(1); ao_telemetry_set_interval(AO_TELEMETRY_INTERVAL_PAD); #endif -#if HAS_LED +#if AO_LED_RED /* signal successful initialization by turning off the LED */ ao_led_off(AO_LED_RED); #endif @@ -160,7 +160,7 @@ ao_flight(void) ao_packet_slave_start(); #endif -#if HAS_LED +#if AO_LED_RED /* signal successful initialization by turning off the LED */ ao_led_off(AO_LED_RED); #endif diff --git a/src/easymini-v1.0/ao_pins.h b/src/easymini-v1.0/ao_pins.h index e721030d..6757047f 100644 --- a/src/easymini-v1.0/ao_pins.h +++ b/src/easymini-v1.0/ao_pins.h @@ -16,7 +16,6 @@ */ #define HAS_BEEP 1 -#define HAS_LED 0 #define AO_STACK_SIZE 384 diff --git a/src/lpcxpresso/ao_pins.h b/src/lpcxpresso/ao_pins.h index c0074ce2..0ffc2fad 100644 --- a/src/lpcxpresso/ao_pins.h +++ b/src/lpcxpresso/ao_pins.h @@ -16,7 +16,6 @@ */ #define HAS_BEEP 0 -#define HAS_LED 1 /* Crystal on the board */ #define AO_LPC_CLKIN 12000000 diff --git a/src/usbtrng/ao_pins.h b/src/usbtrng/ao_pins.h index 9c8fa831..b1fa6eb9 100644 --- a/src/usbtrng/ao_pins.h +++ b/src/usbtrng/ao_pins.h @@ -16,7 +16,6 @@ */ #define HAS_BEEP 0 -#define HAS_LED 1 #define AO_STACK_SIZE 384 -- 2.30.2