Index: firmware/App/Controllers/Valves.c =================================================================== diff -u -r7e2325379e4c4f7f891776646fbbcd4aa9c6eaca -rd8bed1d90475d31ed0f787017f392e7c1e498620 --- firmware/App/Controllers/Valves.c (.../Valves.c) (revision 7e2325379e4c4f7f891776646fbbcd4aa9c6eaca) +++ firmware/App/Controllers/Valves.c (.../Valves.c) (revision d8bed1d90475d31ed0f787017f392e7c1e498620) @@ -35,7 +35,7 @@ #define ENERGIZED 1 ///< 1 for energized valve. #define ALL_VALVES_DEENERGIZED 0x0000 ///< 0 in U16 bit field for all valves. -#define VALVE_PWM_PERIOD 50 ///< Valve PWM Period in 0.1 us res ( 20kHz ) +#define VALVE_PWM_PERIOD 500 ///< Valve PWM Period in 0.1 us res ( 20kHz ) #define VALVE_PWM_LOW ( VALVE_PWM_PERIOD * 0.2 ) ///< Valve low PWM percentage #define VALVE_PWM_PULL_IN 100 ///< Valve 'strike' period at 100% PWM in ms @@ -126,7 +126,7 @@ // TODO set FPGA PWM after finalizing the decision on valve strike and hold behavior // initially set valve PWM configuration and enable -// setFPGAPWMConfigurations(); + //setFPGAPWMConfigurations(); // initially set all valves to de-energized state via FPGA setFPGADDValveStates( commandedValvesStates ); @@ -175,7 +175,7 @@ valveSPBits |= 0x01 << ( i - FIRST_SP_VALVE ); } - for ( i = FIRST_IO_VALVE; i <= LAST_IO_VALVE; i++ ) + for ( i = M12_VALV; i <= LAST_IO_VALVE; i++ ) { valveIOBits |= 0x01 << ( i - FIRST_IO_VALVE ); } @@ -525,25 +525,6 @@ /*********************************************************************//** * @brief - * The setHydValvesStatetoClosedState function sets all Hydraulics / DD - * valves to close state except balancing chamber, UF and Inlet water control. - * @details \b Inputs: none - * @details \b Outputs: valve states - * @return none. - *************************************************************************/ -void setHydValvesStatetoClosedState( void ) -{ - DD_VALVES_T valve; - - // Set all Hydraulics valves to closed state - for ( valve = FIRST_HYD_VALVE; valve <= LAST_HYD_VALVE; valve++ ) - { - setValveState( valve, VALVE_STATE_CLOSED ); - } -} - -/*********************************************************************//** - * @brief * The setRecoveryValvesConfig function sets all recovery valves per * recovery configuration from institutional record. * @details \b Inputs: none