altos: Remove *_TO_DATA macros

[fw/altos] / src / kernel / ao_report.c

diff --git a/src/kernel/ao_report.c b/src/kernel/ao_report.c
index f4253b3db9e42f1427a3cda44ec215c13ce74dcf..73f87cdd16c05762bdd15933a0a6185c58b4fe64 100644 (file)
--- a/src/kernel/ao_report.c
+++ b/src/kernel/ao_report.c
@@ -3,7 +3,8 @@
  *
  * 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.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -44,9 +45,16 @@ static const uint8_t flight_reports[] = {
 #define mid(time)      ao_beep_for(AO_BEEP_MID, time)
 #define high(time)     ao_beep_for(AO_BEEP_HIGH, time)
 #else
-#define low(time)      ao_led_for(AO_LED_GREEN, time)
-#define mid(time)      ao_led_for(AO_LED_RED, time)
-#define high(time)     ao_led_for(AO_LED_GREEN|AO_LED_RED, time)
+#ifndef AO_LED_LOW
+#define AO_LED_LOW     AO_LED_GREEN
+#endif
+#ifndef AO_LED_MID
+#define AO_LED_MID     AO_LED_RED
+#endif
+
+#define low(time)      ao_led_for(AO_LED_LOW, time)
+#define mid(time)      ao_led_for(AO_LED_MID, time)
+#define high(time)     ao_led_for(AO_LED_MID|AO_LED_LOW, time)
 #endif
 #define pause(time)    ao_delay(time)
 
@@ -175,7 +183,7 @@ ao_report_battery(void)
                ao_data_get(&packet);
                if (packet.adc.v_batt != 0)
                        break;
-               ao_sleep(DATA_TO_XDATA(&ao_sample_data));
+               ao_sleep(&ao_sample_data);
        }
        ao_report_number(ao_battery_decivolt(packet.adc.v_batt));
 }
@@ -273,7 +281,7 @@ ao_report(void)
                }
 #endif
                while (ao_report_state == ao_flight_state)
-                       ao_sleep(DATA_TO_XDATA(&ao_flight_state));
+                       ao_sleep(&ao_flight_state);
        }
 }