Skip to content

Commit

Permalink
Bulk update for 2.6.0 release, see VDD for change summary
Browse files Browse the repository at this point in the history
  • Loading branch information
skliper committed Apr 26, 2022
1 parent 1518fa2 commit 68cb97b
Show file tree
Hide file tree
Showing 107 changed files with 56,602 additions and 21,520 deletions.
6 changes: 0 additions & 6 deletions .gitattributes

This file was deleted.

9 changes: 9 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,12 @@ aux_source_directory(fsw/tables APP_TABLE_FILES)
# Create the app module
add_cfe_app(ds ${APP_SRC_FILES})
add_cfe_tables(ds ${APP_TABLE_FILES})

# If UT is enabled, then add the tests from the subdirectory
# Note that this is an app, and therefore does not provide
# stub functions, as other entities would not typically make
# direct function calls into this application.
if (ENABLE_UNIT_TESTS)
add_subdirectory(unit-test)
endif (ENABLE_UNIT_TESTS)

201 changes: 0 additions & 201 deletions LICENSE

This file was deleted.

17 changes: 7 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ core Flight System (cFS) Data Storage Application (DS)
Open Source Release Readme
==========================

DS Release 2.5.2
DS Release 2.6.0

Date: 10/5/2020
Date: 8/30/2021

Introduction
-------------
Expand All @@ -20,26 +20,23 @@ Introduction

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

This software is licensed under the Apache 2.0 license.

Developer's guide information can be generated using Doxygen:
doxygen ds_doxygen_config.txt

Software Included
------------------

Data Storage application (DS) 2.5.2
Data Storage application (DS) 2.6.0


Software Required
------------------

Operating System Abstraction Layer 5.0 or higher can be
obtained at https://github.com/nasa/osal

core Flight Executive 6.8.0 or higher can be obtained at
https://github.com/nasa/cfe
cFS Caelum

Note: An integrated bundle including the cFE, OSAL, and PSP can
be obtained at https://github.com/nasa/cfs
Expand Down
Binary file added docs/DS_RequirementsToDesignTrace.docx
Binary file not shown.
Binary file added docs/DS_v2.6.0_VersionDescriptionDocument.pdf
Binary file not shown.
File renamed without changes.
24 changes: 12 additions & 12 deletions fsw/mission_inc/ds_perfids.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,20 @@
** version 2.5.2"
**
** Copyright © 2019 United States Government as represented by the Administrator of
** the National Aeronautics and Space Administration. All Rights Reserved.
** the National Aeronautics and Space Administration. All Rights Reserved.
**
** Licensed under the Apache License, Version 2.0 (the "License");
** you may not use this file except in compliance with the License.
** You may obtain a copy of the License at
** http://www.apache.org/licenses/LICENSE-2.0
** Unless required by applicable law or agreed to in writing, software
** distributed under the License is distributed on an "AS IS" BASIS,
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
** See the License for the specific language governing permissions and
** limitations under the License.
** Licensed under the Apache License, Version 2.0 (the "License");
** you may not use this file except in compliance with the License.
** You may obtain a copy of the License at
** http://www.apache.org/licenses/LICENSE-2.0
** Unless required by applicable law or agreed to in writing, software
** distributed under the License is distributed on an "AS IS" BASIS,
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
** See the License for the specific language governing permissions and
** limitations under the License.
**
**
** Purpose:
** Purpose:
** Define DS Performance IDs
**
** Notes:
Expand All @@ -27,7 +27,7 @@
#ifndef _ds_perfids_h_
#define _ds_perfids_h_

#define DS_APPMAIN_PERF_ID 38
#define DS_APPMAIN_PERF_ID 38

#endif /* _ds_perfids_h_ */

Expand Down
34 changes: 16 additions & 18 deletions fsw/platform_inc/ds_msgids.h
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
/************************************************************************
** File: ds_msgids.h
** File: ds_msgids.h
**
** NASA Docket No. GSC-18448-1, and identified as "cFS Data Storage (DS) application
** version 2.5.2"
**
** Copyright © 2019 United States Government as represented by the Administrator of
** the National Aeronautics and Space Administration. All Rights Reserved.
** the National Aeronautics and Space Administration. All Rights Reserved.
**
** Licensed under the Apache License, Version 2.0 (the "License");
** you may not use this file except in compliance with the License.
** You may obtain a copy of the License at
** http://www.apache.org/licenses/LICENSE-2.0
** Unless required by applicable law or agreed to in writing, software
** distributed under the License is distributed on an "AS IS" BASIS,
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
** See the License for the specific language governing permissions and
** limitations under the License.
** Licensed under the Apache License, Version 2.0 (the "License");
** you may not use this file except in compliance with the License.
** You may obtain a copy of the License at
** http://www.apache.org/licenses/LICENSE-2.0
** Unless required by applicable law or agreed to in writing, software
** distributed under the License is distributed on an "AS IS" BASIS,
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
** See the License for the specific language governing permissions and
** limitations under the License.
**
**
** Purpose:
** Purpose:
** The CFS Data Storage (DS) Application Message IDs header file
**
** Notes:
Expand All @@ -31,17 +31,15 @@
** DS Command Message IDs
***********************/

#define DS_CMD_MID 0x18BB /**< \brief DS Ground Commands Message ID */
#define DS_SEND_HK_MID 0x18BC /**< \brief DS Send Hk Data Cmd Message ID*/

#define DS_CMD_MID 0x18BB /**< \brief DS Ground Commands Message ID */
#define DS_SEND_HK_MID 0x18BC /**< \brief DS Send Hk Data Cmd Message ID*/

/***************************************
** DS Telemetry Message IDs
***************************************/

#define DS_HK_TLM_MID 0x08B8 /**< \brief DS Hk Telemetry Message ID ****/
#define DS_DIAG_TLM_MID 0x08B9 /**< \brief DS File Info Telemetry Message ID ****/

#define DS_HK_TLM_MID 0x08B8 /**< \brief DS Hk Telemetry Message ID ****/
#define DS_DIAG_TLM_MID 0x08B9 /**< \brief DS File Info Telemetry Message ID ****/

#endif /* _ds_msgids_h_ */

Expand Down
Loading

0 comments on commit 68cb97b

Please sign in to comment.