Skip to content

Commit

Permalink
Merge branch 'master' of github.com:jsphuebner/stm32-sine into antico…
Browse files Browse the repository at this point in the history
…gging

# Conflicts:
#	sinus.cbp
  • Loading branch information
jsphuebner committed Nov 19, 2024
2 parents 5d3ad17 + 7cfcf9f commit 6164ed0
Show file tree
Hide file tree
Showing 5 changed files with 60 additions and 898 deletions.
8 changes: 6 additions & 2 deletions .github/workflows/CI-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,12 @@ jobs:

- name: Build unit tests on host
run: |
make -C test
make Test
- name: Run unit tests on host
- name: Run stm32-sine unit tests on host
run: |
test/test_sine
- name: Run libopeninv unit tests on host
run: |
libopeninv/test/test_libopeninv
6 changes: 4 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,8 @@ get-deps:
$(Q)${MAKE} -C libopencm3

Test:
cd test && $(MAKE)
$(MAKE) -C test
$(MAKE) -C libopeninv/test
cleanTest:
cd test && $(MAKE) clean
$(MAKE) -C test clean
$(MAKE) -C libopeninv/test clean
49 changes: 49 additions & 0 deletions sinus.cbp
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,15 @@
<Add directory="include" />
</Compiler>
</Target>
<Target title="Test libopeninv">
<Option output="libopeninv/test/test_libopeninv" prefix_auto="1" extension_auto="1" />
<Option working_dir="libopeninv/test" />
<Option type="1" />
<Option compiler="gcc" />
<Compiler>
<Add directory="include" />
</Compiler>
</Target>
</Build>
<Unit filename="Makefile">
<Option target="SlipControl" />
Expand All @@ -77,6 +86,7 @@
<Unit filename="libopeninv/include/anain.h" />
<Unit filename="libopeninv/include/canhardware.h" />
<Unit filename="libopeninv/include/canmap.h" />
<Unit filename="libopeninv/include/canobd2.h" />
<Unit filename="libopeninv/include/cansdo.h" />
<Unit filename="libopeninv/include/crc8.h" />
<Unit filename="libopeninv/include/delay.h" />
Expand All @@ -101,6 +111,7 @@
<Unit filename="libopeninv/src/anain.cpp" />
<Unit filename="libopeninv/src/canhardware.cpp" />
<Unit filename="libopeninv/src/canmap.cpp" />
<Unit filename="libopeninv/src/canobd2.cpp" />
<Unit filename="libopeninv/src/cansdo.cpp" />
<Unit filename="libopeninv/src/crc8.cpp" />
<Unit filename="libopeninv/src/digio.cpp" />
Expand All @@ -125,6 +136,40 @@
<Unit filename="libopeninv/src/stm32scheduler.cpp" />
<Unit filename="libopeninv/src/terminal.cpp" />
<Unit filename="libopeninv/src/terminalcommands.cpp" />
<Unit filename="libopeninv/test/Makefile">
<Option target="Test libopeninv" />
</Unit>
<Unit filename="libopeninv/test/stub_canhardware.cpp">
<Option target="Test libopeninv" />
</Unit>
<Unit filename="libopeninv/test/stub_canhardware.h">
<Option target="Test libopeninv" />
</Unit>
<Unit filename="libopeninv/test/stub_libopencm3.c">
<Option compilerVar="CC" />
<Option target="Test libopeninv" />
</Unit>
<Unit filename="libopeninv/test/test-include/hwdefs.h">
<Option target="Test libopeninv" />
</Unit>
<Unit filename="libopeninv/test/test-include/param_prj.h">
<Option target="Test libopeninv" />
</Unit>
<Unit filename="libopeninv/test/test.h">
<Option target="Test libopeninv" />
</Unit>
<Unit filename="libopeninv/test/test_canmap.cpp">
<Option target="Test libopeninv" />
</Unit>
<Unit filename="libopeninv/test/test_fp.cpp">
<Option target="Test libopeninv" />
</Unit>
<Unit filename="libopeninv/test/test_fu.cpp">
<Option target="Test libopeninv" />
</Unit>
<Unit filename="libopeninv/test/test_main.cpp">
<Option target="Test libopeninv" />
</Unit>
<Unit filename="src/hwinit.cpp" />
<Unit filename="src/inc_encoder.cpp" />
<Unit filename="src/pwmgeneration-foc.cpp" />
Expand All @@ -148,6 +193,10 @@
<Unit filename="test/stub_canhardware.h">
<Option target="Test" />
</Unit>
<Unit filename="test/stub_libopencm3.c">
<Option compilerVar="CC" />
<Option target="Test" />
</Unit>
<Unit filename="test/test.h">
<Option target="Test" />
</Unit>
Expand Down
Loading

0 comments on commit 6164ed0

Please sign in to comment.