From: Keith Packard <keithp@keithp.com>
Date: Thu, 28 May 2020 23:03:23 +0000 (-0700)
Subject: altos: Allow flight support without logging
X-Git-Tag: 1.9.3~1^2~30
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=9416e5d71dc57df6612f62451433a34bf669b2cc

altos: Allow flight support without logging

EasyTimer flies rockets, but doesn't have SPI flash for logging.

Signed-off-by: Keith Packard <keithp@keithp.com>
---

diff --git a/src/kernel/ao_cmd.c b/src/kernel/ao_cmd.c
index d1c049ac..9bc19038 100644
--- a/src/kernel/ao_cmd.c
+++ b/src/kernel/ao_cmd.c
@@ -269,7 +269,7 @@ version(void)
 	printf("manufacturer     %s\n"
 	       "product          %s\n"
 	       "serial-number    %u\n"
-#if HAS_FLIGHT || HAS_TRACKER
+#if HAS_LOG && (HAS_FLIGHT || HAS_TRACKER)
 	       "current-flight   %u\n"
 #endif
 #if HAS_LOG
@@ -287,7 +287,7 @@ version(void)
 	       , ao_manufacturer
 	       , ao_product
 	       , ao_serial_number
-#if HAS_FLIGHT || HAS_TRACKER
+#if HAS_LOG && (HAS_FLIGHT || HAS_TRACKER)
 	       , ao_flight_number
 #endif
 #if HAS_LOG
diff --git a/src/kernel/ao_config.c b/src/kernel/ao_config.c
index bd2e95ef..e4fc73c9 100644
--- a/src/kernel/ao_config.c
+++ b/src/kernel/ao_config.c
@@ -86,7 +86,7 @@ _ao_config_put(void)
 	ao_config_setup();
 	ao_config_erase();
 	ao_config_write(0, &ao_config, sizeof (ao_config));
-#if HAS_FLIGHT
+#if HAS_FLIGHT && HAS_LOG
 	ao_log_write_erase(0);
 #endif
 	ao_config_flush();