jaseg/safety-reset
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fw sim: Update for uni servers

Browse source
This commit is contained in:
jaseg 2020-04-20 14:03:35 +02:00
parent f3c84f562a
commit 96c480ea54
3 changed files with 3 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.gitmodules vendored
View file

@ -6,7 +6,7 @@
url = https://github.com/dlbeer/mspdebug
[submodule "controller/fw/cmsis"]
path = controller/fw/cmsis
url = https://github.com/ARM-software/CMSIS_5
url = https://git.jaseg.net/bigdata/pub/safety-reset-cmsis.git
[submodule "controller/fw/libsodium"]
path = controller/fw/libsodium
url = https://github.com/jedisct1/libsodium

4
controller/fw/Makefile
View file

@ -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

2
controller/fw/tools/dsss_demod_test_runner.py
View file

@ -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]