Index: firmware/App/Controllers/ConcentratePumps.h =================================================================== diff -u -r94a190522ce398399c7b93c59f788d7666ec0060 -r7d293e18ea5ac0fce443c68525100e44df80b4fd --- firmware/App/Controllers/ConcentratePumps.h (.../ConcentratePumps.h) (revision 94a190522ce398399c7b93c59f788d7666ec0060) +++ firmware/App/Controllers/ConcentratePumps.h (.../ConcentratePumps.h) (revision 7d293e18ea5ac0fce443c68525100e44df80b4fd) @@ -31,23 +31,23 @@ // ********** public definitions ********** -#define CONCENTRATE_PUMP_MAX_SPEED 48.0 ///< Maximum speed for concentrate pump in mL per min. +#define CONCENTRATE_PUMP_MAX_SPEED 48.0 ///< Maximum speed for concentrate pump in mL/min /// Enumeration of concentrate pumps. typedef enum ConcentratePumps { - CONCENTRATEPUMPS_CP1_ACID = 0, ///< Acid concentrate pump - CONCENTRATEPUMPS_CP2_BICARB, ///< Bicarbonate concentrate pump - NUM_OF_CONCENTRATE_PUMPS ///< Number of concentrate pumps + CONCENTRATEPUMPS_CP1_ACID = 0, ///< Acid concentrate pump + CONCENTRATEPUMPS_CP2_BICARB, ///< Bicarbonate concentrate pump + NUM_OF_CONCENTRATE_PUMPS ///< Number of concentrate pumps } CONCENTRATE_PUMPS_T; /// Concentrate pump data struct. typedef struct { - F32 cp1CurrentSetSpeed; ///< Concentrate pump CP1 current set speed - F32 cp1MeasuredSpeed; ///< Concentrate pump CP1 measured speed - F32 cp2CurrentSetSpeed; ///< Concentrate pump CP2 current set speed - F32 cp2MeasuredSpeed; ///< Concentrate pump CP2 measured speed + F32 cp1CurrentSetSpeed; ///< Concentrate pump CP1 current set speed + F32 cp1MeasuredSpeed; ///< Concentrate pump CP1 measured speed + F32 cp2CurrentSetSpeed; ///< Concentrate pump CP2 current set speed + F32 cp2MeasuredSpeed; ///< Concentrate pump CP2 measured speed } CONCENTRATE_PUMP_DATA_T; // ********** public function prototypes ********** @@ -62,9 +62,9 @@ void requestConcentratePumpOff( CONCENTRATE_PUMPS_T pumpId ); void setConcentratePumpTargetSpeed( CONCENTRATE_PUMPS_T pumpId, F32 targetSpeed_ml_min ); -F32 getMeasuredPumpSpeed( CONCENTRATE_PUMPS_T pumpId ); +F32 getMeasuredPumpSpeed( CONCENTRATE_PUMPS_T pumpId ); -DG_ACID_CONCENTRATES_RECORD_T getAcidConcentrateCalRecord( void ); +DG_ACID_CONCENTRATES_RECORD_T getAcidConcentrateCalRecord( void ); DG_BICARB_CONCENTRATES_RECORD_T getBicarbConcentrateCalRecord( void ); BOOL testSetConcentratePumpDataPublishIntervalOverride( U32 value );