summaryrefslogtreecommitdiff
path: root/src/core/ao_log_mega.c
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2013-04-22 17:20:51 -0500
committerKeith Packard <keithp@keithp.com>2013-04-22 17:20:51 -0500
commit33c3b2c57d0d4285b75d4dcf7ca67ad19da08c86 (patch)
treea9ff47afab29fe141dcd1da0ca276b367f911cb6 /src/core/ao_log_mega.c
parent1a84db819a359be39be51c9105039ab28c9fc894 (diff)
parent90b0db1ae53182c94bf12d661446fc369d916366 (diff)
Merge branch 'master' into stm-flash
Conflicts: ao-tools/ao-stmload/ao-stmload.c
Diffstat (limited to 'src/core/ao_log_mega.c')
-rw-r--r--src/core/ao_log_mega.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/core/ao_log_mega.c b/src/core/ao_log_mega.c
index e03687ad..abf953a6 100644
--- a/src/core/ao_log_mega.c
+++ b/src/core/ao_log_mega.c
@@ -23,7 +23,7 @@
static __xdata uint8_t ao_log_mutex;
static __xdata struct ao_log_mega log;
-__code uint8_t ao_log_format = AO_LOG_FORMAT_MEGAMETRUM;
+__code uint8_t ao_log_format = AO_LOG_FORMAT_TELEMEGA;
static uint8_t
ao_log_csum(__xdata uint8_t *b) __reentrant
@@ -171,6 +171,8 @@ ao_log(void)
}
#endif
+ ao_log_flush();
+
/* Wait for a while */
ao_delay(AO_MS_TO_TICKS(100));