Skip to content

Commit

Permalink
Bulk update for 2.4.0 release, see VDD for change summary
Browse files Browse the repository at this point in the history
  • Loading branch information
skliper committed May 9, 2022
1 parent 49ffb5c commit 1952625
Show file tree
Hide file tree
Showing 128 changed files with 93,278 additions and 9,833 deletions.
6 changes: 0 additions & 6 deletions .gitattributes

This file was deleted.

8 changes: 8 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,11 @@ include_directories(fsw/tables)
include_directories(fsw/src)
aux_source_directory(fsw/tables APP_TBL_FILES)
add_cfe_tables(md ${APP_TBL_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)
Binary file removed LICENSE
Binary file not shown.
21 changes: 9 additions & 12 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ core Flight System (cFS) Memory Dwell Application (MD)
Open Source Release Readme
==========================

MD Release 2.3.3
MD Release 2.4.0

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

Introduction
-------------
Expand All @@ -19,31 +19,28 @@ Introduction
not been previously defined in the system prior to deployment.

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

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


This software is licensed under the Apache 2.0 license.


Software Included
------------------
Memory Dwell application (MD) 2.3.3
Memory Dwell application (MD) 2.4.0


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

Operating System Abstraction Layer 5.0.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


About cFS
-----------
The cFS is a platform and project independent reusable software framework and
Expand Down
Binary file added docs/MD_DevelopersGuide.docx
Binary file not shown.
Binary file added docs/MD_RequirementsToDesignTrace.docx
Binary file not shown.
Binary file added docs/MD_v2.4.0_VersionDescriptionDocument.pdf
Binary file not shown.
Empty file.
2 changes: 1 addition & 1 deletion docs/dox_src/users_guide/cfs_md.dox
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
with the CFS Memory Dwell (MD) application software. The document is intended primarily
for users of the software (operations personal, test engineers, and maintenance personal).
The deployment guide section, is intended for mission developers when deploying and
configuring the FM application software for a mission flight software build environment.
configuring the MD application software for a mission flight software build environment.

<H1> Applicable Documents </H1>

Expand Down
26 changes: 13 additions & 13 deletions fsw/mission_inc/md_perfids.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,23 @@
** File: md_perfids.h
**
** NASA Docket No. GSC-18,450-1, identified as “Core Flight Software System (CFS)
** Memory Dwell Application Version 2.3.3”
** Memory Dwell Application Version 2.3.3”
**
** 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:https://www.apache.org/licenses/LICENSE-2.0
** 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:https://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.
** 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 MD Performance IDs
**
** Notes:
Expand All @@ -28,7 +28,7 @@
#ifndef _md_perfids_h_
#define _md_perfids_h_

#define MD_APPMAIN_PERF_ID 26 /**< \brief CFS Memory Dwell Performance ID */
#define MD_APPMAIN_PERF_ID 26 /**< \brief CFS Memory Dwell Performance ID */

#endif /* _md_perfids_h_ */

Expand Down
48 changes: 24 additions & 24 deletions fsw/platform_inc/md_msgids.h
Original file line number Diff line number Diff line change
@@ -1,31 +1,31 @@
/*************************************************************************
** File: md_msgids.h
** File: md_msgids.h
**
** NASA Docket No. GSC-18,450-1, identified as “Core Flight Software System (CFS)
** Memory Dwell Application Version 2.3.3”
** Memory Dwell Application Version 2.3.3”
**
** Copyright © 2019 United States Government as represented by the Administrator of
** 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:https://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.
** 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:https://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:
** Specification for the CFS Memory Dwell macro constants that can
** be configured from one mission to another
**
**
** Notes:
**
**
**
*************************************************************************/
#ifndef _md_msgids_h_
#define _md_msgids_h_
Expand All @@ -34,22 +34,22 @@
** Macro Definitions
*************************************************************************/
/**
** \name MD Telemetry Message Ids */
** \name MD Telemetry Message Ids */
/** \{ */
#define MD_HK_TLM_MID 0x0890 /**< \brief Message Id for Memory Dwell's housekeeping pkt */
#define MD_DWELL_PKT_MID_BASE 0x0891 /**< \brief Base Message Id for Memory Dwell's dwell packets. MIDs will be base, base + 1, etc. */
#define MD_HK_TLM_MID 0x0890 /**< \brief Message Id for Memory Dwell's housekeeping pkt */
#define MD_DWELL_PKT_MID_BASE \
0x0891 /**< \brief Base Message Id for Memory Dwell's dwell packets. MIDs will be base, base + 1, etc. */

/** \} */

/**
** \name MD Command Message Ids */
** \name MD Command Message Ids */
/** \{ */
#define MD_CMD_MID 0x1890 /**< \brief Message Id for Memory Dwell's ground command */
#define MD_SEND_HK_MID 0x1891 /**< \brief Message Id for Memory Dwell's 'Send Housekeeping' message */
#define MD_WAKEUP_MID 0x1892 /**< \brief Message Id for Memory Dwell's wakeup message */
#define MD_CMD_MID 0x1890 /**< \brief Message Id for Memory Dwell's ground command */
#define MD_SEND_HK_MID 0x1891 /**< \brief Message Id for Memory Dwell's 'Send Housekeeping' message */
#define MD_WAKEUP_MID 0x1892 /**< \brief Message Id for Memory Dwell's wakeup message */
/** \} */


#endif /*_md_msgids_h_*/

/************************/
Expand Down
62 changes: 30 additions & 32 deletions fsw/platform_inc/md_platform_cfg.h
Original file line number Diff line number Diff line change
@@ -1,50 +1,48 @@
/*************************************************************************
** File: md_platform_cfg.h
** File: md_platform_cfg.h
**
** NASA Docket No. GSC-18,450-1, identified as “Core Flight Software System (CFS)
** Memory Dwell Application Version 2.3.3”
** Memory Dwell Application Version 2.3.3”
**
** Copyright © 2019 United States Government as represented by the Administrator of
** 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:https://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.
** 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:https://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:
** Specification for the CFS Memory Dwell constants that can
** be configured from one platform to another
**
** Notes:
**
**
**
*************************************************************************/

#ifndef _md_platform_cfg_h_
#define _md_platform_cfg_h_


/*************************************************************************
** Macro Definitions
*************************************************************************/

/**
** \name MD Command Pipe Parameters */
** \name MD Command Pipe Parameters */
/** \{ */
#define MD_PIPE_NAME "MD_CMD_PIPE"
#define MD_PIPE_DEPTH 50
#define MD_PIPE_NAME "MD_CMD_PIPE"
#define MD_PIPE_DEPTH 50
/** \} */


/** \mdcfg Memory Dwell Base Filename
**
**
** \par Description:
** Default base name and location for Memory Dwell filenames
** AppInit will append 01,02,03, up to number of tables.
Expand All @@ -53,26 +51,26 @@
** This string shouldn't be longer than #OS_MAX_PATH_LEN for the
** target platform in question
*/
#define MD_TBL_FILENAME_FORMAT "/cf/md_dw%02d.tbl"
#define MD_TBL_FILENAME_FORMAT "/cf/md_dw%02d.tbl"

/**
** \mdcfg Number of memory dwell tables.
**
** \par Limits
** Acceptable values for this parameter are 1 to 16.
*/
#define MD_NUM_DWELL_TABLES 4
#define MD_NUM_DWELL_TABLES 4

/**
** \mdcfg Maximum number of dwell specifications (address/delay/length)
** \mdcfg Maximum number of dwell specifications (address/delay/length)
** in a Dwell Table.
**
** \par Limits
** The maximum value for this parameter is limited by its effect
** on the MD_DwellTableLoad_t and associated data points, limiting
** it to 65535 points.
** it to 65535 points.
*/
#define MD_DWELL_TABLE_SIZE 25
#define MD_DWELL_TABLE_SIZE 25

/**
** \mdcfg Option of whether 32 bit integers must be aligned to 32 bit
Expand All @@ -85,7 +83,7 @@
#define MD_ENFORCE_DWORD_ALIGN 1

/**
** \mdcfg Option of whether a signature field will be reserved in
** \mdcfg Option of whether a signature field will be reserved in
** dwell packets. 1 indicates 'yes', 0 indicates 'no'.
**
** \par Limits
Expand All @@ -98,16 +96,16 @@
**
** \par Limits
** Signature field length needs to be a multiple of 4 so that
** dwell packet is a multiple of 4 bytes and no compiler padding
** dwell packet is a multiple of 4 bytes and no compiler padding
** will occur. Note that the final character of the signature string
** must be a null character, so the effective length of user definable
** characters is one less than the defined length. The length
** characters is one less than the defined length. The length
** specified must therefore be at least 4.
*/
#define MD_SIGNATURE_FIELD_LENGTH 32

/** \mdcfg Mission specific version number for MD application
**
**
** \par Description:
** An application version number consists of four parts:
** major version number, minor version number, revision
Expand All @@ -119,7 +117,7 @@
** Must be defined as a numeric value that is greater than
** or equal to zero.
*/
#define MD_MISSION_REV 0
#define MD_MISSION_REV 0

#endif /* _md_platform_cfg_ */

Expand Down
Loading

0 comments on commit 1952625

Please sign in to comment.