Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

cFE Integration candidate: Equuleus-rc1+dev21 #2617

Merged
merged 9 commits into from
Dec 10, 2024
Merged

cFE Integration candidate: Equuleus-rc1+dev21 #2617

merged 9 commits into from
Dec 10, 2024

Conversation

dzbaker
Copy link
Collaborator

@dzbaker dzbaker commented Dec 10, 2024 •
edited
Loading

Checklist (Please check before submitting)

Describe the contribution

Testing performed
cFS Bundle Checks
cFE Checks

Expected behavior changes
See PRs

System(s) tested on
Ubuntu 20.04

Additional context
Add any other context about the contribution here.

Third party code
If included, identify any third party code and provide text file of license

Contributor Info - All information REQUIRED for consideration of pull request
@thnkslprpt
@tandharia

thnkslprpt and others added 9 commits April 27, 2023 09:44
@thnkslprpt
Fix #1448, Simplify and clarify EVS_AddLog logic
7611318
@thnkslprpt
Fix #1398, Consistent use of CFE_EVS_EventType_Enum_t for EventType
af51f08
@thnkslprpt
Fix #1335, Combine redundant switch case to simplify CFE_ES_CleanupOb…
57c8fe7 
…jectCallback
Fix #2615, Unloading module after failed app start
f35e304
@dzbaker
Merge pull request #2308 from thnkslprpt:fix-1398-consistent-use-of-t…
4d49061 
…ypedef-for-EventType

Fix #1398, Consistent use of CFE_EVS_EventType_Enum_t for EventType
@dzbaker
Merge pull request #2612 from thnkslprpt:fix-1335-combine-redundant-s…
fb8b648 
…witch-case

Fix #1335, Combine redundant switch blocks to simplify CFE_ES_CleanupObjectCallback
@dzbaker
Merge pull request #2616 from tandharia:fix-2615-unloading-module
914ad7a 
Fix #2615, Unloading module after failed app start
@dzbaker
Merge pull request #2309 from thnkslprpt:fix-1448-simplify-EVS_AddLog…
25336b2 
…-logic

Fix #1448, Simplify and clarify EVS_AddLog logic
@dzbaker
Updating documentation and version numbers for equuleus-rc1+dev219
bf05cc8
github-advanced-security[bot]
github-advanced-security bot found potential problems Dec 10, 2024
View reviewed changes
modules/core_api/ut-stubs/src/cfe_evs_stubs.c
@@ -84,14 +84,14 @@
* Generated stub function for CFE_EVS_SendEvent()
* ----------------------------------------------------
*/
CFE_Status_t CFE_EVS_SendEvent(uint16 EventID, uint16 EventType, const char *Spec, ...)
CFE_Status_t CFE_EVS_SendEvent(uint16 EventID, CFE_EVS_EventType_Enum_t EventType, const char *Spec, ...)

Check notice

Code scanning / CodeQL

Long function without assertion Note

