Index: firmware/App/Controllers/ConcentratePumps.h =================================================================== diff -u -r256d5cb05f1ef09e19e2f2733a111f600c73a7ee -reae0635792a827b7cf9197cf6f6e253f2a094260 --- firmware/App/Controllers/ConcentratePumps.h (.../ConcentratePumps.h) (revision 256d5cb05f1ef09e19e2f2733a111f600c73a7ee) +++ firmware/App/Controllers/ConcentratePumps.h (.../ConcentratePumps.h) (revision eae0635792a827b7cf9197cf6f6e253f2a094260) @@ -54,6 +54,10 @@ F32 cp2PulseUS; ///< Concentrate pump CP2 pulse in microseconds F32 cp1TargetSpeed; ///< Concentrate pump CP1 target speed F32 cp2TargetSpeed; ///< Concentrate pump CP2 target speed + BOOL cp1Parked; ///< Concentrate pump CP1 parked status + BOOL cp2Parked; ///< Concentrate pump CP2 parked status + BOOL cp1ParkFault; ///< Concentrate pump CP1 park fault status + BOOL cp2ParkFault; ///< Concentrate pump CP2 park fault status } CONCENTRATE_PUMP_DATA_T; // ********** public function prototypes ********** @@ -65,17 +69,24 @@ SELF_TEST_STATUS_T execConcenratePumpsSelfTest( void ); void requestConcentratePumpOn( CONCENTRATE_PUMPS_T pumpId ); -void requestConcentratePumpOff( CONCENTRATE_PUMPS_T pumpId ); +void requestConcentratePumpOff( CONCENTRATE_PUMPS_T pumpId, BOOL park ); void setConcentratePumpTargetSpeed( CONCENTRATE_PUMPS_T pumpId, F32 targetSpeed_ml_min ); F32 getConcentratePumpTargetFlowMLPM( CONCENTRATE_PUMPS_T pumpId ); F32 getMeasuredPumpSpeed( CONCENTRATE_PUMPS_T pumpId ); +BOOL getConcPumpIsParked( CONCENTRATE_PUMPS_T pumpId ); +BOOL getConcPumpParkIsFaulted( CONCENTRATE_PUMPS_T pumpId ); BOOL testSetConcentratePumpDataPublishIntervalOverride( U32 value ); BOOL testResetConcentratePumpDataPublishIntervalOverride( void ); BOOL testSetConcentratePumpTargetSpeedOverride( U32 pumpId, F32 value ); BOOL testSetConcentratePumpMeasuredSpeedOverride( U32 pumpId, F32 value ); BOOL testResetConcentratePumpMeasuredSpeedOverride( U32 pumpId ); +BOOL testSetConcentratePumpParkedOverride( U32 pumpId, U32 value ); +BOOL testResetConcentratePumpParkedOverride( U32 pumpId ); +BOOL testSetConcentratePumpParkCmdFaultedOverride( U32 pumpId, U32 value ); +BOOL testResetConcentratePumpParkCmdFaultedOverride( U32 pumpId ); +BOOL testSetConcentratePumpParkCommand( U32 pumpId ); /**@}*/