Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

STM32 Can implementation; DemoCan Example #110

Merged
merged 25 commits into from
Apr 21, 2024
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
9c7736b
Remove pywin32 from requirements.txt
samparent97 Apr 16, 2024
e458ae9
Fix mcal target includes
samparent97 Apr 16, 2024
2525418
Remove -e from echo command into makefile
samparent97 Apr 16, 2024
0fe707e
WIP: building democan with stm32
samparent97 Apr 16, 2024
7acb363
Add foo and bar demo can projects
samparent97 Apr 17, 2024
220034d
Remove print
samparent97 Apr 17, 2024
1dc453c
Add postbuild to raspi platform
samparent97 Apr 18, 2024
473483a
Revert postbuild change
samparent97 Apr 18, 2024
c1e8723
Remove all uneeded info for demo can dbc
samparent97 Apr 20, 2024
55cbc74
Add Dashboard enable to ioc
samparent97 Apr 20, 2024
cd62aeb
Move tick blocking to project specific binding
samparent97 Apr 20, 2024
9aa67e4
Add tick timestamp to rx messages
samparent97 Apr 20, 2024
4be595f
Add temp debug msg
samparent97 Apr 20, 2024
85e9a0e
Remove os lib from cmake for can demo projects
samparent97 Apr 20, 2024
858211d
Remove line added by clangd
samparent97 Apr 20, 2024
9bf1c7c
Fix missing start var
samparent97 Apr 20, 2024
75d8f8c
Update main.cc
samparent97 Apr 20, 2024
dcbfa55
Remove debug msg
samparent97 Apr 20, 2024
e9aac80
Remove iostream import
samparent97 Apr 20, 2024
e2f8d78
Remove os remenants
samparent97 Apr 20, 2024
cd1f433
Fix all clang format checks
samparent97 Apr 20, 2024
d2d870e
build: :construction_worker: Improve the CubeMX autogeneration code. …
BlakeFreer Apr 21, 2024
3184622
Various fixes
samparent97 Apr 21, 2024
3665ed2
Fix postbuild
samparent97 Apr 21, 2024
b27b381
Move the delay in projects
samparent97 Apr 21, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions firmware/cmake/generate_cubemx.mk
samparent97 marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@ CUBEMX_GEN_SCRIPT = cubemx_script.txt
# Makefile, i.e. whenever IOC_FILE has been updated but new code has not been
# generated.

Makefile: $(IOC_FILE)
.PHONY: Makefile
samparent97 marked this conversation as resolved.
Show resolved Hide resolved

GenerateCubeMx: $(IOC_FILE)
# Create an file containing commands to generate the cubemx code.
echo "config load \"$(IOC_FILE)\"" > $(CUBEMX_GEN_SCRIPT)
echo "project generate ./" >> $(CUBEMX_GEN_SCRIPT)
Expand All @@ -25,6 +27,7 @@ Makefile: $(IOC_FILE)

rm $(CUBEMX_GEN_SCRIPT)

Makefile: $(IOC_FILE)
# Add a recipe for building the sources to objects without linking them.
# This is used by build_cubemx.cmake
echo "" >> Makefile
Expand All @@ -34,4 +37,4 @@ Makefile: $(IOC_FILE)
# This is used by build_cubemx.cmake
echo "" >> Makefile
echo "%.value:" >> Makefile
echo -e "\t@echo \$$(\$$*)" >> Makefile
echo "\t@echo \$$(\$$*)" >> Makefile
2 changes: 1 addition & 1 deletion firmware/mcal/stm32f767/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ add_library(mcal-stm32f767 INTERFACE)
add_subdirectory(periph)
add_subdirectory(os)

target_include_directories(mcal-stm32f767 INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/..)
target_include_directories(mcal-stm32f767 INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/../..)

target_link_libraries(mcal-stm32f767 INTERFACE shared)
2 changes: 1 addition & 1 deletion firmware/mcal/windows/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
add_library(mcal-windows INTERFACE)

target_include_directories(mcal-windows INTERFACE ${SMAKE_CURRENT_SOURCE_DIR}/..)
target_include_directories(mcal-windows INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/../..)

add_subdirectory(periph)
target_link_libraries(mcal-windows INTERFACE shared)
1 change: 0 additions & 1 deletion scripts/cangen/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ MarkupSafe==2.1.5
numpy==1.26.4
packaging==24.0
python-can==4.3.1
pywin32==306
PyYAML==6.0.1
textparser==0.24.0
typing_extensions==4.11.0
Expand Down
Loading