All functions of more than 10 lines should have at least one assertion.
modules/core_api/ut-stubs/src/cfe_evs_stubs.c
@@ -106,14 +106,15 @@
* Generated stub function for CFE_EVS_SendEventWithAppID()
* ----------------------------------------------------
*/
CFE_Status_t CFE_EVS_SendEventWithAppID(uint16 EventID, uint16 EventType, CFE_ES_AppId_t AppID, const char *Spec, ...)
CFE_Status_t CFE_EVS_SendEventWithAppID(uint16 EventID, CFE_EVS_EventType_Enum_t EventType, CFE_ES_AppId_t AppID,

Check notice

Code scanning / CodeQL

Long function without assertion Note

All functions of more than 10 lines should have at least one assertion.
modules/core_api/ut-stubs/src/cfe_evs_stubs.c
@@ -129,15 +130,16 @@
* Generated stub function for CFE_EVS_SendTimedEvent()
* ----------------------------------------------------
*/
CFE_Status_t CFE_EVS_SendTimedEvent(CFE_TIME_SysTime_t Time, uint16 EventID, uint16 EventType, const char *Spec, ...)
CFE_Status_t CFE_EVS_SendTimedEvent(CFE_TIME_SysTime_t Time, uint16 EventID, CFE_EVS_EventType_Enum_t EventType,

Check notice

Code scanning / CodeQL

Long function without assertion Note

All functions of more than 10 lines should have at least one assertion.
modules/evs/fsw/src/cfe_evs.c
@@ -116,7 +116,7 @@
* See description in header file for argument/return detail
*
*-----------------------------------------------------------------*/
CFE_Status_t CFE_EVS_SendEvent(uint16 EventID, uint16 EventType, const char *Spec, ...)
CFE_Status_t CFE_EVS_SendEvent(uint16 EventID, CFE_EVS_EventType_Enum_t EventType, const char *Spec, ...)

Check notice

Code scanning / CodeQL

Long function without assertion Note

All functions of more than 10 lines should have at least one assertion.
modules/evs/fsw/src/cfe_evs.c
@@ -166,7 +166,8 @@
* See description in header file for argument/return detail
*
*-----------------------------------------------------------------*/
CFE_Status_t CFE_EVS_SendEventWithAppID(uint16 EventID, uint16 EventType, CFE_ES_AppId_t AppID, const char *Spec, ...)
CFE_Status_t CFE_EVS_SendEventWithAppID(uint16 EventID, CFE_EVS_EventType_Enum_t EventType, CFE_ES_AppId_t AppID,

Check notice

Code scanning / CodeQL

Long function without assertion Note

All functions of more than 10 lines should have at least one assertion.
modules/evs/fsw/src/cfe_evs_utils.c
@@ -184,7 +184,7 @@
* See description in header file for argument/return detail
*
*-----------------------------------------------------------------*/
bool EVS_IsFiltered(EVS_AppData_t *AppDataPtr, uint16 EventID, uint16 EventType)
bool EVS_IsFiltered(EVS_AppData_t *AppDataPtr, uint16 EventID, CFE_EVS_EventType_Enum_t EventType)

Check notice

Code scanning / CodeQL

Long function without assertion Note

All functions of more than 10 lines should have at least one assertion.
modules/evs/fsw/src/cfe_evs_utils.c
@@ -184,7 +184,7 @@
* See description in header file for argument/return detail
*
*-----------------------------------------------------------------*/
bool EVS_IsFiltered(EVS_AppData_t *AppDataPtr, uint16 EventID, uint16 EventType)
bool EVS_IsFiltered(EVS_AppData_t *AppDataPtr, uint16 EventID, CFE_EVS_EventType_Enum_t EventType)

Check notice

Code scanning / CodeQL

Function too long Note

EVS_IsFiltered has too many lines (91, while 60 are allowed).
modules/evs/fsw/src/cfe_evs_utils.c
@@ -449,7 +449,7 @@
* See description in header file for argument/return detail
*
*-----------------------------------------------------------------*/
void EVS_GenerateEventTelemetry(EVS_AppData_t *AppDataPtr, uint16 EventID, uint16 EventType,
void EVS_GenerateEventTelemetry(EVS_AppData_t *AppDataPtr, uint16 EventID, CFE_EVS_EventType_Enum_t EventType,

Check notice

Code scanning / CodeQL

Long function without assertion Note

All functions of more than 10 lines should have at least one assertion.
modules/evs/fsw/src/cfe_evs_utils.c
@@ -449,7 +449,7 @@
* See description in header file for argument/return detail
*
*-----------------------------------------------------------------*/
void EVS_GenerateEventTelemetry(EVS_AppData_t *AppDataPtr, uint16 EventID, uint16 EventType,
void EVS_GenerateEventTelemetry(EVS_AppData_t *AppDataPtr, uint16 EventID, CFE_EVS_EventType_Enum_t EventType,

Check notice

Code scanning / CodeQL

Function too long Note

EVS_GenerateEventTelemetry has too many lines (78, while 60 are allowed).
modules/evs/fsw/src/cfe_evs_utils.c
@@ -592,7 +592,7 @@
* See description in header file for argument/return detail
*
*-----------------------------------------------------------------*/
int32 EVS_SendEvent(uint16 EventID, uint16 EventType, const char *Spec, ...)
int32 EVS_SendEvent(uint16 EventID, CFE_EVS_EventType_Enum_t EventType, const char *Spec, ...)

Check notice

Code scanning / CodeQL

Long function without assertion Note

All functions of more than 10 lines should have at least one assertion.
@dzbaker dzbaker merged commit 2f0e1a2 into main Dec 10, 2024
39 of 40 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@dzbaker @thnkslprpt