Index: firmware/App/Services/FPGA.c =================================================================== diff -u -r186bc3aa917f8626f5eab6e5e8bf9cddae03ac2c -r6982379266891326c9d45aecd7d54ad5c85ea69f --- firmware/App/Services/FPGA.c (.../FPGA.c) (revision 186bc3aa917f8626f5eab6e5e8bf9cddae03ac2c) +++ firmware/App/Services/FPGA.c (.../FPGA.c) (revision 6982379266891326c9d45aecd7d54ad5c85ea69f) @@ -219,6 +219,21 @@ U16 fpgaVpvn; ///< Reg 414. FPGA pvn voltage. 1V range over 12 bits (0..4095). U16 fpgaTimerCount_ms; ///< Reg 416. Free running 1ms timer counter. Rolls over at 65535.Internal FPGA timer count in ms. U16 backupAlarmAudioPeakCurrent; ///< Reg 418. Piezo alarm peak ADC current in previous 10ms. 12 bit unsigned. + U08 V1EncError; ///< Reg 420. Pinch valve V1 encoder error counter. + U08 V2EncError; ///< Reg 421. Pinch valve V2 encoder error counter. + U08 V3EncError; ///< Reg 422. Pinch valve V3 encoder error counter. + U08 V4EncError; ///< Reg 423. Pinch valve V4 encoder error counter. + U08 ADACounter; ///< Reg 424. ADA bubble counter. + U08 ADVCounter; ///< Reg 425. ADV bubble counter. + U08 ZLeakCounter; ///< Reg 426. Blood leak zero status counter. + U08 BLeakCounter; ///< Reg 427. Blood leak counter. + U08 PBoErrorCount; ///< Reg 428. PBo error count. + U08 bloodLeakZeroedStatus; ///< Reg 429. Blood leak and sensor zeored status. + U16 bloodDetectSetPoint; ///< Reg 430. Blood leak stored set point value. + U16 bloodDetectLevel; ///< Reg 432. Blood leak detection stored level value. + U16 bloodStCount; ///< Reg 434. Blood leak St Count. + U16 bloodLEDIntensity; ///< Reg 436. Blood leak LED intensity. + U16 bloodRdCounter; ///< Reg 438. Blood leak register counter. } FPGA_SENSORS_T; /// Record structure for FPGA continuous priority writes. @@ -241,6 +256,8 @@ U32 syringePumpStepToggleTime; ///< Reg 36. Syringe pump step time toggle register. Sets time between step toggle which dictates stepper motor speed. U16 syringePumpDACOut; ///< Reg 40. Syringe pump DAC output level (12-bit). U08 syringePumpADCandDACControl; ///< Reg 42. Syringe pump ADC and DAC control register. + U08 bloodLeakUARTControl; ///< Reg 43. Blood leak UART control. + U08 bloodLeakFIFOTransmit; ///< Reg 44. Character word store in FIFO to be transmitted into blood leak UART interface. } FPGA_ACTUATORS_T; // TODO clean up the struct @@ -1988,6 +2005,39 @@ fpgaActuatorSetPoints.fpgaSensorTest &= ~FPGA_BLOOD_LEAK_SELF_TEST_CMD; } +U08 getFPGABloodLeakZeroStatusCounter( void ) +{ + return fpgaSensorReadings.ZLeakCounter; +} +U08 getFPGABloodLeakCounter( void ) +{ + return fpgaSensorReadings.BLeakCounter; +} +U08 getFPGABloodLeakZeroedStatus( void ) +{ + return fpgaSensorReadings.bloodLeakZeroedStatus; +} +U16 getFPGABloodLeakDetectSetPoint( void ) +{ + return fpgaSensorReadings.bloodDetectSetPoint; +} +U16 getFPGABloodLeakDetectLevel( void ) +{ + return fpgaSensorReadings.bloodDetectLevel; +} +U16 getFPGABloodLeakStCount( void ) +{ + return fpgaSensorReadings.bloodStCount; +} +U16 getFPGABloodLeakLEDIntensity( void ) +{ + return fpgaSensorReadings.bloodLEDIntensity; +} +U16 getFPGABloodLeakRegisterCounter( void ) +{ + return fpgaSensorReadings.bloodRdCounter; +} + /*********************************************************************//** * @brief * The noFPGABubbleDetected function returns TRUE if no air bubble has been