Index: firmware/App/Controllers/PresOccl.h =================================================================== diff -u -r30f049651877229042e3f8700c8596e5b9a1e0f4 -rccfd15568f1e3d304320c2babb2fd4bcf0413304 --- firmware/App/Controllers/PresOccl.h (.../PresOccl.h) (revision 30f049651877229042e3f8700c8596e5b9a1e0f4) +++ firmware/App/Controllers/PresOccl.h (.../PresOccl.h) (revision ccfd15568f1e3d304320c2babb2fd4bcf0413304) @@ -1,17 +1,17 @@ /************************************************************************** * -* Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. +* Copyright (c) 2019-2021 Diality Inc. - All Rights Reserved. * * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. * -* @file PresOccl.h +* @file PresOccl.h * -* @author (last) Sean Nash -* @date (last) 22-Sep-2020 +* @author (last) Sean Nash +* @date (last) 19-Aug-2021 * -* @author (original) Sean -* @date (original) 15-Jan-2020 +* @author (original) Sean +* @date (original) 15-Jan-2020 * ***************************************************************************/ @@ -23,7 +23,8 @@ /** * @defgroup PressureOcclusion PressureOcclusion * @brief Pressure & Occlusion controller/monitor module. Monitors the - * blood line pressure sensors and pump occlusion sensors. + * venous line pressure sensor (Honeywell HSCMRNN030PDSA3), arterial line + * pressure sensor (Memscap 32022-100mm) and pump occlusion sensors (SMD DIA8308). * * @addtogroup PressureOcclusion * @{ @@ -51,28 +52,33 @@ /// Payload record structure for the pressure & occlusions data message. typedef struct { - F32 arterialPressure; - F32 venousPressure; - U32 bldPumpOcclusion; - U32 diPumpOcclusion; - U32 doPumpOcclusion; + F32 arterialPressure; ///< Latest arterial pressure (mmHg) + F32 venousPressure; ///< Latest venous pressure (mmHg) + U32 bldPumpOcclusion; ///< Latest BP occlusion (no units) + U32 diPumpOcclusion; ///< Latest DPi occlusion (no units) + U32 doPumpOcclusion; ///< Latest DPo occlusion (no units) } PRESSURE_OCCLUSION_DATA_T; // ********** public function prototypes ********** void initPresOccl( void ); void execPresOccl( void ); + +void execPresOcclTest( void ); +SELF_TEST_STATUS_T execPresOcclDryTest( void ); -SELF_TEST_STATUS_T execPresOcclTest( void ); - F32 getMeasuredArterialPressure( void ); F32 getMeasuredVenousPressure( void ); U32 getMeasuredBloodPumpOcclusion( void ); U32 getMeasuredDialInPumpOcclusion( void ); U32 getMeasuredDialOutPumpOcclusion( void ); BOOL isCartridgeLoaded( void ); +BOOL isCartridgeUnloaded( void ); +BOOL isSalineBagEmpty( void ); +void setOcclusionInstallLevels( void ); + BOOL testSetPresOcclDataPublishIntervalOverride( U32 value ); BOOL testResetPresOcclDataPublishIntervalOverride( void ); BOOL testSetArterialPressureOverride( F32 value );