Skip to content

Commit 68cb97b

Browse files
author
Jacob Hageman
committed
Bulk update for 2.6.0 release, see VDD for change summary
1 parent 1518fa2 commit 68cb97b

File tree

107 files changed

+56602
-21520
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

107 files changed

+56602
-21520
lines changed

.gitattributes

Lines changed: 0 additions & 6 deletions
This file was deleted.

CMakeLists.txt

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,12 @@ aux_source_directory(fsw/tables APP_TABLE_FILES)
1212
# Create the app module
1313
add_cfe_app(ds ${APP_SRC_FILES})
1414
add_cfe_tables(ds ${APP_TABLE_FILES})
15+
16+
# If UT is enabled, then add the tests from the subdirectory
17+
# Note that this is an app, and therefore does not provide
18+
# stub functions, as other entities would not typically make
19+
# direct function calls into this application.
20+
if (ENABLE_UNIT_TESTS)
21+
add_subdirectory(unit-test)
22+
endif (ENABLE_UNIT_TESTS)
23+

LICENSE

Lines changed: 0 additions & 201 deletions
This file was deleted.

README.md

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ core Flight System (cFS) Data Storage Application (DS)
44
Open Source Release Readme
55
==========================
66

7-
DS Release 2.5.2
7+
DS Release 2.6.0
88

9-
Date: 10/5/2020
9+
Date: 8/30/2021
1010

1111
Introduction
1212
-------------
@@ -20,26 +20,23 @@ Introduction
2020

2121
The DS application is written in C and depends on the cFS Operating System
2222
Abstraction Layer (OSAL) and cFE components. There is additional DS application
23-
specific configuration information contained in the application user's guide
24-
available in https://github.com/nasa/DS/tree/master/docs/users_guide
23+
specific configuration information contained in the application user's guide.
2524

2625
This software is licensed under the Apache 2.0 license.
2726

27+
Developer's guide information can be generated using Doxygen:
28+
doxygen ds_doxygen_config.txt
2829

2930
Software Included
3031
------------------
3132

32-
Data Storage application (DS) 2.5.2
33+
Data Storage application (DS) 2.6.0
3334

3435

3536
Software Required
3637
------------------
3738

38-
Operating System Abstraction Layer 5.0 or higher can be
39-
obtained at https://github.com/nasa/osal
40-
41-
core Flight Executive 6.8.0 or higher can be obtained at
42-
https://github.com/nasa/cfe
39+
cFS Caelum
4340

4441
Note: An integrated bundle including the cFE, OSAL, and PSP can
4542
be obtained at https://github.com/nasa/cfs
63.1 KB
Binary file not shown.
536 KB
Binary file not shown.
File renamed without changes.

fsw/mission_inc/ds_perfids.h

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,20 @@
55
** version 2.5.2"
66
**
77
** Copyright © 2019 United States Government as represented by the Administrator of
8-
** the National Aeronautics and Space Administration. All Rights Reserved.
8+
** the National Aeronautics and Space Administration. All Rights Reserved.
99
**
10-
** Licensed under the Apache License, Version 2.0 (the "License");
11-
** you may not use this file except in compliance with the License.
12-
** You may obtain a copy of the License at
13-
** http://www.apache.org/licenses/LICENSE-2.0
14-
** Unless required by applicable law or agreed to in writing, software
15-
** distributed under the License is distributed on an "AS IS" BASIS,
16-
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17-
** See the License for the specific language governing permissions and
18-
** limitations under the License.
10+
** Licensed under the Apache License, Version 2.0 (the "License");
11+
** you may not use this file except in compliance with the License.
12+
** You may obtain a copy of the License at
13+
** http://www.apache.org/licenses/LICENSE-2.0
14+
** Unless required by applicable law or agreed to in writing, software
15+
** distributed under the License is distributed on an "AS IS" BASIS,
16+
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17+
** See the License for the specific language governing permissions and
18+
** limitations under the License.
1919
**
2020
**
21-
** Purpose:
21+
** Purpose:
2222
** Define DS Performance IDs
2323
**
2424
** Notes:
@@ -27,7 +27,7 @@
2727
#ifndef _ds_perfids_h_
2828
#define _ds_perfids_h_
2929

30-
#define DS_APPMAIN_PERF_ID 38
30+
#define DS_APPMAIN_PERF_ID 38
3131

3232
#endif /* _ds_perfids_h_ */
3333

fsw/platform_inc/ds_msgids.h

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
/************************************************************************
2-
** File: ds_msgids.h
2+
** File: ds_msgids.h
33
**
44
** NASA Docket No. GSC-18448-1, and identified as "cFS Data Storage (DS) application
55
** version 2.5.2"
66
**
77
** Copyright © 2019 United States Government as represented by the Administrator of
8-
** the National Aeronautics and Space Administration. All Rights Reserved.
8+
** the National Aeronautics and Space Administration. All Rights Reserved.
99
**
10-
** Licensed under the Apache License, Version 2.0 (the "License");
11-
** you may not use this file except in compliance with the License.
12-
** You may obtain a copy of the License at
13-
** http://www.apache.org/licenses/LICENSE-2.0
14-
** Unless required by applicable law or agreed to in writing, software
15-
** distributed under the License is distributed on an "AS IS" BASIS,
16-
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17-
** See the License for the specific language governing permissions and
18-
** limitations under the License.
10+
** Licensed under the Apache License, Version 2.0 (the "License");
11+
** you may not use this file except in compliance with the License.
12+
** You may obtain a copy of the License at
13+
** http://www.apache.org/licenses/LICENSE-2.0
14+
** Unless required by applicable law or agreed to in writing, software
15+
** distributed under the License is distributed on an "AS IS" BASIS,
16+
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17+
** See the License for the specific language governing permissions and
18+
** limitations under the License.
1919
**
2020
**
21-
** Purpose:
21+
** Purpose:
2222
** The CFS Data Storage (DS) Application Message IDs header file
2323
**
2424
** Notes:
@@ -31,17 +31,15 @@
3131
** DS Command Message IDs
3232
***********************/
3333

34-
#define DS_CMD_MID 0x18BB /**< \brief DS Ground Commands Message ID */
35-
#define DS_SEND_HK_MID 0x18BC /**< \brief DS Send Hk Data Cmd Message ID*/
36-
34+
#define DS_CMD_MID 0x18BB /**< \brief DS Ground Commands Message ID */
35+
#define DS_SEND_HK_MID 0x18BC /**< \brief DS Send Hk Data Cmd Message ID*/
3736

3837
/***************************************
3938
** DS Telemetry Message IDs
4039
***************************************/
4140

42-
#define DS_HK_TLM_MID 0x08B8 /**< \brief DS Hk Telemetry Message ID ****/
43-
#define DS_DIAG_TLM_MID 0x08B9 /**< \brief DS File Info Telemetry Message ID ****/
44-
41+
#define DS_HK_TLM_MID 0x08B8 /**< \brief DS Hk Telemetry Message ID ****/
42+
#define DS_DIAG_TLM_MID 0x08B9 /**< \brief DS File Info Telemetry Message ID ****/
4543

4644
#endif /* _ds_msgids_h_ */
4745

0 commit comments

Comments
 (0)