altos/cc1200: Adjust bit-sync configuration

[fw/altos] / src / drivers / ao_pyro_slave.c

diff --git a/src/drivers/ao_pyro_slave.c b/src/drivers/ao_pyro_slave.c
index 5ef42b5ac61296b19a7a9f5774196b38a57d4ae5..f07c2cba184ddb47fdd67dfaac6bb53be13c4e38 100644 (file)
--- a/src/drivers/ao_pyro_slave.c
+++ b/src/drivers/ao_pyro_slave.c
@@ -15,8 +15,11 @@
  * 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>
+#include <ao_flight.h>
+#include <ao_pyro.h>
 
 struct ao_companion_command    ao_companion_command;
 
@@ -27,6 +30,11 @@ static const struct ao_companion_setup       ao_telepyro_setup = {
        .channels               = AO_TELEPYRO_NUM_ADC,
 };
 
+struct ao_config ao_config;
+
+extern volatile __data uint16_t ao_tick_count;
+uint16_t ao_boost_tick;
+
 void ao_spi_slave(void)
 {
        if (!ao_spi_slave_recv((uint8_t *) &ao_companion_command,
@@ -40,10 +48,14 @@ void ao_spi_slave(void)
                                  sizeof (ao_telepyro_setup));
                break;
        case AO_COMPANION_FETCH:
-               ao_spi_slave_send((uint8_t *) &ao_adc_ring[ao_adc_ring_prev(ao_adc_head)].adc,
+               ao_spi_slave_send((uint8_t *) &ao_data_ring[ao_data_ring_prev(ao_data_head)].adc.adc,
                                  AO_TELEPYRO_NUM_ADC * sizeof (uint16_t));
                break;
        case AO_COMPANION_NOTIFY:
+               /* Can't use ao_time because we have interrupts suspended */
+               if (ao_companion_command.flight_state < ao_flight_boost && ao_companion_command.flight_state >= ao_flight_boost)
+                       ao_boost_tick = ao_tick_count;
+               ao_wakeup(&ao_pyro_wakeup);
                break;
        default:
                return;