Index: firmware/App/Services/FPGA.h =================================================================== diff -u -r8b73263b38f449dacc0795c67a7cf6240cb79026 -rcd5be724d5a3ba7457e761191d82f278654d7f5c --- firmware/App/Services/FPGA.h (.../FPGA.h) (revision 8b73263b38f449dacc0795c67a7cf6240cb79026) +++ 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) Dara Navaei -* @date (last) 18-Jun-2022 +* @author (last) Sean Nash +* @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 ); @@ -88,6 +78,7 @@ U16 getFPGAVenousPressure( void ); U16 getFPGAVenousPressureTemperature( void ); U08 getFPGAVenousPressureReadCounter( void ); +U08 getFPGAVenousPressureErrorCounter( void ); U16 getFPGABloodPumpOcclusion( void ); U08 getFPGABloodPumpOcclusionReadCounter( void ); U08 getFPGABloodPumpOcclusionErrorCounter( void ); @@ -105,6 +96,9 @@ U16 getFPGASyringePumpADCChannel1( void ); U16 getFPGASyringePumpADCChannel2( void ); U16 getFPGASyringePumpADCChannel3( void ); +U08 getFPGASyringePumpDACStatus( void ); +U16 getFPGASyringePumpDACSetting( void ); +U16 getFPGASyringePumpDACStoredSetting( void ); U16 getFPGATimerCount( void ); @@ -116,37 +110,20 @@ void getFPGAAirTrapLevels( BOOL *airAtLower, BOOL *airAtUpper ); -void setFPGASensorTest( U08 sensorTest ); - void setFPGAValvesControlMode( U16 bits ); U16 getFPGAValvesStatus( void ); BOOL noFPGAFluidLeakDetected( void ); -BOOL noFPGABloodLeakDetected( void ); // TODO remove -void setFPGABloodLeakZero( void ); -void clearFPGABloodLeakZero( void ); -void setFPGABloodLeakSelfTest( void ); -void clearFPGABloodLeakSelfTest( void ); -U08 getFPGABloodLeakZeroStatus( 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 ); -U08 getFPGABloodLeakSelfTestErrorCounter( void ); -U08 getFPGABloodLeakZeroErrorCounter( void ); BOOL noFPGABubbleDetected( U32 bubble ); void setFPGABubbleSelfTest( U32 bubble ); @@ -174,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 );