Index: firmware/App/Services/FPGA.h =================================================================== diff -u -r68aefeff8890cdfa956c7bfdf0d4505b4ac25cb7 -rcd5be724d5a3ba7457e761191d82f278654d7f5c --- firmware/App/Services/FPGA.h (.../FPGA.h) (revision 68aefeff8890cdfa956c7bfdf0d4505b4ac25cb7) +++ firmware/App/Services/FPGA.h (.../FPGA.h) (revision cd5be724d5a3ba7457e761191d82f278654d7f5c) @@ -1,14 +1,14 @@ /************************************************************************** * -* Copyright (c) 2019-2022 Diality Inc. - All Rights Reserved. +* Copyright (c) 2019-2024 Diality Inc. - All Rights Reserved. * * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. * * @file FPGA.h * * @author (last) Sean Nash -* @date (last) 12-Nov-2021 +* @date (last) 05-Sep-2023 * * @author (original) Dara Navaei * @date (original) 05-Nov-2019 @@ -59,16 +59,6 @@ void setAlarmAudioState( U32 state, U32 volumeLevel, U32 volumeDivider ); -F32 getFPGABloodFlowSignalStrength( void ); -F32 getFPGADialysateFlowSignalStrength( void ); - -F32 getFPGADialysateFlow( void ); -U08 getFPGADialysateFlowMeterStatus( void ); -U08 getFPGADialysateFlowFastPacketReadCounter( void ); -U08 getFPGADialysateFlowSlowPacketReadCounter( void ); -U08 getFPGADialysateFlowStatusPacketReadCounter( void ); -U08 getFPGADialysateFlowErrorCounter( void ); - U16 getFPGABloodPumpHallSensorCount( void ); U08 getFPGABloodPumpHallSensorStatus( void ); U16 getFPGADialInPumpHallSensorCount( void ); @@ -79,9 +69,16 @@ U32 getFPGAArterialPressure( void ); U08 getFPGAArterialPressureReadCounter( void ); U08 getFPGAArterialPressureErrorCounter( void ); + +U16 getFPGADVTArterialPressure( void ); +U16 getFPGADVTArterialTemperature( void ); +U08 getFPGADVTArterialPressureReadCounter( void ); +U08 getFPGATDVTArterialPressureErrorCounter( void ); + U16 getFPGAVenousPressure( void ); U16 getFPGAVenousPressureTemperature( void ); U08 getFPGAVenousPressureReadCounter( void ); +U08 getFPGAVenousPressureErrorCounter( void ); U16 getFPGABloodPumpOcclusion( void ); U08 getFPGABloodPumpOcclusionReadCounter( void ); U08 getFPGABloodPumpOcclusionErrorCounter( void ); @@ -99,6 +96,9 @@ U16 getFPGASyringePumpADCChannel1( void ); U16 getFPGASyringePumpADCChannel2( void ); U16 getFPGASyringePumpADCChannel3( void ); +U08 getFPGASyringePumpDACStatus( void ); +U16 getFPGASyringePumpDACSetting( void ); +U16 getFPGASyringePumpDACStoredSetting( void ); U16 getFPGATimerCount( void ); @@ -110,33 +110,21 @@ void getFPGAAirTrapLevels( BOOL *airAtLower, BOOL *airAtUpper ); -void setFPGASensorTest( U08 sensorTest ); - -OPN_CLS_STATE_T getFPGADoorState( void ); - void setFPGAValvesControlMode( U16 bits ); U16 getFPGAValvesStatus( void ); BOOL noFPGAFluidLeakDetected( void ); -BOOL noFPGABloodLeakDetected( void ); -BOOL FPGABloodLeakZeroDetected( void ); -void setFPGABloodLeakZero( void ); -void clearFPGABloodLeakZero( void ); -void setFPGABloodLeakSelfTest( void ); -void clearFPGABloodLeakSelfTest( void ); +U08 getFPGABloodLeakStatus( void ); void setFPGABloodLeakUARTControl( U08 value ); void setFPGABloodLeakUARTTransmit( U08 value ); -U08 getFPGABloodLeakZeroStatusCounter( void ); -U08 getFPGABloodLeakCounter( void ); -U08 getFPGABloodLeakZeroedStatus( void ); -U16 getFPGABloodLeakDetectSetPoint( void ); -U16 getFPGABloodLeakDetectLevel( void ); -U16 getFPGABloodLeakStCount( void ); -U16 getFPGABloodLeakLEDIntensity( void ); -U16 getFPGABloodLeakRegisterCounter( void ); +U08 getFPGABloodLeakTxFIFOCount( void ); +U16 getFPGABloodLeakRxFIFOCount( void ); +U08 getFPGABloodLeakRxErrorCount( void ); +U08 getFPGABloodLeakRxFIFODataOut( void ); + BOOL noFPGABubbleDetected( U32 bubble ); void setFPGABubbleSelfTest( U32 bubble ); void clearFPGABubbleSelfTest( U32 bubble ); @@ -163,6 +151,10 @@ U16 getFPGAFrontDoorStatus( void ); U16 getFPGAPumpTrackSwitchStatus( void ); +#ifndef _RELEASE_ +HARDWARE_CONFIG_T getHardwareConfigStatus( void ); +#endif + // The PWM functions are only used during debugging #ifdef DEBUG_ENABLED void setFPGAValveDialyzerInletPWM( U16 count );