Index: firmware/App/Controllers/PresOccl.h =================================================================== diff -u -r1a685471524555a374854c0c9ec8e208e71fe2df -r933a18d740285e70be9d00696ed0f5a5381bc8e4 --- firmware/App/Controllers/PresOccl.h (.../PresOccl.h) (revision 1a685471524555a374854c0c9ec8e208e71fe2df) +++ firmware/App/Controllers/PresOccl.h (.../PresOccl.h) (revision 933a18d740285e70be9d00696ed0f5a5381bc8e4) @@ -48,32 +48,42 @@ NUM_OF_OCCLUSION_SENSORS ///< Number of occlusion sensors } OCCLUSION_SENSORS_T; +/// Payload record structure for the pressure & occlusions data message. +typedef struct +{ + F32 arterialPressure; + F32 venousPressure; + U32 bldPumpOcclusion; + U32 diPumpOcclusion; + U32 doPumpOcclusion; +} PRESSURE_OCCLUSION_DATA_T; + // ********** public function prototypes ********** void initPresOccl( void ); void execPresOccl( void ); -void setOcclusionThreshold( OCCLUSION_SENSORS_T sensor, F32 threshold ); - SELF_TEST_STATUS_T execPresOcclTest( void ); -F32 getMeasuredArterialPressure( void ); -F32 getMeasuredVenousPressure( void ); -F32 getMeasuredBloodPumpOcclusion( void ); -F32 getMeasuredDialInPumpOcclusion( void ); -F32 getMeasuredDialOutPumpOcclusion( void ); - +F32 getMeasuredArterialPressure( void ); +F32 getMeasuredVenousPressure( void ); +U32 getMeasuredBloodPumpOcclusion( void ); +U32 getMeasuredDialInPumpOcclusion( void ); +U32 getMeasuredDialOutPumpOcclusion( void ); + +BOOL isCartridgeLoaded( void ); + BOOL testSetPresOcclDataPublishIntervalOverride( U32 value ); BOOL testResetPresOcclDataPublishIntervalOverride( void ); BOOL testSetArterialPressureOverride( F32 value ); 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 ); /**@}*/