diff --git a/docs/dox_src/cfs_lc.dox b/docs/dox_src/cfs_lc.dox index 7f74e44..1f396c3 100644 --- a/docs/dox_src/cfs_lc.dox +++ b/docs/dox_src/cfs_lc.dox @@ -181,11 +181,11 @@ commands as a response to this condition. Actionpoints can be individually enabled/disabled with the #LC_SET_AP_STATE_CC ground - command. The state of an actionpoint may be set to #LC_APSTATE_ACTIVE, #LC_APSTATE_PASSIVE, - or #LC_APSTATE_DISABLED. These states operate in the same way as the application operating - modes described above. #LC_APSTATE_PASSIVE will just disable RTS requests, while - #LC_APSTATE_DISABLED will stop evaluation of the actionpoint all together. An additional - state #LC_APSTATE_PERMOFF which functions the same as #LC_APSTATE_DISABLED but can only + command. The state of an actionpoint may be set to #LC_ActionPointState_ACTIVE, #LC_ActionPointState_PASSIVE, + or #LC_ActionPointState_DISABLED. These states operate in the same way as the application operating + modes described above. #LC_ActionPointState_PASSIVE will just disable RTS requests, while + #LC_ActionPointState_DISABLED will stop evaluation of the actionpoint all together. An additional + state #LC_ActionPointState_PERMOFF which functions the same as #LC_ActionPointState_DISABLED but can only be changed via table load, can be set using the #LC_SET_AP_PERM_OFF_CC ground command (see \ref cfslcfaqs). @@ -259,7 +259,7 @@ In the lc_platform_cfg.h file, there are configuration parameters that control use of the Critical Data Store (CDS) and the LC operation mode on application initialization. The default case is not to use the CDS and to set the application - state to #LC_STATE_DISABLED. + state to #LC_AppState_DISABLED. **/ /** @@ -300,10 +300,10 @@ the WDT parameter DataType to #LC_DATA_WATCH_NOT_USED. The entire ADT is processed anytime a sample request is received that specifies an - actionpoint equal to #LC_ALL_ACTIONPOINTS. For this reason, it is important that unused - entries are properly marked by setting the ADT parameter DefaultState to - #LC_APSTATE_NOT_USED. - + actionpoint equal to #LC_ALL_ACTIONPOINTS. For this reason, it is important that unused + entries are properly marked by setting the ADT parameter DefaultState to + #LC_ActionPoint_NOT_USED. + When either the WDT or ADT are updated, the corresponding results table (WRT or ART) is reset to initialization values. For each entry in the WRT, WatchResult is set to #LC_WATCH_STALE and all other values are zeroed. For each entry in the ART, @@ -520,12 +520,12 @@

#LC_ACTION_STALE is an initialization value for the Actionpoint Results Table. If an actionpoint has this ActionResult then one of - three possible conditions are true: - - 1) The actionpoint is unused (the DefaultState in the ADT is set to - #LC_APSTATE_NOT_USED). - - 2) An actionpoint sample request (#LC_SAMPLE_AP_MID) targeting the AP has not + three possible conditions are true: + + 1) The actionpoint is unused (the DefaultState in the ADT is set to + #LC_ActionPoint_NOT_USED). + + 2) An actionpoint sample request (#LC_SAMPLE_AP_MID) targeting the AP has not yet been received by LC so the AP has not yet been evaluated. 3) One or more of the watchpoints that this AP depends on (as defined by @@ -551,27 +551,27 @@ (Q) - How does the Actionpoint state #LC_APSTATE_PERMOFF differ from - #LC_APSTATE_DISABLED? + How does the Actionpoint state #LC_ActionPointState_PERMOFF differ from + #LC_ActionPointState_DISABLED?

- The AP state #LC_APSTATE_PERMOFF is intended to provide a way to disable + The AP state #LC_ActionPointState_PERMOFF is intended to provide a way to disable an AP so it can not easily be turned back on by mistake. Such actionpoints may not be needed after a seperation sequence or only apply to certain mission phases. While the two states are treated the same way during actionpoint processing (the AP isn't evaluated), there are a few differences. - - An AP can't be set to #LC_APSTATE_PERMOFF with the #LC_SET_AP_STATE_CC command, + + An AP can't be set to #LC_ActionPointState_PERMOFF with the #LC_SET_AP_STATE_CC command, it must be done with the #LC_SET_AP_PERM_OFF_CC command. - - To set an AP to #LC_APSTATE_PERMOFF with the #LC_SET_AP_PERM_OFF_CC command, the - current AP state must be #LC_APSTATE_DISABLED. - + + To set an AP to #LC_ActionPointState_PERMOFF with the #LC_SET_AP_PERM_OFF_CC command, the + current AP state must be #LC_ActionPointState_DISABLED. + The #LC_SET_AP_PERM_OFF_CC command can only be issued for a single actionpoint, #LC_ALL_ACTIONPOINTS is not valid as an argument for this command. - - Once an AP is set to #LC_APSTATE_PERMOFF, it can only be changed with a new ADT + + Once an AP is set to #LC_ActionPointState_PERMOFF, it can only be changed with a new ADT table load. @@ -592,7 +592,7 @@ #LC_HKAR_STATE_NOT_USED, #LC_HKAR_STATE_ACTIVE, #LC_HKAR_STATE_PASSIVE, #LC_HKAR_STATE_DISABLED - An actionpoint whose current state is #LC_APSTATE_PERMOFF will have it's + An actionpoint whose current state is #LC_ActionPointState_PERMOFF will have it's state reported in the APResults as #LC_HKAR_STATE_NOT_USED. The numerical 2 bit values for evaluation results are defined using the @@ -614,10 +614,11 @@ Will an RTS get requested more than once if an AP stays in the #LC_ACTION_FAIL state?

