Skip to content
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

Jump to bottom

Fixes some minor F´ issues #2052

Merged
merged 3 commits into from
May 30, 2023
Merged

Fixes some minor F´ issues #2052

merged 3 commits into from
May 30, 2023

Conversation

LeStarch
Copy link
Collaborator

Originating Project/Creator
Affected Component
Affected Architectures(s)
Related Issue(s)
Has Unit Tests (y/n)
Builds Without Errors (y/n)
Unit Tests Pass (y/n)
Documentation Included (y/n)

Change Description

  1. CAssert has a mismatched definition
  2. Autocoder includes the wrong header for passive components and queued components

@LeStarch LeStarch requested a review from timcanham May 26, 2023 23:50
timcanham
timcanham approved these changes May 29, 2023
View reviewed changes
Copy link
Collaborator

@timcanham timcanham left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I didn't test this, I assume it has been tested.

@LeStarch
Copy link
Collaborator Author

@timcanham turns our the Queued component Autocoder outputs use the ActiveComponentBase.hpp header. This seems wrong to me...but outside the scope here.

The goal here is to remove the ActiveComponentBase.hpp header from Passive components as that removes a forced transitive dependency on Os/Task.hpp, which not all systems have.

@LeStarch
Copy link
Collaborator Author

@timcanham ready for re-review. CI is testing this fairly thoroughly and I ran locally as well.

timcanham
timcanham reviewed May 30, 2023
View reviewed changes
Copy link
Collaborator

@timcanham timcanham left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Some questions...

Svc/FatalHandler/FatalHandlerComponentLinuxImpl.cpp Show resolved Hide resolved
Autocoders/Python/src/fprime_ac/generators/templates/component/hpp.tmpl Show resolved Hide resolved
@LeStarch LeStarch merged commit 24178fc into nasa:devel May 30, 2023
Boehm-Michael pushed a commit to Boehm-Michael/fprime that referenced this pull request Jun 22, 2023
@LeStarch @Boehm-Michael
Fixes some minor F´ issues (nasa#2052)
d6e1168 
* Fixing template component base includes

* Making CAssert match Assert

* Fixing invalid template and missing header include
thomas-bc pushed a commit that referenced this pull request Aug 4, 2023
@LeStarch @thomas-bc
Fixes some minor F´ issues (#2052)
0fb8196 
* Fixing template component base includes

* Making CAssert match Assert

* Fixing invalid template and missing header include
thomas-bc added a commit that referenced this pull request Aug 4, 2023
@thomas-bc
Revert "Fixes some minor F´ issues (#2052)"
cbb2ddf 
This reverts commit 0fb8196.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@timcanham timcanham timcanham approved these changes

@thomas-bc thomas-bc thomas-bc approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@LeStarch @timcanham @thomas-bc