Index: firmware/App/Services/FPGA.h =================================================================== diff -u -r22176ce95e49213c48454f34ddf5d29b8109f2cb -ra89d6b091874136d75a9bfbdbbc1ff00f42467b3 --- firmware/App/Services/FPGA.h (.../FPGA.h) (revision 22176ce95e49213c48454f34ddf5d29b8109f2cb) +++ firmware/App/Services/FPGA.h (.../FPGA.h) (revision a89d6b091874136d75a9bfbdbbc1ff00f42467b3) @@ -8,7 +8,7 @@ * @file FPGA.h * * @author (last) Dara Navaei -* @date (last) 14-Mar-2022 +* @date (last) 12-Jul-2022 * * @author (original) Dara Navaei * @date (original) 05-Nov-2019 @@ -45,10 +45,10 @@ void setFPGADrainPumpSpeed( U08 drainPumpDAC ); void setFPGACPoProbeType( U16 probeType ); void setFPGACPiProbeType( U16 probeType ); -void setFPGACP1Control( U08 pumpControl ); -void setFPGACP2Control( U08 pumpControl ); -void setFPGACP1SetStepSpeed( U16 stepSpeed ); -void setFPGACP2SetStepSpeed( U16 stepSpeed ); +void setFPGAV3AcidPumpControl( U08 pumpControl ); +void setFPGAV3BicarbPumpControl( U08 pumpControl ); +void setFPGAAcidPumpSetStepSpeed( U16 stepSpeed ); +void setFPGABicarbSetStepSpeed( U16 stepSpeed ); void getFPGAVersions( U08 *Id, U08 *Maj, U08 *Min, U08 *Lab ); U16 getFPGAValveStates( void ); @@ -70,22 +70,18 @@ U08 getFPGARTDReadCount( void ); U32 getFPGATRoTemp( void ); - U08 getFPGATRoErrorCount( void ); U08 getFPGATRoReadCount( void ); U32 getFPGATDiTemp( void ); - U08 getFPGATDiErrorCount( void ); U08 getFPGATDiReadCount( void ); U16 getFPGAPrimaryHeaterTemp( void ); - U08 getFPGAPrimaryHeaterFlags( void ); U08 getFPGAPrimaryHeaterReadCount( void ); U16 getFPGATrimmerHeaterTemp( void ); - U08 getFPGATrimmerHeaterFlags( void ); U08 getFPGATrimmerHeaterReadCount( void ); @@ -104,9 +100,9 @@ U08 getFPGAConcentratePumpsFault( void ); -U08 getFPGAEmstatOutByte( void ); -U08 getFPGAEmstatRxErrCount( void ); -U16 getFPGAEmstatRxFifoCount( void ); +U08 getFPGAEmstatCD1CD2OutByte( void ); +U08 getFPGAEmstatCD1CD2RxErrCount( void ); +U16 getFPGAEmstatCD1CD2RxFifoCount( void ); U16 getFPGACP1HallSensePulseWidth( void ); U16 getFPGACP2HallSensePulseWidth( void ); @@ -142,6 +138,30 @@ U08 getFPGADialysateCapStatus( void ); U08 getFPGAConcentrateCapStatus( void ); +//***************** DVT Functions ***************************/ +void setFPGAAcidPumpControl( U08 control ); +void setFPGABicarbPumpControl( U08 control ); + +U08 getFPGABaroReadCount( void ); +U08 getFPGABaroErrorCount( void ); +U16 getFPGABaroPressureSensitivity( void ); +U16 getFPGABaroPressureOffset( void ); +U16 getFPGABaroTempCoeffOfPressSensitvity( void ); +U16 getFPGABaroTempCoeffOfPressOffset( void ); +U16 getFPGABaroReferenceTemp( void ); +U16 getFPGABaroTempCoeffOfTemperature( void ); +U32 getFPGABaroPressure( void ); +U32 getFPGABaroTemperature( void ); + +U08 getFPGAEmstatCPiCPoByteOut( void ); +U16 getFPGAEmstatCPiCPoRxFifoCount( void ); +U08 getFPGAEmstatCPiCPoRxErrCount( void ); + +U32 getFPGATHdTemp( void ); +U32 getFPGATHdInternalTemp( void ); +U08 getFPGATHdReadCount( void ); +U08 getFPGATHdErrorCount( void ); + /**@}*/ #endif