Index: firmware/App/Controllers/Valves.c =================================================================== diff -u -r2cc657d123c9e6db79ed62b02f088c72ccf9ff98 -rae36722cb762a069233685bb62a63107fd80338e --- firmware/App/Controllers/Valves.c (.../Valves.c) (revision 2cc657d123c9e6db79ed62b02f088c72ccf9ff98) +++ firmware/App/Controllers/Valves.c (.../Valves.c) (revision ae36722cb762a069233685bb62a63107fd80338e) @@ -41,15 +41,16 @@ #define DATA_PUBLISH_COUNTER_START_COUNT 50 ///< Data publish counter start count. /// Bits associated with RO valves when interfacing with FPGA to command a valve position. 1=energized, 0=de-energized. -static const U08 ValveBits[ NUM_OF_VALVES ] = { - 0x01, - 0x02, - 0x04, - 0x08, - 0x10, - 0x20, - 0x40, - 0x80 +static const U16 ValveBits[ NUM_OF_VALVES ] = { + 0x0001, + 0x0002, + 0x0004, + 0x0008, + 0x0010, + 0x0020, + 0x0040, + 0x0080, + 0x0100 }; // ********** private data ********** Index: firmware/App/Controllers/Valves.h =================================================================== diff -u -r2cc657d123c9e6db79ed62b02f088c72ccf9ff98 -rae36722cb762a069233685bb62a63107fd80338e --- firmware/App/Controllers/Valves.h (.../Valves.h) (revision 2cc657d123c9e6db79ed62b02f088c72ccf9ff98) +++ firmware/App/Controllers/Valves.h (.../Valves.h) (revision ae36722cb762a069233685bb62a63107fd80338e) @@ -31,15 +31,16 @@ /// Enumeration of valves. typedef enum Valves { - VWI = 0, ///< Valve (M4) + VWI = 0, ///< Valve (M4 VWi) FIRST_VALVE = VWI, ///< First valve - VROD, ///< Valve (P39) - VFF, ///< Valve (P6) - VPI, ///< Valve (P11) - VCR, ///< Valve (P33) - VCB, ///< Valve (P34) - VCD, ///< Valve (P37) - VFB, ///< Valve (M7) + VROD, ///< Valve (P39 VROd) + VFF, ///< Valve (P6 VFF) + VPI, ///< Valve (P11 VPi) + VCR, ///< Valve (P33 VCr) + VCB, ///< Valve (P34 VCb) + VCD, ///< Valve (P37 VCd) + VFB, ///< Valve (M7 VFB) + SPP, ///< Valve (P20 SPP) NUM_OF_VALVES ///< Number of valves } VALVES_T; Index: firmware/App/Services/FpgaRO.c =================================================================== diff -u -re491c38c7c2e7850b5a7ff906c04d81eabf0efb8 -rae36722cb762a069233685bb62a63107fd80338e --- firmware/App/Services/FpgaRO.c (.../FpgaRO.c) (revision e491c38c7c2e7850b5a7ff906c04d81eabf0efb8) +++ firmware/App/Services/FpgaRO.c (.../FpgaRO.c) (revision ae36722cb762a069233685bb62a63107fd80338e) @@ -126,17 +126,17 @@ U16 roPumpTachCount; ///< Reg 360. ROP tachometer counter. U16 dsPumpTachCount; ///< Reg 362. DSP tachometer counter. U16 flowIntTempFmp; ///< Reg 364. FMP flow sensor internal temperature. - U08 valveControlReadback; ///< Reg 366. Valve control bits read back. - U08 valvePWMEnableReadback; ///< Reg 367. Valve PWM enable read back. + U16 valveControlReadback; ///< Reg 366. Valve control bits read back. +// U08 valvePWMEnableReadback; ///< Reg 367. Valve PWM enable read back. U16 roPumpPWMReadback; ///< Reg 368. ROP PWM read back. U16 heaterPWMReadback; ///< Reg 370. Heater PWM read back. } FPGA_SENSORS_T; /// Record structure for FPGA continuous priority writes. typedef struct { - U08 valveControl; ///< Reg 04. Valve control register. - U08 valvePWMEnable; ///< Reg 05. Valve PWM enable register. + U16 valveControl; ///< Reg 04. Valve control register. +// U08 valvePWMEnable; ///< Reg 05. Valve PWM enable register. U08 conductivityCPiControl; ///< Reg 06. CPi conductivity control register. U08 conductivityCPoControl; ///< Reg 07. CPo conductivity control register. U16 conductivityCPiAddress; ///< Reg 08. CPi conductivity address register. @@ -375,7 +375,7 @@ * @details \b Outputs: fpgaSensorReadings.valveControlReadback * @return none *************************************************************************/ -U08 getFPGAValveStates( void ) +U16 getFPGAValveStates( void ) { return fpgaSensorReadings.valveControlReadback; } Index: firmware/App/Services/FpgaRO.h =================================================================== diff -u -re491c38c7c2e7850b5a7ff906c04d81eabf0efb8 -rae36722cb762a069233685bb62a63107fd80338e --- firmware/App/Services/FpgaRO.h (.../FpgaRO.h) (revision e491c38c7c2e7850b5a7ff906c04d81eabf0efb8) +++ firmware/App/Services/FpgaRO.h (.../FpgaRO.h) (revision ae36722cb762a069233685bb62a63107fd80338e) @@ -42,7 +42,7 @@ BOOL checkFPGAFEOEFailure( void ); void setFPGAValveStates( U16 valveStates ); -U08 getFPGAValveStates( void ); +U16 getFPGAValveStates( void ); void setROPumpEnable( BOOL enable ); void setROPumpPWMPct( U16 pwm );