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 time var name changed in .h but not in code #259

Closed
skliper opened this issue Sep 30, 2019 · 1 comment · Fixed by #479
Closed

cfe time var name changed in .h but not in code #259

skliper opened this issue Sep 30, 2019 · 1 comment · Fixed by #479
Assignees
Labels
bug good first issue Good for newcomers
Milestone

Comments

@skliper
Copy link
Contributor

skliper commented Sep 30, 2019

cfe master 6.6 release
osal 4.2.1a
psp 1.3.0.0

building for VxWorks 6.9 SPARC ut700

kspace/plss_cws/../CFS/cfe/fsw/cfe-core/src/time/cfe_time_tone.c
/home/sduran/AEMU_Workspace/plss_cws/../CFS/cfe/fsw/cfe-core/src/time/cfe_time_tone.c: In function 'CFE_TIME_ToneSend':
/home/sduran/AEMU_Workspace/plss_cws/../CFS/cfe/fsw/cfe-core/src/time/cfe_time_tone.c:132:42: error: 'CFE_TIME_ToneDataCmd_Payload_t' has no member named 'AtToneLeaps'
CFE_TIME_TaskData.ToneDataCmd.Payload.AtToneLeaps =

FROM cfe 86ce044, 6.5 release plus a couple of hot fixes, master before 6.6 release, cfe_time_utils.h
typedef struct
{

CFE_TIME_SysTime_t AtToneMET; /* MET at time of tone /
CFE_TIME_SysTime_t AtToneSTCF; /
STCF at time of tone /
---> int16 AtToneLeaps; /
Leap Seconds at time of tone /
int16 ClockSetState; /
Time has been "set" /
int16 ClockFlyState; /
Current fly-wheel state /
CFE_TIME_SysTime_t AtToneDelay; /
Adjustment for slow tone detection /
CFE_TIME_SysTime_t AtToneLatch; /
Local clock latched at time of tone /
CFE_TIME_SysTime_t CurrentLatch; /
Local clock latched just "now" /
CFE_TIME_SysTime_t TimeSinceTone; /
Time elapsed since the tone /
CFE_TIME_SysTime_t CurrentMET; /
MET at this instant */

} CFE_TIME_Reference_t;

FROM cfe master 90fdf9f 6.6 release, cfe_time_utils.h --- var name changed in header, but
not in cfe/fsw/cfe-core/src/time/cfe_time_tone.c:132:42
typedef struct
{

CFE_TIME_SysTime_t AtToneMET; /* MET at time of tone /
CFE_TIME_SysTime_t AtToneSTCF; /
STCF at time of tone /
---> int16 AtToneLeapSeconds; /
Leap Seconds at time of tone /
int16 ClockSetState; /
Time has been "set" /
int16 ClockFlyState; /
Current fly-wheel state /
CFE_TIME_SysTime_t AtToneDelay; /
Adjustment for slow tone detection /
CFE_TIME_SysTime_t AtToneLatch; /
Local clock latched at time of tone /
CFE_TIME_SysTime_t CurrentLatch; /
Local clock latched just "now" /
CFE_TIME_SysTime_t TimeSinceTone; /
Time elapsed since the tone /
CFE_TIME_SysTime_t CurrentMET; /
MET at this instant */

} CFE_TIME_Reference_t;

I do not see the issue with a linux build. I think it might be associated with
#define CFE_PLATFORM_TIME_CFG_BIGENDIAN
The default is to #undef CFE_PLATFORM_TIME_CFG_BIGENDIAN - makes sense on linux/x86
But for vxworks/SPARC, I would think it should be defined.
"** If this configuration parameter is defined, the CFE time server will
** publish time tones with payloads in big-endian order, and time clients
** will expect the tones to be in big-endian order. "

vxworks/sparc will build if
#undef CFE_PLATFORM_TIME_CFG_BIGENDIAN

@skliper
Copy link
Contributor Author

skliper commented Sep 30, 2019

Imported from trac issue 228. Created by sduran on 2017-12-12T15:44:47, last modified: 2019-03-01T15:27:58

@skliper skliper self-assigned this Sep 30, 2019
@skliper skliper added the bug label Sep 30, 2019
@skliper skliper removed their assignment Sep 30, 2019
@skliper skliper added the good first issue Good for newcomers label Nov 4, 2019
@skliper skliper added this to the 6.8.0 milestone Nov 4, 2019
@dmknutsen dmknutsen self-assigned this Jan 3, 2020
dmknutsen added a commit that referenced this issue Jan 3, 2020
Updated to correct the following issue: cfe time var name changed in .h but not in code #259
dmknutsen added a commit that referenced this issue Jan 3, 2020
Implements fix for: cfe time var name changed in .h but not in code #259
dmknutsen added a commit that referenced this issue Jan 3, 2020
Implements fix for: cfe time var name changed in .h but not in code #259
dmknutsen added a commit that referenced this issue Jan 3, 2020
dmknutsen added a commit to dmknutsen/cFE that referenced this issue Jan 3, 2020
dmknutsen added a commit to dmknutsen/cFE that referenced this issue Jan 6, 2020
dmknutsen added a commit to dmknutsen/cFE that referenced this issue Jan 6, 2020
skliper added a commit to skliper/cFE that referenced this issue Jan 7, 2020
Update AtToneLeaps to AtToneLeapSeconds when
CFE_PLATFORM_TIME_CFG_BIGENDIAN is defined to match
the updates for !CFE_PLATFORM_TIME_CFG_BIGENDIAN.
dmknutsen added a commit to dmknutsen/cFE that referenced this issue Jan 7, 2020
skliper pushed a commit that referenced this issue Jan 10, 2020
skliper pushed a commit that referenced this issue Jan 10, 2020
skliper added a commit that referenced this issue 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 issue 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 good first issue Good for newcomers
Projects
None yet
Development

Successfully merging a pull request may close this issue.

2 participants