Index: firmware/App/Services/FpgaDD.c =================================================================== diff -u -r046bc2b62cf942b7e846fa5bff698b94238edf24 -r33090b2328de68d9b94e95feeb5307d8fdc66b97 --- firmware/App/Services/FpgaDD.c (.../FpgaDD.c) (revision 046bc2b62cf942b7e846fa5bff698b94238edf24) +++ firmware/App/Services/FpgaDD.c (.../FpgaDD.c) (revision 33090b2328de68d9b94e95feeb5307d8fdc66b97) @@ -172,71 +172,148 @@ U16 fpgaD18PresTemp; ///< Reg 534. D18 MPM pressure sensor RAW temperature data U16 fpgaD41PresPressure; ///< Reg 536. D41 MPM pressure sensor RAW pressure data U16 fpgaD41PresTemp; ///< Reg 538. D41 MPM pressure sensor RAW temperature data - U32 fpgaD17CondDataOut; ///< Reg 540. Data read from Conductivity Sensor D17 register - U16 fpgaD17CondCond; ///< Reg 544. D17 conductivity - U16 fpgaD17CondTemp; ///< Reg 546. D17 Temperature - U08 fpgaD17CondReadCnt; ///< Reg 548. D17 successful read count - U08 fpgaD17CondErrorCnt; ///< Reg 549. D17 error read count - U32 fpgaD27CondDataOut; ///< Reg 550. Data read from Conductivity Sensor D27 register - U16 fpgaD27CondCond; ///< Reg 554. D27 conductivity - U16 fpgaD27CondTemp; ///< Reg 556. D27 Temperature - U08 fpgaD27CondReadCnt; ///< Reg 558. D27 successful read count - U08 fpgaD27CondErrorCnt; ///< Reg 559. D27 error read count - U32 fpgaD29CondDataOut; ///< Reg 560. Data read from Conductivity Sensor D29 register - U16 fpgaD29CondCond; ///< Reg 564. D29 conductivity - U16 fpgaD29CondTemp; ///< Reg 566. D29 Temperature - U08 fpgaD29CondReadCnt; ///< Reg 568. D29 successful read count - U08 fpgaD29CondErrorCnt; ///< Reg 569. D29 error read count - U32 fpgaD43CondDataOut; ///< Reg 570. Data read from Conductivity Sensor D43 register - U16 fpgaD43CondCond; ///< Reg 574. D43 conductivity - U16 fpgaD43CondTemp; ///< Reg 576. D43 Temperature - U08 fpgaD43CondReadCnt; ///< Reg 578. D43 successful read count - U08 fpgaD43CondErrorCnt; ///< Reg 579. D43 error read count - U16 fpgaD63LevelSensor; ///< Reg 580. Upper level Sensor - U16 fpgaD46LevelSensor; ///< Reg 582. Level Sensor 2 - U08 fpgaHallSensInputs; ///< Reg 584. Hall sensor Inputs - U08 fpgaD42TxFIFOCnt; ///< Reg 585. Blood leak sensor transmit FIFO count - U16 fpgaD42RxErrorCnt; ///< Reg 586. Blood leak sensor Receive error count - U16 fpgaD42RxFIFOCnt; ///< Reg 588. Blood leak sensor Receive FIFO count - U08 fpgaD42RxFIFODataOut; ///< Reg 590. Blood leak sensor Receive data - U08 fpgaD42PulseStatus; ///< Reg 591. Blood leak sensor status - U16 fpgaValveStates; ///< Reg 592. Valve status read - U16 fpgaValvePWMEnableStates; ///< Reg 594. Valve PWM Enable status read - U08 fpgaValveBCStates; ///< Reg 596. Balancing chamber Valves states - U08 fpgaValveBCPWMStates; ///< Reg 597. Balancing Chamber Valve PWM states - U08 fpgaValveSpStates; ///< Reg 598. DD Spare Valves states - U08 fpgaValveSpPWMStates; ///< Reg 599. Spare Valves PWM states - U08 fpgaD11_D10_PumpFault; ///< Reg 600. Concentrate pump fault register for D11_Pump and D10_Pump - U08 fpgaRTDCountErrorCycles; ///< Reg 601. Count of each incomplete seq of reads from RTD ADC. - U16 fpga_UnUsed_4; ///< Reg 602. Not Used - U16 fpga_UnUsed_5; ///< Reg 604. Not Used - U32 fpgaD78Temp; ///< Reg 606. Outlet heat exchanger temperature - U32 fpgaD1Temp; ///< Reg 610. Inlet heat exchanger temperature - U32 fpgaD4Temp; ///< Reg 614. Hydraulics primary heater temperature - U32 fpgaD50Temp; ///< Reg 618. Trimmer heater temperature - U16 fpgaD98LevelSensor; ///< Reg 622. Lower level Sensor - U16 fpgaD12MeasuredSpeed; ///< Reg 624. Fresh dialysate pump measured speed - U16 fpgaD48MeasuredSpeed; ///< Reg 626. Spent dialysate pump measured speed - U08 fpgaRTDReadCnt; ///< Reg 628. Read count for all RTD sensors - U08 fpgaD12D48PumpStatus; ///< Reg 629. Dialysate pumps Error status - U16 fpgaD12CurrentFeedback; ///< Reg 630. Fresh dialysate pump current feedback - U16 fpgaD48CurrentFeedback; ///< Reg 632. Spent dialysate pump current feedback - U08 fpgaD12HallStatus; ///< Reg 634. Fresh dialysate pump hall sensor direction status - U08 fpgaD48HallStatus; ///< Reg 635. Spent dialysate pump hall sensor direction status - U08 fpgaD6FloaterStatus; ///< Reg 636. Floater 1 level sensor status - U08 fpgaFloater2Status; ///< Reg 637. Floater 2 level sensor status - U16 fpgaD11PumpStepCountStatus; ///< Reg 638. Acid concentrate pump revolution down count status - U16 fpgaD10PumpStepCountStatus; ///< Reg 640. Bicarb concentrate pump revolution down count status - U16 fpgaAdcTemp; ///< Reg 642. TBD - U16 fpgaAdcVccInt; ///< Reg 644. TBD - U16 fpgaAdcVccAux; ///< Reg 646. TBD - U16 fpgaAdcVpVn; ///< Reg 648. TBD - U16 fpgaD12PumpSpeedFeedback; ///< Reg 650. D12 Pump speed feedback - U16 fpgaD48PumpSpeedFeedback; ///< Reg 652. D48 Pump Speed feedback - U16 fpga_UnUsed_6; ///< Reg 654. Not used - U16 fpgaD76PumpStepCountStatus; ///< Reg 656. UF pump revolution down count status - U08 fpgaD76PumpFault; ///< Reg 658: UF pump fault - U08 fpga_UnUsed_3; ///< Reg 659: Not used + U16 fpgaD63LevelSensor; ///< Reg 540. Upper level Sensor + U16 fpgaD46LevelSensor; ///< Reg 542. Level Sensor 2 + U08 fpgaHallSensInputs; ///< Reg 544. Hall sensor Inputs + U08 fpgaD42TxFIFOCnt; ///< Reg 545. Blood leak sensor transmit FIFO count + U16 fpgaD42RxErrorCnt; ///< Reg 546. Blood leak sensor Receive error count + U16 fpgaD42RxFIFOCnt; ///< Reg 548. Blood leak sensor Receive FIFO count + U08 fpgaD42RxFIFODataOut; ///< Reg 550. Blood leak sensor Receive data + U08 fpgaD42PulseStatus; ///< Reg 551. Blood leak sensor status + U16 fpgaValveStates; ///< Reg 552. Valve status read + U16 fpgaValvePWMEnableStates; ///< Reg 554. Valve PWM Enable status read + U08 fpgaValveBCStates; ///< Reg 556. Balancing chamber Valves states + U08 fpgaValveBCPWMStates; ///< Reg 557. Balancing Chamber Valve PWM states + U08 fpgaValveSpStates; ///< Reg 558. DD Spare Valves states + U08 fpgaValveSpPWMStates; ///< Reg 559. Spare Valves PWM states + U08 fpgaD11_D10_PumpFault; ///< Reg 560. Concentrate pump fault register for D11_Pump and D10_Pump + U08 fpgaD78D1D4D50ErrorCounter; ///< Reg 561. Count of each incomplete seq of reads from RTD ADC. + U16 fpga_UnUsed_1; ///< Reg 562. Concentrate pump D11_Pump hall sensor pulse width + U16 fpga_UnUsed_2; ///< Reg 564. Concentrate pump D10_Pump hall sensor pulse width + U32 fpgaD78Temp; ///< Reg 566. Outlet heat exchanger temperature + U32 fpgaD1Temp; ///< Reg 570. Inlet heat exchanger temperature + U32 fpgaD4Temp; ///< Reg 574. Hydraulics primary heater temperature + U32 fpgaD50Temp; ///< Reg 578. Trimmer heater temperature + U16 fpgaD98LevelSensor; ///< Reg 582. Lower level Sensor + U16 fpgaD12MeasuredSpeed; ///< Reg 584. Fresh dialysate pump measured speed + U16 fpgaD48MeasuredSpeed; ///< Reg 586. Spent dialysate pump measured speed + U08 fpgaRTDReadCnt; ///< Reg 588. Read count for all RTD sensors + U08 fpgaD12D48PumpStatus; ///< Reg 589. Dialysate pumps Error status + U16 fpgaD12CurrentFeedback; ///< Reg 590. Fresh dialysate pump current feedback + U16 fpgaD48CurrentFeedback; ///< Reg 592. Spent dialysate pump current feedback + U08 fpgaD12HallStatus; ///< Reg 594. Fresh dialysate pump hall sensor direction status + U08 fpgaD48HallStatus; ///< Reg 595. Spent dialysate pump hall sensor direction status + U08 fpgaD6FloaterStatus; ///< Reg 596. Floater 1 level sensor status + U08 fpgaFloater2Status; ///< Reg 597. Floater 2 level sensor status + U16 fpgaD11PumpStepCountStatus; ///< Reg 598. Acid concentrate pump revolution down count status + U16 fpgaD10PumpStepCountStatus; ///< Reg 600. Bicarb concentrate pump revolution down count status + U16 fpgaAdcTemp; ///< Reg 602. TBD + U16 fpgaAdcVccInt; ///< Reg 604. TBD + U16 fpgaAdcVccAux; ///< Reg 606. TBD + U16 fpgaAdcVpVn; ///< Reg 608. TBD + U16 fpgaD12PumpSpeedFeedback; ///< Reg 610. D12 Pump speed feedback + U16 fpgaD48PumpSpeedFeedback; ///< Reg 612. D48 Pump Speed feedback + U16 fpga_UnUsed_3; ///< Reg 614. UF D76_Pump hall sensor pulse width + U16 fpgaD76PumpStepCountStatus; ///< Reg 616. UF pump revolution down count status + U08 fpgaD76PumpFault; ///< Reg 618: UF pump fault + U08 fpga_UnUsed_4; ///< Reg 619: Not used + S16 pressureP46; ///< Reg 620. P46 pressure data. + U16 temperatureP46; ///< Reg 622. P46 temperature data. + S16 pressureM3; ///< Reg 624. M3 pressure data. + U16 temperatureM3; ///< Reg 626. M3 temperature data. + S16 pressureP8; ///< Reg 628. P8 pressure data. + U16 temperatureP8; ///< Reg 630. P8 temperature data. + S16 pressureP13; ///< Reg 632. P13 pressure data. + U16 temperatureP13; ///< Reg 634. P13 temperature data. + S16 pressureP17; ///< Reg 636. P17 pressure data. + U16 temperatureP17; ///< Reg 638. P17 temperature data. + U16 p40PumpTachCount; ///< Reg 640. P40 pump tachometer counter. + U08 p25LevelSwitch; ///< Reg 642. P25 level switch. + U08 fpga_UnUsed_5; ///< Reg 643. Reserved. + U16 flowRateP7; ///< Reg 644. P7 flow sensor rate. + U16 flowTempP7; ///< Reg 646. P7 flow sensor temperature. + U16 p12PumpTachCount; ///< Reg 648. P12 pump tachometer counter. + U16 d79SpeedPulseWidth; ///< Reg 650. D79 pusle width feedback. + U16 flowIntTempP7; ///< Reg 652. P7 flow sensor internal temperature. + U08 valveIOControlReadback; ///< Reg 654. IO Valve control bits read back. + U08 valveFPControlReadback; ///< Reg 655. FP Valve control enable read back. + U08 valveIOPWMEnableReadback; ///< Reg 656. IO Valve PWM enable read back. + U08 valveFPPWMEnableReadback; ///< Reg 657. FP Valve PWM enable read back. + U16 p12PumpPWMReadback; ///< Reg 658. P12 pump PWM read back. + U16 p40PumpPWMReadback; ///< Reg 660. P40 pump PWM read back. + U08 p7flowReadCount; ///< Reg 662. P7 Flow sensor read counter. + U08 p7flowErrorCount; ///< Reg 663. P7 Flow sensor error counter. + U16 fpgaD87PresPressure; ///< Reg 664. D87 MPM pressure sensor RAW pressure data + U16 fpgaD87PresTemp; ///< Reg 666. D87 MPM pressure sensor RAW temperature data + U32 fpgaD99Temp; ///< Reg 668. D99 temperature sensor + U32 fpga_UnUsed_6; ///< Reg 672. eserved. + U32 fpga_UnUsed_7; ///< Reg 676. Reserved. + U08 ad7124errcnt; ///< Reg 680. Counter which increments when an invalid transaction happen between FPGA and AD7124. + U08 ad7124readcnt; ///< Reg 681. Counter which increments when a valid transaction happens between FPGA and AD7124. + U16 flowRateP16; ///< Reg 682. P16 flow sensor rate. + U16 flowTempP16; ///< Reg 684. P16 flow sensor temperature. + U16 flowIntTempP16; ///< Reg 686. P16 flow sensor internal temperature. + U08 p16flowReadCount; ///< Reg 688. P16 Flow sensor read counter. + U08 p16flowErrorCount; ///< Reg 689. P16 Flow sensor error counter. + U32 d11HallSense; ///< Reg 690. D11 Pump hall sensor optical sensor interface pulse width. + U32 d10HallSense; ///< Reg 694. D10 Pump hall sensor optical sensor interface pulse width. + U32 d76HallSense; ///< Reg 698. D76 Pump hall sensor optical sensor interface pulse width. + U32 d17CondCalData; ///< Reg 702. D16 Cal Word - Holds current word being read from cal memory. + U32 d17CondCond; ///< Reg 706. D16 Conductivity Measurement. + U32 d17CondTemp; ///< Reg 710. D16 Temperature Measurement. + U08 d17CondCondReadCount; ///< Reg 714. D16 Conductivity successful read count. + U08 d17CondCondErrorCount; ///< Reg 715. D16 Conductivity unsuccessful error count. + U08 d17CondTempReadCount; ///< Reg 716. D16 Temperature successful read count. + U08 d17CondTempErrorCount; ///< Reg 717. D16 Temperature unsuccessful error count. + U08 d17CondMemCounter; ///< Reg 718. D16 Cal memory counter that keeps track of which cal word. + U08 d74CondMemCounter; ///< Reg 719. D74 Cal memory counter that keeps track of which cal word. + U32 d74CondCalData; ///< Reg 720. D74 Cal Word - Holds current word being read from cal memory. + U32 d74CondCond; ///< Reg 724. D74 Conductivity Measurement. + U32 d74CondTemp; ///< Reg 728. D74 Temperature Measurement. + U08 d74CondCondReadCount; ///< Reg 732. D74 Conductivity successful read count. + U08 d74CondCondErrorCount; ///< Reg 733. D74 Conductivity unsuccessful error count. + U08 d74CondTempReadCount; ///< Reg 734. D74 Temperature successful read count. + U08 d74CondTempErrorCount; ///< Reg 735. D74 Temperature unsuccessful error count. + U32 d27CondCalData; ///< Reg 736. D27 Cal Word - Holds current word being read from cal memory. + U32 d27CondCond; ///< Reg 740. D27 Conductivity Measurement. + U32 d27CondTemp; ///< Reg 744. D27 Temperature Measurement. + U08 d27CondCondReadCount; ///< Reg 748. D27 Conductivity successful read count. + U08 d27CondCondErrorCount; ///< Reg 749. D27 Conductivity unsuccessful error count. + U08 d27CondTempReadCount; ///< Reg 750. D27 Temperature successful read count. + U08 d27CondTempErrorCount; ///< Reg 751. D27 Temperature unsuccessful error count. + U08 d27CondMemCounter; ///< Reg 752. D27 Cal memory counter that keeps track of which cal word. + U08 d29CondMemCounter; ///< Reg 753. D29 Cal memory counter that keeps track of which cal word. + U32 d29CondCalData; ///< Reg 754. D29 Cal Word - Holds current word being read from cal memory. + U32 d29CondCond; ///< Reg 758. D29 Conductivity Measurement. + U32 d29CondTemp; ///< Reg 762. D29 Temperature Measurement. + U08 d29CondCondReadCount; ///< Reg 766. D29 Conductivity successful read count. + U08 d29CondCondErrorCount; ///< Reg 767. D29 Conductivity unsuccessful error count. + U08 d29CondTempReadCount; ///< Reg 768. D29 Temperature successful read count. + U08 d29CondTempErrorCount; ///< Reg 769. D29 Temperature unsuccessful error count. + U32 d43CondCalData; ///< Reg 770. D43 Cal Word - Holds current word being read from cal memory. + U32 d43CondCond; ///< Reg 774. D43 Conductivity Measurement. + U32 d43CondTemp; ///< Reg 778. D43 Temperature Measurement. + U08 d43CondCondReadCount; ///< Reg 782. D43 Conductivity successful read count. + U08 d43CondCondErrorCount; ///< Reg 783. D43 Conductivity unsuccessful error count. + U08 d43CondTempReadCount; ///< Reg 784. D43 Temperature successful read count. + U08 d43CondTempErrorCount; ///< Reg 785. D43 Temperature unsuccessful error count. + U08 d43CondMemCounter; ///< Reg 786. D43 Cal memory counter that keeps track of which cal word. + U08 p9CondMemCounter; ///< Reg 787. P9 Cal memory counter that keeps track of which cal word. + U32 p9CondCalData; ///< Reg 788. P9 Cal Word - Holds current word being read from cal memory. + U32 p9CondCond; ///< Reg 792. P9 Conductivity Measurement. + U32 p9CondTemp; ///< Reg 796. P9 Temperature Measurement. + U08 p9CondCondReadCount; ///< Reg 800. P9 Conductivity successful read count. + U08 p9CondCondErrorCount; ///< Reg 801. P9 Conductivity unsuccessful error count. + U08 p9CondTempReadCount; ///< Reg 802. P9 Temperature successful read count. + U08 p9CondTempErrorCount; ///< Reg 803. P9 Temperature unsuccessful error count. + U32 p18CondCalData; ///< Reg 804. P18 Cal Word - Holds current word being read from cal memory. + U32 p18CondCond; ///< Reg 808. P18 Conductivity Measurement. + U32 p18CondTemp; ///< Reg 812. P18 Temperature Measurement. + U08 p18CondCondReadCount; ///< Reg 816. P18 Conductivity successful read count. + U08 p18CondCondErrorCount; ///< Reg 817. P18 Conductivity unsuccessful error count. + U08 p18CondTempReadCount; ///< Reg 818. P18 Temperature successful read count. + U08 p18CondTempErrorCount; ///< Reg 819. P18 Temperature unsuccessful error count. + U08 p18CondMemCounter; ///< Reg 820. P18 Cal memory counter that keeps track of which cal word. //TODO: Change the variable names to start with fpga as the prefix. S16 pressureP46; ///< Reg 660. P46 pressure data. @@ -474,42 +551,57 @@ U08 fpgaBCValvePWMControl; ///< Reg 15. Balancing Chamber Valves PWM control U08 fpgaDDSpareValveControl; ///< Reg 16. Spare Valves Control Registers U08 fpgaDDSpareValvePWMControl; ///< Reg 17. Spare Valves PWM control - U08 fpgaConSensD17D74Control; ///< Reg 18. Conductivity/Temperature Sensors D17 & D74 Control registers - U08 fpgaConSensD27D29Control; ///< Reg 19. Conductivity/Temperature Sensors D27 & D29 Control registers - U16 fpgaConSensD17D74_Addrs; ///< Reg 20. D17,D74 Initialization Address register - U32 fpgaConSensD17D74_Data_In; ///< Reg 22. D17,D74 Initialization data register - U16 fpgaConSensD27D29_Addrs; ///< Reg 26. D27,D29 Initialization Address register - U32 fpgaConSensD27D29_Data_In; ///< Reg 28. D27,D29 Initialization data register - U16 fpgaRemoteUpdate_Write; ///< Reg 32.Register for Remote update used by SW. - U16 fpgaD12PumpSpeed; ///< Reg 34. D48 Speed/RPM Control - U08 fpgaD12PumpControl; ///< Reg 36. DGP Control - U08 fpgaD48PumpControl; ///< Reg 37. SDP Control - U16 fpgaD48PumpSpeed; ///< Reg 38. SDP Speed/RPM Control - U16 fpgaNotUsed_1; ///< Reg 40. Not used - U08 fpgaD11PumpControl; ///< Reg 42. Acid Concentrate Pump Control - U08 fpgaD10PumpControl; ///< Reg 43. BiCarb Concentrate Pump Control - U16 fpgaNotUsed_2; ///< Reg 44. Not used - U08 fpgaD42SensorTest; ///< Reg 46. Blood leak sensor test - U08 fpgaD42UARTControl; ///< Reg 47. Blood leak sensor UART control - U08 fpgaD42FIFOTx; ///< Reg 48. Blood leak sensor FIFO transmit control - U08 fpgaD5HeaterPWMControl; ///< Reg 49. Primary heater PWM control - U08 fpgaD45HeaterPWMControl; ///< Reg 50. Trimmer heater PWM control - U08 fpgaD79PWMPumpCtl; ///< Reg 51. Rinse pump PWM control - U16 fpgaVBCPWMLow; ///< Reg 52. VBC PWM low ( Balancing chamber valves) - U16 fpgaVBCPWMPeriod; ///< Reg 54. VBC PWM period - U16 fpgaVBCPWMPullIn; ///< Reg 56. VBC PWM pull in - U16 fpgaVSPPWMLow; ///< Reg 58. VSP PWM low ( Spare valves ) - U16 fpgaVSPPWMPeriod; ///< Reg 60. VSP PWM period - U16 fpgaVSPPWMPullIn; ///< Reg 62. VSP PWM pull in - U16 fpgaD11PumpRevCount; ///< Reg 64. Acid Concentrate pump revolution count - U16 fpgaD10PumpRevCount; ///< Reg 66. Bicarb Concentrate pump revolution count - U08 fpgaADCControl; ///< Reg 68. FPGA internal ADC Control register for debugging - U08 fpgaGPIOControl; ///< Reg 69. FPGA GPIO control interface - U16 fpgaACRelayPWMLow; ///< Reg 70. Length of time in 10us resoultion that PWM output stays low. - U16 fpgaACRelayPWMPeriod; ///< Reg 72. PWM period for AC relay/heater. - U16 fpgaNotUsed_3; ///< Reg 74. Not Used - U16 fpgaD76PumpRevCount; ///< Reg 76. UF pump revolution count - U08 fpgaD76PumpControl; ///< Reg 78. UF Pump Control + U16 fpgaRemoteUpdate_Write; ///< Reg 18. Register for Remote update used by SW. + U16 fpgaD12PumpSpeed; ///< Reg 20. D48 Speed/RPM Control + U08 fpgaD12PumpControl; ///< Reg 22. DGP Control + U08 fpgaD48PumpControl; ///< Reg 23. SDP Control + U16 fpgaD48PumpSpeed; ///< Reg 24. SDP Speed/RPM Control + U08 fpgaD11PumpControl; ///< Reg 28. Acid Concentrate Pump Control + U08 fpgaD10PumpControl; ///< Reg 29. BiCarb Concentrate Pump Control + U08 fpgaD42SensorTest; ///< Reg 32. Blood leak sensor test + U08 fpgaD42UARTControl; ///< Reg 33. Blood leak sensor UART control + U08 fpgaD42FIFOTx; ///< Reg 34. Blood leak sensor FIFO transmit control + U08 fpgaD5HeaterPWMControl; ///< Reg 35. Primary heater PWM control + U08 fpgaD45HeaterPWMControl; ///< Reg 36. Trimmer heater PWM control + U08 fpgaD79PWMPumpCtl; ///< Reg 37. Rinse pump PWM control + U16 fpgaVBCPWMLow; ///< Reg 38. VBC PWM low ( Balancing chamber valves) + U16 fpgaVBCPWMPeriod; ///< Reg 40. VBC PWM period + U16 fpgaVBCPWMPullIn; ///< Reg 42. VBC PWM pull in + U16 fpgaVSPPWMLow; ///< Reg 44. VSP PWM low ( Spare valves ) + U16 fpgaVSPPWMPeriod; ///< Reg 46. VSP PWM period + U16 fpgaVSPPWMPullIn; ///< Reg 48. VSP PWM pull in + U16 fpgaD11PumpRevCount; ///< Reg 50. Acid Concentrate pump revolution count + U16 fpgaD10PumpRevCount; ///< Reg 52. Bicarb Concentrate pump revolution count + U08 fpgaADCControl; ///< Reg 54. FPGA internal ADC Control register for debugging + U08 fpgaGPIOControl; ///< Reg 55. FPGA GPIO control interface + U16 fpgaACRelayPWMLow; ///< Reg 56. Length of time in 10us resoultion that PWM output stays low. + U16 fpgaACRelayPWMPeriod; ///< Reg 58. PWM period for AC relay/heater. + U16 reserved1; ///< Reg 60. Reserved + U16 fpgaD76PumpRevCount; ///< Reg 62. UF pump revolution count + U08 fpgaD76PumpControl; ///< Reg 64. UF Pump Control + U08 reserved2; ///< Reg 65. Reserved + U08 valveIOControl; ///< Reg 66. IO Valve control register. + U08 valveFPControl; ///< Reg 67. FP Valve control register. + U16 descalePumpSpeed; ///< Reg 68. Descaler pump speed register. + U08 descalePumpControl; ///< Reg 70. Descaler pump control register. + U08 p12PumpControl; ///< Reg 71. P12 pump control register. + U16 valveIOFPPWMLow; ///< Reg 72. Valve VWi PWM low pulse period in 0.1 uSec. + U16 valveIOFPPWMPeriod; ///< Reg 74. Valve VWi PWM full period in 0.1 uSec. + U16 valveIOFPPWMPullIn; ///< Reg 76. Valve PWM high pulse period when valve is on in 0.1 uSec. + U16 p12PumpPWMDutyCyclePct; ///< Reg 78. P12 pump PWM duty cycle in percentage. + U16 p40PumpPWMDutyCyclePct; ///< Reg 80. P40 pump PWM duty cycle in percentage. + U08 p40PumpControl; ///< Reg 82. P40 pump control register. + U08 reserved3; ///< Reg 83. Reserved. + U08 flowControlp7; ///< Reg 84. P7 AVS Romer flow sensor control register. + U08 flowAddressp7; ///< Reg 85. P7 AVS Romer flow sensor I2C slave address register. + U08 valveIOPWMEnable; ///< Reg 86. Valve IO PWM enable register. + U08 valveFPPWMEnable; ///< Reg 87. Valve FP PWM enable register. + U08 flowControlp16; ///< Reg 88. P16 AVS Romer flow sensor control register. + U08 flowAddressp16; ///< Reg 89. P16 AVS Romer flow sensor I2C slave address register. + U08 reserved4; ///< Reg 90. Reserved. + U32 fpgaD11PumpSpeed; ///< Reg 92. Acid Concentrate Pump Speed/RPM Control + U32 fpgaD10PumpSpeed; ///< Reg 94. BiCarb Concentrate Pump Speed/RPM Control + U32 fpgaD76PumpSpeed; ///< Reg 96. UF Pump Speed/RPM Control U08 notused; ///< Reg 79. Not used U08 valveIOControl; ///< Reg 80. IO Valve control register. @@ -1173,7 +1265,7 @@ * @param stepSpeed The concentrate pump step speed period * @return none *************************************************************************/ -void setFPGAD11PumpSetStepSpeed( U32 stepSpeed ) +void setFPGAD11PumpSetStepSpeed( U16 stepSpeed ) { SET_FPGA_ACTUATOR_FIELD( fpgaD11PumpSpeed, stepSpeed ); } @@ -1187,7 +1279,7 @@ * @param stepSpeed The concentrate pump step speed period * @return none *************************************************************************/ -void setFPGAD10PumpSetStepSpeed( U32 stepSpeed ) +void setFPGAD10PumpSetStepSpeed( U16 stepSpeed ) { SET_FPGA_ACTUATOR_FIELD( fpgaD10PumpSpeed, stepSpeed ); } @@ -1201,7 +1293,7 @@ * @param stepSpeed The concentrate pump step speed period * @return none *************************************************************************/ -void setFPGAD76PumpSetStepSpeed( U32 stepSpeed ) +void setFPGAD76PumpSetStepSpeed( U16 stepSpeed ) { SET_FPGA_ACTUATOR_FIELD( fpgaD76PumpSpeed, stepSpeed ); } @@ -2553,7 +2645,7 @@ * @details \b Outputs: none * @return concentrate pump D11_Pump hall sense pulse width *************************************************************************/ -U32 getFPGAD11PumpHallSensePulseWidth( void ) +U16 getFPGAD11PumpHallSensePulseWidth( void ) { return GET_FPGA_SENSOR_FIELD( fpgaD11PumpHallSense ); } @@ -2566,7 +2658,7 @@ * @details \b Outputs: none * @return concentrate pump D10_Pump hall sense pulse width *************************************************************************/ -U32 getFPGAD10PumpHallSensePulseWidth( void ) +U16 getFPGAD10PumpHallSensePulseWidth( void ) { return GET_FPGA_SENSOR_FIELD( fpgaD10PumpHallSense ); } @@ -2579,7 +2671,7 @@ * @details \b Outputs: none * @return ultrafiltration pump D76_Pump hall sense pulse width *************************************************************************/ -U32 getFPGAD76PumpHallSensePulseWidth( void ) +U16 getFPGAD76PumpHallSensePulseWidth( void ) { return GET_FPGA_SENSOR_FIELD( fpgaD76PumpHallSense ); } @@ -4276,21 +4368,23 @@ * @param control bits indicating control action to take * @return none *************************************************************************/ -void setFPGAP9Control( U08 control ) +void setFPGAP40PumpEnable( BOOL enable ) { SET_FPGA_ACTUATOR_FIELD( conductivityP9Control, control ); } /*********************************************************************//** * @brief - * The setFPGAP9Address function sets the read/write address for a read/write - * action on the P9 sensor. + * The setFPGAP40PumpPWM function sets the P40 pump PWM duty cycle. + * The higher the PWM duty cycle (0..500), the faster the pump will go. + * @note PWM values < 5% or > 95% will cause pump to stop so effective + * range is actually 25..475. * @details \b Inputs: none * @details \b Outputs: conductivityP9Address * @param address The P9 sensor address to read from or write to * @return none *************************************************************************/ -void setFPGAP9Address( U16 address ) +void setFPGAP40PumpPWM( U16 pwm ) { SET_FPGA_ACTUATOR_FIELD( conductivityP9Address, address ); } @@ -4304,7 +4398,7 @@ * @param data The 32-bit data to write to the P9 sensor * @return none *************************************************************************/ -void setFPGAP9Data( U32 data ) +U16 getFPGAP40PumpPWM( void ) { SET_FPGA_ACTUATOR_FIELD( conductivityP9Data, data ); } @@ -4323,7 +4417,7 @@ * @param control bits indicating control action to take * @return none *************************************************************************/ -void setFPGAP18Control( U08 control ) +U16 getFPGAP40PumpTachCount( void ) { SET_FPGA_ACTUATOR_FIELD( conductivityP18Control, control ); } @@ -4337,7 +4431,7 @@ * @param address The P18 sensor address to read from or write to * @return none *************************************************************************/ -void setFPGAP18Address( U16 address ) +U08 getFPGAD17CondReadCount( void ) { SET_FPGA_ACTUATOR_FIELD( conductivityP18Address, address ); } @@ -4351,7 +4445,7 @@ * @param data The 32-bit data to write to the P18 sensor * @return none *************************************************************************/ -void setFPGAP18Data( U32 data ) +U08 getFPGAD17CondErrorCount( void ) { SET_FPGA_ACTUATOR_FIELD( conductivityP18Data, data ); } @@ -4363,7 +4457,7 @@ * @details \b Outputs: conductivityP9Control * @return none *************************************************************************/ -void setFPGAP9Reset( void ) +U08 getFPGAD17TempReadCount( void ) { SET_FPGA_ACTUATOR_BITS( conductivityP9Control, FPGA_CONDUCTIVITY_RESET_BIT ); } @@ -4375,7 +4469,7 @@ * @details \b Outputs: conductivityP9Control * @return none *************************************************************************/ -void clearFPGAP9Reset( void ) +U08 getFPGAD17TempErrorCount( void ) { CLEAR_FPGA_ACTUATOR_BITS( conductivityP9Control, ~FPGA_CONDUCTIVITY_RESET_BIT ); } @@ -4388,7 +4482,7 @@ * @details \b Outputs: conductivityP9Control * @return none *************************************************************************/ -void setFPGAP9InitEnable( void ) +U32 getFPGAD17CondData( void ) { SET_FPGA_ACTUATOR_BITS( conductivityP9Control, FPGA_CONDUCTIVITY_INIT_ENABLE_BIT ); } @@ -4401,7 +4495,7 @@ * @details \b Outputs: conductivityP9Control * @return none *************************************************************************/ -void clearFPGAP9InitEnable( void ) +U32 getFPGAD17CondTemp( void ) { CLEAR_FPGA_ACTUATOR_BITS( conductivityP9Control, ~FPGA_CONDUCTIVITY_INIT_ENABLE_BIT ); } @@ -4414,7 +4508,7 @@ * @details \b Outputs: conductivityP9Control * @return none *************************************************************************/ -void setFPGAP9WriteEnable( void ) +U32 getFPGAD17CondCalData( void ) { SET_FPGA_ACTUATOR_BITS( conductivityP9Control, FPGA_CONDUCTIVITY_WR_ENABLE_BIT ); } @@ -4427,7 +4521,7 @@ * @details \b Outputs: conductivityP9Control * @return none *************************************************************************/ -void clearFPGAP9WriteEnable( void ) +U08 getFPGAD17CalMemCounter( void ) { CLEAR_FPGA_ACTUATOR_BITS( conductivityP9Control, ~FPGA_CONDUCTIVITY_WR_ENABLE_BIT ); } @@ -4440,7 +4534,7 @@ * @details \b Outputs: conductivityP9Control * @return none *************************************************************************/ -void setFPGAP9ReadEnable( void ) +U08 getFPGAD27CondReadCount( void ) { SET_FPGA_ACTUATOR_BITS( conductivityP9Control, FPGA_CONDUCTIVITY_RD_ENABLE_BIT ); } @@ -4453,7 +4547,7 @@ * @details \b Outputs: conductivityP9Control * @return none *************************************************************************/ -void clearFPGAP9ReadEnable( void ) +U08 getFPGAD27CondErrorCount( void ) { CLEAR_FPGA_ACTUATOR_BITS( conductivityP9Control, ~FPGA_CONDUCTIVITY_RD_ENABLE_BIT ); } @@ -4465,7 +4559,7 @@ * @details \b Outputs: conductivityP18Control * @return none *************************************************************************/ -void setFPGAP18Reset( void ) +U08 getFPGAD27TempReadCount( void ) { SET_FPGA_ACTUATOR_BITS( conductivityP18Control, FPGA_CONDUCTIVITY_RESET_BIT ); } @@ -4477,7 +4571,7 @@ * @details \b Outputs: conductivityP18Control * @return none *************************************************************************/ -void clearFPGAP18Reset( void ) +U08 getFPGAD27TempErrorCount( void ) { CLEAR_FPGA_ACTUATOR_BITS( conductivityP18Control, ~FPGA_CONDUCTIVITY_RESET_BIT ); } @@ -4490,7 +4584,7 @@ * @details \b Outputs: conductivityP18Control * @return none *************************************************************************/ -void setFPGAP18InitEnable( void ) +U32 getFPGAD27CondData( void ) { SET_FPGA_ACTUATOR_BITS( conductivityP18Control, FPGA_CONDUCTIVITY_INIT_ENABLE_BIT ); } @@ -4503,7 +4597,7 @@ * @details \b Outputs: conductivityP18Control * @return none *************************************************************************/ -void clearFPGAP18InitEnable( void ) +U32 getFPGAD27CondTemp( void ) { CLEAR_FPGA_ACTUATOR_BITS( conductivityP18Control, ~FPGA_CONDUCTIVITY_INIT_ENABLE_BIT ); } @@ -4516,7 +4610,7 @@ * @details \b Outputs: conductivityP18Control * @return none *************************************************************************/ -void setFPGAP18WriteEnable( void ) +U32 getFPGAD27CondCalData( void ) { SET_FPGA_ACTUATOR_BITS( conductivityP18Control, FPGA_CONDUCTIVITY_WR_ENABLE_BIT ); } @@ -4529,7 +4623,7 @@ * @details \b Outputs: conductivityP18Control * @return none *************************************************************************/ -void clearFPGAP18WriteEnable( void ) +U08 getFPGAD27CalMemCounter( void ) { CLEAR_FPGA_ACTUATOR_BITS( conductivityP18Control, ~FPGA_CONDUCTIVITY_WR_ENABLE_BIT ); } @@ -4542,7 +4636,7 @@ * @details \b Outputs: conductivityP18Control * @return none *************************************************************************/ -void setFPGAP18ReadEnable( void ) +U08 getFPGAD29CondReadCount( void ) { SET_FPGA_ACTUATOR_BITS( conductivityP18Control, FPGA_CONDUCTIVITY_RD_ENABLE_BIT ); } @@ -4555,7 +4649,7 @@ * @details \b Outputs: conductivityP18Control * @return none *************************************************************************/ -void clearFPGAP18ReadEnable( void ) +U08 getFPGAD29CondErrorCount( void ) { CLEAR_FPGA_ACTUATOR_BITS( conductivityP18Control, ~FPGA_CONDUCTIVITY_RD_ENABLE_BIT ); } @@ -4565,9 +4659,9 @@ * The getFPGAP9ReadCount function gets the latest P9 sensor read count. * @details \b Inputs: conductivityP9ReadCount * @details \b Outputs: none - * @return Current read count for P9 sensor. + * @return D29 (D28) Temperature sensor read count *************************************************************************/ -U08 getFPGAP9ReadCount( void ) +U08 getFPGAD29TempReadCount( void ) { return GET_FPGA_SENSOR_FIELD( conductivityP9ReadCount ); } @@ -4577,9 +4671,9 @@ * The getFPGAP9ErrorCount function gets the latest P9 sensor error count. * @details \b Inputs: conductivityP9ErrorCount * @details \b Outputs: none - * @return Current error count for P9 sensor. + * @return D29 (D28) Temperature sensor error count *************************************************************************/ -U08 getFPGAP9ErrorCount( void ) +U08 getFPGAD29TempErrorCount( void ) { return GET_FPGA_SENSOR_FIELD( conductivityP9ErrorCount ); } @@ -4590,9 +4684,9 @@ * reading. * @details \b Inputs: conductivityP9Cond * @details \b Outputs: none - * @return Current conductivity reading from P9 sensor. + * @return D29 Conductivity data *************************************************************************/ -U16 getFPGAP9Conductivity( void ) +U32 getFPGAD29CondData( void ) { return GET_FPGA_SENSOR_FIELD( conductivityP9Cond ); } @@ -4602,9 +4696,9 @@ * The getFPGAP9Temperature function gets the latest P9 sensor temperature. * @details \b Inputs: conductivityP9Temp * @details \b Outputs: none - * @return Current temperature from P9 sensor. + * @return D29 (D28) Temperature data *************************************************************************/ -U16 getFPGAP9Temperature( void ) +U32 getFPGAD29CondTemp( void ) { return GET_FPGA_SENSOR_FIELD( conductivityP9Temp ); } @@ -4615,9 +4709,9 @@ * action. * @details \b Inputs: conductivityP9Data * @details \b Outputs: none - * @return Latest data read from P9 sensor. + * @return D29 calibration data *************************************************************************/ -U32 getFPGAP9Data( void ) +U32 getFPGAD29CondCalData( void ) { return GET_FPGA_SENSOR_FIELD( conductivityP9Data ); } @@ -4627,9 +4721,9 @@ * The getFPGAP18ReadCount function gets the latest P18 sensor read count. * @details \b Inputs: conductivityP18ReadCount * @details \b Outputs: none - * @return Current read count for P18 sensor. + * @return D29 memory count *************************************************************************/ -U08 getFPGAP18ReadCount( void ) +U08 getFPGAD29CalMemCounter( void ) { return GET_FPGA_SENSOR_FIELD( conductivityP18ReadCount ); } @@ -4639,9 +4733,9 @@ * The getFPGAP18ErrorCount function gets the latest P18 sensor error count. * @details \b Inputs: conductivityP18ErrorCount * @details \b Outputs: none - * @return Current error count for P18 sensor. + * @return D437 Conductivity sensor read count *************************************************************************/ -U08 getFPGAP18ErrorCount( void ) +U08 getFPGAD43CondReadCount( void ) { return GET_FPGA_SENSOR_FIELD( conductivityP18ErrorCount ); } @@ -4652,9 +4746,9 @@ * reading. * @details \b Inputs: conductivityP18Cond * @details \b Outputs: none - * @return Current conductivity reading from P18 sensor. + * @return D43 Conductivity sensor error count *************************************************************************/ -U16 getFPGAP18Conductivity( void ) +U08 getFPGAD43CondErrorCount( void ) { return GET_FPGA_SENSOR_FIELD( conductivityP18Cond ); } @@ -4664,9 +4758,9 @@ * The getFPGAP18Temperature function gets the latest P18 sensor temperature. * @details \b Inputs: conductivityP18Temp * @details \b Outputs: none - * @return Current temperature from P18 sensor. + * @return D43 (D44) Temperature sensor read count *************************************************************************/ -U16 getFPGAP18Temperature( void ) +U08 getFPGAD43TempReadCount( void ) { return GET_FPGA_SENSOR_FIELD( conductivityP18Temp ); } @@ -4677,9 +4771,9 @@ * action. * @details \b Inputs: conductivityP18Data * @details \b Outputs: none - * @return Latest data read from P18 sensor. + * @return D43 (D44) Temperature sensor error count *************************************************************************/ -U32 getFPGAP18Data( void ) +U08 getFPGAD43TempErrorCount( void ) { return GET_FPGA_SENSOR_FIELD( conductivityP18Data ); } @@ -4692,7 +4786,7 @@ * @param enable flag indicating whether to enable or disable the P40 pump. * @return none *************************************************************************/ -void setFPGAP40PumpEnable( BOOL enable ) +U32 getFPGAD43CondData( void ) { SET_FPGA_ACTUATOR_FIELD( p40PumpControl, ( TRUE == enable ? 0x1 : 0x0 ) ); } @@ -4708,7 +4802,7 @@ * @param pwm PWM duty cycle magnitude * @return none *************************************************************************/ -void setFPGAP40PumpPWM( U16 pwm ) +U32 getFPGAD43CondTemp( void ) { SET_FPGA_ACTUATOR_FIELD( p40PumpPWMDutyCyclePct, pwm ); } @@ -4719,9 +4813,9 @@ * duty cycle. * @details \b Inputs: p40PumpPWMReadback * @details \b Outputs: none - * @return measured speed (RPM) of the P40 pump + * @return D43 calibration data *************************************************************************/ -U16 getFPGAP40PumpPWM( void ) +U32 getFPGAD43CondCalData( void ) { return GET_FPGA_SENSOR_FIELD( p40PumpPWMReadback ); } @@ -4732,11 +4826,298 @@ * from the P40 pump hall sensor. * @details \b Inputs: p40PumpTachCount * @details \b Outputs: none - * @return P40 pump tachometer count + * @return D43 memory count *************************************************************************/ -U16 getFPGAP40PumpTachCount( void ) +U08 getFPGAD43CalMemCounter( void ) { return GET_FPGA_SENSOR_FIELD( p40PumpTachCount ); } +/*********************************************************************//** + * @brief + * The getFPGAD74CondReadCount function gets the D74 conductivity read count. + * @details \b Inputs: fpgaSensorReadings.d74CondCondReadCount + * @details \b Outputs: none + * @return D74 Conductivity sensor read count + *************************************************************************/ +U08 getFPGAD74CondReadCount( void ) +{ + return fpgaSensorReadings.d74CondCondReadCount; +} + +/*********************************************************************//** + * @brief + * The getFPGAD74CondErrorCount function gets the D74 conductivity error count. + * @details \b Inputs: fpgaSensorReadings.d74CondCondErrorCount + * @details \b Outputs: none + * @return D74 Conductivity sensor error count + *************************************************************************/ +U08 getFPGAD74CondErrorCount( void ) +{ + return fpgaSensorReadings.d74CondCondErrorCount; +} + +/*********************************************************************//** + * @brief + * The getFPGAD74TempReadCount function gets the D74 (D75) temperature read count. + * @details \b Inputs: fpgaSensorReadings.d74CondTempReadCount + * @details \b Outputs: none + * @return D74 (D75) Temperature sensor read count + *************************************************************************/ +U08 getFPGAD74TempReadCount( void ) +{ + return fpgaSensorReadings.d74CondTempReadCount; +} + +/*********************************************************************//** + * @brief + * The getFPGAD74TempErrorCount function gets the D74 (D75) temperature error count. + * @details \b Inputs: fpgaSensorReadings.d74CondTempErrorCount + * @details \b Outputs: none + * @return D74 (D75) Temperature sensor error count + *************************************************************************/ +U08 getFPGAD74TempErrorCount( void ) +{ + return fpgaSensorReadings.d74CondTempErrorCount; +} + +/*********************************************************************//** + * @brief + * The getFPGAD74CondData function gets the D74 conductivity data. + * @details \b Inputs: fpgaSensorReadings.d74CondCond + * @details \b Outputs: none + * @return D74 Conductivity data + *************************************************************************/ +U32 getFPGAD74CondData( void ) +{ + return fpgaSensorReadings.d74CondCond; +} + +/*********************************************************************//** + * @brief + * The getFPGAD74CondTemp function gets the D74 (D75) temperature data. + * @details \b Inputs: fpgaSensorReadings.d74CondTemp + * @details \b Outputs: none + * @return D74 (D75) Temperature data + *************************************************************************/ +U32 getFPGAD74CondTemp( void ) +{ + return fpgaSensorReadings.d74CondTemp; +} + +/*********************************************************************//** + * @brief + * The getFPGAD74CondCalData function gets the D74 cal data. + * @details \b Inputs: fpgaSensorReadings.d74CondCalData + * @details \b Outputs: none + * @return D74 calibration data + *************************************************************************/ +U32 getFPGAD74CondCalData( void ) +{ + return fpgaSensorReadings.d74CondCalData; +} + +/*********************************************************************//** + * @brief + * The getFPGAD74CalMemCounter function gets the D74 memory count. + * @details \b Inputs: fpgaSensorReadings.d74CondMemCounter + * @details \b Outputs: none + * @return D74 memory count + *************************************************************************/ +U08 getFPGAD74CalMemCounter( void ) +{ + return fpgaSensorReadings.d74CondMemCounter; +} + +/*********************************************************************//** + * @brief + * The getFPGAP9CondReadCount function gets the P9 conductivity read count. + * @details \b Inputs: fpgaSensorReadings.p9CondCondReadCount + * @details \b Outputs: none + * @return P9 Conductivity sensor read count + *************************************************************************/ +U08 getFPGAP9CondReadCount( void ) +{ + return fpgaSensorReadings.p9CondCondReadCount; +} + +/*********************************************************************//** + * @brief + * The getFPGAP9CondErrorCount function gets the P9 conductivity error count. + * @details \b Inputs: fpgaSensorReadings.p9CondCondErrorCount + * @details \b Outputs: none + * @return P9 Conductivity sensor error count + *************************************************************************/ +U08 getFPGAP9CondErrorCount( void ) +{ + return fpgaSensorReadings.p9CondCondErrorCount; +} + +/*********************************************************************//** + * @brief + * The getFPGAP9TempReadCount function gets the P9 (P10) temperature read count. + * @details \b Inputs: fpgaSensorReadings.p9CondTempReadCount + * @details \b Outputs: none + * @return P9 (P10) Temperature sensor read count + *************************************************************************/ +U08 getFPGAP9TempReadCount( void ) +{ + return fpgaSensorReadings.p9CondTempReadCount; +} + +/*********************************************************************//** + * @brief + * The getFPGAP9TempErrorCount function gets the P9 (P10) temperature error count. + * @details \b Inputs: fpgaSensorReadings.p9CondTempErrorCount + * @details \b Outputs: none + * @return P9 (P10) Temperature sensor error count + *************************************************************************/ +U08 getFPGAP9TempErrorCount( void ) +{ + return fpgaSensorReadings.p9CondTempErrorCount; +} + +/*********************************************************************//** + * @brief + * The getFPGAP9CondData function gets the P9 conductivity data. + * @details \b Inputs: fpgaSensorReadings.p9CondCond + * @details \b Outputs: none + * @return P9 Conductivity data + *************************************************************************/ +U32 getFPGAP9CondData( void ) +{ + return fpgaSensorReadings.p9CondCond; +} + +/*********************************************************************//** + * @brief + * The getFPGAP9CondTemp function gets the P9 (P10) temperature data. + * @details \b Inputs: fpgaSensorReadings.p9CondTemp + * @details \b Outputs: none + * @return P9 (P10) Temperature data + *************************************************************************/ +U32 getFPGAP9CondTemp( void ) +{ + return fpgaSensorReadings.p9CondTemp; +} + +/*********************************************************************//** + * @brief + * The getFPGAP9CondCalData function gets the P9 cal data. + * @details \b Inputs: fpgaSensorReadings.p9CondCalData + * @details \b Outputs: none + * @return P9 calibration data + *************************************************************************/ +U32 getFPGAP9CondCalData( void ) +{ + return fpgaSensorReadings.p9CondCalData; +} + +/*********************************************************************//** + * @brief + * The getFPGAP9CalMemCounter function gets the P9 memory count. + * @details \b Inputs: fpgaSensorReadings.p9CondMemCounter + * @details \b Outputs: none + * @return P9 memory count + *************************************************************************/ +U08 getFPGAP9CalMemCounter( void ) +{ + return fpgaSensorReadings.p9CondMemCounter; +} + +/*********************************************************************//** + * @brief + * The getFPGAP18CondReadCount function gets the P18 conductivity read count. + * @details \b Inputs: fpgaSensorReadings.p18CondCondReadCount + * @details \b Outputs: none + * @return P18 Conductivity sensor read count + *************************************************************************/ +U08 getFPGAP18CondReadCount( void ) +{ + return fpgaSensorReadings.p18CondCondReadCount; +} + +/*********************************************************************//** + * @brief + * The getFPGAP18CondErrorCount function gets the P18 conductivity error count. + * @details \b Inputs: fpgaSensorReadings.p18CondCondErrorCount + * @details \b Outputs: none + * @return P18 Conductivity sensor error count + *************************************************************************/ +U08 getFPGAP18CondErrorCount( void ) +{ + return fpgaSensorReadings.p18CondCondErrorCount; +} + +/*********************************************************************//** + * @brief + * The getFPGAP18TempReadCount function gets the P18 (P19) temperature read count. + * @details \b Inputs: fpgaSensorReadings.p9CondTempReadCount + * @details \b Outputs: none + * @return P18 (P19) Temperature sensor read count + *************************************************************************/ +U08 getFPGAP18TempReadCount( void ) +{ + return fpgaSensorReadings.p18CondTempReadCount; +} + +/*********************************************************************//** + * @brief + * The getFPGAP18TempErrorCount function gets the P18 (P19) temperature error count. + * @details \b Inputs: fpgaSensorReadings.p18CondTempErrorCount + * @details \b Outputs: none + * @return P18 (P19) Temperature sensor error count + *************************************************************************/ +U08 getFPGAP18TempErrorCount( void ) +{ + return fpgaSensorReadings.p18CondTempErrorCount; +} + +/*********************************************************************//** + * @brief + * The getFPGAP18CondData function gets the P18 conductivity data. + * @details \b Inputs: fpgaSensorReadings.p18CondCond + * @details \b Outputs: none + * @return P18 Conductivity data + *************************************************************************/ +U32 getFPGAP18CondData( void ) +{ + return fpgaSensorReadings.p18CondCond; +} + +/*********************************************************************//** + * @brief + * The getFPGAP18CondTemp function gets the P18 (P19) temperature data. + * @details \b Inputs: fpgaSensorReadings.p18CondTemp + * @details \b Outputs: none + * @return P18 (P19) Temperature data + *************************************************************************/ +U32 getFPGAP18CondTemp( void ) +{ + return fpgaSensorReadings.p18CondTemp; +} + +/*********************************************************************//** + * @brief + * The getFPGAP18CondCalData function gets the P18 cal data. + * @details \b Inputs: fpgaSensorReadings.p18CondCalData + * @details \b Outputs: none + * @return P18 calibration data + *************************************************************************/ +U32 getFPGAP18CondCalData( void ) +{ + return fpgaSensorReadings.p18CondCalData; +} + +/*********************************************************************//** + * @brief + * The getFPGAP18CalMemCounter function gets the P18 memory count. + * @details \b Inputs: fpgaSensorReadings.p18CondMemCounter + * @details \b Outputs: none + * @return P18 memory count + *************************************************************************/ +U08 getFPGAP18CalMemCounter( void ) +{ + return fpgaSensorReadings.p18CondMemCounter; +} /**@}*/