Index: firmware/App/Controllers/SyringePump.h =================================================================== diff -u -r09e6cf9de34acf18f6e1138bf56ac0edb4821186 -r4efd42acbcbde896a1e9e532db77a72bebea0bdc --- firmware/App/Controllers/SyringePump.h (.../SyringePump.h) (revision 09e6cf9de34acf18f6e1138bf56ac0edb4821186) +++ firmware/App/Controllers/SyringePump.h (.../SyringePump.h) (revision 4efd42acbcbde896a1e9e532db77a72bebea0bdc) @@ -1,6 +1,6 @@ /************************************************************************** * -* Copyright (c) 2019-2021 Diality Inc. - All Rights Reserved. +* Copyright (c) 2019-2022 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. @@ -14,24 +14,24 @@ * @date (original) 04-Mar-2021 * ***************************************************************************/ - -#ifndef __SYRINGE_PUMP_H__ -#define __SYRINGE_PUMP_H__ - -#include "HDCommon.h" + +#ifndef __SYRINGE_PUMP_H__ +#define __SYRINGE_PUMP_H__ + +#include "HDCommon.h" #include "HDDefs.h" - -/** - * @defgroup SyringePump SyringePump - * @brief Syringe pump controller/monitor module. Controls the syringe pump - * and monitors status. - * - * @addtogroup SyringePump - * @{ - */ - -// ********** public definitions ********** - + +/** + * @defgroup SyringePump SyringePump + * @brief Syringe pump controller/monitor module. Controls the syringe pump + * and monitors status. + * + * @addtogroup SyringePump + * @{ + */ + +// ********** public definitions ********** + /// Enumeration of syringe pump operations. typedef enum SyringePumpOperations { @@ -68,9 +68,9 @@ U32 syringePumpStatus; } SYRINGE_PUMP_DATA_PAYLOAD_T; -// ********** public function prototypes ********** - -void initSyringePump( void ); +// ********** public function prototypes ********** + +void initSyringePump( void ); void execSyringePump( void ); SELF_TEST_STATUS_T execSyringePumpSelfTest( void ); @@ -95,10 +95,11 @@ BOOL isSyringePlungerFound( void ); BOOL isSyringeVolumeAdequate( void ); BOOL isSyringePumpPrimed( void ); +BOOL isSyringePumpRunning( void ); F32 getSyringePumpVolumeDelivered( void ); -BOOL testSetSyringePumpDataPublishIntervalOverride( U32 value ); -BOOL testResetSyringePumpDataPublishIntervalOverride( void ); +BOOL testSetSyringePumpDataPublishIntervalOverride( U32 value ); +BOOL testResetSyringePumpDataPublishIntervalOverride( void ); BOOL testSyringePumpOperationRequest( SYRINGE_PUMP_OP_PAYLOAD_T opParams ); BOOL testSetSyringePumpMeasuredRateOverride( F32 value ); BOOL testResetSyringePumpMeasuredRateOverride( void ); @@ -120,7 +121,7 @@ BOOL testResetSyringePumpADCandDACStatus( void ); BOOL testSetSyringePumpADCReadCounter( U32 ctr ); BOOL testResetSyringePumpADCReadCounter( void ); - -/**@}*/ - -#endif + +/**@}*/ + +#endif