X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fdrivers%2Fao_science_slave.c;h=775318f94816fe008294ec62a054243a85540ea7;hb=69bdb309f46a28803e93b08921720805b28b18a2;hp=78941255ef7014a28947620dcecac59b524bc45c;hpb=cb837d9bb9e6736fcdfca7692b1f9490ea090838;p=fw%2Faltos

diff --git a/src/drivers/ao_science_slave.c b/src/drivers/ao_science_slave.c
index 78941255..775318f9 100644
--- a/src/drivers/ao_science_slave.c
+++ b/src/drivers/ao_science_slave.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
@@ -17,6 +18,8 @@
 
 #include "ao.h"
 #include "ao_product.h"
+#include "ao_flight.h"
+#include "ao_companion.h"
 
 struct ao_companion_command	ao_companion_command;
 
@@ -29,19 +32,19 @@ static const struct ao_companion_setup	ao_telescience_setup = {
 
 void ao_spi_slave(void)
 {
-	if (!ao_spi_read((uint8_t *) &ao_companion_command,
-			 sizeof (ao_companion_command)))
+	if (!ao_spi_slave_recv((uint8_t *) &ao_companion_command,
+			       sizeof (ao_companion_command)))
 		return;
 
 	/* Figure out the outbound data */
 	switch (ao_companion_command.command) {
 	case AO_COMPANION_SETUP:
-		ao_spi_write((uint8_t *) &ao_telescience_setup,
-			     sizeof (ao_telescience_setup));
+		ao_spi_slave_send((uint8_t *) &ao_telescience_setup,
+				  sizeof (ao_telescience_setup));
 		break;
 	case AO_COMPANION_FETCH:
-		ao_spi_write((uint8_t *) &ao_adc_ring[ao_adc_ring_prev(ao_adc_head)].adc,
-			     AO_LOG_TELESCIENCE_NUM_ADC * sizeof (uint16_t));
+		ao_spi_slave_send((uint8_t *) &ao_data_ring[ao_data_ring_prev(ao_data_head)].adc,
+				  AO_LOG_TELESCIENCE_NUM_ADC * sizeof (uint16_t));
 		break;
 	case AO_COMPANION_NOTIFY:
 		break;