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

diff --git a/src/core/ao_log_telescience.c b/src/core/ao_log_telescience.c
index aac780fa..31eda381 100644
--- a/src/core/ao_log_telescience.c
+++ b/src/core/ao_log_telescience.c
@@ -18,119 +18,25 @@
 #include "ao.h"
 #include "ao_product.h"
 
-static struct ao_task ao_log_task;
-//static struct ao_task ao_spi_task;
-
-uint8_t 	ao_log_running;
-uint8_t		ao_log_mutex;
-uint32_t	ao_log_start_pos;
-uint32_t	ao_log_end_pos;
-uint32_t	ao_log_current_pos;
-
-#define AO_LOG_TELESCIENCE_START	((uint8_t) 's')
-#define AO_LOG_TELESCIENCE_DATA		((uint8_t) 'd')
-
-struct ao_log_telescience ao_log_store;
-struct ao_log_telescience ao_log_fetch;
-
 static uint8_t	ao_log_adc_pos;
 
 __code uint8_t ao_log_format = AO_LOG_FORMAT_TELESCIENCE;
 
-static uint8_t
-ao_log_csum(__xdata uint8_t *b) __reentrant
+static void
+ao_log_telescience_csum(void) __reentrant
 {
+	__xdata uint8_t *b = ao_log_single_write_data.bytes;
 	uint8_t	sum = 0x5a;
 	uint8_t	i;
 
+	ao_log_single_write_data.telescience.csum = 0;
 	for (i = 0; i < sizeof (struct ao_log_telescience); i++)
 		sum += *b++;
-	return -sum;
-}
-
-static uint8_t
-ao_log_telescience_write(void)
-{
-	uint8_t wrote = 0;
-
-	ao_log_store.csum = 0;
-	ao_log_store.csum = ao_log_csum((__xdata uint8_t *) &ao_log_store);
-	ao_mutex_get(&ao_log_mutex); {
-		if (ao_log_current_pos >= ao_log_end_pos && ao_log_running)
-			ao_log_stop();
-		if (ao_log_running) {
-			wrote = 1;
-			ao_storage_write(ao_log_current_pos,
-					 (__xdata uint8_t *) &ao_log_store,
-					 sizeof (struct ao_log_telescience));
-			ao_log_current_pos += sizeof (struct ao_log_telescience);
-		}
-	} ao_mutex_put(&ao_log_mutex);
-	return wrote;
-}
-
-static uint8_t
-ao_log_valid(struct ao_log_telescience *log)
-{
-	uint8_t	*d;
-	uint8_t	i;
-	d = (uint8_t *) log;
-	for (i = 0; i < sizeof (struct ao_log_telescience); i++)
-		if (d[i] != 0xff)
-			return 1;
-	return 0;
-}
-
-static uint8_t
-ao_log_telescience_read(uint32_t pos)
-{
-	if (!ao_storage_read(pos, &ao_log_fetch, sizeof (struct ao_log_telescience)))
-		return 0;
-	return ao_log_valid(&ao_log_fetch);
-}
-
-void
-ao_log_start(void)
-{
-	if (!ao_log_running) {
-		ao_log_running = 1;
-		ao_wakeup(&ao_log_running);
-	}
-}
-
-void
-ao_log_stop(void)
-{
-	if (ao_log_running) {
-		ao_log_running = 0;
-	}
-}
-
-void
-ao_log_restart(void)
-{
-	/* Find end of data */
-	ao_log_end_pos = ao_storage_config;
-	for (ao_log_current_pos = 0;
-	     ao_log_current_pos < ao_storage_config;
-	     ao_log_current_pos += ao_storage_block)
-	{
-		if (!ao_log_telescience_read(ao_log_current_pos))
-			break;
-	}
-	if (ao_log_current_pos > 0) {
-		ao_log_current_pos -= ao_storage_block;
-		for (; ao_log_current_pos < ao_storage_config;
-		     ao_log_current_pos += sizeof (struct ao_log_telescience))
-		{
-			if (!ao_log_telescience_read(ao_log_current_pos))
-				break;
-		}
-	}
+	ao_log_single_write_data.telescience.csum = -sum;
 }
 
 void
-ao_log_telescience(void)
+ao_log_single(void)
 {
 	ao_storage_setup();
 
@@ -139,57 +45,42 @@ ao_log_telescience(void)
 	 */
 	ao_delay(AO_SEC_TO_TICKS(10));
 
-	ao_log_restart();
+	ao_log_single_restart();
 	for (;;) {
 		while (!ao_log_running)
 			ao_sleep(&ao_log_running);
 
 		ao_log_start_pos = ao_log_current_pos;
-		ao_log_store.type = AO_LOG_TELESCIENCE_START;
-		ao_log_store.tick = ao_time();
-		ao_log_store.adc[0] = ao_companion_command.serial;
-		ao_log_store.adc[1] = ao_companion_command.flight;
-		ao_log_telescience_write();
+		ao_log_single_write_data.telescience.type = AO_LOG_TELESCIENCE_START;
+		ao_log_single_write_data.telescience.tick = ao_time();
+		ao_log_single_write_data.telescience.adc[0] = ao_companion_command.serial;
+		ao_log_single_write_data.telescience.adc[1] = ao_companion_command.flight;
+		ao_log_telescience_csum();
+		ao_log_single_write();
 		/* 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_store.type = AO_LOG_TELESCIENCE_DATA;
+		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_store.tick = ao_adc_ring[ao_log_adc_pos].tick;
-				memcpy(&ao_log_store.adc, (void *) ao_adc_ring[ao_log_adc_pos].adc,
+				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,
 				       AO_LOG_TELESCIENCE_NUM_ADC * sizeof (uint16_t));
-				ao_log_telescience_write();
+				ao_log_telescience_csum();
+				ao_log_single_write();
 				ao_log_adc_pos = ao_adc_ring_next(ao_log_adc_pos);
 			}
 			/* Wait for more ADC data to arrive */
 			ao_sleep((void *) &ao_adc_head);
 		}
-		memset(&ao_log_store.adc, '\0', sizeof (ao_log_store.adc));
+		memset(&ao_log_single_write_data.telescience.adc, '\0', sizeof (ao_log_single_write_data.telescience.adc));
 	}
 }
 
 void
