Skip to content

Commit 1692ef7

Browse files
leanfrancuccileanfrancucci
committed
Merge branch 'ao-wout-statemachine' into develop
2 parents 7dfd4a1 + 2dc7c31 commit 1692ef7

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+7378
-91
lines changed

‎.clang-format‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
2+
# For clang-format-18
23
Language: Cpp
3-
# BasedOnStyle: Microsoft
44
AccessModifierOffset: -4
55
AlignAfterOpenBracket: Align
66
AlignArrayOfStructures: Left
@@ -111,7 +111,7 @@ IncludeCategories:
111111
IncludeIsMainRegex: '(Test)?$'
112112
IncludeIsMainSourceRegex: ''
113113
IndentAccessModifiers: false
114-
IndentCaseLabels: false
114+
IndentCaseLabels: true
115115
IndentCaseBlocks: false
116116
IndentGotoLabels: true
117117
IndentPPDirectives: None

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525

2626
# Build tree
2727
/build
28+
/Debug
2829

2930
#
3031
# Top-level generic files
@@ -52,6 +53,8 @@
5253
/spl/
5354
/tpl/
5455
/doc/html/
56+
/.cache
57+
compile_commands.json
5558

5659
#
5760
# Generated include files

‎demo/80x86/Monitor/.gitignore‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
#
2+
# git files that we don't want to ignore even it they are dot-files
3+
#
4+
!.gitignore
5+
!.gitattributes
6+
!.mailmap
7+
!.travis.yml
8+
!codecov.yml
9+
!unitrzlib.a
10+
11+
#
12+
# Generated files
13+
#
14+
Debug
15+
.cache
16+
compile_commands.json

‎demo/80x86/Monitor/.tasks‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
[+]
2+
proc=8
3+
currentDir=$(VIM_CWD)/demo/80x86/$(+cp:Monitor)
4+
5+
[configure]
6+
command=mkdir -p build && export RKH_BASE=$(VIM_ROOT) && cmake -S . -B build -DRKH_DEV_BUILD=ON -DCMAKE_BUILD_TYPE=Debug
7+
output=quickfix
8+
cwd=$(+currentDir)
9+
errorformat=%f(%l):%m
10+
11+
[build]
12+
command=cmake --build build -j$(+proc)
13+
output=quickfix
14+
cwd=$(+currentDir)
15+
16+
[clean]
17+
command=cmake --build build --target clean -j$(+proc)
18+
cwd=$(+currentDir)
19+
20+
[build-target]
21+
command=cmake --build build --target $(-target:all) -j$(+proc)
22+
cwd=$(+currentDir)
23+
24+
[run-app]
25+
command=./build/src/Monitor
26+
cwd=$(+currentDir)
27+
28+
[compile-db]
29+
command= export RKH_BASE=$(VIM_ROOT) && cmake -H. -BDebug -DCMAKE_BUILD_TYPE=Debug -DCMAKE_EXPORT_COMPILE_COMMANDS=YES -DRKH_DEV_BUILD=ON -DRKH_PLATFORM="__LNXGNU__" -DBUILD_CEEDLING=YES && [ ! -f $PWD/Debug/compile_commands.json ] && ln -s Debug/compile_commands.json .
30+
cwd=$(+currentDir)
31+
errorformat=%f(%l):%m

‎demo/80x86/Monitor/.vimspector.json‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
{
2+
"configurations": {
3+
"Launch": {
4+
"adapter": "vscode-cpptools",
5+
"filetypes": [ "cpp", "c", "objc", "rust" ],
6+
"configuration": {
7+
"request": "launch",
8+
"program": "${workspaceRoot}/build/src/Monitor",
9+
"args": [],
10+
"cwd": ".",
11+
"environment": [],
12+
"externalConsole": true,
13+
"MIMode": "gdb",
14+
"stopOnEntry": true,
15+
"stopAtEntry": true
16+
}
17+
}
18+
19+
}
20+
}

‎demo/80x86/Monitor/CMakeLists.txt‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
cmake_minimum_required(VERSION 3.16)
2+
project(Monitor LANGUAGES C)
3+
4+
if (NOT DEFINED ENV{RKH_BASE})
5+
message(FATAL_ERROR "RKH_BASE is not defined in the environment. "
6+
"Define it using 'export RKH_BASE=<path/to/RKH>', "
7+
"before executing CMake")
8+
endif()
9+
10+
add_subdirectory(src)

‎demo/80x86/Monitor/README.md‎

Whitespace-only changes.

‎demo/80x86/Monitor/build/.gitignore‎

Lines changed: 97 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,97 @@
1+
#
2+
# NOTE! Don't add files that are generated in specific
3+
# subdirectories here. Add them in the ".gitignore" file
4+
# in that subdirectory instead.
5+
#
6+
# Normal rules
7+
#
8+
*.o
9+
*.o.*
10+
*.a
11+
*.su
12+
*.mod.c
13+
*.i
14+
*.lst
15+
*.order
16+
*.elf
17+
*.swp
18+
*.bin
19+
*.patch
20+
*.cfgtmp
21+
*.log
22+
23+
# host programs on Cygwin
24+
*.exe
25+
26+
#
27+
# Top-level generic files
28+
#
29+
/MLO*
30+
/SPL
31+
/System.map
32+
/u-boot*
33+
/boards.cfg
34+
35+
#
36+
# git files that we don't want to ignore even it they are dot-files
37+
#
38+
!.gitignore
39+
!.gitattributes
40+
!.mailmap
41+
!.travis.yml
42+
!codecov.yml
43+
!unitrzlib.a
44+
45+
#
46+
# Generated files
47+
#
48+
/LOG
49+
/spl/
50+
/tpl/
51+
/doc/html/
52+
src/
53+
54+
#
55+
# Generated include files
56+
#
57+
/include/config/
58+
/include/generated/
59+
60+
# stgit generated dirs
61+
patches-*
62+
.stgit-edit.txt
63+
64+
# quilt's files
65+
patches
66+
series
67+
68+
# gdb files
69+
.gdb_history
70+
71+
# cscope files
72+
cscope.*
73+
74+
# tags files
75+
/tags
76+
/ctags
77+
/etags
78+
79+
# gnu global files
80+
GPATH
81+
GRTAGS
82+
GSYMS
83+
GTAGS
84+
85+
*.orig
86+
*~
87+
\#*#
88+
#*
89+
90+
# generated cmake files
91+
Makefile
92+
CMakeCache.txt
93+
*.cmake
94+
CMakeFiles
95+
AHSM
96+
CMakeDoxyfile.in
97+
rkh

‎demo/80x86/Monitor/src/CMakeLists.txt‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
# Custom module and scripts
2+
include($ENV{RKH_BASE}/cmake/boilerplate.cmake)
3+
add_subdirectory(${RKH_BASE} ${CMAKE_CURRENT_BINARY_DIR}/rkh)
4+
5+
add_executable(${PROJECT_NAME}
6+
bsp.c
7+
main.c
8+
Monitor.c
9+
)
10+
11+
target_include_directories(${PROJECT_NAME}
12+
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
13+
)
14+
target_link_libraries(${PROJECT_NAME} PRIVATE rkh)

0 commit comments

Comments
 (0)