nasa/fprime
1
0
Fork 0
mirror of https://github.com/nasa/fprime.git synced 2025-12-10 17:47:10 -06:00
Code Issues Packages Projects Releases 34 Wiki Activity

Bugfixes and updates to requirements.txt (#3757)

Browse Source 
* updating to newer cmake since some toolchains need this new version

* bugfix

* bugfix. need to set the size otherwise there is a possibility buffer's allocated size is larger than expected. This is true when using a staticmemory allocator where the static memory is e.g. 256 but the requested size is 128.

* need to static cast
This commit is contained in:
kevin-f-ortega 2025-06-18 09:12:50 -07:00 committed by GitHub
parent 66ea65ad39
commit 13f3677480
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Svc/FrameAccumulator/FrameAccumulator.cpp
View File

@ -128,6 +128,7 @@ void FrameAccumulator ::processRing() {
if (buffer.isValid()) {
// Copy data out of ring buffer into the allocated buffer
Fw::SerializeStatus serialize_status = this->m_inRing.peek(buffer.getData(), size_out);
buffer.setSize(static_cast<Fw::Buffer::SizeType>(size_out));
FW_ASSERT(serialize_status == Fw::SerializeStatus::FW_SERIALIZE_OK);
// Consume (rotate) the data from the ring buffer
serialize_status = this->m_inRing.rotate(size_out);

2
cmake/target/dictionary.cmake
View File

@ -35,8 +35,8 @@ function(dictionary_add_deployment_target MODULE TARGET SOURCES DEPENDENCIES FUL
list(REMOVE_ITEM DEPENDENCIES "${MODULE}")
# Loop through all recursive dependencies and find dictionary targets
foreach(DEPENDENCY IN LISTS DEPENDENCIES)
get_target_property(DICTIONARY_FILES "${DEPENDENCY}" FPRIME_DICTIONARIES)
if (TARGET "${DEPENDENCY}_${TARGET}")
get_target_property(DICTIONARY_FILES "${DEPENDENCY}" FPRIME_DICTIONARIES)
fprime_cmake_ASSERT("No dictionary files defined for ${DEPENDENCY}" DICTIONARY_FILES)
# Install the files as a component. This is done here so it is output to the deployment directory
install(FILES ${DICTIONARY_FILES} DESTINATION ${TOOLCHAIN_NAME}/${MODULE}/dict COMPONENT "${MODULE}_${DEPENDENCY}_${TARGET}")

2
requirements.txt
View File

@ -10,7 +10,7 @@ chardet==5.2.0
charset-normalizer==3.4.0
click==8.1.7
# CMake versions prior to 3.24.2 were not signed correctly for modern macOS versions
cmake==3.24.2
cmake==3.26.0
colorlog==6.8.2
cookiecutter==2.6.0
CT3==3.3.3.post1