Index: firmware/App/Controllers/DialInFlow.h =================================================================== diff -u -ra4e044315bbfaaeff11cb9391485897458a48a5f -rd7b793881e8414f2daf75825d5de4e25a25d10ac --- firmware/App/Controllers/DialInFlow.h (.../DialInFlow.h) (revision a4e044315bbfaaeff11cb9391485897458a48a5f) +++ firmware/App/Controllers/DialInFlow.h (.../DialInFlow.h) (revision d7b793881e8414f2daf75825d5de4e25a25d10ac) @@ -7,8 +7,8 @@ * * @file DialInFlow.h * -* @author (last) Michael Garthwaite -* @date (last) 28-Sep-2022 +* @author (last) Dara Navaei +* @date (last) 18-Oct-2022 * * @author (original) Sean * @date (original) 16-Dec-2019 @@ -45,7 +45,7 @@ F32 measMCSpd; F32 measMCCurr; F32 pwmDC; - F32 flowSigStrength; + U32 rotorCount; } DIALIN_PUMP_STATUS_PAYLOAD_T; // ********** public function prototypes ********** @@ -60,6 +60,7 @@ BOOL homeDialInPump( void ); BOOL isDialInPumpRunning( void ); BOOL isDialInPumpRampComplete( void ); +void resetDialInPumpRotorCount( void ); SELF_TEST_STATUS_T execDialInFlowTest( void ); @@ -70,6 +71,8 @@ F32 getMeasuredDialInPumpMCSpeed( void ); F32 getMeasuredDialInPumpMCCurrent( void ); F32 getDialInPumpPWMDutyCyclePct( BOOL init ); +U32 getDialInPumpRotorCount( void ); +U32 getPumpRotorErrorPersistTime( F32 mtr_speed, F32 gear_ratio ); BOOL testSetDialInFlowDataPublishIntervalOverride( U32 value ); BOOL testResetDialInFlowDataPublishIntervalOverride( void ); @@ -84,7 +87,9 @@ BOOL testResetMeasuredDialInPumpMCSpeedOverride( void ); BOOL testSetMeasuredDialInPumpMCCurrentOverride( F32 value ); BOOL testResetMeasuredDialInPumpMCCurrentOverride( void ); -BOOL testSetDialInPumpTargetDutyCycle( F32 value ); +BOOL testSetDialInPumpTargetDutyCycle( F32 value ); +BOOL testSetDialysateInPumpRotorCountOverride( U32 value ); +BOOL testResetDialysateInPumpRotorCountOverride( void ); /**@}*/