Merge pull request #11 from swift-nav/pr-719-copy

Pass MAX_CHANNELS value to libswiftnav CMAKE. Verified on VV-1606301020.

Author: valeri-atamaniouk

Makefile

@@ -26,10 +26,12 @@ MAKEFLAGS += PIKSI_HW=$(PIKSI_HW)
 
 ifeq ($(PIKSI_HW),v2)
 	CMAKEFLAGS += -DCMAKE_SYSTEM_PROCESSOR=cortex-m4
+	CMAKEFLAGS += -DMAX_CHANNELS=11
 endif
 
 ifeq ($(PIKSI_HW),v3)
 	CMAKEFLAGS += -DCMAKE_SYSTEM_PROCESSOR=cortex-a9
+	CMAKEFLAGS += -DMAX_CHANNELS=31
 endif
 
 .PHONY: all tests firmware docs hitl_setup hitl hitlv3 .FORCE

libswiftnav

@@ -14,6 +14,7 @@
 #ifndef SWIFTNAV_NAP_HW_V2_H
 #define SWIFTNAV_NAP_HW_V2_H
 
+#include <libswiftnav/config.h>
 #include <libswiftnav/signal.h>
 
 /** \addtogroup nap
@@ -39,7 +40,7 @@
 #define NAP_HASH_NOTREADY           2
 
 /** Max number of tracking channels NAP configuration will be built with. */
-#define NAP_MAX_N_TRACK_CHANNELS     12
+#define NAP_MAX_N_TRACK_CHANNELS    (MAX_CHANNELS + 1)
 
 u8 nap_conf_done(void);
 u8 nap_hash_rd_done(void);

src/board/v2/nap/nap_hw.h

@@ -13,10 +13,11 @@
 #ifndef SWIFTNAV_NAP_REGS_H
 #define SWIFTNAV_NAP_REGS_H
 
+#include <libswiftnav/config.h>
 #include <stdint.h>
 
 /** Max number of tracking channels NAP configuration will be built with. */
-#define NAP_MAX_N_TRACK_CHANNELS     32
+#define NAP_MAX_N_TRACK_CHANNELS     (MAX_CHANNELS + 1)
 
 typedef struct {
   volatile uint32_t STATUS;