Index: firmware/App/Drivers/GLXferPump.c =================================================================== diff -u -rd595ea4a23b0b2371e31838c24990059653c1871 -r3fe55376370dc82b5edcb20ac6026d8f079e401b --- firmware/App/Drivers/GLXferPump.c (.../GLXferPump.c) (revision d595ea4a23b0b2371e31838c24990059653c1871) +++ firmware/App/Drivers/GLXferPump.c (.../GLXferPump.c) (revision 3fe55376370dc82b5edcb20ac6026d8f079e401b) @@ -28,7 +28,7 @@ // ********** private definitions ********** -#define AIR_PUMP_PWM_TIME 800 ///< Time (in 10ns increments) per PWM register count for the air pump. +#define AIR_PUMP_PWM_TIME 250 ///< Time (in 10ns increments) per PWM register count for the air pump = 20 kHz. // ********** private data ********** @@ -47,8 +47,8 @@ void initGasLiqXferPumpDriver(void) { currentAirPumpMotorPowerLevel = AIR_PUMP_MOTOR_OFF; - setAirPumpMotorPowerLevel( currentAirPumpMotorPowerLevel ); - setAirPumpMotorPWMCntTime( AIR_PUMP_PWM_TIME ); + setH12AirPumpMotorPowerLevel( currentAirPumpMotorPowerLevel ); + setH12AirPumpMotorPWMCntTime( AIR_PUMP_PWM_TIME ); } /*********************************************************************//** @@ -67,7 +67,7 @@ if ( power != currentAirPumpMotorPowerLevel ) { SEND_EVENT_WITH_2_U32_DATA( TD_EVENT_AIR_PUMP_ON_OFF, (U32)currentAirPumpMotorPowerLevel, (U32)power ); - setAirPumpMotorPowerLevel( power ); + setH12AirPumpMotorPowerLevel( power ); currentAirPumpMotorPowerLevel = power; } } Index: firmware/App/Drivers/GLXferPump.h =================================================================== diff -u -r285b5d82539c96524c93703d52a66fff76fb64fc -r3fe55376370dc82b5edcb20ac6026d8f079e401b --- firmware/App/Drivers/GLXferPump.h (.../GLXferPump.h) (revision 285b5d82539c96524c93703d52a66fff76fb64fc) +++ firmware/App/Drivers/GLXferPump.h (.../GLXferPump.h) (revision 3fe55376370dc82b5edcb20ac6026d8f079e401b) @@ -34,9 +34,9 @@ // ********** public definitions ********** #define AIR_PUMP_MOTOR_OFF 0 ///< Power level setting (PWM) for H12 air pump to turn pump off. -#define AIR_PUMP_MOTOR_MAX_PWM 255 ///< Power level setting (PWM) maximum for H12 air pump. +#define AIR_PUMP_MOTOR_MAX_PWM 250 ///< Power level setting (PWM) maximum for H12 air pump. #define AIR_PUMP_MOTOR_FILL_PWM 50 ///< Power level setting (PWM) for H12 air pump to fill (raise level) the air trap. -#define AIR_PUMP_MOTOR_LOWER_PWM 150 ///< Power level setting (PWM) for H12 air pump to lower the level of the air trap. +#define AIR_PUMP_MOTOR_LOWER_PWM 50 ///< Power level setting (PWM) for H12 air pump to lower the level of the air trap. // ********** public function prototypes ********** Index: firmware/App/Services/FpgaTD.c =================================================================== diff -u -raa6d45143096dfab776ce2ed7c775cfe2dd6db18 -r3fe55376370dc82b5edcb20ac6026d8f079e401b --- firmware/App/Services/FpgaTD.c (.../FpgaTD.c) (revision aa6d45143096dfab776ce2ed7c775cfe2dd6db18) +++ firmware/App/Services/FpgaTD.c (.../FpgaTD.c) (revision 3fe55376370dc82b5edcb20ac6026d8f079e401b) @@ -763,29 +763,29 @@ /*********************************************************************//** * @brief - * The setAirPumpMotorPowerLevel function sets the air pump motor power level + * The setH12AirPumpMotorPowerLevel function sets the air pump motor power level * to 0 to turn pump off or 1..255 for varying power levels. * @details \b Inputs: fpgaActuatorSetPoints.h12Control * @details \b Outputs: fpgaActuatorSetPoints.h12Control * @param power The set power level to set the H12 air pump to. * @return none *************************************************************************/ -void setAirPumpMotorPowerLevel( U08 power ) +void setH12AirPumpMotorPowerLevel( U08 power ) { fpgaActuatorSetPoints.h12Control = power; } /*********************************************************************//** * @brief - * The setAirPumpMotorPWMCntTime function sets the air pump motor PWM count + * The setH12AirPumpMotorPWMCntTime function sets the air pump motor PWM count * time in increments of 10 nS. The PWM period will then be 255 x given * value x 10 nS. * @details \b Inputs: fpgaActuatorSetPoints.h12Period * @details \b Outputs: fpgaActuatorSetPoints.h12Period * @param tenNS The time associated with each PWM count in power level setting. * @return none *************************************************************************/ -void setAirPumpMotorPWMCntTime( U16 tenNS ) +void setH12AirPumpMotorPWMCntTime( U16 tenNS ) { fpgaActuatorSetPoints.h12Period = tenNS; } Index: firmware/App/Services/FpgaTD.h =================================================================== diff -u -raa6d45143096dfab776ce2ed7c775cfe2dd6db18 -r3fe55376370dc82b5edcb20ac6026d8f079e401b --- firmware/App/Services/FpgaTD.h (.../FpgaTD.h) (revision aa6d45143096dfab776ce2ed7c775cfe2dd6db18) +++ firmware/App/Services/FpgaTD.h (.../FpgaTD.h) (revision 3fe55376370dc82b5edcb20ac6026d8f079e401b) @@ -98,8 +98,8 @@ void setH13ValveState( VALVE_3WAY_STATE_T state ); void setH20ValveState( VALVE_3WAY_STATE_T state ); -void setAirPumpMotorPowerLevel( U08 power ); -void setAirPumpMotorPWMCntTime( U16 tenNS ); +void setH12AirPumpMotorPowerLevel( U08 power ); +void setH12AirPumpMotorPWMCntTime( U16 tenNS ); void setH19Control( U08 controlBits ); U08 getH19Control( void ); Index: firmware/App/Tasks/TaskGeneral.c =================================================================== diff -u -raa6d45143096dfab776ce2ed7c775cfe2dd6db18 -r3fe55376370dc82b5edcb20ac6026d8f079e401b --- firmware/App/Tasks/TaskGeneral.c (.../TaskGeneral.c) (revision aa6d45143096dfab776ce2ed7c775cfe2dd6db18) +++ firmware/App/Tasks/TaskGeneral.c (.../TaskGeneral.c) (revision 3fe55376370dc82b5edcb20ac6026d8f079e401b) @@ -178,7 +178,7 @@ ++tmpCtr; if ( tmpCtr == ( 5 * 20 ) ) { - setAirPumpMotorPower( 255 ); + setAirPumpMotorPower( 250 ); set3WayValveState( H13_VALV, VALVE_3WAY_COMMON_TO_OPEN_STATE ); } else if ( tmpCtr == ( 10 * 20 ) ) @@ -188,7 +188,7 @@ } else if ( tmpCtr == ( 15 * 20 ) ) { - setAirPumpMotorPower( 255 ); + setAirPumpMotorPower( 250 ); set3WayValveState( H20_VALV, VALVE_3WAY_COMMON_TO_OPEN_STATE ); } else if ( tmpCtr >= ( 20 * 20 ) ) @@ -235,7 +235,7 @@ sta = 1; // lower the level set3WayValveState( H13_VALV, VALVE_3WAY_COMMON_TO_OPEN_STATE ); - setAirPumpState( AIR_PUMP_STATE_ON, 25 ); + setAirPumpState( AIR_PUMP_STATE_ON, 50 ); } break; case 1: @@ -256,7 +256,7 @@ { // raise the level set3WayValveState( H20_VALV, VALVE_3WAY_COMMON_TO_OPEN_STATE ); - setAirPumpState( AIR_PUMP_STATE_ON, 25 ); + setAirPumpState( AIR_PUMP_STATE_ON, 50 ); sta = 3; } #endif @@ -278,7 +278,7 @@ { // start raising level set3WayValveState( H20_VALV, VALVE_3WAY_COMMON_TO_OPEN_STATE ); - setAirPumpState( AIR_PUMP_STATE_ON, 25 ); + setAirPumpState( AIR_PUMP_STATE_ON, 50 ); sta = 3; } #endif @@ -288,7 +288,7 @@ { // lower the level set3WayValveState( H13_VALV, VALVE_3WAY_COMMON_TO_OPEN_STATE ); - setAirPumpState( AIR_PUMP_STATE_ON, 25 ); + setAirPumpState( AIR_PUMP_STATE_ON, 50 ); sta = 1; } #endif