- No. Assuming the current state of an actionpoint is #LC_APSTATE_ACTIVE, then + No. Assuming the current state of an actionpoint is #LC_ActionPointState_ACTIVE, then when the actionpoint fails enough times to trigger an RTS, the state is set - to #LC_APSTATE_PASSIVE. - + to #LC_ActionPointState_PASSIVE. + +>>>>>>> ad7c0e7 (Fix #16, Convert LC state macros to enums) In the passive state, the AP will continue to be sampled and statistics updated, but no RTS requests will be initiated. diff --git a/fsw/inc/lc_events.h b/fsw/inc/lc_events.h index f9cb419..0018c5e 100644 --- a/fsw/inc/lc_events.h +++ b/fsw/inc/lc_events.h @@ -448,7 +448,7 @@ * * This event message is issued when the #LC_SET_AP_STATE_CC command * has been received and the current actionpoint state is either - * #LC_APSTATE_NOT_USED or #LC_APSTATE_PERMOFF which can only be changed + * #LC_ActionPoint_NOT_USED or #LC_ActionPointState_PERMOFF which can only be changed * with a table load. */ #define LC_APSTATE_CURR_ERR_EID 31 @@ -498,7 +498,7 @@ * * This event message is issued when the #LC_SET_AP_PERM_OFF_CC command * has been received and the current actionpoint state is not - * #LC_APSTATE_DISABLED + * #LC_ActionPointState_DISABLED */ #define LC_APOFF_CURR_ERR_EID 35 @@ -772,7 +772,7 @@ * * This event message is issued when the #LC_SAMPLE_AP_MID message * has been received and the current state for the specified - * actionpoint state is either #LC_APSTATE_NOT_USED or #LC_APSTATE_PERMOFF. + * actionpoint state is either #LC_ActionPoint_NOT_USED or #LC_ActionPointState_PERMOFF. */ #define LC_APSAMPLE_CURR_ERR_EID 57 @@ -796,7 +796,7 @@ * \par Cause: * * This event message is issued when an actionpoint fails evaluation while - * the LC task operating state is #LC_STATE_PASSIVE + * the LC task operating state is #LC_AppState_PASSIVE */ #define LC_PASSIVE_FAIL_DBG_EID 59 @@ -808,7 +808,7 @@ * \par Cause: * * This event message is issued when an actionpoint fails evaluation while - * the actionpoint state is #LC_APSTATE_PASSIVE + * the actionpoint state is #LC_ActionPointState_PASSIVE */ #define LC_AP_PASSIVE_FAIL_INF_EID 60 diff --git a/fsw/inc/lc_msg.h b/fsw/inc/lc_msg.h index 1359e16..cb5a933 100644 --- a/fsw/inc/lc_msg.h +++ b/fsw/inc/lc_msg.h @@ -183,8 +183,8 @@ typedef struct uint8 APResults[LC_HKAR_NUM_BYTES]; /**< \brief Packed actionpoint results data, 4 bits per actionpoint */ uint16 PassiveRTSExecCount; /**< \brief Total count of RTS sequences not initiated because the LC state is - * set to #LC_STATE_PASSIVE or the state of the actionpoint that failed - * is set to #LC_APSTATE_PASSIVE + * set to #LC_AppState_PASSIVE or the state of the actionpoint that failed + * is set to #LC_ActionPointState_PASSIVE */ uint16 WPsInUse; /**< \brief How many watchpoints are currently in effect */ diff --git a/fsw/inc/lc_msgdefs.h b/fsw/inc/lc_msgdefs.h index e16b37f..662d18f 100644 --- a/fsw/inc/lc_msgdefs.h +++ b/fsw/inc/lc_msgdefs.h @@ -39,30 +39,40 @@ #include /************************************************************************ - * Macro Definitions + * Type Definitions ************************************************************************/ /** * \name LC Application States * \{ */ -#define LC_STATE_ACTIVE 1 /**< \brief LC Application State Active */ -#define LC_STATE_PASSIVE 2 /**< \brief LC Application State Pasive */ -#define LC_STATE_DISABLED 3 /**< \brief LC Application State Disabled */ -#define LC_STATE_FROM_CDS 4 /**< \brief Used for reset processing, not valid state */ +typedef enum LC_AppState_Enum +{ + LC_AppState_ACTIVE = 1, /**< \brief LC Application State Active */ + LC_AppState_PASSIVE, /**< \brief LC Application State Pasive */ + LC_AppState_DISABLED, /**< \brief LC Application State Disabled */ + LC_AppState_FROM_CDS /**< \brief Used for reset processing, not valid state */ +} LC_AppState_Enum_t; /**\}*/ /** * \name Actionpoint States * \{ */ -#define LC_APSTATE_NOT_USED 0xFF /**< \brief Actionpoint unused, not valid command argument */ -#define LC_APSTATE_ACTIVE 1 /**< \brief Actionpoint state active */ -#define LC_APSTATE_PASSIVE 2 /**< \brief Actionpoint state passive */ -#define LC_APSTATE_DISABLED 3 /**< \brief Actionpoint state disabled */ -#define LC_APSTATE_PERMOFF 4 /**< \brief Actionpoint state permanently off, see #LC_SET_AP_PERM_OFF_CC */ +typedef enum LC_ActionPointState_Enum +{ + LC_ActionPointState_ACTIVE = 1, /**< \brief Actionpoint state active */ + LC_ActionPointState_PASSIVE, /**< \brief Actionpoint state passive */ + LC_ActionPointState_DISABLED, /**< \brief Actionpoint state disabled */ + LC_ActionPointState_PERMOFF, /**< \brief Actionpoint state permanently off, see #LC_SET_AP_PERMOFF_CC */ + LC_ActionPoint_NOT_USED = 255 /**< \brief Actionpoint unused, not valid command argument */ +} LC_ActionPointState_Enum_t; /**\}*/ +/************************************************************************ + * Macro Definitions + ************************************************************************/ + /** * \name Special Values for Commands * \{ @@ -238,8 +248,8 @@ * - Invalid actionpoint state specified in command message * - Actionpoint number specified in command message is * out of range - * - Actionpoint current state is either #LC_APSTATE_NOT_USED - * or #LC_APSTATE_PERMOFF + * - Actionpoint current state is either #LC_ActionPoint_NOT_USED + * or #LC_ActionPointState_PERMOFF * * \par Evidence of failure may be found in the following telemetry: * - #LC_HkPacket_t.CmdErrCount will increment @@ -258,7 +268,7 @@ * \brief Set AP Permanently Off * * \par Description - * Set the specified actionpoint's state to #LC_APSTATE_PERMOFF + * Set the specified actionpoint's state to #LC_ActionPointState_PERMOFF * * \par Command Structure * #LC_SetAPPermOff_t @@ -275,7 +285,7 @@ * - Command packet length not as expected * - Actionpoint number specified in command message is * out of range - * - Actionpoint current state is not #LC_APSTATE_DISABLED + * - Actionpoint current state is not #LC_ActionPointState_DISABLED * * \par Evidence of failure may be found in the following telemetry: * - #LC_HkPacket_t.CmdErrCount will increment @@ -361,7 +371,7 @@ #ifndef LC_OMIT_DEPRECATED #define LC_SET_AP_PERMOFF_CC LC_SET_AP_PERM_OFF_CC -#define LC_ACTION_NOT_USED LC_APSTATE_NOT_USED +#define LC_ACTION_NOT_USED LC_ActionPoint_NOT_USED #endif #endif diff --git a/fsw/inc/lc_platform_cfg.h b/fsw/inc/lc_platform_cfg.h index 569e71a..0798564 100644 --- a/fsw/inc/lc_platform_cfg.h +++ b/fsw/inc/lc_platform_cfg.h @@ -120,11 +120,11 @@ * * \par Limits: * This parameter must be one of the following: - * #LC_STATE_ACTIVE - * #LC_STATE_PASSIVE - * #LC_STATE_DISABLED + * #LC_AppState_ACTIVE + * #LC_AppState_PASSIVE + * #LC_AppState_DISABLED */ -#define LC_STATE_POWER_ON_RESET LC_STATE_DISABLED +#define LC_STATE_POWER_ON_RESET LC_AppState_DISABLED /** * \brief Save data to CDS compiler switch @@ -152,19 +152,19 @@ * is set to true, and provides a way to override any state LC * may have been operating in prior to the reset occurring. * - * If this is set to LC_STATE_FROM_CDS and LC_SAVE_TO_CDS is set + * If this is set to LC_AppState_FROM_CDS and LC_SAVE_TO_CDS is set * to true, then the LC state will be preserved across resets and - * restored. If this is not set to LC_STATE_FROM_CDS, the state + * restored. If this is not set to LC_AppState_FROM_CDS, the state * saved in the CDS is overwritten by the state assigned here. * * \par Limits: * This parameter must be one of the following: - * #LC_STATE_ACTIVE - * #LC_STATE_PASSIVE - * #LC_STATE_DISABLED - * #LC_STATE_FROM_CDS + * #LC_AppState_ACTIVE + * #LC_AppState_PASSIVE + * #LC_AppState_DISABLED + * #LC_AppState_FROM_CDS */ -#define LC_STATE_WHEN_CDS_RESTORED LC_STATE_FROM_CDS +#define LC_STATE_WHEN_CDS_RESTORED LC_AppState_FROM_CDS /** * \brief Watchpoint Definition Table (WDT) filename diff --git a/fsw/inc/lc_tbl.h b/fsw/inc/lc_tbl.h index e7ca8a0..1b951e0 100644 --- a/fsw/inc/lc_tbl.h +++ b/fsw/inc/lc_tbl.h @@ -47,12 +47,12 @@ typedef struct { uint32 Value; /**< \brief Watchpoint value at comparison that caused - the transition */ - uint8 DataType; /**< \brief Same as Watchpoint Data Type (enumerated) */ + the transition */ + uint8 DataType; /**< \brief Same as Watchpoint Data Type (enumerated) */ uint8 Padding[3]; /**< \brief Structure padding */ - CFE_TIME_SysTime_t Timestamp; /**< \brief Timstamp when the transition was detected */ + CFE_TIME_SysTime_t Timestamp; /**< \brief Timstamp when the transition was detected */ } LC_WRTTransition_t; /** @@ -61,23 +61,23 @@ typedef struct typedef struct { uint8 WatchResult; /**< \brief Result for the last evaluation of this - watchpoint (enumerated) */ + watchpoint (enumerated) */ uint8 Padding[3]; /**< \brief Structure padding */ uint32 CountdownToStale; /**< \brief Number of LC Sample Actionpoint commands still to be processed - before WatchResult becomes stale */ + before WatchResult becomes stale */ uint32 EvaluationCount; /**< \brief How many times this watchpoint has - been evaluated */ + been evaluated */ uint32 FalseToTrueCount; /**< \brief How many times this watchpoint has - transitioned from FALSE to TRUE */ + transitioned from FALSE to TRUE */ uint32 ConsecutiveTrueCount; /**< \brief Number of consecutive times this - watchpoint has evaluated to TRUE */ + watchpoint has evaluated to TRUE */ uint32 CumulativeTrueCount; /**< \brief Total number of times this watchpoint - has evaluated to TRUE */ - LC_WRTTransition_t LastFalseToTrue; /**< \brief Last transition from FALSE to TRUE */ - LC_WRTTransition_t LastTrueToFalse; /**< \brief Last transition from TRUE to FALSE */ + has evaluated to TRUE */ + LC_WRTTransition_t LastFalseToTrue; /**< \brief Last transition from FALSE to TRUE */ + LC_WRTTransition_t LastTrueToFalse; /**< \brief Last transition from TRUE to FALSE */ } LC_WRTEntry_t; /** @@ -85,9 +85,9 @@ typedef struct */ typedef struct { - uint8 ActionResult; /**< \brief Result for the last sample of this - actionpoint */ - uint8 CurrentState; /**< \brief Current state of this actionpoint */ + uint8 ActionResult; /**< \brief Result for the last sample of this actionpoint */ + + uint8 CurrentState; /**< \brief Current state of this actionpoint */ uint16 Padding; /**< \brief Structure padding */ diff --git a/fsw/src/lc_action.c b/fsw/src/lc_action.c index 1f03662..6a48737 100644 --- a/fsw/src/lc_action.c +++ b/fsw/src/lc_action.c @@ -51,7 +51,7 @@ void LC_SampleAPs(uint16 StartIndex, uint16 EndIndex) { CurrentAPState = LC_OperData.ARTPtr[StartIndex].CurrentState; - if ((CurrentAPState != LC_APSTATE_NOT_USED) && (CurrentAPState != LC_APSTATE_PERMOFF)) + if ((CurrentAPState != LC_ActionPoint_NOT_USED) && (CurrentAPState != LC_ActionPointState_PERMOFF)) { /* ** Sample the specified actionpoint @@ -101,7 +101,7 @@ void LC_SampleSingleAP(uint16 APNumber) */ CurrentAPState = LC_OperData.ARTPtr[APNumber].CurrentState; - if ((CurrentAPState == LC_APSTATE_ACTIVE) || (CurrentAPState == LC_APSTATE_PASSIVE)) + if ((CurrentAPState == LC_ActionPointState_ACTIVE) || (CurrentAPState == LC_ActionPointState_PASSIVE)) { /* ** Evaluate the actionpoint and update the results @@ -146,14 +146,14 @@ void LC_SampleSingleAP(uint16 APNumber) /* ** We have failed enough times to request the RTS */ - if (CurrentAPState == LC_APSTATE_ACTIVE) + if (CurrentAPState == LC_ActionPointState_ACTIVE) { /* ** Actions go to passive after they've failed */ - LC_OperData.ARTPtr[APNumber].CurrentState = LC_APSTATE_PASSIVE; + LC_OperData.ARTPtr[APNumber].CurrentState = LC_ActionPointState_PASSIVE; - if (LC_AppData.CurrentLCState == LC_STATE_ACTIVE) + if (LC_AppData.CurrentLCState == LC_AppState_ACTIVE) { /* ** If the LC application state is active, request the @@ -511,15 +511,15 @@ int32 LC_ValidateADT(void *TableData) RPNPtr = TableArray[TableIndex].RPNEquation; EventType = TableArray[TableIndex].EventType; - if (DefaultState == LC_APSTATE_NOT_USED) + if (DefaultState == LC_ActionPoint_NOT_USED) { /* ** Unused table entry */ UnusedCount++; } - else if ((DefaultState != LC_APSTATE_ACTIVE) && (DefaultState != LC_APSTATE_PASSIVE) && - (DefaultState != LC_APSTATE_DISABLED) && (DefaultState != LC_APSTATE_PERMOFF)) + else if ((DefaultState != LC_ActionPointState_ACTIVE) && (DefaultState != LC_ActionPointState_PASSIVE) && + (DefaultState != LC_ActionPointState_DISABLED) && (DefaultState != LC_ActionPointState_PERMOFF)) { /* ** Invalid default state diff --git a/fsw/src/lc_app.c b/fsw/src/lc_app.c index a8b9307..9f3b109 100644 --- a/fsw/src/lc_app.c +++ b/fsw/src/lc_app.c @@ -831,7 +831,7 @@ int32 LC_CreateTaskCDS(void) ** May need to override the restored application state */ -#if LC_STATE_WHEN_CDS_RESTORED != LC_STATE_FROM_CDS +#if LC_STATE_WHEN_CDS_RESTORED != LC_AppState_FROM_CDS LC_AppData.CurrentLCState = LC_STATE_WHEN_CDS_RESTORED; #endif } diff --git a/fsw/src/lc_app.h b/fsw/src/lc_app.h index 9fcb5ad..03e1f0a 100644 --- a/fsw/src/lc_app.h +++ b/fsw/src/lc_app.h @@ -191,9 +191,9 @@ typedef struct uint32 RTSExecCount; /**< \brief Total count of RTS sequences initiated */ uint16 PassiveRTSExecCount; /**< \brief Total count of RTS sequences not initiated because the LC state is - set to #LC_STATE_PASSIVE or the state + set to #LC_AppState_PASSIVE or the state of the actionpoint that failed is set to - #LC_APSTATE_PASSIVE */ + #LC_ActionPointState_PASSIVE */ uint16 CDSSavedOnExit; /**< \brief Variable that tells us if we exited clean or not */ uint8 CurrentLCState; /**< \brief Current LC application operating state */ diff --git a/fsw/src/lc_cmds.c b/fsw/src/lc_cmds.c index 0acd6a0..dc1d337 100644 --- a/fsw/src/lc_cmds.c +++ b/fsw/src/lc_cmds.c @@ -145,7 +145,7 @@ void LC_SampleAPReq(const CFE_SB_Buffer_t *BufPtr) /* ** Ignore AP sample requests if disabled at the application level */ - if (LC_AppData.CurrentLCState != LC_STATE_DISABLED) + if (LC_AppData.CurrentLCState != LC_AppState_DISABLED) { /* ** Range check the actionpoint array index arguments @@ -361,20 +361,20 @@ int32 LC_HousekeepingReq(const CFE_MSG_CommandHeader_t *MsgPtr) */ switch (LC_OperData.ARTPtr[TableIndex + 1].CurrentState) { - case LC_APSTATE_NOT_USED: + case LC_ActionPoint_NOT_USED: ByteData = LC_HKAR_STATE_NOT_USED << 6; break; - case LC_APSTATE_ACTIVE: + case LC_ActionPointState_ACTIVE: ByteData = LC_HKAR_STATE_ACTIVE << 6; LC_OperData.HkPacket.ActiveAPs++; break; - case LC_APSTATE_PASSIVE: + case LC_ActionPointState_PASSIVE: ByteData = LC_HKAR_STATE_PASSIVE << 6; break; - case LC_APSTATE_DISABLED: + case LC_ActionPointState_DISABLED: ByteData = LC_HKAR_STATE_DISABLED << 6; break; @@ -383,7 +383,7 @@ int32 LC_HousekeepingReq(const CFE_MSG_CommandHeader_t *MsgPtr) ** as unused. We should never get an undefined ** action state, but we'll set to not used if we do. */ - case LC_APSTATE_PERMOFF: + case LC_ActionPointState_PERMOFF: default: ByteData = LC_HKAR_STATE_NOT_USED << 6; break; @@ -421,24 +421,24 @@ int32 LC_HousekeepingReq(const CFE_MSG_CommandHeader_t *MsgPtr) */ switch (LC_OperData.ARTPtr[TableIndex].CurrentState) { - case LC_APSTATE_NOT_USED: + case LC_ActionPoint_NOT_USED: ByteData = (ByteData | (LC_HKAR_STATE_NOT_USED << 2)); break; - case LC_APSTATE_ACTIVE: + case LC_ActionPointState_ACTIVE: ByteData = (ByteData | (LC_HKAR_STATE_ACTIVE << 2)); LC_OperData.HkPacket.ActiveAPs++; break; - case LC_APSTATE_PASSIVE: + case LC_ActionPointState_PASSIVE: ByteData = (ByteData | (LC_HKAR_STATE_PASSIVE << 2)); break; - case LC_APSTATE_DISABLED: + case LC_ActionPointState_DISABLED: ByteData = (ByteData | (LC_HKAR_STATE_DISABLED << 2)); break; - case LC_APSTATE_PERMOFF: + case LC_ActionPointState_PERMOFF: default: ByteData = (ByteData | (LC_HKAR_STATE_NOT_USED << 2)); break; @@ -569,9 +569,9 @@ void LC_SetLCStateCmd(const CFE_SB_Buffer_t *BufPtr) switch (CmdPtr->NewLCState) { - case LC_STATE_ACTIVE: - case LC_STATE_PASSIVE: - case LC_STATE_DISABLED: + case LC_AppState_ACTIVE: + case LC_AppState_PASSIVE: + case LC_AppState_DISABLED: LC_AppData.CurrentLCState = CmdPtr->NewLCState; LC_AppData.CmdCount++; @@ -618,9 +618,9 @@ void LC_SetAPStateCmd(const CFE_SB_Buffer_t *BufPtr) */ switch (CmdPtr->NewAPState) { - case LC_APSTATE_ACTIVE: - case LC_APSTATE_PASSIVE: - case LC_APSTATE_DISABLED: + case LC_ActionPointState_ACTIVE: + case LC_ActionPointState_PASSIVE: + case LC_ActionPointState_DISABLED: break; default: @@ -648,7 +648,7 @@ void LC_SetAPStateCmd(const CFE_SB_Buffer_t *BufPtr) { CurrentAPState = LC_OperData.ARTPtr[TableIndex].CurrentState; - if ((CurrentAPState != LC_APSTATE_NOT_USED) && (CurrentAPState != LC_APSTATE_PERMOFF)) + if ((CurrentAPState != LC_ActionPoint_NOT_USED) && (CurrentAPState != LC_ActionPointState_PERMOFF)) { LC_OperData.ARTPtr[TableIndex].CurrentState = CmdPtr->NewAPState; } @@ -666,7 +666,7 @@ void LC_SetAPStateCmd(const CFE_SB_Buffer_t *BufPtr) TableIndex = CmdPtr->APNumber; CurrentAPState = LC_OperData.ARTPtr[TableIndex].CurrentState; - if ((CurrentAPState != LC_APSTATE_NOT_USED) && (CurrentAPState != LC_APSTATE_PERMOFF)) + if ((CurrentAPState != LC_ActionPoint_NOT_USED) && (CurrentAPState != LC_ActionPointState_PERMOFF)) { /* ** Update state for single actionpoint specified @@ -756,7 +756,7 @@ void LC_SetAPPermOffCmd(const CFE_SB_Buffer_t *BufPtr) TableIndex = CmdPtr->APNumber; CurrentAPState = LC_OperData.ARTPtr[TableIndex].CurrentState; - if (CurrentAPState != LC_APSTATE_DISABLED) + if (CurrentAPState != LC_ActionPointState_DISABLED) { /* ** Actionpoints can only be turned permanently off if @@ -773,7 +773,7 @@ void LC_SetAPPermOffCmd(const CFE_SB_Buffer_t *BufPtr) /* ** Update state for actionpoint specified */ - LC_OperData.ARTPtr[TableIndex].CurrentState = LC_APSTATE_PERMOFF; + LC_OperData.ARTPtr[TableIndex].CurrentState = LC_ActionPointState_PERMOFF; LC_AppData.CmdCount++; diff --git a/fsw/src/lc_verify.h b/fsw/src/lc_verify.h index c7f0f0e..e168391 100644 --- a/fsw/src/lc_verify.h +++ b/fsw/src/lc_verify.h @@ -106,8 +106,8 @@ */ #ifndef LC_STATE_POWER_ON_RESET #error LC_STATE_POWER_ON_RESET must be defined! -#elif (LC_STATE_POWER_ON_RESET != LC_STATE_ACTIVE) && (LC_STATE_POWER_ON_RESET != LC_STATE_PASSIVE) && \ - (LC_STATE_POWER_ON_RESET != LC_STATE_DISABLED) +#elif (LC_STATE_POWER_ON_RESET != LC_AppState_ACTIVE) && (LC_STATE_POWER_ON_RESET != LC_AppState_PASSIVE) && \ + (LC_STATE_POWER_ON_RESET != LC_AppState_DISABLED) #error LC_STATE_POWER_ON_RESET must be defined as a supported enumerated type #endif @@ -116,8 +116,8 @@ */ #ifndef LC_STATE_WHEN_CDS_RESTORED #error LC_STATE_WHEN_CDS_RESTORED must be defined! -#elif (LC_STATE_WHEN_CDS_RESTORED != LC_STATE_ACTIVE) && (LC_STATE_WHEN_CDS_RESTORED != LC_STATE_PASSIVE) && \ - (LC_STATE_WHEN_CDS_RESTORED != LC_STATE_DISABLED) && (LC_STATE_WHEN_CDS_RESTORED != LC_STATE_FROM_CDS) +#elif (LC_STATE_WHEN_CDS_RESTORED != LC_AppState_ACTIVE) && (LC_STATE_WHEN_CDS_RESTORED != LC_AppState_PASSIVE) && \ + (LC_STATE_WHEN_CDS_RESTORED != LC_AppState_DISABLED) && (LC_STATE_WHEN_CDS_RESTORED != LC_AppState_FROM_CDS) #error LC_STATE_WHEN_CDS_RESTORED must be defined as a supported enumerated type #endif diff --git a/fsw/src/lc_watch.c b/fsw/src/lc_watch.c index aa1a873..0bf4b34 100644 --- a/fsw/src/lc_watch.c +++ b/fsw/src/lc_watch.c @@ -256,7 +256,7 @@ void LC_CheckMsgForWPs(CFE_SB_MsgId_t MessageID, const CFE_SB_Buffer_t *BufPtr) Timestamp.Subseconds = 0; /* Do nothing if disabled at the application level */ - if (LC_AppData.CurrentLCState != LC_STATE_DISABLED) + if (LC_AppData.CurrentLCState != LC_AppState_DISABLED) { /* Use message timestamp - if none, use current time */ CFE_MSG_GetMsgTime(&BufPtr->Msg, &Timestamp); diff --git a/fsw/tables/lc_def_adt.c b/fsw/tables/lc_def_adt.c index 398f626..31d5233 100644 --- a/fsw/tables/lc_def_adt.c +++ b/fsw/tables/lc_def_adt.c @@ -51,7 +51,7 @@ ** ** ** #100 ** ** { -** .DefaultState = LC_APSTATE_DISABLED, +** .DefaultState = LC_ActionPointState_DISABLED, ** .MaxPassiveEvents = 2, ** .MaxPassFailEvents = 2, ** .MaxFailPassEvents = 2, @@ -68,7 +68,7 @@ ** ** ** #101 ** ** { -** .DefaultState = LC_APSTATE_DISABLED, +** .DefaultState = LC_ActionPointState_DISABLED, ** .MaxPassiveEvents = 2, ** .MaxPassFailEvents = 2, ** .MaxFailPassEvents = 2, @@ -139,7 +139,7 @@ ** ** ** #142 ** ** { -** .DefaultState = LC_APSTATE_DISABLED, +** .DefaultState = LC_ActionPointState_DISABLED, ** .MaxPassiveEvents = 2, ** .MaxPassFailEvents = 2, ** .MaxFailPassEvents = 2, @@ -177,7 +177,7 @@ CFE_TBL_FileDef_t CFE_TBL_FileDef = {"LC_ADT", LC_APP_NAME "." LC_ADT_TABLENAME, */ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { /* #0 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -191,7 +191,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #1 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -205,7 +205,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #2 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -219,7 +219,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #3 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -233,7 +233,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #4 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -247,7 +247,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #5 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -261,7 +261,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #6 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -275,7 +275,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #7 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -289,7 +289,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #8 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -303,7 +303,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #9 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -317,7 +317,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #10 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -331,7 +331,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #11 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -345,7 +345,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #12 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -359,7 +359,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #13 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -373,7 +373,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #14 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -387,7 +387,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #15 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -401,7 +401,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #16 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -415,7 +415,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #17 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -429,7 +429,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #18 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -443,7 +443,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #19 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -457,7 +457,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #20 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -471,7 +471,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #21 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -485,7 +485,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #22 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -499,7 +499,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #23 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -513,7 +513,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #24 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -527,7 +527,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #25 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -541,7 +541,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #26 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -555,7 +555,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #27 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -569,7 +569,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #28 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -583,7 +583,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #29 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -597,7 +597,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #30 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -611,7 +611,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #31 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -625,7 +625,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #32 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -639,7 +639,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #33 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -653,7 +653,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #34 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -667,7 +667,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #35 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -681,7 +681,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #36 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -695,7 +695,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #37 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -709,7 +709,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #38 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -723,7 +723,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #39 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -737,7 +737,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #40 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -751,7 +751,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #41 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -765,7 +765,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #42 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -779,7 +779,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #43 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -793,7 +793,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #44 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -807,7 +807,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #45 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -821,7 +821,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #46 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -835,7 +835,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #47 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -849,7 +849,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #48 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -863,7 +863,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #49 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -877,7 +877,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #50 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -891,7 +891,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #51 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -905,7 +905,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #52 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -919,7 +919,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #53 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -933,7 +933,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #54 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -947,7 +947,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #55 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -961,7 +961,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #56 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -975,7 +975,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #57 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -989,7 +989,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #58 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -1003,7 +1003,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #59 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -1017,7 +1017,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #60 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -1031,7 +1031,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #61 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -1045,7 +1045,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #62 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -1059,7 +1059,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #63 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -1073,7 +1073,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #64 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -1087,7 +1087,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #65 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -1101,7 +1101,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #66 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -1115,7 +1115,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #67 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -1129,7 +1129,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #68 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -1143,7 +1143,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #69 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -1157,7 +1157,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #70 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -1171,7 +1171,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #71 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -1185,7 +1185,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #72 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -1199,7 +1199,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #73 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -1213,7 +1213,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #74 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -1227,7 +1227,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #75 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -1241,7 +1241,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #76 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -1255,7 +1255,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #77 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -1269,7 +1269,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #78 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -1283,7 +1283,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #79 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -1297,7 +1297,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #80 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -1311,7 +1311,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #81 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -1325,7 +1325,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #82 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -1339,7 +1339,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #83 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -1353,7 +1353,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #84 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -1367,7 +1367,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #85 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -1381,7 +1381,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #86 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -1395,7 +1395,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #87 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -1409,7 +1409,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #88 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -1423,7 +1423,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #89 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -1437,7 +1437,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #90 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -1451,7 +1451,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #91 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -1465,7 +1465,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #92 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -1479,7 +1479,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #93 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -1493,7 +1493,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #94 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -1507,7 +1507,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #95 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -1521,7 +1521,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #96 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -1535,7 +1535,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #97 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -1549,7 +1549,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #98 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -1563,7 +1563,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #99 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -1577,7 +1577,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #100 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -1591,7 +1591,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #101 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -1605,7 +1605,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #102 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -1619,7 +1619,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #103 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -1633,7 +1633,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #104 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -1647,7 +1647,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #105 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -1661,7 +1661,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #106 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -1675,7 +1675,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #107 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -1689,7 +1689,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #108 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -1703,7 +1703,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #109 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -1717,7 +1717,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #110 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -1731,7 +1731,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #111 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -1745,7 +1745,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #112 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -1759,7 +1759,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #113 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -1773,7 +1773,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #114 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -1787,7 +1787,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #115 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -1801,7 +1801,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #116 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -1815,7 +1815,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #117 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -1829,7 +1829,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #118 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -1843,7 +1843,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #119 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -1857,7 +1857,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #120 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -1871,7 +1871,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #121 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -1885,7 +1885,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #122 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -1899,7 +1899,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #123 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -1913,7 +1913,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #124 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -1927,7 +1927,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #125 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -1941,7 +1941,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #126 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -1955,7 +1955,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #127 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -1969,7 +1969,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #128 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -1983,7 +1983,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #129 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -1997,7 +1997,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #130 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -2011,7 +2011,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #131 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -2025,7 +2025,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #132 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -2039,7 +2039,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #133 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -2053,7 +2053,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #134 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -2067,7 +2067,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #135 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -2081,7 +2081,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #136 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -2095,7 +2095,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #137 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -2109,7 +2109,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #138 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -2123,7 +2123,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #139 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -2137,7 +2137,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #140 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -2151,7 +2151,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #141 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -2165,7 +2165,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #142 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -2179,7 +2179,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #143 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -2193,7 +2193,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #144 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -2207,7 +2207,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #145 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -2221,7 +2221,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #146 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -2235,7 +2235,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #147 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -2249,7 +2249,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #148 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -2263,7 +2263,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #149 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -2277,7 +2277,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #150 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -2291,7 +2291,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #151 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -2305,7 +2305,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #152 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -2319,7 +2319,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #153 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -2333,7 +2333,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #154 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -2347,7 +2347,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #155 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -2361,7 +2361,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #156 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -2375,7 +2375,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #157 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -2389,7 +2389,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #158 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -2403,7 +2403,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #159 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -2417,7 +2417,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #160 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -2431,7 +2431,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #161 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -2445,7 +2445,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #162 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -2459,7 +2459,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #163 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -2473,7 +2473,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #164 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -2487,7 +2487,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #165 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -2501,7 +2501,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #166 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -2515,7 +2515,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #167 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -2529,7 +2529,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #168 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -2543,7 +2543,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #169 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -2557,7 +2557,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #170 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -2571,7 +2571,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #171 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -2585,7 +2585,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #172 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -2599,7 +2599,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #173 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -2613,7 +2613,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #174 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, @@ -2627,7 +2627,7 @@ LC_ADTEntry_t LC_ADT[LC_MAX_ACTIONPOINTS] = { 0, LC_RPN_EQUAL}}, /* #175 (unused) */ - {.DefaultState = LC_APSTATE_NOT_USED, + {.DefaultState = LC_ActionPoint_NOT_USED, .MaxPassiveEvents = 0, .MaxPassFailEvents = 0, .MaxFailPassEvents = 0, diff --git a/unit-test/lc_action_tests.c b/unit-test/lc_action_tests.c index 8c49fba..a6f1eac 100644 --- a/unit-test/lc_action_tests.c +++ b/unit-test/lc_action_tests.c @@ -71,7 +71,7 @@ void LC_SampleAPs_Test_SingleActionPointError(void) snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Sample AP error, invalid current AP state: AP = %%d, State = %%d"); - LC_OperData.ARTPtr[StartIndex].CurrentState = LC_APSTATE_NOT_USED; + LC_OperData.ARTPtr[StartIndex].CurrentState = LC_ActionPoint_NOT_USED; /* Execute the function being tested */ LC_SampleAPs(StartIndex, EndIndex); @@ -108,7 +108,7 @@ void LC_SampleAPs_Test_SingleActionPointPermOff(void) snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Sample AP error, invalid current AP state: AP = %%d, State = %%d"); - LC_OperData.ARTPtr[StartIndex].CurrentState = LC_APSTATE_PERMOFF; + LC_OperData.ARTPtr[StartIndex].CurrentState = LC_ActionPointState_PERMOFF; /* Execute the function being tested */ LC_SampleAPs(StartIndex, EndIndex); @@ -131,7 +131,7 @@ void LC_SampleSingleAP_Test_StateChangePassToFail(void) snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "AP state change from PASS to FAIL: AP = %%d"); - LC_OperData.ARTPtr[APNumber].CurrentState = LC_APSTATE_ACTIVE; + LC_OperData.ARTPtr[APNumber].CurrentState = LC_ActionPointState_ACTIVE; LC_OperData.ARTPtr[APNumber].ActionResult = LC_ACTION_PASS; LC_OperData.ARTPtr[APNumber].CumulativeEventMsgsSent = 0; LC_OperData.ADTPtr[APNumber].MaxPassFailEvents = 100; @@ -172,7 +172,7 @@ void LC_SampleSingleAP_Test_StateChangePassToFailMaxChange(void) { uint16 APNumber = 0; - LC_OperData.ARTPtr[APNumber].CurrentState = LC_APSTATE_ACTIVE; + LC_OperData.ARTPtr[APNumber].CurrentState = LC_ActionPointState_ACTIVE; LC_OperData.ARTPtr[APNumber].ActionResult = LC_ACTION_PASS; LC_OperData.ARTPtr[APNumber].CumulativeEventMsgsSent = 0; LC_OperData.ARTPtr[APNumber].PassToFailCount = 11; @@ -213,7 +213,7 @@ void LC_SampleSingleAP_Test_ActiveRequestRTS(void) { uint16 APNumber = 0; - LC_OperData.ARTPtr[APNumber].CurrentState = LC_APSTATE_ACTIVE; + LC_OperData.ARTPtr[APNumber].CurrentState = LC_ActionPointState_ACTIVE; LC_OperData.ARTPtr[APNumber].ActionResult = LC_ACTION_FAIL; LC_OperData.ARTPtr[APNumber].CumulativeEventMsgsSent = 0; LC_OperData.ADTPtr[APNumber].MaxPassFailEvents = 100; @@ -226,7 +226,7 @@ void LC_SampleSingleAP_Test_ActiveRequestRTS(void) LC_OperData.ADTPtr[APNumber].EventID = 1; LC_OperData.ADTPtr[APNumber].EventType = 2; - LC_AppData.CurrentLCState = LC_STATE_ACTIVE; + LC_AppData.CurrentLCState = LC_AppState_ACTIVE; LC_OperData.ADTPtr[APNumber].MaxFailsBeforeRTS = 5; LC_OperData.ARTPtr[APNumber].ConsecutiveFailCount = LC_OperData.ADTPtr[APNumber].MaxFailsBeforeRTS; @@ -236,8 +236,8 @@ void LC_SampleSingleAP_Test_ActiveRequestRTS(void) LC_SampleSingleAP(APNumber); /* Verify results */ - UtAssert_True(LC_OperData.ARTPtr[APNumber].CurrentState == LC_APSTATE_PASSIVE, - "LC_OperData.ARTPtr[APNumber].CurrentState == LC_APSTATE_PASSIVE"); + UtAssert_True(LC_OperData.ARTPtr[APNumber].CurrentState == LC_ActionPointState_PASSIVE, + "LC_OperData.ARTPtr[APNumber].CurrentState == LC_ActionPointState_PASSIVE"); UtAssert_True(LC_OperData.ARTPtr[APNumber].CumulativeRTSExecCount == 1, "LC_OperData.ARTPtr[APNumber].CumulativeRTSExecCount == 1"); UtAssert_True(LC_OperData.ARTPtr[APNumber].CumulativeEventMsgsSent == 1, @@ -258,7 +258,7 @@ void LC_SampleSingleAP_Test_APFailWhileLCStatePassive(void) snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "AP failed while LC App passive: AP = %%d, FailCount = %%d, RTS = %%d"); - LC_OperData.ARTPtr[APNumber].CurrentState = LC_APSTATE_ACTIVE; + LC_OperData.ARTPtr[APNumber].CurrentState = LC_ActionPointState_ACTIVE; LC_OperData.ARTPtr[APNumber].ActionResult = LC_ACTION_FAIL; LC_OperData.ADTPtr[APNumber].MaxPassFailEvents = 100; @@ -270,7 +270,7 @@ void LC_SampleSingleAP_Test_APFailWhileLCStatePassive(void) LC_OperData.ADTPtr[APNumber].EventID = 1; LC_OperData.ADTPtr[APNumber].EventType = 2; - LC_AppData.CurrentLCState = LC_STATE_PASSIVE; + LC_AppData.CurrentLCState = LC_AppState_PASSIVE; LC_OperData.ADTPtr[APNumber].MaxFailsBeforeRTS = 5; LC_OperData.ARTPtr[APNumber].ConsecutiveFailCount = LC_OperData.ADTPtr[APNumber].MaxFailsBeforeRTS; @@ -280,8 +280,8 @@ void LC_SampleSingleAP_Test_APFailWhileLCStatePassive(void) LC_SampleSingleAP(APNumber); /* Verify results */ - UtAssert_True(LC_OperData.ARTPtr[APNumber].CurrentState == LC_APSTATE_PASSIVE, - "LC_OperData.ARTPtr[APNumber].CurrentState == LC_APSTATE_PASSIVE"); + UtAssert_True(LC_OperData.ARTPtr[APNumber].CurrentState == LC_ActionPointState_PASSIVE, + "LC_OperData.ARTPtr[APNumber].CurrentState == LC_ActionPointState_PASSIVE"); UtAssert_True(LC_AppData.PassiveRTSExecCount == 1, "LC_AppData.PassiveRTSExecCount == 1"); UtAssert_INT32_EQ(UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)), 1); @@ -302,8 +302,8 @@ void LC_SampleSingleAP_Test_APFailWhilePassive(void) snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "AP failed while passive: AP = %%d, FailCount = %%d, RTS = %%d"); - LC_AppData.CurrentLCState = LC_STATE_ACTIVE; - LC_OperData.ARTPtr[APNumber].CurrentState = LC_APSTATE_PASSIVE; + LC_AppData.CurrentLCState = LC_AppState_ACTIVE; + LC_OperData.ARTPtr[APNumber].CurrentState = LC_ActionPointState_PASSIVE; LC_OperData.ARTPtr[APNumber].ActionResult = LC_ACTION_FAIL; LC_OperData.ADTPtr[APNumber].MaxPassFailEvents = 100; LC_OperData.ARTPtr[APNumber].CumulativeEventMsgsSent = 0; @@ -347,8 +347,8 @@ void LC_SampleSingleAP_Test_APFailWhilePassiveNoEvent(void) { uint16 APNumber = 0; - LC_AppData.CurrentLCState = LC_STATE_ACTIVE; - LC_OperData.ARTPtr[APNumber].CurrentState = LC_APSTATE_PASSIVE; + LC_AppData.CurrentLCState = LC_AppState_ACTIVE; + LC_OperData.ARTPtr[APNumber].CurrentState = LC_ActionPointState_PASSIVE; LC_OperData.ARTPtr[APNumber].ActionResult = LC_ACTION_FAIL; LC_OperData.ADTPtr[APNumber].MaxPassFailEvents = 100; LC_OperData.ARTPtr[APNumber].CumulativeEventMsgsSent = 0; @@ -390,7 +390,7 @@ void LC_SampleSingleAP_Test_StateChangeFailToPass(void) snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "AP state change from FAIL to PASS: AP = %%d"); - LC_OperData.ARTPtr[APNumber].CurrentState = LC_APSTATE_ACTIVE; + LC_OperData.ARTPtr[APNumber].CurrentState = LC_ActionPointState_ACTIVE; LC_OperData.ARTPtr[APNumber].ActionResult = LC_ACTION_FAIL; LC_OperData.ADTPtr[APNumber].MaxFailPassEvents = 1; LC_OperData.ARTPtr[APNumber].CumulativeEventMsgsSent = 0; @@ -427,7 +427,7 @@ void LC_SampleSingleAP_Test_StateChangeFailToPass(void) void LC_SampleSingleAP_Test_StateChangeFailToPassNoEvent(void) { uint16 APNumber = 0; - LC_OperData.ARTPtr[APNumber].CurrentState = LC_APSTATE_ACTIVE; + LC_OperData.ARTPtr[APNumber].CurrentState = LC_ActionPointState_ACTIVE; LC_OperData.ARTPtr[APNumber].ActionResult = LC_ACTION_FAIL; LC_OperData.ADTPtr[APNumber].MaxFailPassEvents = 1; LC_OperData.ARTPtr[APNumber].CumulativeEventMsgsSent = 0; @@ -462,7 +462,7 @@ void LC_SampleSingleAP_Test_ActionStale(void) { uint16 APNumber = 0; - LC_OperData.ARTPtr[APNumber].CurrentState = LC_APSTATE_ACTIVE; + LC_OperData.ARTPtr[APNumber].CurrentState = LC_ActionPointState_ACTIVE; LC_OperData.ARTPtr[APNumber].ActionResult = LC_ACTION_FAIL; LC_OperData.ADTPtr[APNumber].MaxFailPassEvents = 1; @@ -492,7 +492,7 @@ void LC_SampleSingleAP_Test_ActionError(void) snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "AP evaluated to error: AP = %%d, Result = %%d"); - LC_OperData.ARTPtr[APNumber].CurrentState = LC_APSTATE_ACTIVE; + LC_OperData.ARTPtr[APNumber].CurrentState = LC_ActionPointState_ACTIVE; LC_OperData.ARTPtr[APNumber].ActionResult = LC_ACTION_FAIL; LC_OperData.ADTPtr[APNumber].MaxFailPassEvents = 1; @@ -522,7 +522,7 @@ void LC_SampleSingleAP_Test_ConsecutivePass(void) { uint16 APNumber = 0; - LC_OperData.ARTPtr[APNumber].CurrentState = LC_APSTATE_ACTIVE; + LC_OperData.ARTPtr[APNumber].CurrentState = LC_ActionPointState_ACTIVE; LC_OperData.ARTPtr[APNumber].ActionResult = LC_ACTION_PASS; LC_OperData.ADTPtr[APNumber].MaxFailPassEvents = 1; LC_OperData.ARTPtr[APNumber].CumulativeEventMsgsSent = 0; @@ -1252,7 +1252,7 @@ void LC_ValidateADT_Test_ActionNotUsed(void) for (TableIndex = 0; TableIndex < LC_MAX_ACTIONPOINTS; TableIndex++) { - LC_OperData.ADTPtr[TableIndex].DefaultState = LC_APSTATE_NOT_USED; + LC_OperData.ADTPtr[TableIndex].DefaultState = LC_ActionPoint_NOT_USED; } /* Execute the function being tested */ @@ -1326,7 +1326,7 @@ void LC_ValidateADT_Test_BadRtsID(void) for (TableIndex = 0; TableIndex < LC_MAX_ACTIONPOINTS; TableIndex++) { - LC_OperData.ADTPtr[TableIndex].DefaultState = LC_APSTATE_ACTIVE; + LC_OperData.ADTPtr[TableIndex].DefaultState = LC_ActionPointState_ACTIVE; LC_OperData.ADTPtr[TableIndex].RTSId = LC_MAX_VALID_ADT_RTSID + 1; LC_OperData.ADTPtr[TableIndex].MaxFailsBeforeRTS = 77; LC_OperData.ADTPtr[TableIndex].EventType = 66; @@ -1368,7 +1368,7 @@ void LC_ValidateADT_Test_BadFailCount(void) for (TableIndex = 0; TableIndex < LC_MAX_ACTIONPOINTS; TableIndex++) { - LC_OperData.ADTPtr[TableIndex].DefaultState = LC_APSTATE_ACTIVE; + LC_OperData.ADTPtr[TableIndex].DefaultState = LC_ActionPointState_ACTIVE; LC_OperData.ADTPtr[TableIndex].RTSId = 1; LC_OperData.ADTPtr[TableIndex].MaxFailsBeforeRTS = 0; LC_OperData.ADTPtr[TableIndex].EventType = 66; @@ -1409,7 +1409,7 @@ void LC_ValidateADT_Test_InvalidEventType(void) for (TableIndex = 0; TableIndex < LC_MAX_ACTIONPOINTS; TableIndex++) { - LC_OperData.ADTPtr[TableIndex].DefaultState = LC_APSTATE_ACTIVE; + LC_OperData.ADTPtr[TableIndex].DefaultState = LC_ActionPointState_ACTIVE; LC_OperData.ADTPtr[TableIndex].RTSId = 1; LC_OperData.ADTPtr[TableIndex].MaxFailsBeforeRTS = 88; LC_OperData.ADTPtr[TableIndex].EventType = 99; @@ -1451,7 +1451,7 @@ void LC_ValidateADT_Test_ValidateRpnAdtValError(void) for (TableIndex = 0; TableIndex < LC_MAX_ACTIONPOINTS; TableIndex++) { - LC_OperData.ADTPtr[TableIndex].DefaultState = LC_APSTATE_ACTIVE; + LC_OperData.ADTPtr[TableIndex].DefaultState = LC_ActionPointState_ACTIVE; LC_OperData.ADTPtr[TableIndex].RTSId = 1; LC_OperData.ADTPtr[TableIndex].MaxFailsBeforeRTS = 88; LC_OperData.ADTPtr[TableIndex].EventType = CFE_EVS_EventType_DEBUG; @@ -1492,7 +1492,7 @@ void LC_ValidateADT_Test_ValidateRpnAdtValNoError(void) for (TableIndex = 0; TableIndex < LC_MAX_ACTIONPOINTS; TableIndex++) { - LC_OperData.ADTPtr[TableIndex].DefaultState = LC_APSTATE_ACTIVE; + LC_OperData.ADTPtr[TableIndex].DefaultState = LC_ActionPointState_ACTIVE; LC_OperData.ADTPtr[TableIndex].RTSId = 1; LC_OperData.ADTPtr[TableIndex].MaxFailsBeforeRTS = 88; LC_OperData.ADTPtr[TableIndex].EventType = CFE_EVS_EventType_DEBUG; @@ -1529,7 +1529,7 @@ void LC_ValidateADT_Test_Nominal(void) for (TableIndex = 0; TableIndex < LC_MAX_ACTIONPOINTS; TableIndex++) { - LC_OperData.ADTPtr[TableIndex].DefaultState = LC_APSTATE_NOT_USED; + LC_OperData.ADTPtr[TableIndex].DefaultState = LC_ActionPoint_NOT_USED; LC_OperData.ADTPtr[TableIndex].RTSId = 1; LC_OperData.ADTPtr[TableIndex].MaxFailsBeforeRTS = 1; LC_OperData.ADTPtr[TableIndex].EventType = CFE_EVS_EventType_DEBUG; @@ -1539,10 +1539,10 @@ void LC_ValidateADT_Test_Nominal(void) LC_OperData.ADTPtr[TableIndex].RPNEquation[2] = LC_RPN_EQUAL; } - LC_OperData.ADTPtr[0].DefaultState = LC_APSTATE_ACTIVE; - LC_OperData.ADTPtr[1].DefaultState = LC_APSTATE_PASSIVE; - LC_OperData.ADTPtr[2].DefaultState = LC_APSTATE_DISABLED; - LC_OperData.ADTPtr[3].DefaultState = LC_APSTATE_PERMOFF; + LC_OperData.ADTPtr[0].DefaultState = LC_ActionPointState_ACTIVE; + LC_OperData.ADTPtr[1].DefaultState = LC_ActionPointState_PASSIVE; + LC_OperData.ADTPtr[2].DefaultState = LC_ActionPointState_DISABLED; + LC_OperData.ADTPtr[3].DefaultState = LC_ActionPointState_PERMOFF; LC_OperData.ADTPtr[0].EventType = CFE_EVS_EventType_DEBUG; LC_OperData.ADTPtr[1].EventType = CFE_EVS_EventType_INFORMATION; diff --git a/unit-test/lc_cmds_tests.c b/unit-test/lc_cmds_tests.c index 76db891..7e4e8a8 100644 --- a/unit-test/lc_cmds_tests.c +++ b/unit-test/lc_cmds_tests.c @@ -348,7 +348,7 @@ void LC_SampleAPReq_Test_StateDisabled(void) { UT_SetDefaultReturnValue(UT_KEY(LC_VerifyMsgLength), true); - LC_AppData.CurrentLCState = LC_STATE_DISABLED; + LC_AppData.CurrentLCState = LC_AppState_DISABLED; LC_SampleAPReq(&UT_CmdBuf.Buf); } @@ -824,7 +824,7 @@ void LC_HousekeepingReq_Test_ActionNotUsedStale(void) for (TableIndex = 0; TableIndex < LC_MAX_ACTIONPOINTS; TableIndex++) { - LC_OperData.ARTPtr[TableIndex].CurrentState = LC_APSTATE_NOT_USED; + LC_OperData.ARTPtr[TableIndex].CurrentState = LC_ActionPoint_NOT_USED; LC_OperData.ARTPtr[TableIndex].ActionResult = LC_ACTION_STALE; } @@ -876,7 +876,7 @@ void LC_HousekeepingReq_Test_APStateActiveActionPass(void) for (TableIndex = 0; TableIndex < LC_MAX_ACTIONPOINTS; TableIndex++) { - LC_OperData.ARTPtr[TableIndex].CurrentState = LC_APSTATE_ACTIVE; + LC_OperData.ARTPtr[TableIndex].CurrentState = LC_ActionPointState_ACTIVE; LC_OperData.ARTPtr[TableIndex].ActionResult = LC_ACTION_PASS; } @@ -931,7 +931,7 @@ void LC_HousekeepingReq_Test_APStatePassiveActionFail(void) for (TableIndex = 0; TableIndex < LC_MAX_ACTIONPOINTS; TableIndex++) { - LC_OperData.ARTPtr[TableIndex].CurrentState = LC_APSTATE_PASSIVE; + LC_OperData.ARTPtr[TableIndex].CurrentState = LC_ActionPointState_PASSIVE; LC_OperData.ARTPtr[TableIndex].ActionResult = LC_ACTION_FAIL; } @@ -983,7 +983,7 @@ void LC_HousekeepingReq_Test_APStateDisabledActionError(void) for (TableIndex = 0; TableIndex < LC_MAX_ACTIONPOINTS; TableIndex++) { - LC_OperData.ARTPtr[TableIndex].CurrentState = LC_APSTATE_DISABLED; + LC_OperData.ARTPtr[TableIndex].CurrentState = LC_ActionPointState_DISABLED; LC_OperData.ARTPtr[TableIndex].ActionResult = LC_ACTION_ERROR; } @@ -1035,7 +1035,7 @@ void LC_HousekeepingReq_Test_APStatePermOffActionError(void) for (TableIndex = 0; TableIndex < LC_MAX_ACTIONPOINTS; TableIndex++) { - LC_OperData.ARTPtr[TableIndex].CurrentState = LC_APSTATE_PERMOFF; + LC_OperData.ARTPtr[TableIndex].CurrentState = LC_ActionPointState_PERMOFF; LC_OperData.ARTPtr[TableIndex].ActionResult = LC_ACTION_ERROR; } @@ -1213,13 +1213,13 @@ void LC_SetLCStateCmd_Test_Active(void) snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Set LC state command: new state = %%d"); - UT_CmdBuf.SetLCStateCmd.NewLCState = LC_STATE_ACTIVE; + UT_CmdBuf.SetLCStateCmd.NewLCState = LC_AppState_ACTIVE; /* Execute the function being tested */ LC_SetLCStateCmd(&UT_CmdBuf.Buf); /* Verify results */ - UtAssert_True(LC_AppData.CurrentLCState == LC_STATE_ACTIVE, "LC_AppData.CurrentLCState == LC_STATE_ACTIVE"); + UtAssert_True(LC_AppData.CurrentLCState == LC_AppState_ACTIVE, "LC_AppData.CurrentLCState == LC_AppState_ACTIVE"); UtAssert_True(LC_AppData.CmdCount == 1, "LC_AppData.CmdCount == 1"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); @@ -1245,13 +1245,13 @@ void LC_SetLCStateCmd_Test_Passive(void) snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Set LC state command: new state = %%d"); - UT_CmdBuf.SetLCStateCmd.NewLCState = LC_STATE_PASSIVE; + UT_CmdBuf.SetLCStateCmd.NewLCState = LC_AppState_PASSIVE; /* Execute the function being tested */ LC_SetLCStateCmd(&UT_CmdBuf.Buf); /* Verify results */ - UtAssert_True(LC_AppData.CurrentLCState == LC_STATE_PASSIVE, "LC_AppData.CurrentLCState == LC_STATE_PASSIVE"); + UtAssert_True(LC_AppData.CurrentLCState == LC_AppState_PASSIVE, "LC_AppData.CurrentLCState == LC_AppState_PASSIVE"); UtAssert_True(LC_AppData.CmdCount == 1, "LC_AppData.CmdCount == 1"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); @@ -1277,13 +1277,14 @@ void LC_SetLCStateCmd_Test_Disabled(void) snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Set LC state command: new state = %%d"); - UT_CmdBuf.SetLCStateCmd.NewLCState = LC_STATE_DISABLED; + UT_CmdBuf.SetLCStateCmd.NewLCState = LC_AppState_DISABLED; /* Execute the function being tested */ LC_SetLCStateCmd(&UT_CmdBuf.Buf); /* Verify results */ - UtAssert_True(LC_AppData.CurrentLCState == LC_STATE_DISABLED, "LC_AppData.CurrentLCState == LC_STATE_DISABLED"); + UtAssert_True(LC_AppData.CurrentLCState == LC_AppState_DISABLED, + "LC_AppData.CurrentLCState == LC_AppState_DISABLED"); UtAssert_True(LC_AppData.CmdCount == 1, "LC_AppData.CmdCount == 1"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); @@ -1384,7 +1385,7 @@ void LC_SetAPStateCmd_Test_SetAllActionPointsActive(void) snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Set AP state command: AP = %%d, New state = %%d"); - UT_CmdBuf.SetAPStateCmd.NewAPState = LC_APSTATE_ACTIVE; + UT_CmdBuf.SetAPStateCmd.NewAPState = LC_ActionPointState_ACTIVE; UT_CmdBuf.SetAPStateCmd.APNumber = LC_ALL_ACTIONPOINTS; for (TableIndex = 0; TableIndex < LC_MAX_ACTIONPOINTS; TableIndex++) @@ -1399,18 +1400,18 @@ void LC_SetAPStateCmd_Test_SetAllActionPointsActive(void) /* Checks for first index: */ TableIndex = 0; - UtAssert_True(LC_OperData.ARTPtr[TableIndex].CurrentState == LC_APSTATE_ACTIVE, - "LC_OperData.ARTPtr[TableIndex].CurrentState == LC_APSTATE_ACTIVE"); + UtAssert_True(LC_OperData.ARTPtr[TableIndex].CurrentState == LC_ActionPointState_ACTIVE, + "LC_OperData.ARTPtr[TableIndex].CurrentState == LC_ActionPointState_ACTIVE"); /* Checks for middle index: */ TableIndex = LC_MAX_ACTIONPOINTS / 2; - UtAssert_True(LC_OperData.ARTPtr[TableIndex].CurrentState == LC_APSTATE_ACTIVE, - "LC_OperData.ARTPtr[TableIndex].CurrentState == LC_APSTATE_ACTIVE"); + UtAssert_True(LC_OperData.ARTPtr[TableIndex].CurrentState == LC_ActionPointState_ACTIVE, + "LC_OperData.ARTPtr[TableIndex].CurrentState == LC_ActionPointState_ACTIVE"); /* Checks for last index: */ TableIndex = LC_MAX_ACTIONPOINTS - 1; - UtAssert_True(LC_OperData.ARTPtr[TableIndex].CurrentState == LC_APSTATE_ACTIVE, - "LC_OperData.ARTPtr[TableIndex].CurrentState == LC_APSTATE_ACTIVE"); + UtAssert_True(LC_OperData.ARTPtr[TableIndex].CurrentState == LC_ActionPointState_ACTIVE, + "LC_OperData.ARTPtr[TableIndex].CurrentState == LC_ActionPointState_ACTIVE"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_INT32_EQ(call_count_CFE_EVS_SendEvent, 1); @@ -1437,14 +1438,14 @@ void LC_SetAPStateCmd_Test_SetAllActionPointsActiveOneNotUsed(void) snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Set AP state command: AP = %%d, New state = %%d"); - UT_CmdBuf.SetAPStateCmd.NewAPState = LC_APSTATE_ACTIVE; + UT_CmdBuf.SetAPStateCmd.NewAPState = LC_ActionPointState_ACTIVE; UT_CmdBuf.SetAPStateCmd.APNumber = LC_ALL_ACTIONPOINTS; for (TableIndex = 0; TableIndex < LC_MAX_ACTIONPOINTS; TableIndex++) { LC_OperData.ARTPtr[TableIndex].CurrentState = 99; } - LC_OperData.ARTPtr[0].CurrentState = LC_APSTATE_NOT_USED; + LC_OperData.ARTPtr[0].CurrentState = LC_ActionPoint_NOT_USED; /* Execute the function being tested */ LC_SetAPStateCmd(&UT_CmdBuf.Buf); @@ -1453,18 +1454,18 @@ void LC_SetAPStateCmd_Test_SetAllActionPointsActiveOneNotUsed(void) /* Checks for first index: */ TableIndex = 0; - UtAssert_True(LC_OperData.ARTPtr[TableIndex].CurrentState == LC_APSTATE_NOT_USED, - "LC_OperData.ARTPtr[TableIndex].CurrentState == LC_APSTATE_NOT_USED"); + UtAssert_True(LC_OperData.ARTPtr[TableIndex].CurrentState == LC_ActionPoint_NOT_USED, + "LC_OperData.ARTPtr[TableIndex].CurrentState == LC_ActionPoint_NOT_USED"); /* Checks for middle index: */ TableIndex = LC_MAX_ACTIONPOINTS / 2; - UtAssert_True(LC_OperData.ARTPtr[TableIndex].CurrentState == LC_APSTATE_ACTIVE, - "LC_OperData.ARTPtr[TableIndex].CurrentState == LC_APSTATE_ACTIVE"); + UtAssert_True(LC_OperData.ARTPtr[TableIndex].CurrentState == LC_ActionPointState_ACTIVE, + "LC_OperData.ARTPtr[TableIndex].CurrentState == LC_ActionPointState_ACTIVE"); /* Checks for last index: */ TableIndex = LC_MAX_ACTIONPOINTS - 1; - UtAssert_True(LC_OperData.ARTPtr[TableIndex].CurrentState == LC_APSTATE_ACTIVE, - "LC_OperData.ARTPtr[TableIndex].CurrentState == LC_APSTATE_ACTIVE"); + UtAssert_True(LC_OperData.ARTPtr[TableIndex].CurrentState == LC_ActionPointState_ACTIVE, + "LC_OperData.ARTPtr[TableIndex].CurrentState == LC_ActionPointState_ACTIVE"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_INT32_EQ(call_count_CFE_EVS_SendEvent, 1); @@ -1491,14 +1492,14 @@ void LC_SetAPStateCmd_Test_SetAllActionPointsActiveOnePermOff(void) snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Set AP state command: AP = %%d, New state = %%d"); - UT_CmdBuf.SetAPStateCmd.NewAPState = LC_APSTATE_ACTIVE; + UT_CmdBuf.SetAPStateCmd.NewAPState = LC_ActionPointState_ACTIVE; UT_CmdBuf.SetAPStateCmd.APNumber = LC_ALL_ACTIONPOINTS; for (TableIndex = 0; TableIndex < LC_MAX_ACTIONPOINTS; TableIndex++) { LC_OperData.ARTPtr[TableIndex].CurrentState = 99; } - LC_OperData.ARTPtr[0].CurrentState = LC_APSTATE_PERMOFF; + LC_OperData.ARTPtr[0].CurrentState = LC_ActionPointState_PERMOFF; /* Execute the function being tested */ LC_SetAPStateCmd(&UT_CmdBuf.Buf); @@ -1507,18 +1508,18 @@ void LC_SetAPStateCmd_Test_SetAllActionPointsActiveOnePermOff(void) /* Checks for first index: */ TableIndex = 0; - UtAssert_True(LC_OperData.ARTPtr[TableIndex].CurrentState == LC_APSTATE_PERMOFF, - "LC_OperData.ARTPtr[TableIndex].CurrentState == LC_APSTATE_PERMOFF"); + UtAssert_True(LC_OperData.ARTPtr[TableIndex].CurrentState == LC_ActionPointState_PERMOFF, + "LC_OperData.ARTPtr[TableIndex].CurrentState == LC_ActionPointState_PERMOFF"); /* Checks for middle index: */ TableIndex = LC_MAX_ACTIONPOINTS / 2; - UtAssert_True(LC_OperData.ARTPtr[TableIndex].CurrentState == LC_APSTATE_ACTIVE, - "LC_OperData.ARTPtr[TableIndex].CurrentState == LC_APSTATE_ACTIVE"); + UtAssert_True(LC_OperData.ARTPtr[TableIndex].CurrentState == LC_ActionPointState_ACTIVE, + "LC_OperData.ARTPtr[TableIndex].CurrentState == LC_ActionPointState_ACTIVE"); /* Checks for last index: */ TableIndex = LC_MAX_ACTIONPOINTS - 1; - UtAssert_True(LC_OperData.ARTPtr[TableIndex].CurrentState == LC_APSTATE_ACTIVE, - "LC_OperData.ARTPtr[TableIndex].CurrentState == LC_APSTATE_ACTIVE"); + UtAssert_True(LC_OperData.ARTPtr[TableIndex].CurrentState == LC_ActionPointState_ACTIVE, + "LC_OperData.ARTPtr[TableIndex].CurrentState == LC_ActionPointState_ACTIVE"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_INT32_EQ(call_count_CFE_EVS_SendEvent, 1); @@ -1545,7 +1546,7 @@ void LC_SetAPStateCmd_Test_SetAllActionPointsPassive(void) snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Set AP state command: AP = %%d, New state = %%d"); - UT_CmdBuf.SetAPStateCmd.NewAPState = LC_APSTATE_PASSIVE; + UT_CmdBuf.SetAPStateCmd.NewAPState = LC_ActionPointState_PASSIVE; UT_CmdBuf.SetAPStateCmd.APNumber = LC_ALL_ACTIONPOINTS; for (TableIndex = 0; TableIndex < LC_MAX_ACTIONPOINTS; TableIndex++) @@ -1560,18 +1561,18 @@ void LC_SetAPStateCmd_Test_SetAllActionPointsPassive(void) /* Checks for first index: */ TableIndex = 0; - UtAssert_True(LC_OperData.ARTPtr[TableIndex].CurrentState == LC_APSTATE_PASSIVE, - "LC_OperData.ARTPtr[TableIndex].CurrentState == LC_APSTATE_PASSIVE"); + UtAssert_True(LC_OperData.ARTPtr[TableIndex].CurrentState == LC_ActionPointState_PASSIVE, + "LC_OperData.ARTPtr[TableIndex].CurrentState == LC_ActionPointState_PASSIVE"); /* Checks for middle index: */ TableIndex = LC_MAX_ACTIONPOINTS / 2; - UtAssert_True(LC_OperData.ARTPtr[TableIndex].CurrentState == LC_APSTATE_PASSIVE, - "LC_OperData.ARTPtr[TableIndex].CurrentState == LC_APSTATE_PASSIVE"); + UtAssert_True(LC_OperData.ARTPtr[TableIndex].CurrentState == LC_ActionPointState_PASSIVE, + "LC_OperData.ARTPtr[TableIndex].CurrentState == LC_ActionPointState_PASSIVE"); /* Checks for last index: */ TableIndex = LC_MAX_ACTIONPOINTS - 1; - UtAssert_True(LC_OperData.ARTPtr[TableIndex].CurrentState == LC_APSTATE_PASSIVE, - "LC_OperData.ARTPtr[TableIndex].CurrentState == LC_APSTATE_PASSIVE"); + UtAssert_True(LC_OperData.ARTPtr[TableIndex].CurrentState == LC_ActionPointState_PASSIVE, + "LC_OperData.ARTPtr[TableIndex].CurrentState == LC_ActionPointState_PASSIVE"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_INT32_EQ(call_count_CFE_EVS_SendEvent, 1); @@ -1598,7 +1599,7 @@ void LC_SetAPStateCmd_Test_SetAllActionPointsDisabled(void) snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Set AP state command: AP = %%d, New state = %%d"); - UT_CmdBuf.SetAPStateCmd.NewAPState = LC_APSTATE_DISABLED; + UT_CmdBuf.SetAPStateCmd.NewAPState = LC_ActionPointState_DISABLED; UT_CmdBuf.SetAPStateCmd.APNumber = LC_ALL_ACTIONPOINTS; for (TableIndex = 0; TableIndex < LC_MAX_ACTIONPOINTS; TableIndex++) @@ -1613,18 +1614,18 @@ void LC_SetAPStateCmd_Test_SetAllActionPointsDisabled(void) /* Checks for first index: */ TableIndex = 0; - UtAssert_True(LC_OperData.ARTPtr[TableIndex].CurrentState == LC_APSTATE_DISABLED, - "LC_OperData.ARTPtr[TableIndex].CurrentState == LC_APSTATE_DISABLED"); + UtAssert_True(LC_OperData.ARTPtr[TableIndex].CurrentState == LC_ActionPointState_DISABLED, + "LC_OperData.ARTPtr[TableIndex].CurrentState == LC_ActionPointState_DISABLED"); /* Checks for middle index: */ TableIndex = LC_MAX_ACTIONPOINTS / 2; - UtAssert_True(LC_OperData.ARTPtr[TableIndex].CurrentState == LC_APSTATE_DISABLED, - "LC_OperData.ARTPtr[TableIndex].CurrentState == LC_APSTATE_DISABLED"); + UtAssert_True(LC_OperData.ARTPtr[TableIndex].CurrentState == LC_ActionPointState_DISABLED, + "LC_OperData.ARTPtr[TableIndex].CurrentState == LC_ActionPointState_DISABLED"); /* Checks for last index: */ TableIndex = LC_MAX_ACTIONPOINTS - 1; - UtAssert_True(LC_OperData.ARTPtr[TableIndex].CurrentState == LC_APSTATE_DISABLED, - "LC_OperData.ARTPtr[TableIndex].CurrentState == LC_APSTATE_DISABLED"); + UtAssert_True(LC_OperData.ARTPtr[TableIndex].CurrentState == LC_ActionPointState_DISABLED, + "LC_OperData.ARTPtr[TableIndex].CurrentState == LC_ActionPointState_DISABLED"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_INT32_EQ(call_count_CFE_EVS_SendEvent, 1); @@ -1650,7 +1651,7 @@ void LC_SetAPStateCmd_Test_UpdateSingleActionPointActive(void) snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Set AP state command: AP = %%d, New state = %%d"); - UT_CmdBuf.SetAPStateCmd.NewAPState = LC_APSTATE_ACTIVE; + UT_CmdBuf.SetAPStateCmd.NewAPState = LC_ActionPointState_ACTIVE; UT_CmdBuf.SetAPStateCmd.APNumber = LC_MAX_ACTIONPOINTS - 1; LC_OperData.ARTPtr[UT_CmdBuf.SetAPStateCmd.APNumber].CurrentState = 99; @@ -1659,8 +1660,8 @@ void LC_SetAPStateCmd_Test_UpdateSingleActionPointActive(void) LC_SetAPStateCmd(&UT_CmdBuf.Buf); /* Verify results */ - UtAssert_True(LC_OperData.ARTPtr[UT_CmdBuf.SetAPStateCmd.APNumber].CurrentState == LC_APSTATE_ACTIVE, - "LC_OperData.ARTPtr[UT_CmdBuf.SetAPStateCmd.APNumber].CurrentState == LC_APSTATE_ACTIVE"); + UtAssert_True(LC_OperData.ARTPtr[UT_CmdBuf.SetAPStateCmd.APNumber].CurrentState == LC_ActionPointState_ACTIVE, + "LC_OperData.ARTPtr[UT_CmdBuf.SetAPStateCmd.APNumber].CurrentState == LC_ActionPointState_ACTIVE"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_INT32_EQ(call_count_CFE_EVS_SendEvent, 1); @@ -1686,17 +1687,17 @@ void LC_SetAPStateCmd_Test_UpdateSingleActionPointNotUsed(void) snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Set AP state error: AP = %%d, Invalid current AP state = %%d"); - UT_CmdBuf.SetAPStateCmd.NewAPState = LC_APSTATE_ACTIVE; + UT_CmdBuf.SetAPStateCmd.NewAPState = LC_ActionPointState_ACTIVE; UT_CmdBuf.SetAPStateCmd.APNumber = 0; - LC_OperData.ARTPtr[UT_CmdBuf.SetAPStateCmd.APNumber].CurrentState = LC_APSTATE_NOT_USED; + LC_OperData.ARTPtr[UT_CmdBuf.SetAPStateCmd.APNumber].CurrentState = LC_ActionPoint_NOT_USED; /* Execute the function being tested */ LC_SetAPStateCmd(&UT_CmdBuf.Buf); /* Verify results */ - UtAssert_True(LC_OperData.ARTPtr[UT_CmdBuf.SetAPStateCmd.APNumber].CurrentState == LC_APSTATE_NOT_USED, - "LC_OperData.ARTPtr[UT_CmdBuf.SetAPStateCmd.APNumber].CurrentState == LC_APSTATE_NOT_USED"); + UtAssert_True(LC_OperData.ARTPtr[UT_CmdBuf.SetAPStateCmd.APNumber].CurrentState == LC_ActionPoint_NOT_USED, + "LC_OperData.ARTPtr[UT_CmdBuf.SetAPStateCmd.APNumber].CurrentState == LC_ActionPoint_NOT_USED"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_INT32_EQ(call_count_CFE_EVS_SendEvent, 1); @@ -1722,7 +1723,7 @@ void LC_SetAPStateCmd_Test_UpdateSingleActionPointPassive(void) snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Set AP state command: AP = %%d, New state = %%d"); - UT_CmdBuf.SetAPStateCmd.NewAPState = LC_APSTATE_PASSIVE; + UT_CmdBuf.SetAPStateCmd.NewAPState = LC_ActionPointState_PASSIVE; UT_CmdBuf.SetAPStateCmd.APNumber = LC_MAX_ACTIONPOINTS - 1; LC_OperData.ARTPtr[UT_CmdBuf.SetAPStateCmd.APNumber].CurrentState = 99; @@ -1731,8 +1732,8 @@ void LC_SetAPStateCmd_Test_UpdateSingleActionPointPassive(void) LC_SetAPStateCmd(&UT_CmdBuf.Buf); /* Verify results */ - UtAssert_True(LC_OperData.ARTPtr[UT_CmdBuf.SetAPStateCmd.APNumber].CurrentState == LC_APSTATE_PASSIVE, - "LC_OperData.ARTPtr[UT_CmdBuf.SetAPStateCmd.APNumber].CurrentState == LC_APSTATE_PASSIVE"); + UtAssert_True(LC_OperData.ARTPtr[UT_CmdBuf.SetAPStateCmd.APNumber].CurrentState == LC_ActionPointState_PASSIVE, + "LC_OperData.ARTPtr[UT_CmdBuf.SetAPStateCmd.APNumber].CurrentState == LC_ActionPointState_PASSIVE"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_INT32_EQ(call_count_CFE_EVS_SendEvent, 1); @@ -1758,7 +1759,7 @@ void LC_SetAPStateCmd_Test_UpdateSingleActionPointDisabled(void) snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Set AP state command: AP = %%d, New state = %%d"); - UT_CmdBuf.SetAPStateCmd.NewAPState = LC_APSTATE_DISABLED; + UT_CmdBuf.SetAPStateCmd.NewAPState = LC_ActionPointState_DISABLED; UT_CmdBuf.SetAPStateCmd.APNumber = LC_MAX_ACTIONPOINTS - 1; LC_OperData.ARTPtr[UT_CmdBuf.SetAPStateCmd.APNumber].CurrentState = 99; @@ -1767,8 +1768,8 @@ void LC_SetAPStateCmd_Test_UpdateSingleActionPointDisabled(void) LC_SetAPStateCmd(&UT_CmdBuf.Buf); /* Verify results */ - UtAssert_True(LC_OperData.ARTPtr[UT_CmdBuf.SetAPStateCmd.APNumber].CurrentState == LC_APSTATE_DISABLED, - "LC_OperData.ARTPtr[UT_CmdBuf.SetAPStateCmd.APNumber].CurrentState == LC_APSTATE_DISABLED"); + UtAssert_True(LC_OperData.ARTPtr[UT_CmdBuf.SetAPStateCmd.APNumber].CurrentState == LC_ActionPointState_DISABLED, + "LC_OperData.ARTPtr[UT_CmdBuf.SetAPStateCmd.APNumber].CurrentState == LC_ActionPointState_DISABLED"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_INT32_EQ(call_count_CFE_EVS_SendEvent, 1); @@ -1794,10 +1795,10 @@ void LC_SetAPStateCmd_Test_InvalidCurrentAPStateActive(void) snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Set AP state error: AP = %%d, Invalid current AP state = %%d"); - UT_CmdBuf.SetAPStateCmd.NewAPState = LC_APSTATE_ACTIVE; + UT_CmdBuf.SetAPStateCmd.NewAPState = LC_ActionPointState_ACTIVE; UT_CmdBuf.SetAPStateCmd.APNumber = LC_MAX_ACTIONPOINTS - 1; - LC_OperData.ARTPtr[UT_CmdBuf.SetAPStateCmd.APNumber].CurrentState = LC_APSTATE_PERMOFF; + LC_OperData.ARTPtr[UT_CmdBuf.SetAPStateCmd.APNumber].CurrentState = LC_ActionPointState_PERMOFF; /* Execute the function being tested */ LC_SetAPStateCmd(&UT_CmdBuf.Buf); @@ -1829,10 +1830,10 @@ void LC_SetAPStateCmd_Test_InvalidCurrentAPStatePassive(void) snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Set AP state error: AP = %%d, Invalid current AP state = %%d"); - UT_CmdBuf.SetAPStateCmd.NewAPState = LC_APSTATE_PASSIVE; + UT_CmdBuf.SetAPStateCmd.NewAPState = LC_ActionPointState_PASSIVE; UT_CmdBuf.SetAPStateCmd.APNumber = LC_MAX_ACTIONPOINTS - 1; - LC_OperData.ARTPtr[UT_CmdBuf.SetAPStateCmd.APNumber].CurrentState = LC_APSTATE_PERMOFF; + LC_OperData.ARTPtr[UT_CmdBuf.SetAPStateCmd.APNumber].CurrentState = LC_ActionPointState_PERMOFF; /* Execute the function being tested */ LC_SetAPStateCmd(&UT_CmdBuf.Buf); @@ -1864,10 +1865,10 @@ void LC_SetAPStateCmd_Test_InvalidCurrentAPStateDisabled(void) snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Set AP state error: AP = %%d, Invalid current AP state = %%d"); - UT_CmdBuf.SetAPStateCmd.NewAPState = LC_APSTATE_DISABLED; + UT_CmdBuf.SetAPStateCmd.NewAPState = LC_ActionPointState_DISABLED; UT_CmdBuf.SetAPStateCmd.APNumber = LC_MAX_ACTIONPOINTS - 1; - LC_OperData.ARTPtr[UT_CmdBuf.SetAPStateCmd.APNumber].CurrentState = LC_APSTATE_PERMOFF; + LC_OperData.ARTPtr[UT_CmdBuf.SetAPStateCmd.APNumber].CurrentState = LC_ActionPointState_PERMOFF; /* Execute the function being tested */ LC_SetAPStateCmd(&UT_CmdBuf.Buf); @@ -1899,10 +1900,10 @@ void LC_SetAPStateCmd_Test_InvalidAPNumberActive(void) snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Set AP state error: Invalid AP number = %%d"); - UT_CmdBuf.SetAPStateCmd.NewAPState = LC_APSTATE_ACTIVE; + UT_CmdBuf.SetAPStateCmd.NewAPState = LC_ActionPointState_ACTIVE; UT_CmdBuf.SetAPStateCmd.APNumber = LC_MAX_ACTIONPOINTS; - LC_OperData.ARTPtr[UT_CmdBuf.SetAPStateCmd.APNumber].CurrentState = LC_APSTATE_PERMOFF; + LC_OperData.ARTPtr[UT_CmdBuf.SetAPStateCmd.APNumber].CurrentState = LC_ActionPointState_PERMOFF; /* Execute the function being tested */ LC_SetAPStateCmd(&UT_CmdBuf.Buf); @@ -1933,10 +1934,10 @@ void LC_SetAPStateCmd_Test_InvalidAPNumberPassive(void) snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Set AP state error: Invalid AP number = %%d"); - UT_CmdBuf.SetAPStateCmd.NewAPState = LC_APSTATE_PASSIVE; + UT_CmdBuf.SetAPStateCmd.NewAPState = LC_ActionPointState_PASSIVE; UT_CmdBuf.SetAPStateCmd.APNumber = LC_MAX_ACTIONPOINTS; - LC_OperData.ARTPtr[UT_CmdBuf.SetAPStateCmd.APNumber].CurrentState = LC_APSTATE_PERMOFF; + LC_OperData.ARTPtr[UT_CmdBuf.SetAPStateCmd.APNumber].CurrentState = LC_ActionPointState_PERMOFF; /* Execute the function being tested */ LC_SetAPStateCmd(&UT_CmdBuf.Buf); @@ -1966,10 +1967,10 @@ void LC_SetAPStateCmd_Test_InvalidAPNumberDisabled(void) snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Set AP state error: Invalid AP number = %%d"); - UT_CmdBuf.SetAPStateCmd.NewAPState = LC_APSTATE_DISABLED; + UT_CmdBuf.SetAPStateCmd.NewAPState = LC_ActionPointState_DISABLED; UT_CmdBuf.SetAPStateCmd.APNumber = LC_MAX_ACTIONPOINTS; - LC_OperData.ARTPtr[UT_CmdBuf.SetAPStateCmd.APNumber].CurrentState = LC_APSTATE_PERMOFF; + LC_OperData.ARTPtr[UT_CmdBuf.SetAPStateCmd.APNumber].CurrentState = LC_ActionPointState_PERMOFF; /* Execute the function being tested */ LC_SetAPStateCmd(&UT_CmdBuf.Buf); @@ -2102,7 +2103,7 @@ void LC_SetAPPermOffCmd_Test_Nominal(void) UT_CmdBuf.SetAPPermOffCmd.APNumber = 1; - LC_OperData.ARTPtr[UT_CmdBuf.SetAPPermOffCmd.APNumber].CurrentState = LC_APSTATE_DISABLED; + LC_OperData.ARTPtr[UT_CmdBuf.SetAPPermOffCmd.APNumber].CurrentState = LC_ActionPointState_DISABLED; /* Execute the function being tested */ LC_SetAPPermOffCmd(&UT_CmdBuf.Buf); diff --git a/unit-test/lc_watch_tests.c b/unit-test/lc_watch_tests.c index 211fa73..4c3271b 100644 --- a/unit-test/lc_watch_tests.c +++ b/unit-test/lc_watch_tests.c @@ -211,7 +211,7 @@ void LC_CheckMsgForWPs_Test_Nominal(void) LC_OperData.HashTable[LC_GetHashTableIndex(TestMsgId)] = &LC_OperData.MessageLinks[0]; /* Not disabled */ - LC_AppData.CurrentLCState = LC_STATE_ACTIVE; + LC_AppData.CurrentLCState = LC_AppState_ACTIVE; /* Miss on first, match on next */ LC_OperData.MessageLinks[0].MessageID = LC_UT_MID_2; @@ -246,7 +246,7 @@ void LC_CheckMsgForWPs_Test_NominalMsgTime1(void) LC_OperData.HashTable[LC_GetHashTableIndex(TestMsgId)] = &LC_OperData.MessageLinks[0]; /* Not disabled */ - LC_AppData.CurrentLCState = LC_STATE_ACTIVE; + LC_AppData.CurrentLCState = LC_AppState_ACTIVE; /* Match on first, Null message list */ LC_OperData.MessageLinks[0].MessageID = TestMsgId; @@ -276,7 +276,7 @@ void LC_CheckMsgForWPs_Test_NominalMsgTime2(void) LC_OperData.HashTable[LC_GetHashTableIndex(TestMsgId)] = &LC_OperData.MessageLinks[0]; /* Not disabled */ - LC_AppData.CurrentLCState = LC_STATE_ACTIVE; + LC_AppData.CurrentLCState = LC_AppState_ACTIVE; /* Miss on first */ LC_OperData.MessageLinks[0].MessageID = TestMsgId; @@ -303,7 +303,7 @@ void LC_CheckMsgForWPs_Test_NominalDisabled(void) { CFE_SB_MsgId_t TestMsgId = LC_UT_MID_1; - LC_AppData.CurrentLCState = LC_STATE_DISABLED; + LC_AppData.CurrentLCState = LC_AppState_DISABLED; /* Execute the function being tested */ LC_CheckMsgForWPs(TestMsgId, &UT_CmdBuf.Buf);