Different build targets for Chimera and Dev #1764
Conversation
kryptoish
added
the
Build System/DevEx
| IF ("${FIRMWARE_TARGET}" STREQUAL "chimera") | ||
| # add_subdirectory(chimera) /* need this? */ | ||
| add_subdirectory(chimera_v2) | ||
| add_subdirectory(dev) | ||
| ELSE () | ||
| add_subdirectory(dev) | ||
| ENDIF () |
There was a problem hiding this comment.
You can move this up the the initial If (target binary) condition. I don't think you need to have dev in here as well. You do not the chimera only chimera_v2.
There was a problem hiding this comment.
Also may wan to add a compile definition for chimera, I know in the past we had issues with the hw_chimera_v2_enabled and replace those in tasks.c
CMakePresets.json
Outdated
| "FIRMWARE_TARGET": "chimera", | ||
| "USE_COMMIT_INFO": "ON", | ||
| "BOOTLOAD": "ON", | ||
| "WATCHDOG": "ON" |
There was a problem hiding this comment.
Do we want watchdog on for chimera?
There was a problem hiding this comment.
I would say let's turn bootloader and watchdog off
firmware/CMakeLists.txt
Outdated
| # add_subdirectory(chimera) | ||
| add_subdirectory(chimera_v2) | ||
| IF ("${FIRMWARE_TARGET}" STREQUAL "chimera") | ||
| # add_subdirectory(chimera) /* need this? */ |
kryptoish
force-pushed
the
cmake_chimera_segregation
branch
from
5df6c85 to
1b1774f
Compare
|
on everyone's soul i have no idea why it builds on github and not on my computer but ion care. |
kryptoish
force-pushed
the
cmake_chimera_segregation
branch
from
675f50b to
124d474
Compare
|
@kryptoish don't put that on my soul |
|
also update ur arm i think we're on latest now |
Lucien950
left a comment
Lucien950
left a comment
There was a problem hiding this comment.
added comments onto VC, applies to all boards
There was a problem hiding this comment.
why not create a whole new chimera_tasks.c?
| set(IO_INCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/src/io" "${SHARED_IO_INCLUDE_DIR}" "${SHARED_IO_INCLUDE_QUINTUNA_DIR}") | ||
|
|
||
| file(GLOB_RECURSE HW_SRCS CONFIGURE_DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/src/hw/*.c") | ||
| list(FILTER HW_SRCS EXCLUDE REGEX ".*/hw_chimeraConfig_v2\\.c$") |
There was a problem hiding this comment.
i feel like it's a lot easier and makes more sense to just throw the chimeraConfig into chimera_tasks.c (defined previously)
| "chimera_v2_proto_cm7" | ||
| m) | ||
| if ("${FIRMWARE_TARGET}" STREQUAL "chimera") | ||
| target_link_libraries("quintuna_VC_app.elf" PRIVATE "chimera_v2_proto_cm7") |
There was a problem hiding this comment.
instead of doing an optional linking, can you just make a seperate target for chimera?
| # ======== Code Time ======== | ||
| option(PLATFORM "The platform to build for, either \"firmware\" or \"dimos\"" "firmware") | ||
| option(TARGET "The target to build for. Choose between \"binary\" and \"test\"." "binary") | ||
| option(FIRMWARE_TARGET "The firmware target to build for. Choose between \"dev\" and \"chimera\"." "dev") |
There was a problem hiding this comment.
can we make it so that firmware builds have chimera and non-chimera targets? achieved by making seperate chimera targets
There was a problem hiding this comment.
be very careful about this, because all this code gets destroyed on code autogen (namly all code outside of USER_CODE_BEGIN blocks are destroyed).
We will be managing our own freertos into the future, so maybe don't worry about this for now? On hexray, you can manage your freertos tasks without cubemx
Changelist
Testing Done
Resolved Tickets
FIRM-540