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

cFE Integration candidate: Equuleus-rc1+dev4 #2512

Merged

dzbaker merged 5 commits into main from integration-candidate

Feb 2, 2024

Collaborator

dzbaker commented Feb 2, 2024 •

edited

Loading

Checklist (Please check before submitting)

I reviewed the Contributing Guide.
I signed and emailed the appropriate Contributor License Agreement to GSFC-SoftwareRelease@mail.nasa.gov and copied cfs-program@lists.nasa.gov.

Describe the contribution

PR Fix #2508, EDS XML file updates #2510. Addresses Issue Update EDS files for latest CFE changes #2508
PR Fix #2507, add EDS cmake hooks #2511. Addresses Issue Add EDS build hooks #2507

Testing performed
cFS Bundle Checks
cFE Checks

Expected behavior changes
See PRs

System(s) tested on
Ubuntu 20.04

Additional context
Add any other context about the contribution here.

Third party code
If included, identify any third party code and provide text file of license

Contributor Info - All information REQUIRED for consideration of pull request
@jphickey

jphickey and others added 5 commits

January 31, 2024 20:56


          Fix #2508, EDS XML file updates

7f6a082

Cleans up multiple copies of the XML files, and minor updates to others.

Adds the FileName type to base_types.xml

Removes the FileDef structure definition from cfe_tbl.xml, as this is an
internal struct for building tables and not really part of the interface.


          Fix #2507, add EDS cmake hooks

350f57e

Adds CFE_EDS_ENABLED_BUILD option at the top level, along with
other logic that is tied in only when this is set TRUE.

By default it is set to FALSE, so it does not change any existing
workflows yet.

Also added are the keys for two configuration values for reflecting
EDS DB objects (pointers) and some minor cleanup.


          Merge pull request #2510 from jphickey:fix-2508-edsxml-updates

431e4a2

Fix #2508, EDS XML file updates


          Merge pull request #2511 from jphickey:fix-2507-eds-hooks

6355bc2

Fix #2507, add EDS cmake hooks


          Updating documentation and version numbers for equuleus-rc1+dev90

713aa65

github-advanced-security bot found potential problems

View reviewed changes

cmake/target/src/target_config.c

    
            @@ -126,6 +126,78 @@
          
               */

              extern CFE_StaticModuleLoadEntry_t CFE_PSP_MODULE_LIST[];

              #ifdef CFE_EDS_ENABLED_BUILD

Check notice

Code scanning / CodeQL

Conditional compilation Note

Use of conditional compilation must be kept to a minimum.

cmake/target/src/target_config.c

    
               * non-const pointer gets set NULL.  There are no "write" operations

               * in this mode -- registration and de-registration is not necessary.

               */

              #ifdef CFE_EDS_LINK_MODE_GLOBAL

Check notice

Code scanning / CodeQL

Conditional compilation Note

Use of conditional compilation must be kept to a minimum.

cmake/target/src/target_config.c

    
               * Dynamic (non-const) runtime EDS database object

               * This is filled in as additional EDS datasheet objects are registered

               */

              #ifdef CFE_EDS_LINK_MODE_LOCAL

Check notice

Code scanning / CodeQL

Conditional compilation Note

Use of conditional compilation must be kept to a minimum.

cmake/target/src/target_config.c

    
               * For all of these DB objects, use NULL if not defined.

               * This covers the case where EDS is not being used.

               */

              #ifndef CFE_NONCONST_EDS_DB_PTR

Check notice

Code scanning / CodeQL

Conditional compilation Note

Use of conditional compilation must be kept to a minimum.

cmake/target/src/target_config.c

    
               * Note that the non-const object can be used as a const object,

               * but not the other way around.  This can also be NULL.

               */

              #ifndef CFE_CONST_EDS_DB_PTR

Check notice

Code scanning / CodeQL

Conditional compilation Note

Use of conditional compilation must be kept to a minimum.

cmake/target/src/target_config.c

    
               * of the software bus messages.  This can also be NULL if

               * EDS is not being used.

               */

              #ifndef CFE_SB_INTF_DB_PTR

Check notice

Code scanning / CodeQL

Conditional compilation Note

Use of conditional compilation must be kept to a minimum.

dzbaker merged commit 8cdad66 into main

40 of 41 checks passed

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet