Merge branch 'branch-1.6' into debian

Conflicts:
	ChangeLog
	altoslib/AltosTelemetryReader.java
	configure.ac

1 files changed, 12 insertions, 0 deletions

diff --git a/src/kernel/ao_serial.h b/src/kernel/ao_serial.h
index baf213c0..dbc9f8e4 100644
--- a/src/kernel/ao_serial.h
+++ b/src/kernel/ao_serial.h
@@ -34,6 +34,9 @@ ao_serial0_getchar(void);
 int
 _ao_serial0_pollchar(void);
 
+uint8_t
+_ao_serial0_sleep(void);
+
 void
 ao_serial0_putchar(char c);
 
@@ -54,6 +57,9 @@ ao_serial1_getchar(void);
 int
 _ao_serial1_pollchar(void);
 
+uint8_t
+_ao_serial1_sleep(void);
+
 void
 ao_serial1_putchar(char c);
 
@@ -74,6 +80,9 @@ ao_serial2_getchar(void);
 int
 _ao_serial2_pollchar(void);
 
+uint8_t
+_ao_serial2_sleep(void);
+
 void
 ao_serial2_putchar(char c);
 
@@ -94,6 +103,9 @@ ao_serial3_getchar(void);
 int
 _ao_serial3_pollchar(void);
 
+uint8_t
+_ao_serial3_sleep(void);
+
 void
 ao_serial3_putchar(char c);