Skip to content

Bugfixes and updates to requirements.txt #3757

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

Merged
merged 4 commits into from
Jun 18, 2025
Merged

Bugfixes and updates to requirements.txt #3757

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c5255bd
updating to newer cmake since some toolchains need this new version
kevin-f-ortega Jun 17, 2025
eff699d
bugfix
kevin-f-ortega Jun 17, 2025
4b35b2d
bugfix. need to set the size otherwise there is a possibility buffer'…
kevin-f-ortega Jun 17, 2025
ea22ba3
need to static cast
kevin-f-ortega Jun 17, 2025
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
1 change: 1 addition & 0 deletions Svc/FrameAccumulator/FrameAccumulator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion cmake/target/dictionary.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}")
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading