Merge branch 'gps-mosaic'

diff --cc src/kernel/ao.h
Simple merge

diff --cc src/kernel/ao_config.c
Simple merge

diff --cc src/kernel/ao_config.h
Simple merge

diff --cc src/kernel/ao_host.h
index 30df8edc0e66ffc7cc7f610adc57103edbfd881c,c3a4fa51a72283a73555c4281191ef017d0b03c2..1cf2410232bc399d818c17cd69712dfd5445b2f0
--- 1/src/kernel/ao_host.h
--- 2/src/kernel/ao_host.h
+++ b/src/kernel/ao_host.h
@@@ -93,9 -89,12 +96,9 @@@ enum ao_igniter_status 
  #define ao_log_start()
  #define ao_log_stop()
  
- #define AO_MS_TO_TICKS(ms)    ((ms) / 10)
- #define AO_NS_TO_TICKS(ns)    ((ns) / (10000000L))
- #define AO_SEC_TO_TICKS(s)    ((s) * 100)
 -#ifndef AO_HERTZ
 -#define AO_HERTZ              100
 -#endif
+ #define AO_MS_TO_TICKS(ms)    ((ms) / (1000 / AO_HERTZ))
+ #define AO_SEC_TO_TICKS(s)    ((AO_TICK_TYPE) (s) * AO_HERTZ)
+ #define AO_NS_TO_TICKS(ns)    ((ns) / (1000000000L / AO_HERTZ))
  
  #define AO_FLIGHT_TEST
  

diff --cc src/telemega-v3.0/ao_pins.h
Simple merge

diff --cc src/telemega-v4.0/ao_pins.h
Simple merge

diff --cc src/telemega-v5.0/ao_pins.h
Simple merge

diff --cc src/telemega-v6.0/ao_pins.h
Simple merge

diff --cc src/test/Makefile
index 2c74780d1fac362f6a9305ac7190196279cc1c9b,63922b5bd9d2ca8f29ce49ad6f18d15d84974b17..2cba8a35af785dafb4a2fdff486a4f4a3ff6b044
--- 1/src/test/Makefile
--- 2/src/test/Makefile
+++ b/src/test/Makefile
@@@ -17,9 -16,10 +17,10 @@@ TEST_LIB=-ljson-
  
  KALMAN=make-kalman 
  
 -CFLAGS=-I.. -I. -I../kernel -I../drivers -I../micropeak -I../product -I../lisp -O0 -g -Wall -DAO_LISP_TEST -no-pie
 +CFLAGS=-I.. -I. -I../kernel -I../drivers -I../product -I../lisp -O0 -g -Wall -DAO_LISP_TEST -no-pie
  
- all: $(PROGS) ao_aprs_data.wav
+ #all: $(PROGS) ao_aprs_data.wav
+ all: ao_gps_test_mosaic
  
  clean::
        rm -f $(PROGS) ao_aprs_data.wav run-out.baro run-out.full

diff --cc src/test/ao_gps_test_ublox.c
index 6cccf0e51b3af18e43e62a75a44bf920f56fbf02,034946703e592807b9fe0922e79011016eb9ad8d..9c25a465f1b575cbeae24c19a6b18d2eac5dc2b6
--- 1/src/test/ao_gps_test_ublox.c
--- 2/src/test/ao_gps_test_ublox.c
+++ b/src/test/ao_gps_test_ublox.c
@@@ -25,9 -23,9 +25,10 @@@
  #include <errno.h>
  #include <sys/types.h>
  #include <sys/stat.h>
 +#include <stdbool.h>
  #include <fcntl.h>
  #include <unistd.h>
+ 
  #define AO_GPS_NUM_SAT_MASK   (0xf << 0)
  #define AO_GPS_NUM_SAT_SHIFT  (0)