Skip to content

Commit

Permalink
Update to version 2.3.1 Closes #1
Browse files Browse the repository at this point in the history
  • Loading branch information
the-other-james committed Dec 4, 2017
1 parent bb45741 commit 3147be6
Show file tree
Hide file tree
Showing 264 changed files with 42,620 additions and 47,665 deletions.
11 changes: 11 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
cmake_minimum_required(VERSION 2.6.4)
project(CFS_MD C)

include_directories(fsw/mission_inc)
include_directories(fsw/platform_inc)
include_directories(${cfs_lib_MISSION_DIR}/fsw/public_inc)

aux_source_directory(fsw/src APP_SRC_FILES)

# Create the app module
add_cfe_app(md ${APP_SRC_FILES})
18 changes: 9 additions & 9 deletions cfs-md-app-OSS-readme.txt
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
core Flight System (cFS) Memory Dwell Application (MD)
Open Source Release Readme

MD Release 2.3.0
MD Release 2.3.1

Date:
February 27, 2015
July 14, 2017

Introduction:
The Memory Dwell application (MD) is a core Flight System (cFS) application
Expand All @@ -23,12 +23,12 @@ Introduction:
The MD application is written in C and depends on the cFS Operating System
Abstraction Layer (OSAL) and cFE components. To build and run the MD
application, follow the cFS Deployment Guide instructions contained in
cFE-6.4.1-OSS-release/docs. There is additional MD application specific
cFE-6.5.0a-OSS-release/docs. There is additional MD application specific
configuration information contained in the application user's guide
available in cfs-md-2.3.0-OSS-release/docs/users_guide
available in cfs-md-2.3.1-OSS-release/docs/users_guide

There are also "Quick start" instructions provided in
cFE-6.4.1-OSS-release/cfe-OSS-readme.txt
cFE-6.5.0a-OSS-release/cfe-OSS-readme.txt

The OSAL is available at http://sourceforge.net/projects/osal/ and
github.com/nasa/
Expand All @@ -40,21 +40,21 @@ Introduction:


Software Included:
Memory Dwell application (MD) 2.3.0
Memory Dwell application (MD) 2.3.1


Software Required:

Operating System Abstraction Layer 4.1.1 or higher can be
Operating System Abstraction Layer 4.2.0 or higher can be
obtained at http://sourceforge.net/projects/osal or
github.com/nasa/osal

core Flight Executive 6.4.1 or higher can be obtained at
core Flight Executive 6.5.0 or higher can be obtained at
http://sorceforge.net/projects/coreflightexec


Runtime Targets Supported:
The "out of the box" targets in the cFE 6.4.1 distribution include:
The "out of the box" targets in the cFE 6.5.0 distribution include:
1. 32 bit x86 Linux ( CentOS 6.x )
2. Motorola MCP750 PowerPC vxWorks 6.4

Expand Down
Binary file not shown.
Binary file not shown.
935 changes: 469 additions & 466 deletions docs/dox_src/detailed_design/cfs_md.dox

Large diffs are not rendered by default.

