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.

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

cFE Integration Candidate: Caelum+dev2 #2019

Merged
merged 21 commits into from
Jan 21, 2022
Merged

cFE Integration Candidate: Caelum+dev2 #2019

merged 21 commits into from
Jan 21, 2022

Conversation

astrogeco
Copy link
Contributor

@astrogeco astrogeco commented Dec 15, 2021

Describe the contribution

PR #2033

PR #2015,

PR #2012,

PR #2013,

PR #2027,

PR #2031,

PR #2023,

PR #2029,

PR #2025,

PR #2011

Testing performed
cFE Checks https://github.com/nasa/cFE/pull/2019/checks
cFS Bundle Checks https://github.com/nasa/cFS/pull/410/checks

Expected behavior changes
See PRs

System(s) tested on
Ubuntu 18.04
RTEMS (bundle level)

Additional context
Part of nasa/cFS#410

Third party code
None

Contributor Info - All information REQUIRED for consideration of pull request

@ArielSAdamsNASA
@skliper
@jphickey
@paulober
@Nodraak

arielswalker and others added 15 commits October 27, 2021 15:08
…ake-func

Fix #1997, Mismatched foreach in cmake function
Corrects the implicit type conversion from an osal_id_t to an integer,
making it explicit by using the OS_ObjectIdToInteger() conversion function.
Cleans up the array length calculation for perf structs to not assume
a specific base element type (uint32).  This also makes the definitions
much more readable.
Fix #2016, cFE Application Developers Guide.md: specify language for improved code highlighting
…default

Fix #2026, CFE_FS_ParseInputFileNameEx avoid uninit var #2027
Fix #2030, array length calculation for perf structs
@astrogeco astrogeco force-pushed the integration-candidate branch from 0d7f6b8 to 3f4d4b0 Compare January 19, 2022 20:16
@astrogeco astrogeco changed the title cFS Integration candidate: Caelum+dev2 cFE Integration candidate: Caelum+dev2 Jan 20, 2022
@astrogeco astrogeco force-pushed the integration-candidate branch from 8d258df to c1aa63d Compare January 21, 2022 04:22
@astrogeco astrogeco force-pushed the integration-candidate branch from ee3a502 to a0a3be0 Compare January 21, 2022 19:39
@astrogeco astrogeco force-pushed the integration-candidate branch from a0a3be0 to b4fb004 Compare January 21, 2022 20:49
@astrogeco astrogeco marked this pull request as ready for review January 21, 2022 20:52
@astrogeco astrogeco changed the title cFE Integration candidate: Caelum+dev2 cFE Integration Candidate: Caelum+dev2 Jan 21, 2022
@astrogeco astrogeco merged commit 07fb348 into main Jan 21, 2022
astrogeco added a commit to nasa/cFS that referenced this pull request Jan 21, 2022
Combines:

nasa/cFE#2019, cFE v7.0.0-rc4+dev60
nasa/osal#1212, osal v6.0.0-rc4+dev29
nasa/sch_lab#105, sch_lab v2.5.0-rc4+dev13

Includes:

*cFE*

nasa/cFE#2033, Add CFE_ES_AppInfo_t element documentation
nasa/cFE#2011, Reuse CodeQL, Static Analysis, and Format Check
nasa/cFE#2015, Add FS Functional test
nasa/cFE#2012, Fix mismatched foreach in cmake function
nasa/cFE#2013, Improved code highlighting in cFE Application Developers Guide
nasa/cFE#2027, CFE_FS_ParseInputFileNameEx avoid uninit var
nasa/cFE#2031, Fix array length calculation for perf structs
nasa/cFE#2023, Limit SBR UT loops
nasa/cFE#2029, Initialize BlockData in ES UT
nasa/cFE#2025, Fix osal_id_t type conversion in es_UT.c

*osal*

nasa/osal#1206, Search global and local symbol tables
nasa/osal#1201, Add missing space to UtAssert_STUB_COUNT
nasa/osal#1202, Add UINT8 and UINT16 equivalents for UtAssert_UINT32_<Comparison> macros
nasa/osal#1203, correct warnings on gcc11
nasa/osal#1211, Set output in OS_stat handler
nasa/osal#1190, Reuse CodeQL, Static Analysis, Format Check

*other*

nasa/sch_lab#104, Add option to configure base tick rate

*Continuous Integration Updates*

nasa/PSP#317, Reuse CodeQL, Static Analysis, and Format Check

nasa/sample_lib#72, Reuse CodeQL, Static Analysis, and Format Check
nasa/sample_app#162, Reuse CodeQL, Static Analysis, and Format Check
nasa/ci_lab#100, Reuse CodeQL, Static Analysis, and Format Check
nasa/to_lab#111, Reuse CodeQL, Static Analysis, and Format Check

nasa/tblCRCTool#59, Reuse CodeQL, Static Analysis, and Format Check
nasa/elf2cfetbl#97, Reuse CodeQL, Static Analysis, and Format Check
nasa/cFS-GroundSystem#200, Reuse CodeQL, Static Analysis, and Format Check

Co-authored-by: Ariel Adams     <ArielSAdamsNASA@users.noreply.github.com>
Co-authored-by: Jacob Hageman   <skliper@users.noreply.github.com>
Co-authored-by: Joseph Hickey   <jphickey@users.noreply.github.com>
Co-authored-by: Kurtis Dinelle  <kurtjd@users.noreply.github.com>
Co-authored-by: Paul            <paulober@users.noreply.github.com>
Co-authored-by: Adrien Chardon  <Nodraak@users.noreply.github.com>
@skliper skliper added this to the Draco milestone Mar 28, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment