Skip to content

Commit d1dac9a

Browse files
authored
Merge pull request #67 from thnkslprpt/fix-66-update-reset-counters-event-type
Fix #66, Update Reset Counters event type to INFO
2 parents a42147c + d12cecb commit d1dac9a

13 files changed

+16
-17
lines changed

.github/pull_request_template.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ A clear and concise description of what the contribution is.
1010
**Testing performed**
1111
Steps taken to test the contribution:
1212
1. Build steps '...'
13-
1. Execution steps '...'
13+
2. Execution steps '...'
1414

1515
**Expected behavior changes**
1616
A clear and concise description of how this contribution will change behavior and level of impact.

.github/workflows/codeql-build.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ name: CodeQl Analysis
33
on:
44
push:
55
pull_request:
6-
6+
77

88
jobs:
99
codeql:
1010
name: Codeql Analysis
1111
uses: nasa/cFS/.github/workflows/codeql-reusable.yml@main
1212
with:
13-
component-path: apps/hk
13+
component-path: apps/hk
1414
prep: 'make prep; make -C build/tools/elf2cfetbl'
1515
make: 'make -C build/native/default_cpu1/apps/hk'
1616
setup: |

.github/workflows/format-check.yml

-1
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,3 @@ jobs:
99
format-check:
1010
name: Run format check
1111
uses: nasa/cFS/.github/workflows/format-check.yml@main
12-

.github/workflows/static-analysis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ jobs:
1010
name: Run cppcheck
1111
uses: nasa/cFS/.github/workflows/static-analysis.yml@main
1212
with:
13-
strict-dir-list: './fsw'
13+
strict-dir-list: './fsw'

docs/dox_src/cfs_hk.dox

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454

5555
This document provides a complete specification for the commands and telemetry associated
5656
with the CFS Housekeeping (HK) application software. The document is intended primarily
57-
for users of the software (operations personal, test engineers, and maintenance personnel).
57+
for users of the software (operations personnel, test engineers, and maintenance personnel).
5858
The last section of the document, the deployment guide section, is intended for mission
5959
developers when deploying and configuring the FM application software for a mission
6060
flight software build environment.

fsw/inc/hk_events.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181
/**
8282
* \brief HK Reset Counters Command Event ID
8383
*
84-
* \par Type: DEBUG
84+
* \par Type: INFORMATION
8585
*
8686
* \par Cause:
8787
*

fsw/inc/hk_extern_typedefs.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@
3333
* Dictates the number of elements in the hk copy table.
3434
*
3535
* \par Limits
36-
* The maximum size of this paramater is 8192
36+
* The maximum size of this parameter is 8192
3737
*/
3838
#define HK_COPY_TABLE_ENTRIES 128
3939

40-
#endif /* HK_EXTERN_TYPEDEFS_H */
40+
#endif /* HK_EXTERN_TYPEDEFS_H */

fsw/inc/hk_platform_cfg.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
* \par Limits
3939
* The minimum size of this parameter is 1
4040
* The maximum size dictated by cFE platform configuration
41-
* parameter CFE_SB_MAX_PIPE_DEPTH
41+
* parameter OS_QUEUE_MAX_DEPTH
4242
*/
4343
#define HK_PIPE_DEPTH 40
4444

fsw/src/hk_app.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -360,7 +360,7 @@ void HK_NoopCmd(const CFE_SB_Buffer_t *BufPtr)
360360
void HK_ResetCountersCmd(const CFE_SB_Buffer_t *BufPtr)
361361
{
362362
HK_ResetHkData();
363-
CFE_EVS_SendEvent(HK_RESET_INF_EID, CFE_EVS_EventType_DEBUG, "HK Reset Counters command received");
363+
CFE_EVS_SendEvent(HK_RESET_INF_EID, CFE_EVS_EventType_INFORMATION, "HK Reset Counters command received");
364364
}
365365

366366
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */

fsw/src/hk_dispatch.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ int32 HK_VerifyCmdLength(const CFE_SB_Buffer_t *BufPtr, size_t ExpectedLength)
6666

6767
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
6868
/* */
69-
/* Verify Non-Command Msg Length (Event is differnt) */
69+
/* Verify Non-Command Msg Length (Event is different) */
7070
/* */
7171
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
7272
int32 HK_VerifyMsgLength(const CFE_SB_Buffer_t *BufPtr, size_t ExpectedLength)

fsw/src/hk_verify.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,10 @@
4343
#endif
4444
/*
4545
* JPH 2015-06-29 - Removed check of:
46-
* HK_PIPE_DEPTH > CFE_SB_MAX_PIPE_DEPTH
46+
* HK_PIPE_DEPTH > OS_QUEUE_MAX_DEPTH
4747
*
4848
* This is not a valid check anymore, as the HK app does not have knowledge
49-
* of CFE_SB_MAX_PIPE_DEPTH. But if the configuration violates this rule it will
49+
* of OS_QUEUE_MAX_DEPTH. But if the configuration violates this rule it will
5050
* show up as an obvious run-time error so the compile-time check is redundant.
5151
*/
5252

unit-test/hk_app_tests.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ uint8 call_count_CFE_EVS_SendEvent;
5050
* Function under test: HK_AppMain
5151
*
5252
* Case: Tests the "nominal" mode where all dependent calls should be
53-
* successful by defaut.
53+
* successful by default.
5454
*/
5555
void Test_HK_AppMain_Success(void)
5656
{
@@ -1028,7 +1028,7 @@ void Test_HK_ResetCountersCmd(void)
10281028

10291029
UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, HK_RESET_INF_EID);
10301030

1031-
UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_DEBUG);
1031+
UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_INFORMATION);
10321032

10331033
strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH);
10341034

unit-test/hk_utils_tests.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1950,7 +1950,7 @@ void UtTest_Setup(void)
19501950
UtTest_Add(Test_HK_ProcessIncomingHkData_MessageError, HK_Test_Setup, HK_Test_TearDown,
19511951
"Test_HK_ProcessIncomingHkData_MessageError");
19521952

1953-
/* Test functions for HK_VaidateHkCopyTable */
1953+
/* Test functions for HK_ValidateHkCopyTable */
19541954
UtTest_Add(Test_HK_ValidateHkCopyTable_Success, HK_Test_Setup, HK_Test_TearDown,
19551955
"Test_HK_ValidateHkCopyTable_Success");
19561956
UtTest_Add(Test_HK_ValidateHkCopyTable_Error, HK_Test_Setup, HK_Test_TearDown, "Test_HK_ValidateHkCopyTable_Error");

0 commit comments

Comments
 (0)