Index: firmware/App/Services/FPGA.c =================================================================== diff -u -r402885eda2ed755a079c854d1228ac5f76cbec7c -rc4597167d133bcafd1a0576d0f7c53f430d98d4b --- firmware/App/Services/FPGA.c (.../FPGA.c) (revision 402885eda2ed755a079c854d1228ac5f76cbec7c) +++ firmware/App/Services/FPGA.c (.../FPGA.c) (revision c4597167d133bcafd1a0576d0f7c53f430d98d4b) @@ -138,18 +138,18 @@ { U08 errorCountProcessor; ///< Reg 256. TBD. U08 errorCountPC; ///< Reg 257. TBD. - U08 bloodFlowMeterDataPktCount; ///< Reg 258. Blood flow sensor data packet count. - U08 bloodFlowMeterSlowPktCounts; ///< Reg 259. Blood flow sensor slow data packet count. - F32 bloodFlowLast; ///< Reg 260. Blood flow rate data. - U08 bloodFlowMeterDeviceStatus; ///< Reg 264. Blood flow sensor status. - U08 bloodFlowMeterResponse; ///< Reg 265. TBD. - U08 dialysateFlowMeterDataPktCount; ///< Reg 266. Dialysate flow sensor data packet count. - U08 dialysateFlowMeterSlowPckCounts; ///< Reg 267. Dialysate flow sensor slow data packet count. - F32 dialysateFlowLast; ///< Reg 268. Dialysate flow rate data. - U08 dialysateFlowMeterDeviceStatus; ///< Reg 272. Dialysate flow sensor status. - U08 dialysateFlowMeterResponse; ///< Reg 273. TBD. - U08 bloodFlowMeterErrorCount; ///< Reg 274. Blood flow sensor error count. - U08 dialysateFlowMeterErrorCount; ///< Reg 275. Dialysate flow sensor error count. + U08 bloodFlowMeterDataPktCount; ///< Reg 258. Blood flow sensor data packet count. (OBSOLETE) + U08 bloodFlowMeterSlowPktCounts; ///< Reg 259. Blood flow sensor slow data packet count. (OBSOLETE) + F32 bloodFlowLast; ///< Reg 260. Blood flow rate data. (OBSOLETE) + U08 bloodFlowMeterDeviceStatus; ///< Reg 264. Blood flow sensor status. (OBSOLETE) + U08 bloodFlowMeterResponse; ///< Reg 265. TBD. (OBSOLETE) + U08 dialysateFlowMeterDataPktCount; ///< Reg 266. Dialysate flow sensor data packet count. (OBSOLETE) + U08 dialysateFlowMeterSlowPckCounts; ///< Reg 267. Dialysate flow sensor slow data packet count. (OBSOLETE) + F32 dialysateFlowLast; ///< Reg 268. Dialysate flow rate data. (OBSOLETE) + U08 dialysateFlowMeterDeviceStatus; ///< Reg 272. Dialysate flow sensor status. (OBSOLETE) + U08 dialysateFlowMeterResponse; ///< Reg 273. TBD. (OBSOLETE) + U08 bloodFlowMeterErrorCount; ///< Reg 274. Blood flow sensor error count. (OBSOLETE) + U08 dialysateFlowMeterErrorCount; ///< Reg 275. Dialysate flow sensor error count. (OBSOLETE) U16 bloodOcclusionData; ///< Reg 276. Blood pump occlusion sensor data. U08 bloodOcclusionReadCount; ///< Reg 278. Blood pump occlusion sensor read count. U08 bloodOcclusionErrorCount; ///< Reg 279. Blood pump occlusion sensor error count. @@ -164,9 +164,9 @@ U08 dialInPumpHallSensorStatus; ///< Reg 291. Dialysate inlet pump hall sensor status. U32 adc1Channel0; ///< Reg 292. ADC1 channel 0 data. U32 adc1Channel1; ///< Reg 296. ADC1 channel 1 data. - U32 bloodFlowSoundSpeedData; ///< Reg 300. Blood flow sensor - sound speed data. - U32 bloodFlowAccFlowData; ///< Reg 304. Blood flow sensor - accumulated flow data. - F32 bloodFlowSignalStrength; ///< Reg 308. Blood flow sensor - signal strength. + U32 bloodFlowSoundSpeedData; ///< Reg 300. Blood flow sensor - sound speed data. (OBSOLETE) + U32 bloodFlowAccFlowData; ///< Reg 304. Blood flow sensor - accumulated flow data. (OBSOLETE) + F32 bloodFlowSignalStrength; ///< Reg 308. Blood flow sensor - signal strength. (OBSOLETE) U08 adc1SequenceCount; ///< Reg 312. ADC1 round robin channel sequence count. U08 adc1ErrorCount; ///< Reg 313. ADC1 error count. U16 accelX; ///< Reg 314. Accelerometer X axis data. @@ -183,9 +183,9 @@ U08 dialOutPumpSensorStatus; ///< Reg 335. Dialysate outlet pump hall sensor status. U16 dialInPumpHallSensorCount; ///< Reg 336. Dialysate inlet pump hall sensor count. U16 dialOutPumpHallSensorCount; ///< Reg 338. Dialysate outlet pump hall sensor count. - U32 dialysateFlowSoundSpeedData; ///< Reg 340. Dialysate flow sensor - sound speed data. - U32 dialysateFlowAccFlowData; ///< Reg 344. Dialysate flow sensor - accumulated flow data. - F32 dialysateFlowSignalStrength; ///< Reg 348. Dialysate flow sensor - signal strength. + U32 dialysateFlowSoundSpeedData; ///< Reg 340. Dialysate flow sensor - sound speed data. (OBSOLETE) + U32 dialysateFlowAccFlowData; ///< Reg 344. Dialysate flow sensor - accumulated flow data. (OBSOLETE) + F32 dialysateFlowSignalStrength; ///< Reg 348. Dialysate flow sensor - signal strength. (OBSOLETE) U16 fan1PulseTime; ///< Reg 352. Fan 1 pulse time in 2.5 uSec resolution. 0xFFFF if fan RPM < 500 RPM. U16 fan2PUlseTime; ///< Reg 354. Fan 2 pulse time in 2.5 uSec resolution. 0xFFFF if fan RPM < 500 RPM. U16 fpgaGPIO; ///< Reg 356. FPGA GPIO register. @@ -227,15 +227,15 @@ 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 bloodLeakDetectSetPoint; ///< Reg 430. Blood leak stored set point value. - U16 bloodLeakDetectLevel; ///< Reg 432. Blood leak detection stored level value. - U16 bloodLeakStCount; ///< Reg 434. Blood leak St Count. - U16 bloodLeakLEDIntensity; ///< Reg 436. Blood leak LED intensity. - U16 bloodLeakRdCounter; ///< Reg 438. Blood leak register counter. + U08 ZLeakCounter; ///< Reg 426. Blood leak zero status counter. (OBSOLETE) + U08 BLeakCounter; ///< Reg 427. Blood leak counter. (OBSOLETE) + U08 VenousErrorCounter; ///< Reg 428. Venous error counter. + U08 bloodLeakZeroedStatus; ///< Reg 429. Blood leak and sensor zeored status. (OBSOLETE) + U16 bloodLeakDetectSetPoint; ///< Reg 430. Blood leak stored set point value. (OBSOLETE) + U16 bloodLeakDetectLevel; ///< Reg 432. Blood leak detection stored level value. (OBSOLETE) + U16 bloodLeakStCount; ///< Reg 434. Blood leak St Count. (OBSOLETE) + U16 bloodLeakLEDIntensity; ///< Reg 436. Blood leak LED intensity. (OBSOLETE) + U16 bloodLeakRdCounter; ///< Reg 438. Blood leak register counter. (OBSOLETE) U16 arterialPressure; ///< Reg 440. Arterial pressure sensor. U16 arterialPressureTemperature; ///< Reg 442. Arterial pressure sensor temperature. U08 arterialPressureReadCount; ///< Reg 444. Arterial pressure sensor read count. @@ -246,9 +246,6 @@ U08 bloodLeakRxFIFODataOut; ///< Reg 450. Blood leak receive FIFO data out. U08 dummyByte; ///< Reg 451. Dummy byte to meet the even of the data. U16 fpgaCompatibilityRev; ///< Reg 452. Compatibility revisions - U08 bloodLeakSelfTestErrorCounter; ///< Reg 452. Blood leak self test error counter. - U08 bloodLeakZeroErrorCounter; ///< Reg 453. Blood leak zero error counter. - } FPGA_SENSORS_T; /// Record structure for FPGA continuous priority writes. @@ -1655,6 +1652,19 @@ /*********************************************************************//** * @brief + * The getFPGAVenousPressureErrorCounter function gets the latest venous pressure + * sensor error counter. + * @details Inputs: fpgaSensorReadings + * @details Outputs: none + * @return last venous pressure sensor error counter + *************************************************************************/ +U08 getFPGAVenousPressureErrorCounter( void ) +{ + return fpgaSensorReadings.VenousErrorCounter; +} + +/*********************************************************************//** + * @brief * The setFPGASyringePumpControlFlags function sets the syringe pump control * register per given bit flags. * @details Inputs: none @@ -2163,32 +2173,6 @@ /*********************************************************************//** * @brief - * The getFPGABloodLeakSelfTestErrorCounter function returns the blood leak - * self test error counter. - * @details Inputs: none - * @details Outputs: none - * @return fpgaSensorReadings.bloodLeakSelfTestErrorCounter - *************************************************************************/ -U08 getFPGABloodLeakSelfTestErrorCounter( void ) -{ - return fpgaSensorReadings.bloodLeakSelfTestErrorCounter; -} - -/*********************************************************************//** - * @brief - * The getFPGABloodLeakZeroErrorCounter function returns the blood leak - * zero error counter. - * @details Inputs: none - * @details Outputs: none - * @return fpgaSensorReadings.bloodLeakZeroErrorCounter - *************************************************************************/ -U08 getFPGABloodLeakZeroErrorCounter( void ) -{ - return fpgaSensorReadings.bloodLeakZeroErrorCounter; -} - -/*********************************************************************//** - * @brief * The noFPGABubbleDetected function returns TRUE if no air bubble has been * detected and FALSE if an air bubble has been detected. * @details Inputs: fpgaSensorReadings