46 changes: 23 additions & 23 deletions docs/dox_src/mnem_maps/cfs_md_cmd_mnem_map
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
#---------------------------------------------------------------------------
# Each of the following assignment statements should have the documentation
# mnemonic on the left followed by the mission specific command mnemonic
# on the right of the equals operator.
#
# FORMATTING DETAILS TO REMEMBER!
# 1) ALIASES line MUST have "+=" as the operator
# 2) There CANNOT be spaces around the "=" operator on assignment statements
# 3) Each line, EXCEPT the last, MUST have the line continuation character "\"
# at the end
# 4) NO comments, such as these, can be interspersed within the assignment
# statements
# 5) If there are multiple mnemonics for a particular data point, they should
# be separated by the following ", \b \c " and enclosed in double quotes to
# maintain proper formatting in the documentation. For example:
# ES_RESET="$sc_$cpu_ES_ProcessorReset, \b \c $sc_$cpu_ES_PowerOnReset"
#---------------------------------------------------------------------------
ALIASES += \
MD_NOOP=$sc_$cpu_MD_NOOP \
MD_RESETCTRS=$sc_$cpu_MD_ResetCtrs \
MD_STARTDWELL=$sc_$cpu_MD_StartDwell \
MD_STOPDWELL=$sc_$cpu_MD_StopDwell \
MD_JAMDWELL=$sc_$cpu_MD_JamDwell \
#---------------------------------------------------------------------------
# Each of the following assignment statements should have the documentation
# mnemonic on the left followed by the mission specific command mnemonic
# on the right of the equals operator.
#
# FORMATTING DETAILS TO REMEMBER!
# 1) ALIASES line MUST have "+=" as the operator
# 2) There CANNOT be spaces around the "=" operator on assignment statements
# 3) Each line, EXCEPT the last, MUST have the line continuation character "\"
# at the end
# 4) NO comments, such as these, can be interspersed within the assignment
# statements
# 5) If there are multiple mnemonics for a particular data point, they should
# be separated by the following ", \b \c " and enclosed in double quotes to
# maintain proper formatting in the documentation. For example:
# ES_RESET="$sc_$cpu_ES_ProcessorReset, \b \c $sc_$cpu_ES_PowerOnReset"
#---------------------------------------------------------------------------
ALIASES += \
MD_NOOP=$sc_$cpu_MD_NOOP \
MD_RESETCTRS=$sc_$cpu_MD_ResetCtrs \
MD_STARTDWELL=$sc_$cpu_MD_StartDwell \
MD_STOPDWELL=$sc_$cpu_MD_StopDwell \
MD_JAMDWELL=$sc_$cpu_MD_JamDwell \
MD_SETSIGNATURE=$sc_$cpu_MD_SetSignature
66 changes: 33 additions & 33 deletions docs/dox_src/mnem_maps/cfs_md_tlm_mnem_map
Original file line number Diff line number Diff line change
@@ -1,33 +1,33 @@
#---------------------------------------------------------------------------
# Each of the following assignment statements should have the documentation
# mnemonic on the left followed by the mission specific telemetry mnemonic
# on the right of the equals operator.
#
# FORMATTING DETAILS TO REMEMBER!
# 1) ALIASES line MUST have "+=" as the operator
# 2) There CANNOT be spaces around the "=" operator on assignment statements
# 3) Each line, EXCEPT the last, MUST have the line continuation character "\"
# at the end
# 4) NO comments, such as these, can be interspersed within the assignment
# statements
# 5) If there are multiple mnemonics for a particular data point, they should
# be separated by the following ", \b \c " and enclosed in double quotes to
# maintain proper formatting in the documentation. For example:
# ES_RESET="$sc_$cpu_ES_ProcessorReset, \b \c $sc_$cpu_ES_PowerOnReset"
#---------------------------------------------------------------------------
ALIASES += \
MD_CMDEC=$sc_$cpu_MD_CMDEC \
MD_CMDPC=$sc_$cpu_MD_CMDPC \
MD_ENABLEMASK=$sc_$cpu_MD_EnableMask \
MD_ADDRCNT=$sc_$cpu_MD_AddrCnt[MD_NUM_DWELL_TABLES] \
MD_RATES=$sc_$cpu_MD_Rate[MD_NUM_DWELL_TABLES] \
MD_DATASIZE=$sc_$cpu_MD_DataSize[MD_NUM_DWELL_TABLES] \
MD_DWPKTOFFSET=$sc_$cpu_MD_DwPktOffset[MD_NUM_DWELL_TABLES] \
MD_DWTBLENTRY=$sc_$cpu_MD_DwTblEntry[MD_NUM_DWELL_TABLES] \
MD_COUNTDOWN=$sc_$cpu_MD_CountDown[MD_NUM_DWELL_TABLES] \
MD_TABLEID="$sc_$cpu_MD_DwlPkt1TableId, \b \c $sc_$cpu_MD_DwlPkt2TableId, \b \c $sc_$cpu_MD_DwlPkt3TableId, \b \c $sc_$cpu_MD_DwlPkt4TableId" \
MD_NUMADDRESSES="$sc_$cpu_MD_DwlPkt1NumAddresses, \b \c $sc_$cpu_MD_DwlPkt2NumAddresses, \b \c $sc_$cpu_MD_DwlPkt3NumAddresses, \b \c $sc_$cpu_MD_DwlPkt4NumAddresses" \
MD_PKTDATASIZE="$sc_$cpu_MD_DwlPkt1PktDataSize, \b \c $sc_$cpu_MD_DwlPkt2PktDataSize, \b \c $sc_$cpu_MD_DwlPkt3PktDataSize, \b \c $sc_$cpu_MD_DwlPkt4PktDataSize" \
MD_RATE="$sc_$cpu_MD_DwlPkt1Rate, \b \c $sc_$cpu_MD_DwlPkt2Rate, \b \c $sc_$cpu_MD_DwlPkt3Rate, \b \c $sc_$cpu_MD_DwlPkt4Rate" \
MD_SIGNATURE="$sc_$cpu_MD_DwlPkt1Signature[MD_SIGNATURE_FIELD_LENGTH], \b \c $sc_$cpu_MD_DwlPkt2Signature[\b \c ], \b \c $sc_$cpu_MD_DwlPkt3Signature[\b \c ], \b \c $sc_$cpu_MD_DwlPkt4Signature[\b \c ]" \
MD_DWELLDATA="$sc_$cpu_MD_DwlPkt1DwellData[MD_DWELL_TABLE_SIZE*4], \b \c $sc_$cpu_MD_DwlPkt2DwellData[\b \c ], \b \c $sc_$cpu_MD_DwlPkt3DwellData[\b \c ], \b \c $sc_$cpu_MD_DwlPkt4DwellData[\b \c ]"
#---------------------------------------------------------------------------
# Each of the following assignment statements should have the documentation
# mnemonic on the left followed by the mission specific telemetry mnemonic
# on the right of the equals operator.
#
# FORMATTING DETAILS TO REMEMBER!
# 1) ALIASES line MUST have "+=" as the operator
# 2) There CANNOT be spaces around the "=" operator on assignment statements
# 3) Each line, EXCEPT the last, MUST have the line continuation character "\"
# at the end
# 4) NO comments, such as these, can be interspersed within the assignment
# statements
# 5) If there are multiple mnemonics for a particular data point, they should
# be separated by the following ", \b \c " and enclosed in double quotes to
# maintain proper formatting in the documentation. For example:
# ES_RESET="$sc_$cpu_ES_ProcessorReset, \b \c $sc_$cpu_ES_PowerOnReset"
#---------------------------------------------------------------------------
ALIASES += \
MD_CMDEC=$sc_$cpu_MD_CMDEC \
MD_CMDPC=$sc_$cpu_MD_CMDPC \
MD_ENABLEMASK=$sc_$cpu_MD_EnableMask \
MD_ADDRCNT=$sc_$cpu_MD_AddrCnt[MD_NUM_DWELL_TABLES] \
MD_RATES=$sc_$cpu_MD_Rate[MD_NUM_DWELL_TABLES] \
MD_DATASIZE=$sc_$cpu_MD_DataSize[MD_NUM_DWELL_TABLES] \
MD_DWPKTOFFSET=$sc_$cpu_MD_DwPktOffset[MD_NUM_DWELL_TABLES] \
MD_DWTBLENTRY=$sc_$cpu_MD_DwTblEntry[MD_NUM_DWELL_TABLES] \
MD_COUNTDOWN=$sc_$cpu_MD_CountDown[MD_NUM_DWELL_TABLES] \
MD_TABLEID="$sc_$cpu_MD_DwlPkt1TableId, \b \c $sc_$cpu_MD_DwlPkt2TableId, \b \c $sc_$cpu_MD_DwlPkt3TableId, \b \c $sc_$cpu_MD_DwlPkt4TableId" \
MD_NUMADDRESSES="$sc_$cpu_MD_DwlPkt1NumAddresses, \b \c $sc_$cpu_MD_DwlPkt2NumAddresses, \b \c $sc_$cpu_MD_DwlPkt3NumAddresses, \b \c $sc_$cpu_MD_DwlPkt4NumAddresses" \
MD_PKTDATASIZE="$sc_$cpu_MD_DwlPkt1PktDataSize, \b \c $sc_$cpu_MD_DwlPkt2PktDataSize, \b \c $sc_$cpu_MD_DwlPkt3PktDataSize, \b \c $sc_$cpu_MD_DwlPkt4PktDataSize" \
MD_RATE="$sc_$cpu_MD_DwlPkt1Rate, \b \c $sc_$cpu_MD_DwlPkt2Rate, \b \c $sc_$cpu_MD_DwlPkt3Rate, \b \c $sc_$cpu_MD_DwlPkt4Rate" \
MD_SIGNATURE="$sc_$cpu_MD_DwlPkt1Signature[MD_SIGNATURE_FIELD_LENGTH], \b \c $sc_$cpu_MD_DwlPkt2Signature[\b \c ], \b \c $sc_$cpu_MD_DwlPkt3Signature[\b \c ], \b \c $sc_$cpu_MD_DwlPkt4Signature[\b \c ]" \
MD_DWELLDATA="$sc_$cpu_MD_DwlPkt1DwellData[MD_DWELL_TABLE_SIZE*4], \b \c $sc_$cpu_MD_DwlPkt2DwellData[\b \c ], \b \c $sc_$cpu_MD_DwlPkt3DwellData[\b \c ], \b \c $sc_$cpu_MD_DwlPkt4DwellData[\b \c ]"
Loading

0 comments on commit 3147be6

Please sign in to comment.