Index: firmware/App/Controllers/DialInFlow.h =================================================================== diff -u -rd91a24c730aeb5cd7e3eba9ef4eca78e442911f8 -r6eb873c4bc96fb22e85ac23aeee1c37e5366d731 --- firmware/App/Controllers/DialInFlow.h (.../DialInFlow.h) (revision d91a24c730aeb5cd7e3eba9ef4eca78e442911f8) +++ firmware/App/Controllers/DialInFlow.h (.../DialInFlow.h) (revision 6eb873c4bc96fb22e85ac23aeee1c37e5366d731) @@ -33,7 +33,21 @@ #define MAX_DIAL_IN_FLOW_RATE 600 ///< Maximum dialysate inlet flow rate (in mL/min). #define MIN_DIAL_IN_FLOW_RATE 100 ///< Minimum dialysate inlet flow rate (in mL/min). +#define DIALYSATE_FLOW_RATE_FOR_RECIRC 100 ///< Dialysate recirculation flow rate (in mL/min). +/// Payload record structure for a dialysate inlet pump data message. +typedef struct +{ + S32 setPoint; + F32 measFlow; + F32 measRotorSpd; + F32 measPumpSpd; + F32 measMCSpd; + F32 measMCCurr; + F32 pwmDC; + F32 flowSigStrength; +} DIALIN_PUMP_STATUS_PAYLOAD_T; + // ********** public function prototypes ********** void initDialInFlow( void ); @@ -44,15 +58,17 @@ void signalDialInPumpHardStop( void ); void signalDialInPumpRotorHallSensor( void ); BOOL homeDialInPump( void ); +BOOL isDialInPumpRunning( void ); SELF_TEST_STATUS_T execDialInFlowTest( void ); -DATA_GET_PROTOTYPE( S32, getTargetDialInFlowRate ); -DATA_GET_PROTOTYPE( F32, getMeasuredDialInFlowRate); -DATA_GET_PROTOTYPE( F32, getMeasuredDialInPumpRotorSpeed ); -DATA_GET_PROTOTYPE( F32, getMeasuredDialInPumpSpeed ); -DATA_GET_PROTOTYPE( F32, getMeasuredDialInPumpMCSpeed ); -DATA_GET_PROTOTYPE( F32, getMeasuredDialInPumpMCCurrent ); +S32 getTargetDialInFlowRate( void ); +F32 getMeasuredDialInFlowRate( void ); +F32 getMeasuredDialInFlowSignalStrength( void ); +F32 getMeasuredDialInPumpRotorSpeed( void ); +F32 getMeasuredDialInPumpSpeed( void ); +F32 getMeasuredDialInPumpMCSpeed( void ); +F32 getMeasuredDialInPumpMCCurrent( void ); BOOL setDialInFlowCalibration( F32 gain, F32 offset ); void getDialInFlowCalibration( F32 *gain, F32 *offset ); @@ -70,6 +86,8 @@ BOOL testResetMeasuredDialInPumpMCSpeedOverride( void ); BOOL testSetMeasuredDialInPumpMCCurrentOverride( F32 value ); BOOL testResetMeasuredDialInPumpMCCurrentOverride( void ); +BOOL testSetMeasuredDialInFlowSignalStrengthOverride( F32 value ); +BOOL testResetMeasuredDialInFlowSignalStrengthOverride( void ); /**@}*/