Index: firmware/App/Controllers/BloodLeak.c =================================================================== diff -u -re9cc9eadcf846737bbc4e900db22f4c2a06ad922 -re3c5eb0fcb29840433e2c46086146ae683533104 --- firmware/App/Controllers/BloodLeak.c (.../BloodLeak.c) (revision e9cc9eadcf846737bbc4e900db22f4c2a06ad922) +++ firmware/App/Controllers/BloodLeak.c (.../BloodLeak.c) (revision e3c5eb0fcb29840433e2c46086146ae683533104) @@ -41,17 +41,13 @@ 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 bloodLeakStatusPublishInterval = { BLOOD_LEAK_PUB_INTERVAL, BLOOD_LEAK_PUB_INTERVAL, 0, 0 }; -static OVERRIDE_U32_T bloodLeakStatePublishInterval = { BLOOD_LEAK_PUB_INTERVAL, BLOOD_LEAK_PUB_INTERVAL, 0, 0 }; -static U32 bloodLeakStatusPublicationTimerCounter = 0; ///< Timer counter used to schedule blood leak status publication to CAN bus. -static U32 bloodLeakStatePublicationTimerCounter = 0; ///< Timer counter used to schedule blood leak state publication to CAN bus. +static OVERRIDE_U32_T bloodLeakDataPublishInterval = { BLOOD_LEAK_PUB_INTERVAL, BLOOD_LEAK_PUB_INTERVAL, 0, 0 }; +static U32 bloodLeakDataPublicationTimerCounter = 0; ///< Timer counter used to schedule blood leak data publication to CAN bus. // ********** private function prototypes ********** -static void publishBloodLeakStatus( void ); -static void publishBloodLeakState( void ); -static U32 getPublishBloodLeakStatusInterval( void ); -static U32 getPublishBloodLeakStateInterval( void ); +static void publishBloodLeakData( void ); +static U32 getPublishBloodLeakDataInterval( void ); /*********************************************************************//** * @brief @@ -73,10 +69,12 @@ * @details Outputs: Blood Leak module zeroing. * @return none *************************************************************************/ -void zeroBloodLeak( void ) +BOOL zeroBloodLeak( void ) { bloodLeakState.data = BLOOD_LEAK_ZERO_STATE; - //setBloodLeakZero(); TODO + //setFPGABloodLeakZero(); TODO + + return TRUE; // TODO } /*********************************************************************//** @@ -89,9 +87,9 @@ BOOL selfTestBloodLeak( void ) { bloodLeakState.data = BLOOD_LEAK_SELF_TEST_STATE; - //setBloodLeakSelfTest(); TODO + //setFPGABloodLeakSelfTest(); TODO - return TRUE; + return TRUE; // TODO } /*********************************************************************//** @@ -145,11 +143,8 @@ } } - // Publish blood leak status if due - publishBloodLeakStatus(); - - // Publish blood leak state if due - publishBloodLeakState(); + // Publish blood leak data if due + publishBloodLeakData(); } /*********************************************************************//** @@ -174,45 +169,6 @@ /*********************************************************************//** * @brief - * The getPublishBloodLeakStatusInterval function gets the blood leak status - * publication interval. - * @details Inputs: bloodLeakStatusPublishInterval - * @details Outputs: none - * @return the current blood leak status publication interval (in task intervals). - *************************************************************************/ -static U32 getPublishBloodLeakStatusInterval( void ) -{ - U32 result = bloodLeakStatusPublishInterval.data; - - if ( OVERRIDE_KEY == bloodLeakStatusPublishInterval.override ) - { - result = bloodLeakStatusPublishInterval.ovData; - } - - return result; -} - -/*********************************************************************//** - * @brief - * The publishBloodLeakStatus function publishes blood leak status at the set interval. - * @details Inputs: bloodLeakStatus - * @details Outputs: if broadcast is due, send blood leak status - * @return none - *************************************************************************/ -static void publishBloodLeakStatus( void ) -{ - // Publish blood leak status on interval - if ( ++bloodLeakStatusPublicationTimerCounter >= getPublishBloodLeakStatusInterval() ) - { - BLOOD_LEAK_STATUS_T status = getBloodLeakStatus(); - - broadcastBloodLeakStatus( status ); - bloodLeakStatusPublicationTimerCounter = 0; - } -} - -/*********************************************************************//** - * @brief * The getBloodLeakState function gets the current state of the blood * leak detector state machine. * @details Inputs: bloodLeakState @@ -233,40 +189,41 @@ /*********************************************************************//** * @brief - * The getPublishBloodLeakStateInterval function gets the blood leak state + * The getPublishBloodLeakDataInterval function gets the blood leak data * publication interval. - * @details Inputs: bloodLeakStatePublishInterval + * @details Inputs: bloodLeakDataPublishInterval * @details Outputs: none - * @return the current blood leak state publication interval (in task intervals). + * @return the current blood leak data publication interval (in task intervals). *************************************************************************/ -static U32 getPublishBloodLeakStateInterval( void ) +static U32 getPublishBloodLeakDataInterval( void ) { - U32 result = bloodLeakStatePublishInterval.data; + U32 result = bloodLeakDataPublishInterval.data; - if ( OVERRIDE_KEY == bloodLeakStatePublishInterval.override ) + if ( OVERRIDE_KEY == bloodLeakDataPublishInterval.override ) { - result = bloodLeakStatePublishInterval.ovData; + result = bloodLeakDataPublishInterval.ovData; } return result; } /*********************************************************************//** * @brief - * The publishBloodLeakState function publishes blood leak state at the set interval. - * @details Inputs: bloodLeakState - * @details Outputs: if broadcast is due, send blood leak state + * The publishBloodLeakData function publishes blood leak data at the set interval. + * @details Inputs: bloodLeakStatus, bloodLeakState + * @details Outputs: if broadcast is due, send blood leak data * @return none *************************************************************************/ -static void publishBloodLeakState( void ) +static void publishBloodLeakData( void ) { - // Publish blood leak state on interval - if ( ++bloodLeakStatePublicationTimerCounter >= getPublishBloodLeakStateInterval() ) + // Publish blood leak data on interval + if ( ++bloodLeakDataPublicationTimerCounter >= getPublishBloodLeakDataInterval() ) { + BLOOD_LEAK_STATUS_T status = getBloodLeakStatus(); BLOOD_LEAK_STATES_T state = getBloodLeakState(); - broadcastBloodLeakState( state ); - bloodLeakStatePublicationTimerCounter = 0; + broadcastBloodLeakData( status, state ); + bloodLeakDataPublicationTimerCounter = 0; } } @@ -278,14 +235,14 @@ /*********************************************************************//** * @brief - * The testSetBloodLeakStatusPublishIntervalOverride function overrides the - * blood leak status publish interval. + * The testSetBloodLeakDataPublishIntervalOverride function overrides the + * blood leak data publish interval. * @details Inputs: none - * @details Outputs: bloodLeakStatusPublishInterval - * @param value override blood leak status publish interval with (in ms) + * @details Outputs: bloodLeakDataPublishInterval + * @param value override blood leak data publish interval with (in ms) * @return TRUE if override successful, FALSE if not *************************************************************************/ -BOOL testSetBloodLeakStatusPublishIntervalOverride( U32 value ) +BOOL testSetBloodLeakDataPublishIntervalOverride( U32 value ) { BOOL result = FALSE; @@ -294,153 +251,56 @@ U32 intvl = value / TASK_PRIORITY_INTERVAL; result = TRUE; - bloodLeakStatusPublishInterval.ovData = intvl; - bloodLeakStatusPublishInterval.override = OVERRIDE_KEY; + bloodLeakDataPublishInterval.ovData = intvl; + bloodLeakDataPublishInterval.override = OVERRIDE_KEY; } return result; } /*********************************************************************//** * @brief - * The testResetBloodLeakStatusPublishIntervalOverride function resets the override - * of the blood leak status publish interval. + * The testResetBloodLeakDataPublishIntervalOverride function resets the override + * of the blood leak data publish interval. * @details Inputs: none - * @details Outputs: bloodLeakStatusPublishInterval + * @details Outputs: bloodLeakDataPublishInterval * @return TRUE if override reset successful, FALSE if not *************************************************************************/ -BOOL testResetBloodLeakStatusPublishIntervalOverride( void ) +BOOL testResetBloodLeakDataPublishIntervalOverride( void ) { BOOL result = FALSE; if ( TRUE == isTestingActivated() ) { result = TRUE; - bloodLeakStatusPublishInterval.override = OVERRIDE_RESET; - bloodLeakStatusPublishInterval.ovData = bloodLeakStatusPublishInterval.ovInitData; + bloodLeakDataPublishInterval.override = OVERRIDE_RESET; + bloodLeakDataPublishInterval.ovData = bloodLeakDataPublishInterval.ovInitData; } return result; } /*********************************************************************//** * @brief - * The testSetBloodLeakStatusOverride function overrides the status + * The testSetBloodLeakDataOverride function overrides the data * of the blood leak detector. * @details Inputs: none - * @details Outputs: bloodLeakStatus + * @details Outputs: bloodLeakStatus, bloodLeakState * @param none - * @param status override blood leak detector with this + * @param data override blood leak detector with this * @return TRUE if override successful, FALSE if not *************************************************************************/ -BOOL testSetBloodLeakStatusOverride( BLOOD_LEAK_STATUS_T status ) +BOOL testSetBloodLeakDataOverride( BLOOD_LEAK_STATUS_T status, BLOOD_LEAK_STATES_T state ) { BOOL result = FALSE; - if ( ( status < NUM_OF_BLOOD_LEAK_STATUS ) ) + if ( ( status < NUM_OF_BLOOD_LEAK_STATUS ) && ( state < NUM_OF_BLOOD_LEAK_STATES ) ) { if ( TRUE == isTestingActivated() ) { result = TRUE; bloodLeakStatus.ovData = (U32)status; bloodLeakStatus.override = OVERRIDE_KEY; - } - } - - return result; -} - -/*********************************************************************//** - * @brief - * The testResetBloodLeakStatusOverride function resets the override of the - * blood leak detector. - * @details Inputs: none - * @details Outputs: bloodLeakStatus - * @param none - * @return TRUE if reset successful, FALSE if not - *************************************************************************/ -BOOL testResetBloodLeakStatusOverride( void ) -{ - BOOL result = FALSE; - - if ( TRUE == isTestingActivated() ) - { - result = TRUE; - bloodLeakStatus.override = OVERRIDE_RESET; - bloodLeakStatus.ovData = bloodLeakStatus.ovInitData; - } - - return result; -} - -/**@}*/ - -/*********************************************************************//** - * @brief - * The testSetBloodLeakStatePublishIntervalOverride function overrides the - * blood leak state publish interval. - * @details Inputs: none - * @details Outputs: bloodLeakStatePublishInterval - * @param value override blood leak state publish interval with (in ms) - * @return TRUE if override successful, FALSE if not - *************************************************************************/ -BOOL testSetBloodLeakStatePublishIntervalOverride( U32 value ) -{ - BOOL result = FALSE; - - if ( TRUE == isTestingActivated() ) - { - U32 intvl = value / TASK_PRIORITY_INTERVAL; - - result = TRUE; - bloodLeakStatePublishInterval.ovData = intvl; - bloodLeakStatePublishInterval.override = OVERRIDE_KEY; - } - - return result; -} - -/*********************************************************************//** - * @brief - * The testResetBloodLeakStatePublishIntervalOverride function resets the override - * of the blood leak state publish interval. - * @details Inputs: none - * @details Outputs: bloodLeakStatePublishInterval - * @return TRUE if override reset successful, FALSE if not - *************************************************************************/ -BOOL testResetBloodLeakStatePublishIntervalOverride( void ) -{ - BOOL result = FALSE; - - if ( TRUE == isTestingActivated() ) - { - result = TRUE; - bloodLeakStatePublishInterval.override = OVERRIDE_RESET; - bloodLeakStatePublishInterval.ovData = bloodLeakStatePublishInterval.ovInitData; - } - - return result; -} - -/*********************************************************************//** - * @brief - * The testSetBloodLeakStateOverride function overrides the state - * of the blood leak detector state machine. - * @details Inputs: none - * @details Outputs: bloodLeakState - * @param none - * @param state override blood leak detector with this - * @return TRUE if override successful, FALSE if not - *************************************************************************/ -BOOL testSetBloodLeakStateOverride( BLOOD_LEAK_STATES_T state ) -{ - BOOL result = FALSE; - - if ( ( state < NUM_OF_BLOOD_LEAK_STATES ) ) - { - if ( TRUE == isTestingActivated() ) - { - result = TRUE; bloodLeakState.ovData = (U32)state; bloodLeakState.override = OVERRIDE_KEY; } @@ -451,20 +311,22 @@ /*********************************************************************//** * @brief - * The testResetBloodLeakStateOverride function resets the override of the - * blood leak detector state machine. + * The testResetBloodLeakDataOverride function resets the override of the + * blood leak detector data. * @details Inputs: none - * @details Outputs: bloodLeakState + * @details Outputs: bloodLeakStatus, bloodLeakState * @param none * @return TRUE if reset successful, FALSE if not *************************************************************************/ -BOOL testResetBloodLeakStateOverride( void ) +BOOL testResetBloodLeakDataOverride( void ) { BOOL result = FALSE; if ( TRUE == isTestingActivated() ) { result = TRUE; + bloodLeakStatus.override = OVERRIDE_RESET; + bloodLeakStatus.ovData = bloodLeakStatus.ovInitData; bloodLeakState.override = OVERRIDE_RESET; bloodLeakState.ovData = bloodLeakState.ovInitData; } Index: firmware/App/Controllers/BloodLeak.h =================================================================== diff -u -re9cc9eadcf846737bbc4e900db22f4c2a06ad922 -re3c5eb0fcb29840433e2c46086146ae683533104 --- firmware/App/Controllers/BloodLeak.h (.../BloodLeak.h) (revision e9cc9eadcf846737bbc4e900db22f4c2a06ad922) +++ firmware/App/Controllers/BloodLeak.h (.../BloodLeak.h) (revision e3c5eb0fcb29840433e2c46086146ae683533104) @@ -54,22 +54,17 @@ // ********** public function prototypes ********** void initBloodLeak( void ); -void zeroBloodLeak( void ); +BOOL zeroBloodLeak( void ); BOOL selfTestBloodLeak( void ); void execBloodLeak( void ); BLOOD_LEAK_STATUS_T getBloodLeakStatus( void ); BLOOD_LEAK_STATES_T getBloodLeakState( void ); -BOOL testSetBloodLeakStatusPublishIntervalOverride( U32 value ); -BOOL testResetBloodLeakStatusPublishIntervalOverride( void ); -BOOL testSetBloodLeakStatusOverride( BLOOD_LEAK_STATUS_T state ); -BOOL testResetBloodLeakStatusOverride( void ); - -BOOL testSetBloodLeakStatePublishIntervalOverride( U32 value ); -BOOL testResetBloodLeakStatePublishIntervalOverride( void ); -BOOL testSetBloodLeakStateOverride( BLOOD_LEAK_STATES_T state ); -BOOL testResetBloodLeakStateOverride( void ); +BOOL testSetBloodLeakDataPublishIntervalOverride( U32 value ); +BOOL testResetBloodLeakDataPublishIntervalOverride( void ); +BOOL testSetBloodLeakDataOverride( BLOOD_LEAK_STATUS_T status, BLOOD_LEAK_STATES_T state ); +BOOL testResetBloodLeakDataOverride( void ); /**@}*/ Index: firmware/App/Services/SystemComm.c =================================================================== diff -u -rb8d4f0f17b9069862ef77f0a967b0fe6a7ac7d52 -re3c5eb0fcb29840433e2c46086146ae683533104 --- firmware/App/Services/SystemComm.c (.../SystemComm.c) (revision b8d4f0f17b9069862ef77f0a967b0fe6a7ac7d52) +++ firmware/App/Services/SystemComm.c (.../SystemComm.c) (revision e3c5eb0fcb29840433e2c46086146ae683533104) @@ -1450,20 +1450,13 @@ case MSG_ID_HD_FLUID_LEAK_STATE_DETECTOR_OVERRIDE: handleSetFluidLeakStateDetectorOverrideRequest( message ); - case MSG_ID_HD_BLOOD_LEAK_STATUS_SEND_INTERVAL_OVERRIDE: - handleSetBloodLeakStatusBroadcastIntervalOverrideRequest( message ); + case MSG_ID_HD_BLOOD_LEAK_DATA_SEND_INTERVAL_OVERRIDE: + handleSetBloodLeakDataBroadcastIntervalOverrideRequest( message ); break; - case MSG_ID_HD_BLOOD_LEAK_STATUS_DETECTOR_OVERRIDE: - handleSetBloodLeakStatusDetectorOverrideRequest( message ); + case MSG_ID_HD_BLOOD_LEAK_DATA_DETECTOR_OVERRIDE: + handleSetBloodLeakDataDetectorOverrideRequest( message ); - case MSG_ID_HD_BLOOD_LEAK_STATE_SEND_INTERVAL_OVERRIDE: - handleSetBloodLeakStateBroadcastIntervalOverrideRequest( message ); - break; - - case MSG_ID_HD_BLOOD_LEAK_STATE_DETECTOR_OVERRIDE: - handleSetBloodLeakStateDetectorOverrideRequest( message ); - case MSG_ID_HD_SET_OP_MODE_REQUEST: handleTestSetOpModeRequest( message ); break; Index: firmware/App/Services/SystemCommMessages.c =================================================================== diff -u -re9cc9eadcf846737bbc4e900db22f4c2a06ad922 -re3c5eb0fcb29840433e2c46086146ae683533104 --- firmware/App/Services/SystemCommMessages.c (.../SystemCommMessages.c) (revision e9cc9eadcf846737bbc4e900db22f4c2a06ad922) +++ firmware/App/Services/SystemCommMessages.c (.../SystemCommMessages.c) (revision e3c5eb0fcb29840433e2c46086146ae683533104) @@ -1434,54 +1434,28 @@ /***********************************************************************//** * @brief - * The broadcastBloodLeakStatus function constructs an HD blood leak status msg to \n + * The broadcastBloodLeakData function constructs an HD blood leak data msg to \n * be broadcasted and queues the msg for transmit on the appropriate CAN channel. * @details Inputs: none - * @details Outputs: blood leak status msg constructed and queued - * @param status blood leak status + * @details Outputs: blood leak data msg constructed and queued + * @param blood leak data * @return TRUE if msg successfully queued for transmit, FALSE if not *************************************************************************/ -BOOL broadcastBloodLeakStatus( BLOOD_LEAK_STATUS_T status ) +BOOL broadcastBloodLeakData( BLOOD_LEAK_STATUS_T status, BLOOD_LEAK_STATES_T state ) { BOOL result; MESSAGE_T msg; U08 *payloadPtr = msg.payload; U32 leakStatus = (U32)status; - - // Create a message record - blankMessage( &msg ); - msg.hdr.msgID = MSG_ID_HD_BLOOD_LEAK_STATUS; - msg.hdr.payloadLen = 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 ); - - return result; -} - -/***********************************************************************//** - * @brief - * The broadcastBloodLeakState 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 result; - MESSAGE_T msg; - U08 *payloadPtr = msg.payload; U32 leakState = (U32)state; // Create a message record blankMessage( &msg ); - msg.hdr.msgID = MSG_ID_HD_BLOOD_LEAK_STATE; - msg.hdr.payloadLen = sizeof( U32 ); + msg.hdr.msgID = MSG_ID_HD_BLOOD_LEAK_DATA; + msg.hdr.payloadLen = sizeof( U32 ) + sizeof( U32 ); + memcpy( payloadPtr, &leakStatus, sizeof( U32 ) ); + payloadPtr += sizeof( U32 ); memcpy( payloadPtr, &leakState, sizeof( U32 ) ); // Serialize the message (w/ sync, CRC, and appropriate CAN padding) and add serialized message data to appropriate comm buffer @@ -4289,14 +4263,14 @@ /*********************************************************************//** * @brief - * The handleSetBloodLeakStatusBroadcastIntervalOverrideRequest function handles a - * request to override the blood leak status broadcast interval. + * The handleSetBloodLeakDataBroadcastIntervalOverrideRequest function handles a + * request to override the blood leak data broadcast interval. * @details Inputs: none * @details Outputs: message handled * @param message : a pointer to the message to handle * @return none *************************************************************************/ -void handleSetBloodLeakStatusBroadcastIntervalOverrideRequest( MESSAGE_T *message ) +void handleSetBloodLeakDataBroadcastIntervalOverrideRequest( MESSAGE_T *message ) { TEST_OVERRIDE_PAYLOAD_T payload; BOOL result = FALSE; @@ -4307,11 +4281,11 @@ memcpy( &payload, message->payload, sizeof( TEST_OVERRIDE_PAYLOAD_T ) ); if ( FALSE == payload.reset ) { - result = testSetBloodLeakStatusPublishIntervalOverride( (U32)( payload.state.u32 ) ); + result = testSetBloodLeakDataPublishIntervalOverride( (U32)( payload.state.u32 ) ); } else { - result = testResetBloodLeakStatusPublishIntervalOverride(); + result = testResetBloodLeakDataPublishIntervalOverride(); } } @@ -4321,14 +4295,14 @@ /*********************************************************************//** * @brief - * The handleSetBloodLeakStatusDetectorOverrideRequest function handles a request to - * override the blood leak detector status. + * The handleSetBloodLeakDataDetectorOverrideRequest function handles a request to + * override the blood leak detector data. * @details Inputs: none * @details Outputs: message handled * @param message : a pointer to the message to handle * @return none *************************************************************************/ -void handleSetBloodLeakStatusDetectorOverrideRequest( MESSAGE_T *message ) +void handleSetBloodLeakDataDetectorOverrideRequest( MESSAGE_T *message ) { TEST_OVERRIDE_ARRAY_PAYLOAD_T payload; BOOL result = FALSE; @@ -4339,11 +4313,11 @@ memcpy( &payload, message->payload, sizeof( TEST_OVERRIDE_ARRAY_PAYLOAD_T ) ); if ( FALSE == payload.reset ) { - result = testSetBloodLeakStatusOverride( ( BLOOD_LEAK_STATUS_T)( payload.state.u32 ) ); + result = testSetBloodLeakDataOverride( ( BLOOD_LEAK_STATUS_T)( payload.state.u32 ), ( BLOOD_LEAK_STATES_T)( payload.state.u32 ) ); } else { - result = testResetBloodLeakStatusOverride(); + result = testResetBloodLeakDataOverride(); } } @@ -4353,70 +4327,6 @@ /*********************************************************************//** * @brief - * The handleSetBloodLeakStateBroadcastIntervalOverrideRequest function handles a - * request to override the blood leak state broadcast interval. - * @details Inputs: none - * @details Outputs: message handled - * @param message : a pointer to the message to handle - * @return none - *************************************************************************/ -void handleSetBloodLeakStateBroadcastIntervalOverrideRequest( MESSAGE_T *message ) -{ - TEST_OVERRIDE_PAYLOAD_T payload; - BOOL result = FALSE; - - // Verify payload length - if ( sizeof( TEST_OVERRIDE_PAYLOAD_T ) == message->hdr.payloadLen ) - { - memcpy( &payload, message->payload, sizeof( TEST_OVERRIDE_PAYLOAD_T ) ); - if ( FALSE == payload.reset ) - { - result = testSetBloodLeakStatePublishIntervalOverride( (U32)( payload.state.u32 ) ); - } - else - { - result = testResetBloodLeakStatePublishIntervalOverride(); - } - } - - // Respond to request - sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result ); -} - -/*********************************************************************//** - * @brief - * The handleSetBloodLeakStateDetectorOverrideRequest function handles a request to - * override the blood leak detector state. - * @details Inputs: none - * @details Outputs: message handled - * @param message : a pointer to the message to handle - * @return none - *************************************************************************/ -void handleSetBloodLeakStateDetectorOverrideRequest( MESSAGE_T *message ) -{ - TEST_OVERRIDE_ARRAY_PAYLOAD_T payload; - BOOL result = FALSE; - - // Verify payload length - if ( sizeof( TEST_OVERRIDE_ARRAY_PAYLOAD_T ) == message->hdr.payloadLen ) - { - memcpy( &payload, message->payload, sizeof( TEST_OVERRIDE_ARRAY_PAYLOAD_T ) ); - if ( FALSE == payload.reset ) - { - result = testSetBloodLeakStateOverride( ( BLOOD_LEAK_STATES_T)( payload.state.u32 ) ); - } - else - { - result = testResetBloodLeakStateOverride(); - } - } - - // Respond to request - sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result ); -} - -/*********************************************************************//** - * @brief * The handleHDSoftwareResetRequest function handles a request to reset the * HD firmware processor. * @details Inputs: none Index: firmware/App/Services/SystemCommMessages.h =================================================================== diff -u -re9cc9eadcf846737bbc4e900db22f4c2a06ad922 -re3c5eb0fcb29840433e2c46086146ae683533104 --- firmware/App/Services/SystemCommMessages.h (.../SystemCommMessages.h) (revision e9cc9eadcf846737bbc4e900db22f4c2a06ad922) +++ firmware/App/Services/SystemCommMessages.h (.../SystemCommMessages.h) (revision e3c5eb0fcb29840433e2c46086146ae683533104) @@ -281,12 +281,9 @@ // MSG_ID_HD_FLUID_LEAK_STATE BOOL broadcastFluidLeakState( FLUID_LEAK_STATES_T state ); -// MSG_ID_HD_BLOOD_LEAK_STATUS -BOOL broadcastBloodLeakStatus( BLOOD_LEAK_STATUS_T status ); +// MSG_ID_HD_BLOOD_LEAK_DATA +BOOL broadcastBloodLeakData( BLOOD_LEAK_STATUS_T status, BLOOD_LEAK_STATES_T state ); -// MSG_ID_HD_BLOOD_LEAK_STATE -BOOL broadcastBloodLeakState( BLOOD_LEAK_STATES_T state ); - // MSG_ID_HD_PRIMING_STATUS_DATA BOOL broadcastPrimeData( PRIMING_DATA_PAYLOAD_T *primeDataPtr ); @@ -482,18 +479,12 @@ // MSG_ID_HD_FLUID_LEAK_STATE_DETECTOR_OVERRIDE void handleSetFluidLeakStateDetectorOverrideRequest( MESSAGE_T *message ); -// MSG_ID_HD_BLOOD_LEAK_STATUS_SEND_INTERVAL_OVERRIDE -void handleSetBloodLeakStatusBroadcastIntervalOverrideRequest( MESSAGE_T *message ); +// MSG_ID_HD_BLOOD_LEAK_DATA_SEND_INTERVAL_OVERRIDE +void handleSetBloodLeakDataBroadcastIntervalOverrideRequest( MESSAGE_T *message ); -// MSG_ID_HD_BLOOD_LEAK_STATUS_DETECTOR_OVERRIDE -void handleSetBloodLeakStatusDetectorOverrideRequest( MESSAGE_T *message ); +// MSG_ID_HD_BLOOD_LEAK_DATA_DETECTOR_OVERRIDE +void handleSetBloodLeakDataDetectorOverrideRequest( MESSAGE_T *message ); -// MSG_ID_HD_BLOOD_LEAK_STATE_SEND_INTERVAL_OVERRIDE -void handleSetBloodLeakStateBroadcastIntervalOverrideRequest( MESSAGE_T *message ); - -// MSG_ID_HD_BLOOD_LEAK_STATE_DETECTOR_OVERRIDE -void handleSetBloodLeakStateDetectorOverrideRequest( MESSAGE_T *message ); - // MSG_ID_SUPER_CLEAR_ALARMS_CMD void handleTestSuperClearAlarmsRequest( MESSAGE_T *message );