From 87ae7dfcb35d9a55950eecc2116d13d73b2b9ece Mon Sep 17 00:00:00 2001
From: jaseg <git-bigdata-wsl-arch@jaseg.de>
Date: Fri, 17 Apr 2020 17:59:08 +0200
Subject: fw simulator: WIP

---
 controller/fw/Makefile | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'controller/fw/Makefile')

diff --git a/controller/fw/Makefile b/controller/fw/Makefile
index e96d35f..80a6db2 100644
--- a/controller/fw/Makefile
+++ b/controller/fw/Makefile
@@ -3,6 +3,8 @@
 # Dependency directories
 ########################################################################################################################
 
+$(info $(shell env))
+
 CUBE_DIR		?= STM32CubeF4
 CMSIS_DIR 		?= cmsis
 MSPDEBUG_DIR 	?= mspdebug
@@ -25,13 +27,12 @@ FMEAS_SAMPLING_RATE		?= $(shell echo $(FMEAS_ADC_SAMPLING_RATE) / \($(FMEAS_FFT_
 DSSS_GOLD_CODE_NBITS 	?= 5
 DSSS_DECIMATION			?= 10
 # TODO maybe auto adjust this based on detection rate?
-DSSS_THESHOLD_FACTOR	?= 5.0f
+DSSS_THRESHOLD_FACTOR	?= 5.0f
 DSSS_WAVELET_WIDTH		?= 7.3
 DSSS_WAVELET_LUT_SIZE	?= 69
 DSSS_FILTER_FC			?= 3e-3
 DSSS_FILTER_ORDER		?= 12
 
-PAYLOAD_DATA_BIT		?= 64
 TRANSMISSION_SYMBOLS	?= 32
 PRESIG_STORE_SIZE		?= 3
 
@@ -149,17 +150,16 @@ COMMON_CFLAGS	+= -DFMEAS_ADC_MAX=$(FMEAS_ADC_MAX)
 COMMON_CFLAGS	+= -DFMEAS_ADC_SAMPLING_RATE=$(FMEAS_ADC_SAMPLING_RATE)
 COMMON_CFLAGS	+= -DFMEAS_FFT_WINDOW_SIGMA=$(FMEAS_FFT_WINDOW_SIGMA)
 COMMON_CFLAGS	+= -DDSSS_DECIMATION=$(DSSS_DECIMATION)
-COMMON_CFLAGS	+= -DDSSS_THESHOLD_FACTOR=$(DSSS_THESHOLD_FACTOR)
+COMMON_CFLAGS	+= -DDSSS_THRESHOLD_FACTOR=$(DSSS_THRESHOLD_FACTOR)
 COMMON_CFLAGS	+= -DDSSS_WAVELET_WIDTH=$(DSSS_WAVELET_WIDTH)
 COMMON_CFLAGS	+= -DDSSS_WAVELET_LUT_SIZE=$(DSSS_WAVELET_LUT_SIZE)
-COMMON_CFLAGS	+= -DPAYLOAD_DATA_BIT=$(PAYLOAD_DATA_BIT)
 COMMON_CFLAGS	+= -DTRANSMISSION_SYMBOLS=$(TRANSMISSION_SYMBOLS)
 COMMON_CFLAGS	+= -DPRESIG_STORE_SIZE=$(PRESIG_STORE_SIZE)
 
 # for musl
 CFLAGS			+= -Dhidden=
 
-SIM_CFLAGS	+= -lm -DSIMULATION -fsanitize=address
+SIM_CFLAGS	+= -lm -DSIMULATION
 SIM_CFLAGS	+= -Wall -Wextra -Wpedantic -Wshadow -Wimplicit-function-declaration -Wundef -Wno-unused-parameter
 
 INT_CFLAGS	+= -Wall -Wextra -Wpedantic -Wshadow -Wimplicit-function-declaration -Wundef -Wno-unused-parameter
@@ -203,7 +203,8 @@ binsize: $(BUILDDIR)/$(BINARY) $(BUILDDIR)/$(BINARY:.elf=-symbol-sizes.pdf)
 	@echo "▐▬▬▬▌ SyMbOL sIzE HiGhScORe LiSt ▐▬▬▬▌"
 	$(NM) --print-size --size-sort --radix=d $< | tail -n 20
 
-src/dsss_demod.c: $(BUILDDIR)/generated/dsss_gold_code.h $(BUILDDIR)/generated/dsss_butter_filter.h
+# $(BUILDDIR)/generated/dsss_butter_filter.h
+src/dsss_demod.c: $(BUILDDIR)/generated/dsss_gold_code.h 
 
 $(BUILDDIR)/generated/dsss_gold_code.h: $(BUILDDIR)/generated/gold_code_$(DSSS_GOLD_CODE_NBITS).h
 	ln -srf $< $@
-- 
cgit