From d9b26d16c063aec32b70287ff861a1f23642a9f2 Mon Sep 17 00:00:00 2001
From: jaseg <git-bigdata-wsl-arch@jaseg.de>
Date: Wed, 4 Mar 2020 17:10:31 +0100
Subject: Fix frequency measurement simulation

---
 controller/fw/Makefile | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

(limited to 'controller/fw/Makefile')

diff --git a/controller/fw/Makefile b/controller/fw/Makefile
index a4b8a66..8dfcb1d 100644
--- a/controller/fw/Makefile
+++ b/controller/fw/Makefile
@@ -46,17 +46,17 @@ FMEAS_ADC_SAMPLING_RATE ?= 1000
 FMEAS_ADC_MAX			?= 4096
 FMEAS_FFT_LEN			?= 256
 FMEAS_FFT_WINDOW 		?= gaussian
-FMEAS_FFT_WINDOW_SIGMA 	?= 8.0
+FMEAS_FFT_WINDOW_SIGMA 	?= 16.0
 
 
-CC			?= $(PREFIX)gcc
-CXX			?= $(PREFIX)g++
-LD			?= $(PREFIX)gcc
-AR			?= $(PREFIX)ar
-AS			?= $(PREFIX)as
-OBJCOPY		?= $(PREFIX)objcopy
-OBJDUMP		?= $(PREFIX)objdump
-GDB			?= $(PREFIX)gdb
+CC			:= $(PREFIX)gcc
+CXX			:= $(PREFIX)g++
+LD			:= $(PREFIX)gcc
+AR			:= $(PREFIX)ar
+AS			:= $(PREFIX)as
+OBJCOPY		:= $(PREFIX)objcopy
+OBJDUMP		:= $(PREFIX)objdump
+GDB			:= $(PREFIX)gdb
 
 HOST_CC				?= $(HOST_PREFIX)gcc
 HOST_CXX			?= $(HOST_PREFIX)g++
@@ -75,9 +75,9 @@ LIBSODIUM_DIR_ABS	:= $(abspath $(LIBSODIUM_DIR))
 TINYAES_DIR_ABS		:= $(abspath $(TINYAES_DIR))
 MUSL_DIR_ABS		:= $(abspath $(MUSL_DIR))
 
-COMMON_CFLAGS		+= -I$(OPENCM3_DIR_ABS)/include -Imspdebug/util -Imspdebug/drivers
+COMMON_CFLAGS		+= -I$(OPENCM3_DIR_ABS)/include -Imspdebug/util -Imspdebug/drivers -Ilevmarq
 COMMON_CFLAGS		+= -I$(CMSIS_DIR_ABS)/CMSIS/DSP/Include -I$(CMSIS_DIR_ABS)/CMSIS/Core/Include 
-COMMON_CFLAGS		+= -I$(abspath musl_include_shims) -Ilevmarq
+CFLAGS				+= -I$(abspath musl_include_shims)
 
 COMMON_CFLAGS	+= -Os -std=gnu11 -g -DSTM32F4
 CFLAGS			+= -mthumb -mcpu=cortex-m4 -mfloat-abi=hard -mfpu=fpv4-sp-d16
@@ -91,7 +91,7 @@ COMMON_CFLAGS	+= -DFMEAS_FFT_WINDOW_SIGMA=$(FMEAS_FFT_WINDOW_SIGMA)
 # for musl
 CFLAGS			+= -Dhidden=
 
-SIM_CFLAGS	+= -Isrc
+SIM_CFLAGS	+= -Isrc -lm -DSIMULATION
 
 INT_CFLAGS	+= -Wall -Wextra -Wpedantic -Wshadow -Wimplicit-function-declaration -Wundef
 INT_CFLAGS	+= -Wredundant-decls -Wmissing-prototypes -Wstrict-prototypes
@@ -112,7 +112,7 @@ LDFLAGS			+= -L$(OPENCM3_DIR_ABS)/lib -l$(OPENCM3_LIB) $(shell $(CC) -print-libg
 
 all: $(BUILDDIR)/$(BINARY)
 
-tests: $(BUILDDIR)/tools/freq_meas_test.elf
+tests: $(BUILDDIR)/tools/freq_meas_test
 
 OBJS := $(addprefix $(BUILDDIR)/,$(C_SOURCES:.c=.o) $(CXX_SOURCES:.cpp=.o))
 
@@ -127,7 +127,7 @@ ALL_OBJS += $(BUILDDIR)/generated/fmeas_fft_window.o
 $(BUILDDIR)/$(BINARY): $(ALL_OBJS)
 	$(LD) -T$(LDSCRIPT) $(COMMON_LDFLAGS) $(LDFLAGS) -o $@ -Wl,-Map=$(BUILDDIR)/src/$*.map $^
 
-$(BUILDDIR)/tools/freq_meas_test.elf: tools/freq_meas_test.c src/freq_meas.c levmarq/levmarq.c $(BUILDDIR)/generated/fmeas_fft_window.c $(CMSIS_SOURCES)
+$(BUILDDIR)/tools/freq_meas_test: tools/freq_meas_test.c src/freq_meas.c levmarq/levmarq.c $(BUILDDIR)/generated/fmeas_fft_window.c $(CMSIS_SOURCES)
 	mkdir -p $(@D)
 	$(HOST_CC) $(COMMON_CFLAGS) $(SIM_CFLAGS) -o $@ $^
 
@@ -177,6 +177,7 @@ clean:
 	-rm -r $(BUILDDIR)/src
 	-rm -r $(BUILDDIR)/generated
 	-rm $(BUILDDIR)/$(BINARY)
+	-rm $(BUILDDIR)/tools/freq_meas_test
 
 mrproper: clean
 	-rm -r build
-- 
cgit