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: 2021-06-01 #1584

Merged
merged 48 commits into from
Jun 8, 2021
Merged
Changes from 1 commit
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
6de6d24
Fix #1446, Remove unused EVS LogMode defines
pepepr08 May 18, 2021
41dff63
Fix #1554, add doxygen aliases for OSAL parameter/retvals
jphickey May 20, 2021
be1d5d5
Fix #1441, Replace Header Content Type magic number.
zanzaben May 20, 2021
849eed3
Fix #1548, Include verify headers to validate config
skliper May 20, 2021
18152c3
Fix #1507, Document TblName as app specific
skliper May 20, 2021
202c122
Fix #1494, Documentation cleanup in TBL/TIME
skliper May 20, 2021
ee19f18
Fix #1485, Document CFE_ES_PoolCreateEx NumBlockSizes error handling
skliper May 20, 2021
a98d831
Fix #1561, use OSAL script to generate API guide
jphickey May 20, 2021
2e0bc9f
Fix #1561, also remove dox files now in OSAL
jphickey May 20, 2021
6333d25
Fix #1476, Use CFE_MSG_SequenceCount_t for seqcnt type
skliper May 21, 2021
8c84e57
Fix #1455, Add CFE_SB_DestinationD tag and use for pointers
skliper May 21, 2021
4652c0d
Fix #1423, Remove deprecated elements
skliper May 21, 2021
d7c2b24
Fix #1435, Consistent use of uint16 for EventID
skliper May 24, 2021
6ce0230
Fix #1394, Remove shell file subtype and clarify scope
skliper May 25, 2021
b9aa9ca
Fix #1391, EVS/FS documentation cleanup
skliper May 25, 2021
8280c27
Fix #1386, Remove CFE_EVS_Unregister API
skliper May 25, 2021
8128384
Fix #1366, Resolve mismatched endforeach of CMakeList.txt
skliper May 25, 2021
18e4d06
Fix #1390, Improve event filter documentation
skliper May 25, 2021
251267a
Fix #1364, Update ES verify errors to match test
skliper May 25, 2021
ee6c43d
Fix #1569, Remove unused CFE_SB_NO_SUBSCRIBERS
skliper May 24, 2021
d6c0091
Fix #1452, Document cleanup from SB/MSG/SBR review
skliper May 24, 2021
560111c
Fix #1362, Simplify file open/truncate logic
skliper May 26, 2021
13eb53f
Fix #1512, Add Coding Standard Rules in CodeQL
arielswalker May 13, 2021
b7bfaba
Merge pull request #1580 from skliper/fix1364-es_verify_errors
astrogeco May 27, 2021
41d6eaa
Merge pull request #1578 from skliper/fix1366-mismatch_endforeach
astrogeco May 27, 2021
6d8b907
Merge pull request #1579 from skliper/fix1390-event_filter_doc
astrogeco May 27, 2021
de3af04
Merge pull request #1576 from skliper/fix1391-evs_fs_doc_cleanup
astrogeco May 27, 2021
5febad7
Merge pull request #1575 from skliper/fix1394-file_subtype
astrogeco May 27, 2021
2a93eaf
Merge pull request #1582 from skliper/fix1362-open_truncate
astrogeco May 27, 2021
7f08fc3
Merge pull request #1567 from skliper/fix1423-remove_deprecated
astrogeco May 27, 2021
517a18f
Merge pull request #1556 from zanzaben/fix1441_Replace_File_content_m…
astrogeco May 27, 2021
0cab138
Merge pull request #1553 from pepepr08/fix1446-logmode-defines
astrogeco May 27, 2021
786125e
Merge pull request #1570 from skliper/fix1452-sb_msg_sbr_comments
astrogeco May 27, 2021
9a01dcc
Merge pull request #1565 from skliper/fix1455-destination_tag
astrogeco May 27, 2021
b1f36ee
Merge pull request #1564 from skliper/fix1476-sequencecounttype
astrogeco May 27, 2021
efd72a0
Merge pull request #1562 from skliper/fix1485-numblocksize_error_doc
astrogeco May 27, 2021
1344f7f
Merge pull request #1560 from skliper/fix1494-tbltime_doc_cleanup
astrogeco May 27, 2021
3fdecc6
Merge pull request #1558 from skliper/fix1507-tblname_processor_specific
astrogeco May 27, 2021
d71583a
Merge pull request #1563 from jphickey/fix-1561-osal-apiguide
astrogeco May 27, 2021
acea60e
IC:2021-06-01, Remove deprecated doxygen reference
astrogeco May 27, 2021
16196d4
Fix #1585, Fix Calculate CRC header return description.
zanzaben Jun 1, 2021
df3d75f
Merge pull request #1557 from skliper/fix1548-include_verify
astrogeco Jun 2, 2021
41d552c
Merge pull request #1513 from ArielSAdamsNASA/fix-1512-coding-standar…
astrogeco Jun 2, 2021
2d97cb2
Merge pull request #1591 from zanzaben/fix1585_fix_crc_header
astrogeco Jun 2, 2021
00d1a39
Merge pull request #1572 from skliper/fix1435-eventid_type
astrogeco Jun 2, 2021
4a3129c
Merge pull request #1577 from skliper/fix1386-remove_evs_unregister
astrogeco Jun 2, 2021
51ecd53
Merge pull request #1555 from jphickey/fix-1554-doc-tags
jphickey Jun 3, 2021
66378f9
IC:2021-06-01, Bump to v6.8.0-rc1+dev642
astrogeco Jun 8, 2021
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
Prev Previous commit
Next Next commit
Fix #1394, Remove shell file subtype and clarify scope
  • Loading branch information
skliper committed May 25, 2021
commit 6ce02300af72aca1cf9b3a65045240067f7c60d8
16 changes: 6 additions & 10 deletions modules/core_api/fsw/inc/cfe_fs_extern_typedefs.h
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,12 @@
#define CFE_FS_FILE_CONTENT_ID 0x63464531 /**< \brief Magic Number for cFE compliant files (= 'cFE1') */

/**
* @brief Label definitions associated with CFE_FS_SubType_Enum_t
* @brief File subtypes used within cFE
*
* This defines all the file subtypes used by cFE.
* Note apps can extend as needed but need to
* avoid conflicts (app context not currently included
* in the file header).
*/
enum CFE_FS_SubType
{
Expand Down Expand Up @@ -98,15 +103,6 @@ enum CFE_FS_SubType
*/
CFE_FS_SubType_ES_PERFDATA = 4,

/**
* @brief Executive Services Shell Response File
*
* Executive Services Shell Response Data File which is generated in response to a
* shell command.
*
*/
CFE_FS_SubType_ES_SHELL = 5,

/**
* @brief Executive Services Critical Data Store Registry Dump File
*
Expand Down