Skip to content

Updates for Svc/FpySquencer corresponding to UT cmake update for protected/private#3812

Merged
LeStarch merged 2 commits intonasa:develfrom
m-aleem:devel-3446-an
Jun 30, 2025
Merged

Updates for Svc/FpySquencer corresponding to UT cmake update for protected/private#3812
LeStarch merged 2 commits intonasa:develfrom
m-aleem:devel-3446-an

Conversation

@m-aleem
Copy link
Contributor

@m-aleem m-aleem commented Jun 26, 2025

Related Issue(s) #3446
Has Unit Tests (y/n) Yes - Existing
Documentation Included (y/n) N/A

Change Description

I locally updated fprime/cmake/settings.cmake to change -DPROTECTED=protected -DPRIVATE=private. This causes additional build errors beyond all our updates in manual code for PRIVATE->private and PROTECTED->protected due to auto-coded files which use PRIVATE, PROTECTED. This set of changes is associated with fixing Svc/FpySquencer so that the UTs in this directory can build and pass.

Approach in this case was:

  1. Add accessor methods to FpySquencerTester
  2. Implementing new friend of the statemachine class !! This will require FPP update !!

Rationale

#3446

Future Work

  1. Note that this PR does not include the update to fprime/cmake/settings.cmake itself - this will be done at the end
  2. Note that this PR does not include re-naming the flight code Impl to (separate issue)

@m-aleem
Copy link
Contributor Author

m-aleem commented Jun 26, 2025

@bocchino @LeStarch

This update will need a ‘tandem’ FPP update which I have ready to go, and reviewing the F-Prime-and-FPP-Tandem-Development Wiki I believe I need to request a separate FPP branch for this before opening a FPP Pull Request.
Rob - Can you please create a branch or let me know if you need anything else?

For context, the updates are to add Friend class of format {x}Tester to the State Machine Cpp writer, previewable here.

(To summarize: The FPP update should be merged first then this PR)

@m-aleem m-aleem requested a review from LeStarch June 26, 2025 23:15
@m-aleem m-aleem marked this pull request as ready for review June 26, 2025 23:15
@LeStarch LeStarch merged commit b363b82 into nasa:devel Jun 30, 2025
51 checks passed
@m-aleem m-aleem deleted the devel-3446-an branch July 22, 2025 18:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants