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

Integration Candidate 20191230 #34

Merged
merged 5 commits into from
Jan 9, 2020
Merged

Integration Candidate 20191230 #34

merged 5 commits into from
Jan 9, 2020

Conversation

skliper
Copy link
Contributor

@skliper skliper commented Dec 31, 2019

Describe the contribution
Fix #23, Fix #25, Fix #28, Fix #30

Testing performed

  1. Checked out all IC 20191230 branches
  2. Built and ran cFS unit tests and OSAL coverage (vxworks and shared)
    1. All passed (although osal_timer_UT occasionally still fails due to a test issue)
  3. Make cmdUtils where cFS-GroundSystem expects it
    1. cd tools/cFS-GroundSystem/Subsystems/cmdUtil
    2. make
  4. Started Ground system
    1. python3 GroundSystem.py
  5. Enabled commands to 127.0.0.1
  6. Confirmed telemetry packets received
  7. Sent ES and TIME noop commands, confirmed noop message from cFS on Port 1
  8. Sent ES power on reset and observed cFS exit

Expected behavior changes
See related pull requests

System(s) tested on

  • cFS Dev Server 2
  • OS: Ubuntu 18.04
  • Versions: ic-20191230 branches

Additional context
N/A

Contributor Info - All information REQUIRED for consideration of pull request
Jacob Hageman - NASA/GSFC

jphickey and others added 5 commits December 30, 2019 11:45
@jphickey @skliper
Fix #23: Invoke SAMPLE_Function as part of Process command
7c10e1a 
The CFE framework sample/lab applications did not have any
example use-cases where a _library_ function was invoked.

For the FSW verification aspect, it is important to do
this at least in one place as it verifies that the
run-time linking is working properly, not just for
functions in the core image but also for dynamically
loaded libraries.

The unit test framework also needs to support this use
case, to demonstrate that it can link against the stub
provided by the library for the local UT.

This just simply adds a call to the "SAMPLE_Function"
provided by sample_lib to demonstrate this.
@jphickey @skliper
Fix #25: Reverse command and error counts
3491a24 
These were being copied to the telemetry packet
backwards.  Trivial fix.
@jphickey @skliper
Fix #28: Check return of CFE_TBL_GetAddress
693d75f 
The code must not dereference the pointer unless the call
returned CFE_SUCCESS, otherwise the pointer is not valid.
@jphickey @skliper
Fix #30: avoid compile warnings due to printf format
67fac46 
When using printf-style format conversions one must generally
cast the argument to the intended type, as it does not happen
implicitly with variable-argument functions.

In particular the existing code worked on the default (native) build
but generated warnings when building on RTEMS for a 32-bit x86 target.
@skliper
CCB 20191218: Merge #24 #27 #29 #31
36df88f 
Fix #23, #25, #28, #30
Reviewed and approved at 2019-12-18 CCB
@skliper skliper changed the title Ic 20191230 Integration Candidate 20191230 Dec 31, 2019
@skliper skliper merged commit 36df88f into master Jan 9, 2020
@astrogeco astrogeco deleted the ic-20191230 branch March 13, 2020 14:05
@skliper skliper added this to the 1.2.0 milestone Jun 1, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
Bootes
2 participants
@skliper @jphickey