Index: firmware/App/Controllers/PresOccl.c =================================================================== diff -u -rf8feb10a7e19e17148e4ce8b247316c9772d1753 -rb34eab65955f1681758069584bf6d1cda7fee846 --- firmware/App/Controllers/PresOccl.c (.../PresOccl.c) (revision f8feb10a7e19e17148e4ce8b247316c9772d1753) +++ firmware/App/Controllers/PresOccl.c (.../PresOccl.c) (revision b34eab65955f1681758069584bf6d1cda7fee846) @@ -76,8 +76,6 @@ static PRESSURE_STATE_T presOcclState = PRESSURE_INIT_STATE; ///< current state of pressure monitor state machine. static U32 presOcclDataPublicationTimerCounter = 0; ///< used to schedule pressure data publication to CAN bus. -static OVERRIDE_F32_T measuredBloodFlowRate = { 0.0, 0.0, 0.0, 0 }; ///< measured blood flow rate - /// 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. @@ -429,11 +427,11 @@ { PRESSURE_OCCLUSION_DATA_T data; - data.artPres = getMeasuredArterialPressure(); - data.venPres = getMeasuredVenousPressure(); - data.bpOccl = getMeasuredBloodPumpOcclusion(); - data.diOccl = getMeasuredDialInPumpOcclusion(); - data.doOccl = getMeasuredDialOutPumpOcclusion(); + data.arterialPressure = getMeasuredArterialPressure(); + data.venousPressure = getMeasuredVenousPressure(); + data.bldPumpOcclusion = getMeasuredBloodPumpOcclusion(); + data.diPumpOcclusion = getMeasuredDialInPumpOcclusion(); + data.doPumpOcclusion = getMeasuredDialOutPumpOcclusion(); broadcastPresOcclData( data ); presOcclDataPublicationTimerCounter = 0; Index: firmware/App/Controllers/PresOccl.h =================================================================== diff -u -rf8feb10a7e19e17148e4ce8b247316c9772d1753 -rb34eab65955f1681758069584bf6d1cda7fee846 --- firmware/App/Controllers/PresOccl.h (.../PresOccl.h) (revision f8feb10a7e19e17148e4ce8b247316c9772d1753) +++ firmware/App/Controllers/PresOccl.h (.../PresOccl.h) (revision b34eab65955f1681758069584bf6d1cda7fee846) @@ -65,8 +65,8 @@ SELF_TEST_STATUS_T execPresOcclTest( void ); -U32 getMeasuredArterialPressure( void ); -U32 getMeasuredVenousPressure( void ); +F32 getMeasuredArterialPressure( void ); +F32 getMeasuredVenousPressure( void ); U32 getMeasuredBloodPumpOcclusion( void ); U32 getMeasuredDialInPumpOcclusion( void ); U32 getMeasuredDialOutPumpOcclusion( void ); @@ -79,11 +79,11 @@ BOOL testResetArterialPressureOverride( void ); BOOL testSetVenousPressureOverride( F32 value ); BOOL testResetVenousPressureOverride( void ); -BOOL testSetBloodPumpOcclusionOverride( F32 value ); +BOOL testSetBloodPumpOcclusionOverride( U32 value ); BOOL testResetBloodPumpOcclusionOverride( void ); -BOOL testSetDialInPumpOcclusionOverride( F32 value ); +BOOL testSetDialInPumpOcclusionOverride( U32 value ); BOOL testResetDialInPumpOcclusionOverride( void ); -BOOL testSetDialOutPumpOcclusionOverride( F32 value ); +BOOL testSetDialOutPumpOcclusionOverride( U32 value ); BOOL testResetDialOutPumpOcclusionOverride( void ); /**@}*/ Index: firmware/App/Services/AlarmMgmt.h =================================================================== diff -u -rd91a24c730aeb5cd7e3eba9ef4eca78e442911f8 -rb34eab65955f1681758069584bf6d1cda7fee846 --- firmware/App/Services/AlarmMgmt.h (.../AlarmMgmt.h) (revision d91a24c730aeb5cd7e3eba9ef4eca78e442911f8) +++ firmware/App/Services/AlarmMgmt.h (.../AlarmMgmt.h) (revision b34eab65955f1681758069584bf6d1cda7fee846) @@ -152,19 +152,19 @@ SW_FAULT_ID_DIAL_OUT_FLOW_INVALID_DIAL_OUT_PUMP_DIRECTION, SW_FAULT_ID_DIAL_OUT_FLOW_INVALID_DIAL_OUT_PUMP_STATE, // 40 SW_FAULT_ID_DIAL_OUT_FLOW_SET_TOO_HIGH, - SW_FAULT_ID_BLOOD_FLOW_INVALID_FILTER_STATE, - SW_FAULT_ID_DIAL_IN_FLOW_INVALID_FILTER_STATE, + SW_FAULT_ID____AVAILABLE_1, + SW_FAULT_ID____AVAILABLE_2, SW_FAULT_ID_RTC_EXEC_INVALID_STATE, SW_FAULT_ID_RTC_SELF_TEST_INVALID_STATE, // 45 SW_FAULT_ID_RTC_TRANSACTION_SERVICE_INVALID_STATE, SW_FAULT_ID_PRES_OCCL_INVALID_STATE, - SW_FAULT_ID_PRES_OCCL_INVALID_PRES_SENSOR, - SW_FAULT_ID_PRES_OCCL_INVALID_OCCL_SENSOR, + SW_FAULT_ID____AVAILABLE_3, + SW_FAULT_ID____AVAILABLE_4, SW_FAULT_ID_MSG_PENDING_ACK_LIST_FULL, // 50 SW_FAULT_ID_PI_CTRL_INVALID_CONTROLLER, SW_FAULT_ID_PI_CTRL_INVALID_SIGNAL, - SW_FAULT_ID_DIAL_OUT_INVALID_MEASURED_SIGNAL_STATE, - SW_FAULT_ID_DIAL_OUT_SET_RX_OUT_OF_RANGE, + SW_FAULT_ID____AVAILABLE_5, + SW_FAULT_ID____AVAILABLE_6, SW_FAULT_ID_DIALYSIS_INVALID_STATE, // 55 SW_FAULT_ID_DIALYSIS_INVALID_UF_STATE, SW_FAULT_ID_NVDATAMGMT_INVALID_SELF_TEST_STATE, Index: firmware/App/Services/SystemCommMessages.h =================================================================== diff -u -rd91a24c730aeb5cd7e3eba9ef4eca78e442911f8 -rb34eab65955f1681758069584bf6d1cda7fee846 --- firmware/App/Services/SystemCommMessages.h (.../SystemCommMessages.h) (revision d91a24c730aeb5cd7e3eba9ef4eca78e442911f8) +++ firmware/App/Services/SystemCommMessages.h (.../SystemCommMessages.h) (revision b34eab65955f1681758069584bf6d1cda7fee846) @@ -21,7 +21,8 @@ #include "HDCommon.h" #include "MsgQueues.h" #include "DialOutFlow.h" -#include "DGInterface.h" +#include "DGInterface.h" +#include "PresOccl.h" /** * @defgroup SystemCommMessages SystemCommMessages @@ -173,7 +174,7 @@ BOOL broadcastDialOutFlowData( DIAL_OUT_FLOW_DATA_T *dialOutFlowData ); // MSG_ID_PRESSURE_OCCLUSION_DATA -BOOL broadcastPresOcclData( F32 artPres, F32 venPres, F32 bpOccl, F32 diOccl, F32 doOccl ); +BOOL broadcastPresOcclData( PRESSURE_OCCLUSION_DATA_T data ); // MSG_ID_RTC_EPOCH BOOL broadcastRTCEpoch( U32 epoch );