-ao_log_set(void)
-{
-	printf("Logging currently %s\n", ao_log_running ? "on" : "off");
-	ao_cmd_hex();
-	if (ao_cmd_status == ao_cmd_success) {
-		if (ao_cmd_lex_i) {
-			printf("Logging from %ld to %ld\n", ao_log_current_pos, ao_log_end_pos);
-			ao_log_start();
-		} else {
-			printf ("Log stopped at %ld\n", ao_log_current_pos);
-			ao_log_stop();
-		}
-	}
-	ao_cmd_status = ao_cmd_success;
-}
-
-void
-ao_log_list(void)
+ao_log_single_list(void)
 {
 	uint32_t	pos;
 	uint32_t	start = 0;
@@ -197,8 +88,8 @@ ao_log_list(void)
 
 	for (pos = 0; ; pos += sizeof (struct ao_log_telescience)) {
 		if (pos >= ao_storage_config ||
-		    !ao_log_telescience_read(pos) ||
-		    ao_log_fetch.type == AO_LOG_TELESCIENCE_START)
+		    !ao_log_single_read(pos) ||
+		    ao_log_single_read_data.telescience.type == AO_LOG_TELESCIENCE_START)
 		{
 			if (pos != start) {
 				printf("flight %d start %x end %x\n",
@@ -206,7 +97,7 @@ ao_log_list(void)
 				       (uint16_t) (start >> 8),
 				       (uint16_t) ((pos + 0xff) >> 8)); flush();
 			}
-			if (ao_log_fetch.type != AO_LOG_TELESCIENCE_START)
+			if (ao_log_single_read_data.telescience.type != AO_LOG_TELESCIENCE_START)
 				break;
 			start = pos;
 			flight++;
@@ -216,59 +107,11 @@ ao_log_list(void)
 }
 
 void
-ao_log_delete(void)
+ao_log_single_extra_query(void)
 {
-	uint32_t	pos;
-
-	ao_cmd_hex();
-	if (ao_cmd_status != ao_cmd_success)
-		return;
-	if (ao_cmd_lex_i != 1) {
-		ao_cmd_status = ao_cmd_syntax_error;
-		printf("No such flight: %d\n", ao_cmd_lex_i);
-		return;
-	}
-	ao_log_stop();
-	for (pos = 0; pos < ao_storage_config; pos += ao_storage_block) {
-		if (!ao_log_telescience_read(pos))
-			break;
-		ao_storage_erase(pos);
-	}
-	ao_log_current_pos = ao_log_start_pos = 0;
-	if (pos == 0)
-		printf("No such flight: %d\n", ao_cmd_lex_i);
-	else
-		printf ("Erased\n");
-}
-
-static void
-ao_log_query(void)
-{
-	printf("Logging enabled: %d\n", ao_log_running);
-	printf("Log start: %ld\n", ao_log_start_pos);
-	printf("Log cur: %ld\n", ao_log_current_pos);
-	printf("Log end: %ld\n", ao_log_end_pos);
-	printf("log data tick: %04x\n", ao_log_store.tick);
-	printf("TM data tick: %04x\n", ao_log_store.tm_tick);
-	printf("TM state: %d\n", ao_log_store.tm_state);
+	printf("log data tick: %04x\n", ao_log_single_write_data.telescience.tick);
+	printf("TM data tick: %04x\n", ao_log_single_write_data.telescience.tm_tick);
+	printf("TM state: %d\n", ao_log_single_write_data.telescience.tm_state);
 	printf("TM serial: %d\n", ao_companion_command.serial);
 	printf("TM flight: %d\n", ao_companion_command.flight);
 }
-
-const struct ao_cmds ao_log_cmds[] = {
-	{ ao_log_set,	"L <0 off, 1 on>\0Set logging mode" },
-	{ ao_log_list,	"l\0List stored flight logs" },
-	{ ao_log_delete, "d 1\0Delete all stored flights" },
-	{ ao_log_query, "q\0Query log status" },
-	{ 0,	NULL },
-};
-
-void
-ao_log_init(void)
-{
-	ao_log_running = 0;
-
-	ao_cmd_register(&ao_log_cmds[0]);
-
-	ao_add_task(&ao_log_task, ao_log_telescience, "log");
-}