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: 2020-05-27 #44

Merged
merged 3 commits into from
Jun 10, 2020
Merged

Integration Candidate: 2020-05-27 #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
862a9ee
Fix #41, remove dependencies on CCSDS types
jphickey May 28, 2020
491e2ce
Merge pull request #42 from jphickey/fix-41-ccsds-refs
astrogeco Jun 3, 2020
daee638
Increase version to 2.3.6 and update Readme
Jun 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ To send telemtry to the "ground" or UDP/IP port, edit the subscription table in

## Version History

### Development Build: 2.3.6
- Replace references to `ccsds.h` types with the `cfe_sb.h`-provided type.
- See <https://github.com/nasa/to_lab/pull/44>

### Development Build: 2.3.5

- Apply code style
Expand Down
6 changes: 3 additions & 3 deletions fsw/src/to_lab_app.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ int32 TO_LAB_RemoveAll(const TO_LAB_RemoveAll_t *data);
int32 TO_LAB_RemovePacket(const TO_LAB_RemovePacket_t *data);
int32 TO_LAB_ResetCounters(const TO_LAB_ResetCounters_t *data);
int32 TO_LAB_SendDataTypes(const TO_LAB_SendDataTypes_t *data);
int32 TO_LAB_SendHousekeeping(const CCSDS_CommandPacket_t *data);
int32 TO_LAB_SendHousekeeping(const CFE_SB_CmdHdr_t *data);

/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
/* */
Expand Down Expand Up @@ -273,7 +273,7 @@ void TO_LAB_process_commands(void)
break;

case TO_LAB_SEND_HK_MID:
TO_LAB_SendHousekeeping((const CCSDS_CommandPacket_t *)MsgPtr);
TO_LAB_SendHousekeeping((const CFE_SB_CmdHdr_t *)MsgPtr);
break;

default:
Expand Down Expand Up @@ -417,7 +417,7 @@ int32 TO_LAB_SendDataTypes(const TO_LAB_SendDataTypes_t *data)
/* TO_LAB_SendHousekeeping() -- HK status */
/* Does not increment CommandCounter */
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
int32 TO_LAB_SendHousekeeping(const CCSDS_CommandPacket_t *data)
int32 TO_LAB_SendHousekeeping(const CFE_SB_CmdHdr_t *data)
{
CFE_SB_TimeStampMsg(&TO_LAB_Global.HkBuf.MsgHdr);
CFE_SB_SendMsg(&TO_LAB_Global.HkBuf.MsgHdr);
Expand Down
2 changes: 1 addition & 1 deletion fsw/src/to_lab_version.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@

#define TO_LAB_MAJOR_VERSION 2
#define TO_LAB_MINOR_VERSION 3
#define TO_LAB_REVISION 5
#define TO_LAB_REVISION 6
#define TO_LAB_MISSION_REV 0

#endif /* _to_lab_version_h_ */
Expand Down