summaryrefslogtreecommitdiff
path: root/controller
diff options
context:
space:
mode:
authorjaseg <git-bigdata-wsl-arch@jaseg.de>2020-04-20 14:03:35 +0200
committerjaseg <git-bigdata-wsl-arch@jaseg.de>2020-04-20 14:05:05 +0200
commit96c480ea5447dc7172ad56ca895dbed54070b8b0 (patch)
tree7a9d706b35fb508bc22dea38f57f3e21a1750efe /controller
parentf3c84f562ae3aa63e30ee6368f6f23dd243b092b (diff)
downloadmaster-thesis-96c480ea5447dc7172ad56ca895dbed54070b8b0.tar.gz
master-thesis-96c480ea5447dc7172ad56ca895dbed54070b8b0.tar.bz2
master-thesis-96c480ea5447dc7172ad56ca895dbed54070b8b0.zip
fw sim: Update for uni servers
Diffstat (limited to 'controller')
-rw-r--r--controller/fw/Makefile4
-rw-r--r--controller/fw/tools/dsss_demod_test_runner.py2
2 files changed, 2 insertions, 4 deletions
diff --git a/controller/fw/Makefile b/controller/fw/Makefile
index 80a6db2..ab9d66c 100644
--- a/controller/fw/Makefile
+++ b/controller/fw/Makefile
@@ -3,8 +3,6 @@
# Dependency directories
########################################################################################################################
-$(info $(shell env))
-
CUBE_DIR ?= STM32CubeF4
CMSIS_DIR ?= cmsis
MSPDEBUG_DIR ?= mspdebug
@@ -210,7 +208,7 @@ $(BUILDDIR)/generated/dsss_gold_code.h: $(BUILDDIR)/generated/gold_code_$(DSSS_G
ln -srf $< $@
.PRECIOUS: $(BUILDDIR)/generated/gold_code_%.c $(BUILDDIR)/generated/gold_code_%.h
-$(BUILDDIR)/generated/gold_code_%.c $(BUILDDIR)/generated/gold_code_%.h &: | $(BUILDDIR)/generated
+$(BUILDDIR)/generated/gold_code_%.c $(BUILDDIR)/generated/gold_code_%.h&: | $(BUILDDIR)/generated
$(PYTHON3) tools/gold_code_header_gen.py -v dsss_gold_code_table -c $* > $(BUILDDIR)/generated/gold_code_$*.c
$(PYTHON3) tools/gold_code_header_gen.py -v dsss_gold_code_table -h $* > $(BUILDDIR)/generated/gold_code_$*.h
diff --git a/controller/fw/tools/dsss_demod_test_runner.py b/controller/fw/tools/dsss_demod_test_runner.py
index c0f737d..51fc09b 100644
--- a/controller/fw/tools/dsss_demod_test_runner.py
+++ b/controller/fw/tools/dsss_demod_test_runner.py
@@ -101,7 +101,7 @@ def run_test(seed, amplitude_spec, background, nbits, decimation, symbols, thfs,
proc = subprocess.Popen(cmdline, stdout=subprocess.PIPE, text=True)
stdout, _stderr = proc.communicate()
if proc.returncode != 0:
- raise SystemError(f'Subprocess signalled error: {proc.returncode=}')
+ raise SystemError(f'Subprocess signalled error: {proc.returncode}')
lines = stdout.splitlines()
matched = [ l.partition('[')[2].partition(']')[0]