From db50711ba4a1f41f4082981bae58f213d48d96a1 Mon Sep 17 00:00:00 2001 From: jaseg Date: Tue, 5 May 2020 17:50:09 +0200 Subject: fw: Tie together all parts for an end-to-end demo --- controller/fw/Makefile | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'controller/fw/Makefile') diff --git a/controller/fw/Makefile b/controller/fw/Makefile index b6fa43f..c0f01d5 100644 --- a/controller/fw/Makefile +++ b/controller/fw/Makefile @@ -32,7 +32,8 @@ DSSS_WAVELET_LUT_SIZE ?= 69 DSSS_FILTER_FC ?= 3e-3 DSSS_FILTER_ORDER ?= 12 -TRANSMISSION_SYMBOLS ?= 32 +# Transmission symbols: 20 for 20*6=120 bit key + 10 for reed-solomon ECC +TRANSMISSION_SYMBOLS ?= 30 PRESIG_STORE_SIZE ?= 3 # will be generated if necessary @@ -47,6 +48,8 @@ C_SOURCES += src/mspdebug_wrapper.c C_SOURCES += src/spi_flash.c C_SOURCES += src/freq_meas.c C_SOURCES += src/dsss_demod.c +C_SOURCES += src/rslib.c +C_SOURCES += src/crypto.c C_SOURCES += src/adc.c C_SOURCES += src/protocol.c C_SOURCES += src/serial.c @@ -77,6 +80,8 @@ MUSL_SOURCES += math/fabsf.c MUSL_SOURCES += stdlib/abs.c MUSL_SOURCES += string/memset.c MUSL_SOURCES += string/memcpy.c +MUSL_SOURCES += string/memcmp.c +MUSL_SOURCES += string/strlen.c MUSL_SOURCES += math/__math_oflowf.c MUSL_SOURCES += math/__math_uflowf.c MUSL_SOURCES += math/__math_xflowf.c @@ -139,6 +144,8 @@ CFLAGS += -I$(abspath musl_include_shims) CFLAGS += -Itinyprintf COMMON_CFLAGS += -I$(BUILDDIR) -Isrc -Itinyaes CFLAGS += -I$(CUBE_DIR)/Drivers/CMSIS/Device/ST/STM32F4xx/Include +COMMON_CFLAGS += -I$(LIBSODIUM_DIR_ABS)/src/libsodium/include -I$(BUILDDIR)/libsodium/src/libsodium/include -I$(LIBSODIUM_DIR_ABS)/src/libsodium/include/sodium +COMMON_CFLAGS += -I$(RSLIB_DIR)/src COMMON_CFLAGS += -O0 -std=gnu11 -g -DSTM32F407xx -DSTM32F4 -DDEBUG=$(DEBUG) CFLAGS += $(ARCH_FLAGS) $(SYSTEM_FLAGS) @@ -187,11 +194,11 @@ ALL_OBJS := $(OBJS) ALL_OBJS += $(BUILDDIR)/src/startup_stm32f407xx.o ALL_OBJS += $(BUILDDIR)/src/system_stm32f4xx.o ALL_OBJS += $(BUILDDIR)/libsodium/src/libsodium/.libs/libsodium.a -ALL_OBJS += $(BUILDDIR)/tinyaes/aes.o ALL_OBJS += $(BUILDDIR)/levmarq/levmarq.o ALL_OBJS += $(BUILDDIR)/generated/gold_code_$(DSSS_GOLD_CODE_NBITS).o ALL_OBJS += $(BUILDDIR)/generated/fmeas_fft_window.o ALL_OBJS += $(BUILDDIR)/generated/dsss_cwt_wavelet.o +ALL_OBJS += $(BUILDDIR)/generated/crypto_presig_data.o ######################################################################################################################## # Rules -- cgit