From: Keith Packard <keithp@keithp.com>
Date: Sat, 26 Jul 2025 18:43:54 +0000 (-0700)
Subject: Merge branch 'gps-mosaic'
X-Git-Tag: 1.9.22~1^2~7
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=622ff19bf096a46ebf0e6bfde1667b135cc7a751;p=fw%2Faltos

Merge branch 'gps-mosaic'
---

622ff19bf096a46ebf0e6bfde1667b135cc7a751
diff --cc src/kernel/ao_host.h
index 30df8edc,c3a4fa51..1cf24102
--- a/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/test/Makefile
index 2c74780d,63922b5b..2cba8a35
--- a/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 6cccf0e5,03494670..9c25a465
--- a/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)