Index: firmware/App/Controllers/PresOccl.c =================================================================== diff -u -raceb6e5388e905d119c5c379bc97ced0720aa270 -r1b738450008f53cdacc28226a503593bb54ba901 --- firmware/App/Controllers/PresOccl.c (.../PresOccl.c) (revision aceb6e5388e905d119c5c379bc97ced0720aa270) +++ firmware/App/Controllers/PresOccl.c (.../PresOccl.c) (revision 1b738450008f53cdacc28226a503593bb54ba901) @@ -130,7 +130,6 @@ /// Interval (in ms) at which to publish pressure/occlusion data to CAN bus. static OVERRIDE_U32_T presOcclDataPublishInterval = { PRES_OCCL_DATA_PUB_INTERVAL, PRES_OCCL_DATA_PUB_INTERVAL, 0, 0 }; static OVERRIDE_F32_T arterialPressure = {0.0, 0.0, 0.0, 0 }; ///< Measured arterial pressure. -static OVERRIDE_F32_T arterialPressureOffset = {0.0, 0.0, 0.0, 0 }; ///< Calculated arterial pressure offset. static OVERRIDE_F32_T venousPressure = {0.0, 0.0, 0.0, 0 }; ///< Measured venous pressure. static OVERRIDE_U32_T bloodPumpOcclusion = {0, 0, 0, 0 }; ///< Measured blood pump occlusion pressure. static F32 longFilteredArterialPressure; ///< Measured arterial pressure after long (10 s) filter. @@ -1157,49 +1156,4 @@ return result; } -/*********************************************************************//** - * @brief - * The testSetBloodPumpOcclusionOverride function overrides the arterial - * pressure offset. - * @details Inputs: none - * @details Outputs: arterialPressureOffset - * @param value override arterial pressure offset with - * @return TRUE if override successful, FALSE if not - *************************************************************************/ -BOOL testSetArterialPressureOffsetOverride( F32 value ) -{ - BOOL result = FALSE; - - if ( TRUE == isTestingActivated() ) - { - result = TRUE; - arterialPressureOffset.ovData = value; - arterialPressureOffset.override = OVERRIDE_KEY; - } - - return result; -} - -/*********************************************************************//** - * @brief - * The testResetArterialPressureOffsetOverride function resets the override of the - * arterial pressure offset. - * @details Inputs: none - * @details Outputs: arterialPressureOffset - * @return TRUE if reset successful, FALSE if not - *************************************************************************/ -BOOL testResetArterialPressureOffsetOverride( void ) -{ - BOOL result = FALSE; - - if ( TRUE == isTestingActivated() ) - { - result = TRUE; - arterialPressureOffset.override = OVERRIDE_RESET; - arterialPressureOffset.ovData = arterialPressureOffset.ovInitData; - } - - return result; -} - /**@}*/ Index: firmware/App/Controllers/PresOccl.h =================================================================== diff -u -r37a9fd8f15e413db5337371a7d1a1cb65567af7c -r1b738450008f53cdacc28226a503593bb54ba901 --- firmware/App/Controllers/PresOccl.h (.../PresOccl.h) (revision 37a9fd8f15e413db5337371a7d1a1cb65567af7c) +++ firmware/App/Controllers/PresOccl.h (.../PresOccl.h) (revision 1b738450008f53cdacc28226a503593bb54ba901) @@ -89,8 +89,6 @@ BOOL testResetVenousPressureOverride( void ); BOOL testSetBloodPumpOcclusionOverride( U32 value ); BOOL testResetBloodPumpOcclusionOverride( void ); -BOOL testSetArterialPressureOffsetOverride( F32 value ); -BOOL testResetArterialPressureOffsetOverride( void ); /**@}*/ Index: firmware/App/Services/SystemComm.c =================================================================== diff -u -r1519b5d150fd913f596715f0eacce7d5c5e0d56c -r1b738450008f53cdacc28226a503593bb54ba901 --- firmware/App/Services/SystemComm.c (.../SystemComm.c) (revision 1519b5d150fd913f596715f0eacce7d5c5e0d56c) +++ firmware/App/Services/SystemComm.c (.../SystemComm.c) (revision 1b738450008f53cdacc28226a503593bb54ba901) @@ -1359,10 +1359,6 @@ handleHDBloodPumpRotorCountOverrideRequest( message ); break; - case MSG_ID_SET_ARTERIAL_PRESSURE_OFFSET: - handleHDSetArterialPressureOffsetRequest( message ); - break; - case MSG_ID_BLOOD_PUMP_HOME_CMD: handleTestBloodPumpHomeRequest( message ); break; Index: firmware/App/Services/SystemCommMessages.c =================================================================== diff -u -r4ec54dc76acf9a434fb860c51739a7dd6f72afd6 -r1b738450008f53cdacc28226a503593bb54ba901 --- firmware/App/Services/SystemCommMessages.c (.../SystemCommMessages.c) (revision 4ec54dc76acf9a434fb860c51739a7dd6f72afd6) +++ firmware/App/Services/SystemCommMessages.c (.../SystemCommMessages.c) (revision 1b738450008f53cdacc28226a503593bb54ba901) @@ -3620,38 +3620,6 @@ /*********************************************************************//** * @brief - * The handleHDSetArterialPressureOffsetRequest function handles a request to - * set the arterial pressure offset. - * @details Inputs: none - * @details Outputs: message handled - * @param message a pointer to the message to handle - * @return none - *************************************************************************/ -void handleHDSetArterialPressureOffsetRequest( 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 = testSetArterialPressureOffsetOverride( payload.state.f32 ); - } - else - { - result = testResetArterialPressureOffsetOverride(); - } - } - - // Respond to request - sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result ); -} - -/*********************************************************************//** - * @brief * The handleTestBloodPumpRotorMeasuredSpeedOverrideRequest function handles a request to * override the measured blood pump rotor speed (RPM). * @details Inputs: none Index: firmware/App/Services/SystemCommMessages.h =================================================================== diff -u -r4ec54dc76acf9a434fb860c51739a7dd6f72afd6 -r1b738450008f53cdacc28226a503593bb54ba901 --- firmware/App/Services/SystemCommMessages.h (.../SystemCommMessages.h) (revision 4ec54dc76acf9a434fb860c51739a7dd6f72afd6) +++ firmware/App/Services/SystemCommMessages.h (.../SystemCommMessages.h) (revision 1b738450008f53cdacc28226a503593bb54ba901) @@ -467,9 +467,6 @@ // MSG_ID_BLOOD_ROTOR_COUNT_OVERRIDE void handleHDBloodPumpRotorCountOverrideRequest( MESSAGE_T *message ); -// MSG_ID_SET_ARTERIAL_PRESSURE_OFFSET -void handleHDSetArterialPressureOffsetRequest( MESSAGE_T *message ); - // MSG_ID_BLOOD_PUMP_MC_MEAS_SPEED_OVERRIDE void handleTestBloodPumpMCMeasuredSpeedOverrideRequest( MESSAGE_T *message );