Skip to content

Dev config parsing #100

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.

Sign up for GitHub

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

Draft
alex-brinkman wants to merge 6 commits into
base: devel
Choose a base branch
from
Draft

Dev config parsing #100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
10db139
add enum conversions
alex-brinkman Apr 28, 2023
08b91c6
AC working up to the JSD devices, need to define config input YAMLs f…
alex-brinkman May 1, 2023
bd811dd
few more mods for supporting parity enums with JSD
alex-brinkman May 3, 2023
5a59490
added yaml defs for simple JSD devices, elmos still remain
alex-brinkman May 10, 2023
9f31161
wip, added config enums and structs for actuator types
alex-brinkman May 10, 2023
9a40e6f
fixed autocoder issues with handling std arrays and vectors
alex-brinkman May 10, 2023
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
18 changes: 14 additions & 4 deletions src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,24 @@ function(run_fcgen fc_input_file fc_output_file)
)
endfunction()

run_fcgen("types.h.cog" "${CMAKE_BINARY_DIR}/include/fastcat/types.h")
run_fcgen("device_includes.h.cog" "${CMAKE_BINARY_DIR}/include/fastcat/device_includes.h")
run_fcgen("signal_handling.cc.cog" "${CMAKE_BINARY_DIR}/autogen/signal_handling.cc")
run_fcgen("commander.cc.cog" "${CMAKE_BINARY_DIR}/autogen/commander.cc")
run_fcgen(types.h.cog ${CMAKE_BINARY_DIR}/include/fastcat/types.h)
run_fcgen(device_includes.h.cog ${CMAKE_BINARY_DIR}/include/fastcat/device_includes.h)
run_fcgen(signal_handling.cc.cog ${CMAKE_BINARY_DIR}/autogen/signal_handling.cc)
run_fcgen(commander.cc.cog ${CMAKE_BINARY_DIR}/autogen/commander.cc)

run_fcgen(
enum_conversions.h.cog
${CMAKE_BINARY_DIR}/include/fastcat/enum_conversions.h)

run_fcgen(
device_config_parsing_libyamlcpp.h.cog
${CMAKE_BINARY_DIR}/include/fastcat/device_config_parsing_libyamlcpp.h)

add_custom_target(fcgen DEPENDS
${CMAKE_BINARY_DIR}/include/fastcat/types.h
${CMAKE_BINARY_DIR}/include/fastcat/device_includes.h
${CMAKE_BINARY_DIR}/include/fastcat/enum_conversions.h
${CMAKE_BINARY_DIR}/include/fastcat/device_config_parsing_libyamlcpp.h
)

add_library(fastcat STATIC
Expand Down
3 changes: 2 additions & 1 deletion src/config.h.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
#define FASTCAT_CONFIG_H_

#define FASTCAT_SOURCE_DIR "@CMAKE_CURRENT_SOURCE_DIR@"
#define FASTCAT_UNIT_TEST_DIR "@CMAKE_CURRENT_SOURCE_DIR@/test/test_unit/"
#define FASTCAT_TEST_DIR "@CMAKE_CURRENT_SOURCE_DIR@/test/"

#define FASTCAT_VERSION_MAJOR ${${PROJECT_NAME}_VERSION_MAJOR}
#define FASTCAT_VERSION_MINOR ${${PROJECT_NAME}_VERSION_MINOR}
#define FASTCAT_VERSION_PATCH ${${PROJECT_NAME}_VERSION_PATCH}
Expand Down
Loading