Index: firmware/App/Controllers/BloodLeak.c =================================================================== diff -u -r6ebc1c6fd052021f95c55e81bdce3612e90efa71 -r9690fa47c23a2d76f62f385b553db7e565e18a1e --- firmware/App/Controllers/BloodLeak.c (.../BloodLeak.c) (revision 6ebc1c6fd052021f95c55e81bdce3612e90efa71) +++ firmware/App/Controllers/BloodLeak.c (.../BloodLeak.c) (revision 9690fa47c23a2d76f62f385b553db7e565e18a1e) @@ -45,18 +45,18 @@ // ********** private data ********** static OVERRIDE_U32_T bloodLeakState; ///< Current state of blood leak state machine. -static U32 bloodLeakStatePublicationTimerCounter = 0; ///< Timer counter used to schedule blood leak publication to CAN bus. +static U32 bloodLeakStatusPublicationTimerCounter = 0; ///< Timer counter used to schedule blood leak status publication to CAN bus. static U32 bloodLeakSelfTestTimerCount = 0; ///< Timer counter for blood leak self-test. /// Interval (in ms) at which to publish blood leak data to CAN bus. -static OVERRIDE_U32_T bloodLeakStatePublishInterval = { BLOOD_LEAK_PUB_INTERVAL, BLOOD_LEAK_PUB_INTERVAL, 0, 0 }; +static OVERRIDE_U32_T bloodLeakStatusPublishInterval = { BLOOD_LEAK_PUB_INTERVAL, BLOOD_LEAK_PUB_INTERVAL, 0, 0 }; static OVERRIDE_U32_T bloodLeakStatus; ///< Detected blood leak status for blood leak detector. // ********** private function prototypes ********** -static void publishBloodLeakState( void ); -static U32 getPublishBloodLeakStateInterval( void ); +static void publishBloodLeakStatus( void ); +static U32 getPublishBloodLeakStatusInterval( void ); /*********************************************************************//** * @brief @@ -108,76 +108,76 @@ } // Check state reading and act upon - if ( BLOOD_LEAK_DETECTED == getBloodLeakState() ) + if ( BLOOD_LEAK_DETECTED == getBloodLeakStatus() ) { activateAlarmNoData( ALARM_ID_HD_BLOOD_LEAK_DETECTED ); } - else // BLOOD_LEAK_NOT_DETECTED == getBloodLeakState() + else // BLOOD_LEAK_NOT_DETECTED == getBloodLeakStatus() { clearAlarmCondition( ALARM_ID_HD_BLOOD_LEAK_DETECTED ); } } - // Publish blood leak state if due - publishBloodLeakState(); + // Publish blood leak status if due + publishBloodLeakStatus(); } /*********************************************************************//** * @brief - * The getBloodLeakState function gets the current reading for the blood + * The getBloodLeakStatus function gets the current reading for the blood * leak detector. - * @details Inputs: bloodLeakState + * @details Inputs: bloodLeakStatus * @details Outputs: none - * @return the current blood leak state. + * @return the current blood leak status. *************************************************************************/ -BLOOD_LEAK_STATES_T getBloodLeakState( void ) +BLOOD_LEAK_STATES_T getBloodLeakStatus( void ) { - BLOOD_LEAK_STATES_T result = (BLOOD_LEAK_STATES_T)bloodLeakState.data; + BLOOD_LEAK_STATES_T result = (BLOOD_LEAK_STATES_T)bloodLeakStatus.data; - if ( OVERRIDE_KEY == bloodLeakState.override ) + if ( OVERRIDE_KEY == bloodLeakStatus.override ) { - result = (BLOOD_LEAK_STATES_T)bloodLeakState.ovData; + result = (BLOOD_LEAK_STATES_T)bloodLeakStatus.ovData; } return result; } /*********************************************************************//** * @brief - * The getPublishBloodLeakStateInterval function gets the blood leak state + * The getPublishBloodLeakStatusInterval function gets the blood leak state * publication interval. - * @details Inputs: bloodLeakStatePublishInterval + * @details Inputs: bloodLeakStatusPublishInterval * @details Outputs: none * @return the current blood leak state publication interval (in task intervals). *************************************************************************/ -static U32 getPublishBloodLeakStateInterval( void ) +static U32 getPublishBloodLeakStatusInterval( void ) { - U32 result = bloodLeakStatePublishInterval.data; + U32 result = bloodLeakStatusPublishInterval.data; - if ( OVERRIDE_KEY == bloodLeakStatePublishInterval.override ) + if ( OVERRIDE_KEY == bloodLeakStatusPublishInterval.override ) { - result = bloodLeakStatePublishInterval.ovData; + result = bloodLeakStatusPublishInterval.ovData; } return result; } /*********************************************************************//** * @brief - * The publishBloodLeakState function publishes blood leak state at the set interval. + * The publishBloodLeakStatus function publishes blood leak state at the set interval. * @details Inputs: bloodLeakState * @details Outputs: if broadcast is due, send blood leak state * @return none *************************************************************************/ -static void publishBloodLeakState( void ) +static void publishBloodLeakStatus( void ) { - // Publish blood leak state on interval - if ( ++bloodLeakStatePublicationTimerCounter >= getPublishBloodLeakStateInterval() ) + // Publish blood leak status on interval + if ( ++bloodLeakStatusPublicationTimerCounter >= getPublishBloodLeakStatusInterval() ) { - BLOOD_LEAK_STATES_T state = getBloodLeakState(); + BLOOD_LEAK_STATES_T status = getBloodLeakStatus(); - broadcastBloodLeakState( state ); - bloodLeakStatePublicationTimerCounter = 0; + broadcastBloodLeakStatus( status ); + bloodLeakStatusPublicationTimerCounter = 0; } } @@ -189,14 +189,14 @@ /*********************************************************************//** * @brief - * The testSetBloodLeakStatePublishIntervalOverride function overrides the + * The testSetBloodLeakStatusPublishIntervalOverride function overrides the * blood leak state publish interval. * @details Inputs: none - * @details Outputs: bloodLeakStatePublishInterval + * @details Outputs: bloodLeakStatusPublishInterval * @param value override blood leak state publish interval with (in ms) * @return TRUE if override successful, FALSE if not *************************************************************************/ -BOOL testSetBloodLeakStatePublishIntervalOverride( U32 value ) +BOOL testSetBloodLeakStatusPublishIntervalOverride( U32 value ) { BOOL result = FALSE; @@ -205,46 +205,46 @@ U32 intvl = value / TASK_PRIORITY_INTERVAL; result = TRUE; - bloodLeakStatePublishInterval.ovData = intvl; - bloodLeakStatePublishInterval.override = OVERRIDE_KEY; + bloodLeakStatusPublishInterval.ovData = intvl; + bloodLeakStatusPublishInterval.override = OVERRIDE_KEY; } return result; } /*********************************************************************//** * @brief - * The testResetBloodLeakStatePublishIntervalOverride function resets the override + * The testResetBloodLeakStatusPublishIntervalOverride function resets the override * of the blood leak state publish interval. * @details Inputs: none - * @details Outputs: bloodLeakStatePublishInterval + * @details Outputs: bloodLeakStatusPublishInterval * @return TRUE if override reset successful, FALSE if not *************************************************************************/ -BOOL testResetBloodLeakStatePublishIntervalOverride( void ) +BOOL testResetBloodLeakStatusPublishIntervalOverride( void ) { BOOL result = FALSE; if ( TRUE == isTestingActivated() ) { result = TRUE; - bloodLeakStatePublishInterval.override = OVERRIDE_RESET; - bloodLeakStatePublishInterval.ovData = bloodLeakStatePublishInterval.ovInitData; + bloodLeakStatusPublishInterval.override = OVERRIDE_RESET; + bloodLeakStatusPublishInterval.ovData = bloodLeakStatusPublishInterval.ovInitData; } return result; } /*********************************************************************//** * @brief - * The testSetBloodLeakStateOverride function overrides the state + * The testSetBloodLeakStatusOverride function overrides the status * of the blood leak detector. * @details Inputs: none - * @details Outputs: bloodLeakState + * @details Outputs: bloodLeakStatus * @param none - * @param state override blood leak detector with this + * @param status override blood leak detector with this * @return TRUE if override successful, FALSE if not *************************************************************************/ -BOOL testSetBloodLeakStateOverride( BLOOD_LEAK_STATES_T state ) +BOOL testSetBloodLeakStatusOverride( BLOOD_LEAK_STATES_T state ) { BOOL result = FALSE; @@ -253,8 +253,8 @@ if ( TRUE == isTestingActivated() ) { result = TRUE; - bloodLeakState.ovData = (U32)state; - bloodLeakState.override = OVERRIDE_KEY; + bloodLeakStatus.ovData = (U32)state; + bloodLeakStatus.override = OVERRIDE_KEY; } } @@ -263,22 +263,22 @@ /*********************************************************************//** * @brief - * The testResetBloodLeakStateOverride function resets the override of the + * The testResetBloodLeakStatusOverride function resets the override of the * blood leak detector. * @details Inputs: none - * @details Outputs: bloodLeakState + * @details Outputs: bloodLeakStatus * @param none * @return TRUE if reset successful, FALSE if not *************************************************************************/ -BOOL testResetBloodLeakStateOverride( void ) +BOOL testResetBloodLeakStatusOverride( void ) { BOOL result = FALSE; if ( TRUE == isTestingActivated() ) { result = TRUE; - bloodLeakState.override = OVERRIDE_RESET; - bloodLeakState.ovData = bloodLeakState.ovInitData; + bloodLeakStatus.override = OVERRIDE_RESET; + bloodLeakStatus.ovData = bloodLeakStatus.ovInitData; } return result; Index: firmware/App/Controllers/BloodLeak.h =================================================================== diff -u -r6ebc1c6fd052021f95c55e81bdce3612e90efa71 -r9690fa47c23a2d76f62f385b553db7e565e18a1e --- firmware/App/Controllers/BloodLeak.h (.../BloodLeak.h) (revision 6ebc1c6fd052021f95c55e81bdce3612e90efa71) +++ firmware/App/Controllers/BloodLeak.h (.../BloodLeak.h) (revision 9690fa47c23a2d76f62f385b553db7e565e18a1e) @@ -47,12 +47,12 @@ void zeroBloodLeak( void ); void execBloodLeak( void ); -BLOOD_LEAK_STATES_T getBloodLeakState( void ); +BLOOD_LEAK_STATES_T getBloodLeakStatus( void ); -BOOL testSetBloodLeakStatePublishIntervalOverride( U32 value ); -BOOL testResetBloodLeakStatePublishIntervalOverride( void ); -BOOL testSetBloodLeakStateOverride( BLOOD_LEAK_STATES_T state ); -BOOL testResetBloodLeakStateOverride( void ); +BOOL testSetBloodLeakStatusPublishIntervalOverride( U32 value ); +BOOL testResetBloodLeakStatusPublishIntervalOverride( void ); +BOOL testSetBloodLeakStatusOverride( BLOOD_LEAK_STATES_T state ); +BOOL testResetBloodLeakStatusOverride( void ); /**@}*/ Index: firmware/App/Services/SystemComm.c =================================================================== diff -u -r14f908289dbed6a75452ab270214514756e8be03 -r9690fa47c23a2d76f62f385b553db7e565e18a1e --- firmware/App/Services/SystemComm.c (.../SystemComm.c) (revision 14f908289dbed6a75452ab270214514756e8be03) +++ firmware/App/Services/SystemComm.c (.../SystemComm.c) (revision 9690fa47c23a2d76f62f385b553db7e565e18a1e) @@ -1454,8 +1454,8 @@ handleSetBloodLeakBroadcastIntervalOverrideRequest( message ); break; - case MSG_ID_HD_BLOOD_LEAK_STATE_DETECTOR_OVERRIDE: - handleSetBloodLeakStateDetectorOverrideRequest( message ); + case MSG_ID_HD_BLOOD_LEAK_STATUS_DETECTOR_OVERRIDE: + handleSetBloodLeakStatusDetectorOverrideRequest( message ); case MSG_ID_HD_SET_OP_MODE_REQUEST: handleTestSetOpModeRequest( message ); Index: firmware/App/Services/SystemCommMessages.c =================================================================== diff -u -r70b000b9a49b56f1e5d41aebddf4ed97a01faa0b -r9690fa47c23a2d76f62f385b553db7e565e18a1e --- firmware/App/Services/SystemCommMessages.c (.../SystemCommMessages.c) (revision 70b000b9a49b56f1e5d41aebddf4ed97a01faa0b) +++ firmware/App/Services/SystemCommMessages.c (.../SystemCommMessages.c) (revision 9690fa47c23a2d76f62f385b553db7e565e18a1e) @@ -1434,26 +1434,26 @@ /***********************************************************************//** * @brief - * The broadcastBloodLeakState function constructs an HD blood leak state msg to \n + * The broadcastBloodLeakStatus function constructs an HD blood leak state msg to \n * be broadcasted and queues the msg for transmit on the appropriate CAN channel. * @details Inputs: none * @details Outputs: blood leak state msg constructed and queued * @param state blood leak state * @return TRUE if msg successfully queued for transmit, FALSE if not *************************************************************************/ -BOOL broadcastBloodLeakState( BLOOD_LEAK_STATES_T state ) +BOOL broadcastBloodLeakStatus( BLOOD_LEAK_STATES_T status ) { BOOL result; MESSAGE_T msg; U08 *payloadPtr = msg.payload; - U32 leakState = (U32)state; + U32 leakStatus = (U32)status; // Create a message record blankMessage( &msg ); msg.hdr.msgID = MSG_ID_HD_BLOOD_LEAK_STATE; msg.hdr.payloadLen = sizeof( U32 ); - memcpy( payloadPtr, &leakState, sizeof( U32 ) ); + memcpy( payloadPtr, &leakStatus, sizeof( U32 ) ); // Serialize the message (w/ sync, CRC, and appropriate CAN padding) and add serialized message data to appropriate comm buffer result = serializeMessage( msg, COMM_BUFFER_OUT_CAN_HD_BROADCAST, ACK_NOT_REQUIRED ); @@ -4278,11 +4278,11 @@ memcpy( &payload, message->payload, sizeof( TEST_OVERRIDE_PAYLOAD_T ) ); if ( FALSE == payload.reset ) { - result = testSetBloodLeakStatePublishIntervalOverride( (U32)( payload.state.u32 ) ); + result = testSetBloodLeakStatusPublishIntervalOverride( (U32)( payload.state.u32 ) ); } else { - result = testResetBloodLeakStatePublishIntervalOverride(); + result = testResetBloodLeakStatusPublishIntervalOverride(); } } @@ -4292,14 +4292,14 @@ /*********************************************************************//** * @brief - * The handleSetBloodLeakStateDetectorOverrideRequest function handles a request to - * override the blood leak detector state. + * The handleSetBloodLeakStatusDetectorOverrideRequest function handles a request to + * override the blood leak detector status. * @details Inputs: none * @details Outputs: message handled * @param message : a pointer to the message to handle * @return none *************************************************************************/ -void handleSetBloodLeakStateDetectorOverrideRequest( MESSAGE_T *message ) +void handleSetBloodLeakStatusDetectorOverrideRequest( MESSAGE_T *message ) { TEST_OVERRIDE_ARRAY_PAYLOAD_T payload; BOOL result = FALSE; @@ -4310,11 +4310,11 @@ memcpy( &payload, message->payload, sizeof( TEST_OVERRIDE_ARRAY_PAYLOAD_T ) ); if ( FALSE == payload.reset ) { - result = testSetBloodLeakStateOverride( ( BLOOD_LEAK_STATES_T)( payload.state.u32 ) ); + result = testSetBloodLeakStatusOverride( ( BLOOD_LEAK_STATES_T)( payload.state.u32 ) ); } else { - result = testResetBloodLeakStateOverride(); + result = testResetBloodLeakStatusOverride(); } } Index: firmware/App/Services/SystemCommMessages.h =================================================================== diff -u -r033f3e49502d5cce85b60cbf6ea3ed7f6f6592e8 -r9690fa47c23a2d76f62f385b553db7e565e18a1e --- firmware/App/Services/SystemCommMessages.h (.../SystemCommMessages.h) (revision 033f3e49502d5cce85b60cbf6ea3ed7f6f6592e8) +++ firmware/App/Services/SystemCommMessages.h (.../SystemCommMessages.h) (revision 9690fa47c23a2d76f62f385b553db7e565e18a1e) @@ -281,8 +281,8 @@ // MSG_ID_HD_FLUID_LEAK_STATE BOOL broadcastFluidLeakState( FLUID_LEAK_STATES_T state ); -// MSG_ID_HD_BLOOD_LEAK_STATE -BOOL broadcastBloodLeakState( BLOOD_LEAK_STATES_T state ); +// MSG_ID_HD_BLOOD_LEAK_STATUS +BOOL broadcastBloodLeakStatus( BLOOD_LEAK_STATES_T status ); // MSG_ID_HD_PRIMING_STATUS_DATA BOOL broadcastPrimeData( PRIMING_DATA_PAYLOAD_T *primeDataPtr ); @@ -482,8 +482,8 @@ // MSG_ID_HD_BLOOD_LEAK_SEND_INTERVAL_OVERRIDE void handleSetBloodLeakBroadcastIntervalOverrideRequest( MESSAGE_T *message ); -// MSG_ID_HD_BLOOD_LEAK_STATE_DETECTOR_OVERRIDE -void handleSetBloodLeakStateDetectorOverrideRequest( MESSAGE_T *message ); +// MSG_ID_HD_BLOOD_LEAK_STATUS_DETECTOR_OVERRIDE +void handleSetBloodLeakStatusDetectorOverrideRequest( MESSAGE_T *message ); // MSG_ID_SUPER_CLEAR_ALARMS_CMD void handleTestSuperClearAlarmsRequest( MESSAGE_T *message );