X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fcore%2Fao_log_telescience.c;h=002a10bd9fd8dab64f5f407b60cf76787140ae04;hb=e0a0a747624c2df66ca4a73b5a0de014ea204dca;hp=31eda381d775a9d393c3c5a591816ce09858e56c;hpb=f6f54d70b768dca1715ddddea64a4df00d82b09e;p=fw%2Faltos

diff --git a/src/core/ao_log_telescience.c b/src/core/ao_log_telescience.c
index 31eda381..002a10bd 100644
--- a/src/core/ao_log_telescience.c
+++ b/src/core/ao_log_telescience.c
@@ -17,8 +17,10 @@
 
 #include "ao.h"
 #include "ao_product.h"
+#include "ao_log.h"
+#include "ao_companion.h"
 
-static uint8_t	ao_log_adc_pos;
+static uint8_t	ao_log_data_pos;
 
 __code uint8_t ao_log_format = AO_LOG_FORMAT_TELESCIENCE;
 
@@ -60,20 +62,20 @@ ao_log_single(void)
 		/* Write the whole contents of the ring to the log
 		 * when starting up.
 		 */
-		ao_log_adc_pos = ao_adc_ring_next(ao_adc_head);
+		ao_log_data_pos = ao_data_ring_next(ao_data_head);
 		ao_log_single_write_data.telescience.type = AO_LOG_TELESCIENCE_DATA;
 		while (ao_log_running) {
 			/* Write samples to EEPROM */
-			while (ao_log_adc_pos != ao_adc_head) {
-				ao_log_single_write_data.telescience.tick = ao_adc_ring[ao_log_adc_pos].tick;
-				memcpy(&ao_log_single_write_data.telescience.adc, (void *) ao_adc_ring[ao_log_adc_pos].adc,
+			while (ao_log_data_pos != ao_data_head) {
+				ao_log_single_write_data.telescience.tick = ao_data_ring[ao_log_data_pos].tick;
+				memcpy(&ao_log_single_write_data.telescience.adc, (void *) ao_data_ring[ao_log_data_pos].adc.adc,
 				       AO_LOG_TELESCIENCE_NUM_ADC * sizeof (uint16_t));
 				ao_log_telescience_csum();
 				ao_log_single_write();
-				ao_log_adc_pos = ao_adc_ring_next(ao_log_adc_pos);
+				ao_log_data_pos = ao_data_ring_next(ao_log_data_pos);
 			}
 			/* Wait for more ADC data to arrive */
-			ao_sleep((void *) &ao_adc_head);
+			ao_sleep((void *) &ao_data_head);
 		}
 		memset(&ao_log_single_write_data.telescience.adc, '\0', sizeof (ao_log_single_write_data.telescience.adc));
 	}