Merge branch 'branch-1.2' into debian

1 files changed, 8 insertions, 5 deletions

diff --git a/src/drivers/ao_companion.c b/src/drivers/ao_companion.c
index c749adea..0f405253 100644
--- a/src/drivers/ao_companion.c
+++ b/src/drivers/ao_companion.c
@@ -18,7 +18,7 @@
 #include <ao.h>
 #include <ao_companion.h>
 
-#ifdef MEGAMETRUM
+#ifdef TELEMEGA
 #define ao_spi_slow(b)
 #define ao_spi_fast(b)
 #endif
@@ -118,10 +118,13 @@ ao_companion_status(void) __reentrant
 	printf("Companion running: %d\n", ao_companion_running);
 	if (!ao_companion_running)
 		return;
-	printf("device: %d\n", ao_companion_setup.board_id);
-	printf("update period: %d\n", ao_companion_setup.update_period);
-	printf("channels: %d\n", ao_companion_setup.channels);
-	printf("data:");
+	printf("device: %d\n"
+	       "update period: %d\n"
+	       "channels: %d\n"
+	       "data:",
+	       ao_companion_setup.board_id,
+	       ao_companion_setup.update_period,
+	       ao_companion_setup.channels);
 	for(i = 0; i < ao_companion_setup.channels; i++)
 		printf(" %5u", ao_companion_data[i]);
 	printf("\n");