Index: firmware/App/Controllers/PresOccl.c =================================================================== diff -u -r55a6adaf81175d25c1d9cc4c96d7dfda84eede16 -ra4236a98b2de7d007173862dfe6b114bce08f90f --- firmware/App/Controllers/PresOccl.c (.../PresOccl.c) (revision 55a6adaf81175d25c1d9cc4c96d7dfda84eede16) +++ firmware/App/Controllers/PresOccl.c (.../PresOccl.c) (revision a4236a98b2de7d007173862dfe6b114bce08f90f) @@ -35,43 +35,43 @@ /// Defined states for the pressure and occlusion monitor state machine typedef enum PresOccl_States { - PRESSURE_INIT_STATE = 0, /// Initialization state - PRESSURE_CONTINUOUS_READ_STATE, /// Continuous read sensors state + PRESSURE_INIT_STATE = 0, ///< Initialization state + PRESSURE_CONTINUOUS_READ_STATE, ///< Continuous read sensors state NUM_OF_PRESSURE_STATES } PRESSURE_STATE_T; /// Defined states for the pressure and occlusion self test state machine typedef enum PresOccl_Self_Test_States { - PRESSURE_SELF_TEST_STATE_START = 0, /// Self test start state - PRESSURE_TEST_STATE_IN_PROGRESS, /// Self test in progress state - PRESSURE_TEST_STATE_COMPLETE, /// Self test completed state + PRESSURE_SELF_TEST_STATE_START = 0, ///< Self test start state + PRESSURE_TEST_STATE_IN_PROGRESS, ///< Self test in progress state + PRESSURE_TEST_STATE_COMPLETE, ///< Self test completed state NUM_OF_PRESSURE_SELF_TEST_STATES } PRESSURE_SELF_TEST_STATE_T; // ********** private data ********** -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 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 -DATA_DECL( U32, PresOcclDataPub, presOcclDataPublishInterval, PRES_OCCL_DATA_PUB_INTERVAL, PRES_OCCL_DATA_PUB_INTERVAL ); /// interval (in ms) at which to publish pressure/occlusion data to CAN bus -DATA_DECL( F32, ArterialPressure, arterialPressure, 0, 0 ); /// measured arterial pressure -DATA_DECL( F32, VenousPressure, venousPressure, 0.0, 0.0 ); /// measured venous pressure -DATA_DECL( F32, BloodPumpOcclusion, bloodPumpOcclusion, 0.0, 0.0 ); /// measured blood pump occlusion pressure -DATA_DECL( F32, DialInPumpOcclusion, dialInPumpOcclusion, 0.0, 0.0 ); /// measured dialysate inlet pump occlusion pressure -DATA_DECL( F32, DialOutPumpOcclusion, dialOutPumpOcclusion, 0.0, 0.0 ); /// measured dialysate outlet pump occlusion pressure +DATA_DECL( U32, PresOcclDataPub, presOcclDataPublishInterval, PRES_OCCL_DATA_PUB_INTERVAL, PRES_OCCL_DATA_PUB_INTERVAL ); ///< interval (in ms) at which to publish pressure/occlusion data to CAN bus +DATA_DECL( F32, ArterialPressure, arterialPressure, 0, 0 ); ///< measured arterial pressure +DATA_DECL( F32, VenousPressure, venousPressure, 0.0, 0.0 ); ///< measured venous pressure +DATA_DECL( F32, BloodPumpOcclusion, bloodPumpOcclusion, 0.0, 0.0 ); ///< measured blood pump occlusion pressure +DATA_DECL( F32, DialInPumpOcclusion, dialInPumpOcclusion, 0.0, 0.0 ); ///< measured dialysate inlet pump occlusion pressure +DATA_DECL( F32, DialOutPumpOcclusion, dialOutPumpOcclusion, 0.0, 0.0 ); ///< measured dialysate outlet pump occlusion pressure -static PRESSURE_SELF_TEST_STATE_T presOcclSelfTestState = PRESSURE_SELF_TEST_STATE_START; /// current pressure self test state -static U32 bloodPumpSelfTestTimerCount = 0; /// timer counter for pressure self test +static PRESSURE_SELF_TEST_STATE_T presOcclSelfTestState = PRESSURE_SELF_TEST_STATE_START; ///< current pressure self test state +static U32 bloodPumpSelfTestTimerCount = 0; ///< timer counter for pressure self test -static F32 arterialPressureLowLimitmmHG = 0.0; /// lower alarm limit for arterial pressure -static F32 arterialPressureHighLimitmmHG = 0.0; /// upper alarm limit for arterial pressure -static F32 venousPressureLowLimitmmHG = 0.0; /// lower alarm limit for venous pressure -static F32 venousPressureHighLimitmmHG = 0.0; /// upper alarm limit for venous pressure +static F32 arterialPressureLowLimitmmHG = 0.0; ///< lower alarm limit for arterial pressure +static F32 arterialPressureHighLimitmmHG = 0.0; ///< upper alarm limit for arterial pressure +static F32 venousPressureLowLimitmmHG = 0.0; ///< lower alarm limit for venous pressure +static F32 venousPressureHighLimitmmHG = 0.0; ///< upper alarm limit for venous pressure // TODO - set thresholds for occlusions -static F32 bloodPumpOcclusionPressureThresholdmmHG = 50.0; /// pressure threshold for blood pump occlusion -static F32 dialInPumpOcclusionPressureThresholdmmHG = 50.0; /// pressure threshold for dialysate inlet pump occlusion -static F32 dialOutPumpOcclusionPressureThresholdmmHG = 50.0; /// pressure threshold for dialysate outlet pump occlusion +static F32 bloodPumpOcclusionPressureThresholdmmHG = 50.0; ///< pressure threshold for blood pump occlusion +static F32 dialInPumpOcclusionPressureThresholdmmHG = 50.0; ///< pressure threshold for dialysate inlet pump occlusion +static F32 dialOutPumpOcclusionPressureThresholdmmHG = 50.0; ///< pressure threshold for dialysate outlet pump occlusion // ********** private function prototypes **********