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

Fix #259, Update tone leap variable #453

Merged
merged 1 commit into from
Jan 10, 2020

Conversation

dmknutsen
Copy link
Contributor

@dmknutsen dmknutsen commented Jan 6, 2020

Describe the contribution
Fixes #259

Testing performed

  1. Modified cpu1_platform_cfg.h such that I could reproduce the error:
    #undef CFE_PLATFORM_TIME_CFG_BIGENDIAN -->
    #define CFE_PLATFORM_TIME_CFG_BIGENDIAN
  2. Corrected cfe_time_tone.c via replacing all instances of AtToneLeaps variable
    with AtToneLeapSeconds.
  3. Recompiled software:
    make prep
    make
    make install
  4. Ran software and verified that the issue was fixed:
    ./core-cpu1

Expected behavior changes
The software will compile and run successfully.

System(s) tested on:
Oracle VM VirtualBox
OS: ubuntu-19.10
Version: cFE 6.7.3.0; OSAL 5.0.3.0; PSP 1.4.1.0

Additional context
None

Contributor Info
Dan Knutsen
GSFC/NASA

@skliper
Copy link
Contributor

skliper commented Jan 6, 2020

Did you really test against 6.6.0a and 1.4.2a? I'd recommend testing against the bundle master (it's at 6.7.3 and OSAL 5.0.3 now), see the line printed at startup:

EVS Port1 42/1/CFE_ES 2: Versions:cFE 6.7.3.0, OSAL 5.0.3.0, PSP 1.4.1.0, chksm 17082

@skliper skliper added the bug label Jan 6, 2020
@skliper skliper added this to the 6.8.0 milestone Jan 6, 2020
@dmknutsen
Copy link
Contributor Author

dmknutsen commented Jan 6, 2020 via email

Copy link
Contributor

@skliper skliper left a comment

Choose a reason for hiding this comment

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

Actually it looks like this is committing a permissions change, which should be reverted.

@skliper skliper changed the title Issue 259 Fix #259, Update tone leap variable Jan 7, 2020
@skliper skliper added the CCB:Approved Indicates code review and approval by community CCB label Jan 10, 2020
@skliper
Copy link
Contributor

skliper commented Jan 10, 2020

CCB 20190108 - Reviewed and approved for integration candidate

@skliper skliper changed the base branch from master to merge-20200108 January 10, 2020 15:12
@skliper skliper merged commit 1bd78f0 into nasa:merge-20200108 Jan 10, 2020
skliper added a commit that referenced this pull request Jan 10, 2020
Fix #259 #425 #427 #435 #437 #438 #443 #445
Reviewed and approved at 2020-01-08 CCB
skliper added a commit that referenced this pull request Jan 14, 2020
Fix #259, Update tone leap variable
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug CCB:Approved Indicates code review and approval by community CCB
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants