Index: firmware/App/Services/FpgaDD.c =================================================================== diff -u -r325e67dab10f6666702bf0f1256015b31e58de4f -r5147570b8c12a721fe05ec9aa5dd38baa6c3a931 --- firmware/App/Services/FpgaDD.c (.../FpgaDD.c) (revision 325e67dab10f6666702bf0f1256015b31e58de4f) +++ firmware/App/Services/FpgaDD.c (.../FpgaDD.c) (revision 5147570b8c12a721fe05ec9aa5dd38baa6c3a931) @@ -230,29 +230,29 @@ U16 p12PumpTachCount; ///< Reg 708. P12 pump tachometer counter. U16 dsPumpTachCount; ///< Reg 710. DSP tachometer counter. U16 flowIntTempP7; ///< Reg 712. P7 flow sensor internal temperature. - U08 valveControlReadback; ///< Reg 714. Valve control bits read back. - U08 valvePWMEnableReadback; ///< Reg 715. Valve PWM enable read back. - U16 p12PumpPWMReadback; ///< Reg 716. P12 pump PWM read back. - U16 p40PumpPWMReadback; ///< Reg 718. P40 pump PWM read back. - U08 p7flowReadCount; ///< Reg 720. P7 Flow sensor read counter. - U08 p7flowErrorCount; ///< Reg 721. P7 Flow sensor error counter. - U32 tempP23; ///< Reg 722. P23 temperature sensor reading. - U32 tempP22; ///< Reg 726. P22 ( TRO2 ) temperature sensor reading. - U32 tempTax1; ///< Reg 730. ( Tax1 ) temperature sensor reading. - U32 tempRTD; ///< Reg 734. spare temperature sensor reading. - U08 ad7124errcnt; ///< Reg 738. Counter which increments when an invalid transaction happen between FPGA and AD7124. - U08 ad7124readcnt; ///< Reg 739. Counter which increments when a valid transaction happens between FPGA and AD7124. - U16 flowRateP16; ///< Reg 740. P16 flow sensor rate. - U16 flowTempP16; ///< Reg 742. P16 flow sensor temperature. - U16 flowIntTempP16; ///< Reg 744. P16 flow sensor internal temperature. - U08 p16flowReadCount; ///< Reg 746. P16 Flow sensor read counter. - U08 p16flowErrorCount; ///< Reg 747. P16 Flow sensor error counter. + U16 valveControlReadback; ///< Reg 714. Valve control bits read back. + U16 valvePWMEnableReadback; ///< Reg 716. Valve PWM enable read back. + U16 p12PumpPWMReadback; ///< Reg 718. P12 pump PWM read back. + U16 p40PumpPWMReadback; ///< Reg 720. P40 pump PWM read back. + U08 p7flowReadCount; ///< Reg 722. P7 Flow sensor read counter. + U08 p7flowErrorCount; ///< Reg 723. P7 Flow sensor error counter. + U32 tempP23; ///< Reg 724. P23 temperature sensor reading. + U32 tempP22; ///< Reg 728. P22 ( TRO2 ) temperature sensor reading. + U32 tempTax1; ///< Reg 732. ( Tax1 ) temperature sensor reading. + U32 tempRTD; ///< Reg 736. spare temperature sensor reading. + U08 ad7124errcnt; ///< Reg 740. Counter which increments when an invalid transaction happen between FPGA and AD7124. + U08 ad7124readcnt; ///< Reg 741. Counter which increments when a valid transaction happens between FPGA and AD7124. + U16 flowRateP16; ///< Reg 742. P16 flow sensor rate. + U16 flowTempP16; ///< Reg 744. P16 flow sensor temperature. + U16 flowIntTempP16; ///< Reg 746. P16 flow sensor internal temperature. + U08 p16flowReadCount; ///< Reg 748. P16 Flow sensor read counter. + U08 p16flowErrorCount; ///< Reg 749. P16 Flow sensor error counter. - U32 fpgaD74CondDataOut; ///< Reg 748. Data read from Conductivity Sensor D74 register - U16 fpgaD74CondCond; ///< Reg 752. D74 conductivity - U16 fpgaD74CondTemp; ///< Reg 754. D74 Temperature - U08 fpgaD74CondReadCnt; ///< Reg 756. D74 successful read count - U08 fpgaD74CondErrorCnt; ///< Reg 757. D74 error read count + U32 fpgaD74CondDataOut; ///< Reg 750. Data read from Conductivity Sensor D74 register + U16 fpgaD74CondCond; ///< Reg 754. D74 conductivity + U16 fpgaD74CondTemp; ///< Reg 756. D74 Temperature + U08 fpgaD74CondReadCnt; ///< Reg 758. D74 successful read count + U08 fpgaD74CondErrorCnt; ///< Reg 759. D74 error read count } DD_FPGA_SENSORS_T; typedef struct @@ -2844,7 +2844,7 @@ * @details \b Outputs: fpgaSensorReadings.valveControlReadback * @return none *************************************************************************/ -U08 getFPGAIOFPValveStates( void ) +U16 getFPGAIOFPValveStates( void ) { return fpgaSensorReadings.valveControlReadback; }