altos: Make serial, usb, beeper and accelerometer optional components

[fw/altos] / src / ao.h

diff --git a/src/ao.h b/src/ao.h
index cef20e61731e869a5a3a517d7a2186cf9fa5c694..5bbe5158e8452707518f88cccf477cc83e960a48 100644 (file)
--- a/src/ao.h
+++ b/src/ao.h
@@ -164,9 +164,13 @@ struct ao_adc {
 
 #if HAS_ADC
 
+#if HAS_ACCEL
 #ifndef HAS_ACCEL_REF
 #error Please define HAS_ACCEL_REF
 #endif
+#else
+#define HAS_ACCEL_REF 0
+#endif
 
 /*
  * ao_adc.c
@@ -303,7 +307,14 @@ extern __code __at (0x00a0) uint16_t ao_romconfig_version;
 extern __code __at (0x00a2) uint16_t ao_romconfig_check;
 extern __code __at (0x00a4) uint16_t ao_serial_number;
 extern __code __at (0x00a6) uint32_t ao_radio_cal;
+
+#ifndef HAS_USB
+#error Please define HAS_USB
+#endif
+
+#if HAS_USB
 extern __code __at (0x00aa) uint8_t ao_usb_descriptors [];
+#endif
 
 /*
  * ao_usb.c
@@ -327,9 +338,11 @@ ao_usb_pollchar(void);
 void
 ao_usb_flush(void);
 
+#if HAS_USB
 /* USB interrupt handler */
 void
 ao_usb_isr(void) __interrupt 6;
+#endif
 
 /* Enable the USB controller */
 void
@@ -380,7 +393,6 @@ uint8_t
 ao_match_word(__code char *word);
 
 struct ao_cmds {
-       char            cmd;
        void            (*func)(void);
        const char      *help;
 };
@@ -922,13 +934,13 @@ ao_radio_get(void);
 #define ao_radio_put() ao_mutex_put(&ao_radio_mutex)
 
 void
-ao_radio_set_telemetry(void);
+ao_radio_set_fixed_pkt(size_t size);
 
-void
-ao_radio_set_packet(void);
+#define ao_radio_set_telemetry() \
+        ao_radio_set_fixed_pkt(sizeof (struct ao_telemetry))
 
-void
-ao_radio_set_rdf(void);
+#define ao_radio_set_packet() \
+        ao_radio_set_fixed_pkt(sizeof (struct ao_packet))
 
 void
 ao_radio_send(__xdata void *data, uint8_t size) __reentrant;
@@ -1063,7 +1075,6 @@ ao_rssi_init(uint8_t rssi_led);
  * each instance of a product
  */
 
-extern __code __at(0x00aa) uint8_t ao_usb_descriptors [];
 extern const char ao_version[];
 extern const char ao_manufacturer[];
 extern const char ao_product[];