Index: firmware/App/Services/FpgaDD.c =================================================================== diff -u -r33090b2328de68d9b94e95feeb5307d8fdc66b97 -r79f8b1a11dcc2f05a685ca33ba2a53fc4208fb4b --- firmware/App/Services/FpgaDD.c (.../FpgaDD.c) (revision 33090b2328de68d9b94e95feeb5307d8fdc66b97) +++ firmware/App/Services/FpgaDD.c (.../FpgaDD.c) (revision 79f8b1a11dcc2f05a685ca33ba2a53fc4208fb4b) @@ -172,148 +172,71 @@ 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 - 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. + 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 //TODO: Change the variable names to start with fpga as the prefix. S16 pressureP46; ///< Reg 660. P46 pressure data. @@ -481,59 +404,59 @@ U32 fpgaD11PumpHallSense; ///< Reg 690. Concentrate pump D11_Pump hall sensor pulse width U32 fpgaD10PumpHallSense; ///< Reg 694. Concentrate pump D10_Pump hall sensor pulse width U32 fpgaD76PumpHallSense; ///< Reg 698. Concentrate pump D76_Pump hall sensor pulse width - U32 fpgaD17CondDataCal; ///< Reg 702. D17 CAL word update - U32 fpgaD17CondCond; ///< Reg 706. D17 conductivity - U32 fpgaD17CondTemp; ///< Reg 710. D17 Temperature + U32 fpgaD17DataCal; ///< Reg 702. D17 CAL word update + F32 fpgaD17CondResistance; ///< Reg 706. D17 conductivity resistance + F32 fpgaD17TempResistance; ///< Reg 710. D17 Temperature resistance U08 fpgaD17CondReadCnt; ///< Reg 714. D17 successful read count U08 fpgaD17CondErrorCnt; ///< Reg 715. D17 error read count U08 fpgaD17TempReadCount; ///< Reg 716. D17 temperature successful read count U08 fpgaD17TempErrorCount; ///< Reg 717. D17 Temperature error read count U08 fpgaD17CalMemCounter; ///< Reg 718. D17 CAL counter U08 fpgaD74CalMemCounter; ///< Reg 719. D74 CAL counter - U32 fpgaD74CondDataCal; ///< Reg 720. D74 CAL word update - U32 fpgaD74CondCond; ///< Reg 724. D74 conductivity - U32 fpgaD74CondTemp; ///< Reg 728. D74 Temperature + U32 fpgaD74DataCal; ///< Reg 720. D74 CAL word update + F32 fpgaD74CondResistance; ///< Reg 724. D74 conductivity resistance + F32 fpgaD74TempResistance; ///< Reg 728. D74 Temperature resistance U08 fpgaD74CondReadCnt; ///< Reg 732. D74 successful read count U08 fpgaD74CondErrorCnt; ///< Reg 733. D74 error read count U08 fpgaD74TempReadCount; ///< Reg 734. D74 temperature successful read count U08 fpgaD74TempErrorCount; ///< Reg 735. D74 Temperature error read count - U32 fpgaD27CondDataCal; ///< Reg 736. D27 CAL word update - U32 fpgaD27CondCond; ///< Reg 740. D27 conductivity - U32 fpgaD27CondTemp; ///< Reg 744. D27 Temperature + U32 fpgaD27DataCal; ///< Reg 736. D27 CAL word update + F32 fpgaD27CondResistance; ///< Reg 740. D27 conductivity resistance + F32 fpgaD27TempResistance; ///< Reg 744. D27 Temperature reistance U08 fpgaD27CondReadCnt; ///< Reg 748. D27 successful read count U08 fpgaD27CondErrorCnt; ///< Reg 749. D27 error read count U08 fpgaD27TempReadCount; ///< Reg 750. D27 temperature successful read count U08 fpgaD27TempErrorCount; ///< Reg 751. D27 Temperature error read count U08 fpgaD27CalMemCounter; ///< Reg 752. D27 CAL counter U08 fpgaD29CalMemCounter; ///< Reg 753. D29 CAL counter - U32 fpgaD29CondDataCal; ///< Reg 754. D29 CAL word update - U32 fpgaD29CondCond; ///< Reg 758. D29 conductivity - U32 fpgaD29CondTemp; ///< Reg 762. D29 Temperature + U32 fpgaD29DataCal; ///< Reg 754. D29 CAL word update + F32 fpgaD29CondResistance; ///< Reg 758. D29 conductivity resistance + F32 fpgaD29TempResistance; ///< Reg 762. D29 Temperature resistance U08 fpgaD29CondReadCnt; ///< Reg 766. D29 successful read count U08 fpgaD29CondErrorCnt; ///< Reg 767. D29 error read count U08 fpgaD29TempReadCount; ///< Reg 768. D29 temperature successful read count U08 fpgaD29TempErrorCount; ///< Reg 769. D29 Temperature error read count - U32 fpgaD43CondDataCal; ///< Reg 770. D43 CAL word update - U32 fpgaD43CondCond; ///< Reg 774. D43 conductivity - U32 fpgaD43CondTemp; ///< Reg 778. D43 Temperature + U32 fpgaD43DataCal; ///< Reg 770. D43 CAL word update + F32 fpgaD43CondResistance; ///< Reg 774. D43 conductivity resistance + F32 fpgaD43TempResistance; ///< Reg 778. D43 Temperature resistance U08 fpgaD43CondReadCnt; ///< Reg 782. D43 successful read count U08 fpgaD43CondErrorCnt; ///< Reg 783. D43 error read count U08 fpgaD43TempReadCount; ///< Reg 784. D43 temperature successful read count U08 fpgaD43TempErrorCount; ///< Reg 785. D43 Temperature error read count U08 fpgaD43CalMemCounter; ///< Reg 786. D43 CAL counter U08 fpgaP9CalMemCounter; ///< Reg 787. P9 CAL counter - U32 conductivityP9Data; ///< Reg 788. P9 CAL word update - U32 conductivityP9Cond; ///< Reg 792. P9 Conductivity - U32 conductivityP9Temp; ///< Reg 796. P9 Temperature - U08 conductivityP9ReadCount; ///< Reg 800. P9 successful read count - U08 conductivityP9ErrorCount; ///< Reg 801. P9 error read count + U32 fpgaP9CalData; ///< Reg 788. P9 CAL word update + F32 fpgaP9CondResistance; ///< Reg 792. P9 Conductivity resistance + F32 fpgaP9TempResistance; ///< Reg 796. P9 Temperature resistance + U08 fpgaP9CondReadCount; ///< Reg 800. P9 successful read count + U08 fpgaP9CondErrorCount; ///< Reg 801. P9 error read count U08 fpgaP9TempReadCount; ///< Reg 802. P9 temperature successful read count U08 fpgaP9TempErrorCount; ///< Reg 803. P9 Temperature error read count - U32 conductivityP18Data; ///< Reg 804. P18 CAL word update - U32 conductivityP18Cond; ///< Reg 808. P18 Conductivity - U32 conductivityP18Temp; ///< Reg 812. P18 Temperature - U08 conductivityP18ReadCount; ///< Reg 816. P18 successful read count - U08 conductivityP18ErrorCount; ///< Reg 817. P18 error read count + U32 fpgaP18CalData; ///< Reg 804. P18 CAL word update + F32 fpgaP18CondResistance; ///< Reg 808. P18 Conductivity resistance + F32 fpgaP18TempReistance; ///< Reg 812. P18 Temperature resistance + U08 fpgaP18CondReadCount; ///< Reg 816. P18 successful read count + U08 fpgaP18CondErrorCount; ///< Reg 817. P18 error read count U08 fpgaP18TempReadCount; ///< Reg 818. P18 temperature successful read count U08 fpgaP18TempErrorCount; ///< Reg 819. P18 Temperature error read count U08 fpgaP18CalMemCounter; ///< Reg 820. P18 CAL counter @@ -551,57 +474,42 @@ 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 - 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 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 U08 notused; ///< Reg 79. Not used U08 valveIOControl; ///< Reg 80. IO Valve control register. @@ -1265,7 +1173,7 @@ * @param stepSpeed The concentrate pump step speed period * @return none *************************************************************************/ -void setFPGAD11PumpSetStepSpeed( U16 stepSpeed ) +void setFPGAD11PumpSetStepSpeed( U32 stepSpeed ) { SET_FPGA_ACTUATOR_FIELD( fpgaD11PumpSpeed, stepSpeed ); } @@ -1279,7 +1187,7 @@ * @param stepSpeed The concentrate pump step speed period * @return none *************************************************************************/ -void setFPGAD10PumpSetStepSpeed( U16 stepSpeed ) +void setFPGAD10PumpSetStepSpeed( U32 stepSpeed ) { SET_FPGA_ACTUATOR_FIELD( fpgaD10PumpSpeed, stepSpeed ); } @@ -1293,7 +1201,7 @@ * @param stepSpeed The concentrate pump step speed period * @return none *************************************************************************/ -void setFPGAD76PumpSetStepSpeed( U16 stepSpeed ) +void setFPGAD76PumpSetStepSpeed( U32 stepSpeed ) { SET_FPGA_ACTUATOR_FIELD( fpgaD76PumpSpeed, stepSpeed ); } @@ -1411,744 +1319,6 @@ /*********************************************************************//** * @brief - * The setFPGAD17CondReset function resets the FPGA Conductivity - * Sensor D17. - * @details \b Inputs: none - * @details \b Outputs: fpgaConSensD17D74Control - * @param none - * @return none - *************************************************************************/ -void setFPGAD17CondReset( void ) -{ - SET_FPGA_ACTUATOR_BITS( fpgaConSensD17D74Control, FPGA_D17_RESET_BIT ); -} - -/*********************************************************************//** - * @brief - * The clearFPGAD17CondReset function clears the reset of FPGA Conductivity - * Sensor D17. - * @details \b Inputs: none - * @details \b Outputs: fpgaConSensD17D74Control - * @param none - * @return none - *************************************************************************/ -void clearFPGAD17CondReset( void ) -{ - CLEAR_FPGA_ACTUATOR_BITS( fpgaConSensD17D74Control, ~FPGA_D17_RESET_BIT ); -} - -/*********************************************************************//** - * @brief - * The setFPGAD17CondInitEnable function enables the FPGA Conductivity - * Sensor D17 initialzation procedure. - * @details \b Inputs: none - * @details \b Outputs: fpgaConSensD17D74Control - * @param none - * @return none - *************************************************************************/ -void setFPGAD17CondInitEnable( void ) -{ - SET_FPGA_ACTUATOR_BITS( fpgaConSensD17D74Control, FPGA_D17_INIT_ENABLE_BIT ); -} - -/*********************************************************************//** - * @brief - * The clearFPGAD17CondInitEnable function clears the init process of FPGA Conductivity - * Sensor D17. - * @details \b Inputs: none - * @details \b Outputs: fpgaConSensD17D74Control - * @param none - * @return none - *************************************************************************/ -void clearFPGAD17CondInitEnable( void ) -{ - CLEAR_FPGA_ACTUATOR_BITS( fpgaConSensD17D74Control, ~FPGA_D17_INIT_ENABLE_BIT ); -} - -/*********************************************************************//** - * @brief - * The setFPGAD17CondWriteEnable function enables the FPGA Conductivity - * Sensor D17 write transaction. - * @details \b Inputs: none - * @details \b Outputs: fpgaConSensD17D74Control - * @param none - * @warning: The address (setFPGAD17D74Address) and data (setFPGACD12Data) register - * must be populated before invoking this write enable function to initiate - * write transaction with the sensor. - * @return none - *************************************************************************/ -void setFPGAD17CondWriteEnable( void ) -{ - SET_FPGA_ACTUATOR_BITS( fpgaConSensD17D74Control, FPGA_D17_WR_ENABLE_BIT ); -} - -/*********************************************************************//** - * @brief - * The clearFPGAD17CondWriteEnable function clears the write enable of FPGA Conductivity - * Sensor D17. - * @details \b Inputs: none - * @details \b Outputs: fpgaConSensD17D74Control - * @param none - * @return none - *************************************************************************/ -void clearFPGAD17CondWriteEnable( void ) -{ - CLEAR_FPGA_ACTUATOR_BITS( fpgaConSensD17D74Control, ~FPGA_D17_WR_ENABLE_BIT ); -} - -/*********************************************************************//** - * @brief - * The setFPGAD17CondReadEnable function enables the FPGA Conductivity - * Sensor D17 read transaction. - * @details \b Inputs: none - * @details \b Outputs: fpgaConSensD17D74Control - * @param none - * @warning: The address (setFPGAD17D74Address) register must be populated - * before invoking this read enable function to initiate read transaction - * with the sensor. - * @return none - *************************************************************************/ -void setFPGAD17CondReadEnable( void ) -{ - SET_FPGA_ACTUATOR_BITS( fpgaConSensD17D74Control, FPGA_D17_RD_ENABLE_BIT ); -} - -/*********************************************************************//** - * @brief - * The clearFPGAD17CondReadEnable function clears the read enable of FPGA Conductivity - * Sensor D17. - * @details \b Inputs: none - * @details \b Outputs: fpgaConSensD17D74Control - * @param none - * @return none - *************************************************************************/ -void clearFPGAD17CondReadEnable( void ) -{ - CLEAR_FPGA_ACTUATOR_BITS( fpgaConSensD17D74Control, ~FPGA_D17_RD_ENABLE_BIT ); -} - -/*********************************************************************//** - * @brief - * The setFPGAD27CondReset function resets the FPGA Conductivity - * Sensor D27. - * @details \b Inputs: none - * @details \b Outputs: fpgaConSensD27D29Control - * @param none - * @return none - *************************************************************************/ -void setFPGAD27CondReset( void ) -{ - SET_FPGA_ACTUATOR_BITS( fpgaConSensD27D29Control, FPGA_D27_RESET_BIT ); -} - -/*********************************************************************//** - * @brief - * The clearFPGAD27CondReset function clears the reset of FPGA Conductivity - * Sensor D27. - * @details \b Inputs: none - * @details \b Outputs: fpgaConSensD27D29Control - * @param none - * @return none - *************************************************************************/ -void clearFPGAD27CondReset( void ) -{ - CLEAR_FPGA_ACTUATOR_BITS( fpgaConSensD27D29Control, ~FPGA_D27_RESET_BIT ); -} - -/*********************************************************************//** - * @brief - * The setFPGAD27CondInitEnable function enables the FPGA Conductivity - * Sensor D27 initialzation procedure. - * @details \b Inputs: none - * @details \b Outputs: fpgaConSensD27D29Control - * @param none - * @return none - *************************************************************************/ -void setFPGAD27CondInitEnable( void ) -{ - SET_FPGA_ACTUATOR_BITS( fpgaConSensD27D29Control, FPGA_D27_INIT_ENABLE_BIT ); -} - -/*********************************************************************//** - * @brief - * The clearFPGAD27CondInitEnable function clears the init process of FPGA Conductivity - * Sensor D27. - * @details \b Inputs: none - * @details \b Outputs: fpgaConSensD27D29Control - * @param none - * @return none - *************************************************************************/ -void clearFPGAD27CondInitEnable( void ) -{ - CLEAR_FPGA_ACTUATOR_BITS( fpgaConSensD27D29Control, ~FPGA_D27_INIT_ENABLE_BIT ); -} - -/*********************************************************************//** - * @brief - * The setFPGAD27CondWriteEnable function enables the FPGA Conductivity - * Sensor D27 write transaction. - * @details \b Inputs: none - * @details \b Outputs: fpgaConSensD27D29Control - * @param none - * @warning: The address (setFPGACD12Address) and data (setFPGACD12Data) register - * must be populated before invoking this write enable function to initiate - * write transaction with the sensor. - * @return none - *************************************************************************/ -void setFPGAD27CondWriteEnable( void ) -{ - SET_FPGA_ACTUATOR_BITS( fpgaConSensD27D29Control, FPGA_D27_WR_ENABLE_BIT ); -} - -/*********************************************************************//** - * @brief - * The clearFPGAD27CondWriteEnable function clears the write enable of FPGA Conductivity - * Sensor D27. - * @details \b Inputs: none - * @details \b Outputs: fpgaConSensD27D29Control - * @param none - * @return none - *************************************************************************/ -void clearFPGAD27CondWriteEnable( void ) -{ - CLEAR_FPGA_ACTUATOR_BITS( fpgaConSensD27D29Control, ~FPGA_D27_WR_ENABLE_BIT ); -} - -/*********************************************************************//** - * @brief - * The setFPGAD27CondReadEnable function enables the FPGA Conductivity - * Sensor D27 read transaction. - * @details \b Inputs: none - * @details \b Outputs: fpgaConSensD27D29Control - * @param none - * @warning: The address (setFPGACD12Address) register must be populated - * before invoking this read enable function to initiate read transaction - * with the sensor. - * @return none - *************************************************************************/ -void setFPGAD27CondReadEnable( void ) -{ - SET_FPGA_ACTUATOR_BITS( fpgaConSensD27D29Control, FPGA_D27_RD_ENABLE_BIT ); -} - -/*********************************************************************//** - * @brief - * The clearFPGAD27CondReadEnable function clears the read enable of FPGA Conductivity - * Sensor D27. - * @details \b Inputs: none - * @details \b Outputs: fpgaConSensD27D29Control - * @param none - * @return none - *************************************************************************/ -void clearFPGAD27CondReadEnable( void ) -{ - CLEAR_FPGA_ACTUATOR_BITS( fpgaConSensD27D29Control, ~FPGA_D27_RD_ENABLE_BIT ); -} - -/*********************************************************************//** - * @brief - * The setFPGD29CondReset function resets the FPGA Conductivity - * Sensor D29. - * @details \b Inputs: none - * @details \b Outputs: fpgaConSensD27D29Control - * @param none - * @return none - *************************************************************************/ -void setFPGAD29CondReset( void ) -{ - SET_FPGA_ACTUATOR_BITS( fpgaConSensD27D29Control, FPGA_D29_RESET_BIT ); -} - -/*********************************************************************//** - * @brief - * The clearFPGAD29CondReset function clears the reset of FPGA Conductivity - * Sensor D29. - * @details \b Inputs: none - * @details \b Outputs: fpgaConSensD27D29Control - * @param none - * @return none - *************************************************************************/ -void clearFPGAD29CondReset( void ) -{ - CLEAR_FPGA_ACTUATOR_BITS( fpgaConSensD27D29Control, ~FPGA_D29_RESET_BIT ); -} - -/*********************************************************************//** - * @brief - * The setFPGAD29CondInitEnable function enables the FPGA Conductivity - * Sensor D29 initialzation procedure. - * @details \b Inputs: none - * @details \b Outputs: fpgaConSensD27D29Control - * @param none - * @return none - *************************************************************************/ -void setFPGAD29CondInitEnable( void ) -{ - SET_FPGA_ACTUATOR_BITS( fpgaConSensD27D29Control, FPGA_D29_INIT_ENABLE_BIT ); -} - -/*********************************************************************//** - * @brief - * The clearFPGAD29CondInitEnable function clears the init process of FPGA Conductivity - * Sensor D29. - * @details \b Inputs: none - * @details \b Outputs: fpgaConSensD27D29Control - * @param none - * @return none - *************************************************************************/ -void clearFPGAD29CondInitEnable( void ) -{ - CLEAR_FPGA_ACTUATOR_BITS( fpgaConSensD27D29Control, ~FPGA_D29_INIT_ENABLE_BIT ); -} - -/*********************************************************************//** - * @brief - * The setFPGAD29CondWriteEnable function enables the FPGA Conductivity - * Sensor D29 write transaction. - * @details \b Inputs: none - * @details \b Outputs: fpgaConSensD27D29Control - * @param none - * @warning: The address (setFPGACD12Address) and data (setFPGACD12Data) register - * must be populated before invoking this write enable function to initiate - * write transaction with the sensor. - * @return none - *************************************************************************/ -void setFPGAD29CondWriteEnable( void ) -{ - SET_FPGA_ACTUATOR_BITS( fpgaConSensD27D29Control, FPGA_D29_WR_ENABLE_BIT ); -} - -/*********************************************************************//** - * @brief - * The clearFPGAD29CondWriteEnable function clears the write enable of FPGA Conductivity - * Sensor D29. - * @details \b Inputs: none - * @details \b Outputs: fpgaConSensD27D29Control - * @param none - * @return none - *************************************************************************/ -void clearFPGAD29CondWriteEnable( void ) -{ - CLEAR_FPGA_ACTUATOR_BITS( fpgaConSensD27D29Control, ~FPGA_D29_WR_ENABLE_BIT ); -} - -/*********************************************************************//** - * @brief - * The setFPGAD29CondReadEnable function enables the FPGA Conductivity - * Sensor D29 read transaction. - * @details \b Inputs: none - * @details \b Outputs: fpgaConSensD27D29Control - * @param none - * @warning: The address (setFPGACD12Address) register must be populated - * before invoking this read enable function to initiate read transaction - * with the sensor. - * @return none - *************************************************************************/ -void setFPGAD29CondReadEnable( void ) -{ - SET_FPGA_ACTUATOR_BITS( fpgaConSensD27D29Control, FPGA_D29_RD_ENABLE_BIT ); -} - -/*********************************************************************//** - * @brief - * The clearFPGAD29CondReadEnable function clears the read enable of FPGA Conductivity - * Sensor D29. - * @details \b Inputs: none - * @details \b Outputs: fpgaConSensD27D29Control - * @param none - * @return none - *************************************************************************/ -void clearFPGAD29CondReadEnable( void ) -{ - CLEAR_FPGA_ACTUATOR_BITS( fpgaConSensD27D29Control, ~FPGA_D29_RD_ENABLE_BIT ); -} - -/*********************************************************************//** - * @brief - * The setFPGAD43CondReset function resets the FPGA Conductivity - * Sensor D43. - * @details \b Inputs: none - * @details \b Outputs: fpgaConSensD43Control - * @param none - * @return none - *************************************************************************/ -void setFPGAD43CondReset( void ) -{ - SET_FPGA_ACTUATOR_BITS( fpgaConSensD43Control, FPGA_D43_RESET_BIT ); -} - -/*********************************************************************//** - * @brief - * The clearFPGAD43CondReset function clears the reset of FPGA Conductivity - * Sensor D43. - * @details \b Inputs: none - * @details \b Outputs: fpgaConSensD43Control - * @param none - * @return none - *************************************************************************/ -void clearFPGAD43CondReset( void ) -{ - CLEAR_FPGA_ACTUATOR_BITS( fpgaConSensD43Control, ~FPGA_D43_RESET_BIT ); -} - -/*********************************************************************//** - * @brief - * The setFPGAD43CondInitEnable function enables the FPGA Conductivity - * Sensor D43 initialzation procedure. - * @details \b Inputs: none - * @details \b Outputs: fpgaConSensD43Control - * @param none - * @return none - *************************************************************************/ -void setFPGAD43CondInitEnable( void ) -{ - SET_FPGA_ACTUATOR_BITS( fpgaConSensD43Control, FPGA_D43_INIT_ENABLE_BIT ); -} - -/*********************************************************************//** - * @brief - * The clearFPGAD43CondInitEnable function clears the init process of FPGA Conductivity - * Sensor D43. - * @details \b Inputs: none - * @details \b Outputs: fpgaConSensD43Control - * @param none - * @return none - *************************************************************************/ -void clearFPGAD43CondInitEnable( void ) -{ - CLEAR_FPGA_ACTUATOR_BITS( fpgaConSensD43Control, ~FPGA_D43_INIT_ENABLE_BIT ); -} - -/*********************************************************************//** - * @brief - * The setFPGAD43CondWriteEnable function enables the FPGA Conductivity - * Sensor D43 write transaction. - * @details \b Inputs: none - * @details \b Outputs: fpgaConSensD43Control - * @param none - * @warning: The address (setFPGACD12Address) and data (setFPGACD12Data) register - * must be populated before invoking this write enable function to initiate - * write transaction with the sensor. - * @return none - *************************************************************************/ -void setFPGAD43CondWriteEnable( void ) -{ - SET_FPGA_ACTUATOR_BITS( fpgaConSensD43Control, FPGA_D43_WR_ENABLE_BIT ); -} - -/*********************************************************************//** - * @brief - * The clearFPGAD43CondWriteEnable function clears the write enable of FPGA Conductivity - * Sensor D43. - * @details \b Inputs: none - * @details \b Outputs: fpgaConSensD43Control - * @param none - * @return none - *************************************************************************/ -void clearFPGAD43CondWriteEnable( void ) -{ - CLEAR_FPGA_ACTUATOR_BITS( fpgaConSensD43Control, ~FPGA_D43_WR_ENABLE_BIT ); -} - -/*********************************************************************//** - * @brief - * The setFPGAD43CondReadEnable function enables the FPGA Conductivity - * Sensor D43 read transaction. - * @details \b Inputs: none - * @details \b Outputs: fpgaConSensD43Control - * @param none - * @warning: The address (setFPGACD12Address) register must be populated - * before invoking this read enable function to initiate read transaction - * with the sensor. - * @return none - *************************************************************************/ -void setFPGAD43CondReadEnable( void ) -{ - SET_FPGA_ACTUATOR_BITS( fpgaConSensD43Control, FPGA_D43_RD_ENABLE_BIT ); -} - -/*********************************************************************//** - * @brief - * The clearFPGAD43CondReadEnable function clears the read enable of FPGA Conductivity - * Sensor D43. - * @details \b Inputs: none - * @details \b Outputs: fpgaConSensD43Control - * @param none - * @return none - *************************************************************************/ -void clearFPGAD43CondReadEnable( void ) -{ - CLEAR_FPGA_ACTUATOR_BITS( fpgaConSensD43Control, ~FPGA_D43_RD_ENABLE_BIT ); -} - -/*********************************************************************//** - * @brief - * The setFPGAD74CondReset function resets the FPGA Conductivity - * Sensor D74. - * @details \b Inputs: none - * @details \b Outputs: fpgaConSensD17D74Control - * @param none - * @return none - *************************************************************************/ -void setFPGAD74CondReset( void ) -{ - SET_FPGA_ACTUATOR_BITS( fpgaConSensD17D74Control, FPGA_D74_RESET_BIT ); -} - -/*********************************************************************//** - * @brief - * The clearFPGAD74CondReset function clears the reset of FPGA Conductivity - * Sensor D74. - * @details \b Inputs: none - * @details \b Outputs: fpgaConSensD17D74Control - * @param none - * @return none - *************************************************************************/ -void clearFPGAD74CondReset( void ) -{ - CLEAR_FPGA_ACTUATOR_BITS( fpgaConSensD17D74Control, ~FPGA_D74_RESET_BIT ); -} - -/*********************************************************************//** - * @brief - * The setFPGAD74CondInitEnable function enables the FPGA Conductivity - * Sensor D74 initialzation procedure. - * @details \b Inputs: none - * @details \b Outputs: fpgaConSensD17D74Control - * @param none - * @return none - *************************************************************************/ -void setFPGAD74CondInitEnable( void ) -{ - SET_FPGA_ACTUATOR_BITS( fpgaConSensD17D74Control, FPGA_D74_INIT_ENABLE_BIT ); -} - -/*********************************************************************//** - * @brief - * The clearFPGAD74CondInitEnable function clears the init process of FPGA Conductivity - * Sensor D74. - * @details \b Inputs: none - * @details \b Outputs: fpgaConSensD17D74Control - * @param none - * @return none - *************************************************************************/ -void clearFPGAD74CondInitEnable( void ) -{ - CLEAR_FPGA_ACTUATOR_BITS( fpgaConSensD17D74Control, ~FPGA_D74_INIT_ENABLE_BIT ); -} - -/*********************************************************************//** - * @brief - * The setFPGAD74CondWriteEnable function enables the FPGA Conductivity - * Sensor D74 write transaction. - * @details \b Inputs: none - * @details \b Outputs: fpgaConSensD17D74Control - * @param none - * @warning: The address (setFPGACD74Address) and data (setFPGACD74Data) register - * must be populated before invoking this write enable function to initiate - * write transaction with the sensor. - * @return none - *************************************************************************/ -void setFPGAD74CondWriteEnable( void ) -{ - SET_FPGA_ACTUATOR_BITS( fpgaConSensD17D74Control, FPGA_D74_WR_ENABLE_BIT ); -} - -/*********************************************************************//** - * @brief - * The clearFPGAD74CondWriteEnable function clears the write enable of FPGA Conductivity - * Sensor D74. - * @details \b Inputs: none - * @details \b Outputs: fpgaConSensD17D74Control - * @param none - * @return none - *************************************************************************/ -void clearFPGAD74CondWriteEnable( void ) -{ - CLEAR_FPGA_ACTUATOR_BITS( fpgaConSensD17D74Control, ~FPGA_D74_WR_ENABLE_BIT ); -} - -/*********************************************************************//** - * @brief - * The setFPGAD74CondReadEnable function enables the FPGA Conductivity - * Sensor D74 read transaction. - * @details \b Inputs: none - * @details \b Outputs: fpgaConSensD17D74Control - * @param none - * @warning: The address (setFPGACD74Address) register must be populated - * before invoking this read enable function to initiate read transaction - * with the sensor. - * @return none - *************************************************************************/ -void setFPGAD74CondReadEnable( void ) -{ - SET_FPGA_ACTUATOR_BITS( fpgaConSensD17D74Control, FPGA_D74_RD_ENABLE_BIT ); -} - -/*********************************************************************//** - * @brief - * The clearFPGAD74CondReadEnable function clears the read enable of FPGA Conductivity - * Sensor D74. - * @details \b Inputs: none - * @details \b Outputs: fpgaConSensD17D74Control - * @param none - * @return none - *************************************************************************/ -void clearFPGAD74CondReadEnable( void ) -{ - CLEAR_FPGA_ACTUATOR_BITS( fpgaConSensD17D74Control, ~FPGA_D74_RD_ENABLE_BIT ); -} - - -/*********************************************************************//** - * @brief - * The setFPGAD17D74Control function sets the FPGA Conductivity - * Sensor control register for D17 and D74. - * bit 7: Enables D74 read transaction (1), address needed - * bit 6: Enables D74 write transaction (1), address and data needs to be set - * bit 5: Enable D74 Init procedure (1) - * bit 4: reset D74 Conduct sensor (1) - * bit 3: Enables D17 read transaction (1), address needed - * bit 2: Enables D17 write transaction (1), address and data needs to be set - * bit 1: Enable D17 Init procedure (1) - * bit 0: reset D17 Conduct sensor (1) - * @details \b Inputs: none - * @details \b Outputs: fpgaConSensD17D74Control - * @param control Conductivity Sensor control set - * @return none - *************************************************************************/ -void setFPGAD17D74Control( U08 control ) -{ - SET_FPGA_ACTUATOR_FIELD( fpgaConSensD17D74Control, control ); -} - -/*********************************************************************//** - * @brief - * The setFpgaCD34Control function sets the FPGA Conductivity - * Sensor control register for D27 and D29. - * bit 7: Enables D29 read transaction (1), address needed - * bit 6: Enables D29 write transaction (1), address and data needs to be set - * bit 5: Enable D29 Init procedure (1) - * bit 4: reset D29 Conduct sensor (1) - * bit 3: Enables D27 read transaction (1), address needed - * bit 2: Enables D27 write transaction (1), address and data needs to be set - * bit 1: Enable D27 Init procedure (1) - * bit 0: reset D27 Conduct sensor (1) - * @details \b Inputs: none - * @details \b Outputs: fpgaConSensTD34Control - * @param control Conductivity sensor control set - * @return none - *************************************************************************/ -void setFPGAD27D29Control( U08 control ) -{ - SET_FPGA_ACTUATOR_FIELD( fpgaConSensD27D29Control, control ); -} - -/*********************************************************************//** - * @brief - * The setFpgaCD5Control function sets the FPGA Conductivity - * Sensor control register for D43. - * bit 4- 7: Reserved. - * bit 3: Enables D43 read transaction (1), address needed - * bit 2: Enables D43 write transaction (1), address and data needs to be set - * bit 1: Enable D43 Init procedure (1) - * bit 0: reset D43 Conduct sensor (1) - * @details \b Inputs: none - * @details \b Outputs: fpgaConSensD74Control - * @param control Conductivity sensor control set - * @return none - *************************************************************************/ -void setFPGAD43Control( U08 control ) -{ - SET_FPGA_ACTUATOR_FIELD( fpgaConSensD43Control, control ); -} - -/*********************************************************************//** - * @brief - * The setFPGAD17D74Address function sets the conductivity sensor - * CD12 address register to perform read and write operations. - * @details \b Inputs: none - * @details \b Outputs: fpgaConSensD17D74_Addrs - * @param address The conductivity sensor D17 and D74 address - * @return none - *************************************************************************/ -void setFPGAD17D74Address( U16 address ) -{ - SET_FPGA_ACTUATOR_FIELD( fpgaConSensD17D74_Addrs, address ); -} - -/*********************************************************************//** - * @brief - * The setFPGAD27D29Address function sets the conductivity sensor - * CD34 address register to perform read and write operations. - * @details \b Inputs: none - * @details \b Outputs: fpgaConSensD27D29_Addrs - * @param address The conductivity sensor CD34 address - * @return none - *************************************************************************/ -void setFPGAD27D29Address( U16 address ) -{ - SET_FPGA_ACTUATOR_FIELD( fpgaConSensD27D29_Addrs, address ); -} - -/*********************************************************************//** - * @brief - * The setFPGAD43Address function sets the conductivity sensor - * D74 address register to perform read and write operations. - * @details \b Inputs: none - * @details \b Outputs: fpgaConSensD43_Addrs - * @param address The conductivity sensor D43 address - * @return none - *************************************************************************/ -void setFPGAD43Address( U16 address ) -{ - SET_FPGA_ACTUATOR_FIELD( fpgaConSensD43_Addrs, address ); -} - -/*********************************************************************//** - * @brief - * The setFPGAD17D74Data function sets the conductivity sensor - * CD12 data outputfor write operations. - * @details \b Inputs: none - * @details \b Outputs: fpgaConSensD17D74_Data_In - * @param data The conductivity sensor D17 and D74 Data - * @return none - *************************************************************************/ -void setFPGAD17D74Data( U32 data ) -{ - SET_FPGA_ACTUATOR_FIELD( fpgaConSensD17D74_Data_In, data ); -} - -/*********************************************************************//** - * @brief - * The setFPGAD27D29Data function sets the conductivity sensor - * CD34 data outputfor write operations. - * @details \b Inputs: none - * @details \b Outputs: fpgaConSensD27D29_Data_In - * @param data The conductivity sensor D27 and D29 Data - * @return none - *************************************************************************/ -void setFPGAD27D29Data( U32 data ) -{ - SET_FPGA_ACTUATOR_FIELD( fpgaConSensD27D29_Data_In, data ); -} - -/*********************************************************************//** - * @brief - * The setFPGAD43Data function sets the conductivity sensor - * D43 data output for write operations. - * @details \b Inputs: none - * @details \b Outputs: fpgaConSensD43_Data_In - * @param data The conductivity sensor D43 Data - * @return none - *************************************************************************/ -void setFPGAD43Data( U32 data ) -{ - SET_FPGA_ACTUATOR_FIELD( fpgaConSensD43_Data_In, data ); -} - -/*********************************************************************//** - * @brief * The setFPGAD5HeaterPWMControl function sets the primary heater * PWM input. * @details \b Inputs: none @@ -2645,7 +1815,7 @@ * @details \b Outputs: none * @return concentrate pump D11_Pump hall sense pulse width *************************************************************************/ -U16 getFPGAD11PumpHallSensePulseWidth( void ) +U32 getFPGAD11PumpHallSensePulseWidth( void ) { return GET_FPGA_SENSOR_FIELD( fpgaD11PumpHallSense ); } @@ -2658,7 +1828,7 @@ * @details \b Outputs: none * @return concentrate pump D10_Pump hall sense pulse width *************************************************************************/ -U16 getFPGAD10PumpHallSensePulseWidth( void ) +U32 getFPGAD10PumpHallSensePulseWidth( void ) { return GET_FPGA_SENSOR_FIELD( fpgaD10PumpHallSense ); } @@ -2671,7 +1841,7 @@ * @details \b Outputs: none * @return ultrafiltration pump D76_Pump hall sense pulse width *************************************************************************/ -U16 getFPGAD76PumpHallSensePulseWidth( void ) +U32 getFPGAD76PumpHallSensePulseWidth( void ) { return GET_FPGA_SENSOR_FIELD( fpgaD76PumpHallSense ); } @@ -2882,7 +2052,7 @@ *************************************************************************/ U08 getFPGAD17CondReadCount( void ) { - return GET_FPGA_SENSOR_FIELD( fpgaD17CondReadCnt ); + return fpgaSensorReadings.fpgaD17CondReadCnt; } /*********************************************************************//** @@ -2894,31 +2064,43 @@ *************************************************************************/ U08 getFPGAD17CondErrorCount( void ) { - return GET_FPGA_SENSOR_FIELD( fpgaD17CondErrorCnt ); + return fpgaSensorReadings.fpgaD17CondErrorCnt; } /*********************************************************************//** * @brief - * The getFPGAD17Cond function gets D17 conductivity sensor value. - * @details \b Inputs: fpgaCD1 + * The getFPGAD17TempReadCount function gets the D17 (D16) temperature read count. + * @details \b Inputs: fpgaSensorReadings.fpgaD17TempReadCount * @details \b Outputs: none - * @return Latest D17 conductivity sensor value + * @return D17 (D16) Temperature sensor read count *************************************************************************/ -U16 getFPGAD17Cond( void ) +U08 getFPGAD17TempReadCount( void ) { - return GET_FPGA_SENSOR_FIELD( fpgaD17CondCond ); + return fpgaSensorReadings.fpgaD17TempReadCount; } /*********************************************************************//** * @brief + * The getFPGAD17TempErrorCount function gets the D17 (D16) temperature error count. + * @details \b Inputs: fpgaSensorReadings.fpgaD17TempErrorCount + * @details \b Outputs: none + * @return D17 (D16) Temperature sensor error count + *************************************************************************/ +U08 getFPGAD17TempErrorCount( void ) +{ + return fpgaSensorReadings.fpgaD17TempErrorCount; +} + +/*********************************************************************//** + * @brief * The getFPGAD17CondTemp function gets D17 conductivity sensor temperature value. * @details \b Inputs: fpgaCD1Temp * @details \b Outputs: none * @return Latest D17 conductivity sensor temperature value *************************************************************************/ -U16 getFPGAD17CondTemp( void ) +F32 getFPGAD17CondTemp( void ) { - return GET_FPGA_SENSOR_FIELD( fpgaD17CondTemp ); + return fpgaSensorReadings.fpgaD17TempResistance; } /*********************************************************************//** @@ -2928,21 +2110,44 @@ * @details \b Outputs: none * @return Latest D17 conductivity sensor register data value *************************************************************************/ -U32 getFPGAD17CondData( void ) +F32 getFPGAD17CondData( void ) { - return GET_FPGA_SENSOR_FIELD( fpgaD17CondCond ); + return fpgaSensorReadings.fpgaD17CondResistance; } /*********************************************************************//** * @brief + * The getFPGAD17CondData function gets the D17 cal data. + * @details \b Inputs: fpgaSensorReadings.fpgaD17DataCal + * @details \b Outputs: none + * @return D17 calibration data + *************************************************************************/ +U32 getFPGAD17CondCalData( void ) +{ + return fpgaSensorReadings.fpgaD17DataCal; +} + +/*********************************************************************//** + * @brief + * The getFPGAD17CalMemCounter function gets the D17 memory count. + * @details \b Inputs: fpgaSensorReadings.fpgaD17CalMemCounter + * @details \b Outputs: none + * @return D17 memory count + *************************************************************************/ +U08 getFPGAD17CalMemCounter( void ) +{ + return fpgaSensorReadings.fpgaD17CalMemCounter; +} +/*********************************************************************//** + * @brief * The getFPGAD27CondReadCount function gets D27 conductivity sensor read count. * @details \b Inputs: fpgaD27CondReadCnt * @details \b Outputs: none * @return Latest D27 conductivity sensor read count *************************************************************************/ U08 getFPGAD27CondReadCount( void ) { - return GET_FPGA_SENSOR_FIELD( fpgaD27CondReadCnt ); + return fpgaSensorReadings.fpgaD27CondReadCnt; } /*********************************************************************//** @@ -2954,19 +2159,43 @@ *************************************************************************/ U08 getFPGAD27CondErrorCount( void ) { - return GET_FPGA_SENSOR_FIELD( fpgaD27CondErrorCnt ); + return fpgaSensorReadings.fpgaD27CondErrorCnt; } /*********************************************************************//** * @brief - * The getFPGAD27Cond function gets D27 conductivity sensor value. - * @details \b Inputs: fpgaD27Cond + * The getFPGAD27TempReadCount function gets the D27 (D28) temperature read count. + * @details \b Inputs: fpgaSensorReadings.fpgaD27TempReadCount * @details \b Outputs: none + * @return D27 (D28) Temperature sensor read count + *************************************************************************/ +U08 getFPGAD27TempReadCount( void ) +{ + return fpgaSensorReadings.fpgaD27TempReadCount; +} + +/*********************************************************************//** + * @brief + * The getFPGAD27TempErrorCount function gets the D27 (D28) temperature error count. + * @details \b Inputs: fpgaSensorReadings.fpgaD27TempErrorCount + * @details \b Outputs: none + * @return D27 (D28) Temperature sensor error count + *************************************************************************/ +U08 getFPGAD27TempErrorCount( void ) +{ + return fpgaSensorReadings.fpgaD27TempErrorCount; +} + +/*********************************************************************//** + * @brief + * The getFPGAD27CondData function gets D27 conductivity sensor value. + * @details \b Inputs: fpgaD27CondResistance + * @details \b Outputs: none * @return Latest D27 conductivity sensor value *************************************************************************/ -U16 getFPGAD27Cond( void ) +F32 getFPGAD27CondData( void ) { - return GET_FPGA_SENSOR_FIELD( fpgaD27CondCond ); + return fpgaSensorReadings.fpgaD27CondResistance; } /*********************************************************************//** @@ -2976,33 +2205,45 @@ * @details \b Outputs: none * @return Latest D27 conductivity sensor temperature value *************************************************************************/ -U16 getFPGAD27CondTemp( void ) +F32 getFPGAD27CondTemp( void ) { - return GET_FPGA_SENSOR_FIELD( fpgaD27CondTemp ); + return fpgaSensorReadings.fpgaD27TempResistance; } /*********************************************************************//** * @brief - * The getFPGAD27CondData function gets D27 conductivity sensor register value. - * @details \b Inputs: fpgaD27CondDataOut + * The getFPGAD27CondCalData function gets the D27 cal data. + * @details \b Inputs: fpgaSensorReadings.fpgaD27DataCal * @details \b Outputs: none - * @return Latest D27 conductivity sensor register data value + * @return D27 calibration data *************************************************************************/ -U32 getFPGAD27CondData( void ) +U32 getFPGAD27CondCalData( void ) { - return GET_FPGA_SENSOR_FIELD( fpgaD27CondCond ); + return fpgaSensorReadings.fpgaD27DataCal; } /*********************************************************************//** * @brief + * The getFPGAD27CalMemCounter function gets the D27 memory count. + * @details \b Inputs: fpgaSensorReadings.fpgaD27CalMemCounter + * @details \b Outputs: none + * @return D27 memory count + *************************************************************************/ +U08 getFPGAD27CalMemCounter( void ) +{ + return fpgaSensorReadings.fpgaD27CalMemCounter; +} + +/*********************************************************************//** + * @brief * The getFPGAD29CondReadCount function gets D29 conductivity sensor read count. * @details \b Inputs: fpgaD29CondReadCnt * @details \b Outputs: none * @return Latest D29 conductivity sensor read count *************************************************************************/ U08 getFPGAD29CondReadCount( void ) { - return GET_FPGA_SENSOR_FIELD( fpgaD29CondReadCnt ); + return fpgaSensorReadings.fpgaD29CondReadCnt; } /*********************************************************************//** @@ -3014,55 +2255,90 @@ *************************************************************************/ U08 getFPGAD29CondErrorCount( void ) { - return GET_FPGA_SENSOR_FIELD( fpgaD29CondErrorCnt ); + return fpgaSensorReadings.fpgaD29CondErrorCnt; } /*********************************************************************//** * @brief - * The getFPGAD29Cond function gets D29 conductivity sensor value. - * @details \b Inputs: fpgaD29Cond + * The getFPGAD29TempReadCount function gets the D29 (D28) temperature read count. + * @details \b Inputs: fpgaSensorReadings.fpgaD29TempReadCount * @details \b Outputs: none - * @return Latest D29 conductivity sensor value + * @return D29 (D28) Temperature sensor read count *************************************************************************/ -U16 getFPGAD29Cond( void ) +U08 getFPGAD29TempReadCount( void ) { - return GET_FPGA_SENSOR_FIELD( fpgaD29CondCond ); + return fpgaSensorReadings.fpgaD29TempReadCount; } /*********************************************************************//** * @brief + * The getFPGAD29TempErrorCount function gets the D29 (D28) temperature error count. + * @details \b Inputs: fpgaSensorReadings.fpgaD29TempErrorCount + * @details \b Outputs: none + * @return D29 (D28) Temperature sensor error count + *************************************************************************/ +U08 getFPGAD29TempErrorCount( void ) +{ + return fpgaSensorReadings.fpgaD29TempErrorCount; +} +/*********************************************************************//** + * @brief * The getFPGAD29CondTemp function gets D29 conductivity sensor temperature value. - * @details \b Inputs: fpgaD29CondTemp + * @details \b Inputs: fpgaD29TempResistance * @details \b Outputs: none * @return Latest D29 conductivity sensor temperature value *************************************************************************/ -U16 getFPGAD29CondTemp( void ) +F32 getFPGAD29CondTemp( void ) { - return GET_FPGA_SENSOR_FIELD( fpgaD29CondTemp ); + return fpgaSensorReadings.fpgaD29TempResistance; } /*********************************************************************//** * @brief * The getFPGAD29CondData function gets D29 conductivity sensor register value. - * @details \b Inputs: fpgaD29CondDataOut + * @details \b Inputs: fpgaD29CondResistance * @details \b Outputs: none * @return Latest D29 conductivity sensor register data value *************************************************************************/ -U32 getFPGAD29CondData( void ) +F32 getFPGAD29CondData( void ) { - return GET_FPGA_SENSOR_FIELD( fpgaD29CondCond ); + return fpgaSensorReadings.fpgaD29CondResistance; } /*********************************************************************//** * @brief + * The getFPGAD29CondCalData function gets the D29 cal data. + * @details \b Inputs: fpgaSensorReadings.fpgaD29DataCal + * @details \b Outputs: none + * @return D29 calibration data + *************************************************************************/ +U32 getFPGAD29CondCalData( void ) +{ + return fpgaSensorReadings.fpgaD29DataCal; +} + +/*********************************************************************//** + * @brief + * The getFPGAD29CalMemCounter function gets the D29 memory count. + * @details \b Inputs: fpgaSensorReadings.fpgaD29CalMemCounter + * @details \b Outputs: none + * @return D29 memory count + *************************************************************************/ +U08 getFPGAD29CalMemCounter( void ) +{ + return fpgaSensorReadings.fpgaD29CalMemCounter; +} + +/*********************************************************************//** + * @brief * The getFPGAD43CondReadCount function gets D43 conductivity sensor read count. * @details \b Inputs: fpgaD43CondReadCnt * @details \b Outputs: none * @return Latest D43 conductivity sensor read count *************************************************************************/ U08 getFPGAD43CondReadCount( void ) { - return GET_FPGA_SENSOR_FIELD( fpgaD43CondReadCnt ); + return fpgaSensorReadings.fpgaD43CondReadCnt; } /*********************************************************************//** @@ -3074,31 +2350,43 @@ *************************************************************************/ U08 getFPGAD43CondErrorCount( void ) { - return GET_FPGA_SENSOR_FIELD( fpgaD43CondErrorCnt ); + return fpgaSensorReadings.fpgaD43CondErrorCnt; } /*********************************************************************//** * @brief - * The getFPGAD43Cond function gets D43 conductivity sensor value. - * @details \b Inputs: fpgaD43Cond + * The getFPGAD43TempReadCount function gets the D43 (D44) temperature read count. + * @details \b Inputs: fpgaSensorReadings.fpgaD43TempReadCount * @details \b Outputs: none - * @return Latest D43 conductivity sensor value + * @return D43 (D44) Temperature sensor read count *************************************************************************/ -U16 getFPGAD43Cond( void ) +U08 getFPGAD43TempReadCount( void ) { - return GET_FPGA_SENSOR_FIELD( fpgaD43CondCond ); + return fpgaSensorReadings.fpgaD43TempReadCount; } /*********************************************************************//** * @brief + * The getFPGAD43TempErrorCount function gets the D43 (D44) temperature error count. + * @details \b Inputs: fpgaSensorReadings.fpgaD43TempErrorCount + * @details \b Outputs: none + * @return D43 (D44) Temperature sensor error count + *************************************************************************/ +U08 getFPGAD43TempErrorCount( void ) +{ + return fpgaSensorReadings.fpgaD43TempErrorCount; +} + +/*********************************************************************//** + * @brief * The getFPGAD43CondTemp function gets D43 conductivity sensor temperature value. * @details \b Inputs: fpgaD43CondTemp * @details \b Outputs: none * @return Latest D43 conductivity sensor temperature value *************************************************************************/ -U16 getFPGAD43CondTemp( void ) +F32 getFPGAD43CondTemp( void ) { - return GET_FPGA_SENSOR_FIELD( fpgaD43CondTemp ); + return fpgaSensorReadings.fpgaD43TempResistance; } /*********************************************************************//** @@ -3108,21 +2396,45 @@ * @details \b Outputs: none * @return Latest D43 conductivity sensor register data value *************************************************************************/ -U32 getFPGAD43CondData( void ) +F32 getFPGAD43CondData( void ) { - return GET_FPGA_SENSOR_FIELD( fpgaD43CondCond ); + return fpgaSensorReadings.fpgaD43CondResistance; } /*********************************************************************//** * @brief + * The getFPGAD43CondCalData function gets the D43 cal data. + * @details \b Inputs: fpgaSensorReadings.fpgaD43DataCal + * @details \b Outputs: none + * @return D43 calibration data + *************************************************************************/ +U32 getFPGAD43CondCalData( void ) +{ + return fpgaSensorReadings.fpgaD43DataCal; +} + +/*********************************************************************//** + * @brief + * The getFPGAD43CalMemCounter function gets the D43 memory count. + * @details \b Inputs: fpgaSensorReadings.fpgaD43CalMemCounter + * @details \b Outputs: none + * @return D43 memory count + *************************************************************************/ +U08 getFPGAD43CalMemCounter( void ) +{ + return fpgaSensorReadings.fpgaD43CalMemCounter; +} + +/*********************************************************************//** + * @brief * The getFPGAD74CondReadCount function gets D74 conductivity sensor read count. * @details \b Inputs: fpgaD74CondReadCnt * @details \b Outputs: none * @return Latest D74 conductivity sensor read count *************************************************************************/ U08 getFPGAD74CondReadCount( void ) { - return GET_FPGA_SENSOR_FIELD( fpgaD74CondReadCnt ); + return fpgaSensorReadings.fpgaD74CondReadCnt; } /*********************************************************************//** @@ -3134,31 +2446,43 @@ *************************************************************************/ U08 getFPGAD74CondErrorCount( void ) { - return GET_FPGA_SENSOR_FIELD( fpgaD74CondErrorCnt ); + return fpgaSensorReadings.fpgaD74CondErrorCnt; } /*********************************************************************//** * @brief - * The getFPGAD74Cond function gets D74 conductivity sensor value. - * @details \b Inputs: fpgaD74Cond + * The getFPGAD74TempReadCount function gets the D74 (D75) temperature read count. + * @details \b Inputs: fpgaSensorReadings.fpgaD74TempReadCount * @details \b Outputs: none - * @return Latest D74 conductivity sensor value + * @return D74 (D75) Temperature sensor read count *************************************************************************/ -U16 getFPGAD74Cond( void ) +U08 getFPGAD74TempReadCount( void ) { - return GET_FPGA_SENSOR_FIELD( fpgaD74CondCond ); + return fpgaSensorReadings.fpgaD74TempReadCount; } /*********************************************************************//** * @brief + * The getFPGAD74TempErrorCount function gets the D74 (D75) temperature error count. + * @details \b Inputs: fpgaSensorReadings.fpgaD74TempErrorCount + * @details \b Outputs: none + * @return D74 (D75) Temperature sensor error count + *************************************************************************/ +U08 getFPGAD74TempErrorCount( void ) +{ + return fpgaSensorReadings.fpgaD74TempErrorCount; +} + +/*********************************************************************//** + * @brief * The getFPGAD74CondTemp function gets D74 conductivity sensor temperature value. * @details \b Inputs: fpgaD74CondTemp * @details \b Outputs: none * @return Latest D74 conductivity sensor temperature value *************************************************************************/ -U16 getFPGAD74CondTemp( void ) +F32 getFPGAD74CondTemp( void ) { - return GET_FPGA_SENSOR_FIELD( fpgaD74CondTemp ); + return fpgaSensorReadings.fpgaD74TempResistance; } /*********************************************************************//** @@ -3168,13 +2492,36 @@ * @details \b Outputs: none * @return Latest D74 conductivity sensor register data value *************************************************************************/ -U32 getFPGAD74CondData( void ) +F32 getFPGAD74CondData( void ) { - return GET_FPGA_SENSOR_FIELD( fpgaD74CondCond ); + return fpgaSensorReadings.fpgaD74CondResistance; } +/*********************************************************************//** + * @brief + * The getFPGAD74CondCalData function gets the D74 cal data. + * @details \b Inputs: fpgaSensorReadings.fpgaD74DataCal + * @details \b Outputs: none + * @return D74 calibration data + *************************************************************************/ +U32 getFPGAD74CondCalData( void ) +{ + return fpgaSensorReadings.fpgaD74DataCal; +} /*********************************************************************//** * @brief + * The getFPGAD74CalMemCounter function gets the D74 memory count. + * @details \b Inputs: fpgaSensorReadings.fpgaD74CalMemCounter + * @details \b Outputs: none + * @return D74 memory count + *************************************************************************/ +U08 getFPGAD74CalMemCounter( void ) +{ + return fpgaSensorReadings.fpgaD74CalMemCounter; +} + +/*********************************************************************//** + * @brief * The getFPGAD63LevelSensor function gets the latest FPGA D63 upper level * sensor reading. * @details \b Inputs: fpgaD63LevelSensor @@ -4356,437 +3703,13 @@ /*********************************************************************//** * @brief - * The setFPGAP9Control function sets the FPGA P9 sensor control register - * to perform a given action. - * bit 4..7: unused - * bit 3: Enable P9 read transaction; address needed - * bit 2: Enable P9 write transaction; address and data needs to be set - * bit 1: Enable P9 initialization procedure - * bit 0: reset P9 sensor - * @details \b Inputs: none - * @details \b Outputs: conductivityP9Control - * @param control bits indicating control action to take - * @return none - *************************************************************************/ -void setFPGAP40PumpEnable( BOOL enable ) -{ - SET_FPGA_ACTUATOR_FIELD( conductivityP9Control, control ); -} - -/*********************************************************************//** - * @brief - * 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 setFPGAP40PumpPWM( U16 pwm ) -{ - SET_FPGA_ACTUATOR_FIELD( conductivityP9Address, address ); -} - -/*********************************************************************//** - * @brief - * The setFPGAP9Data function sets the write data for a write action on - * the P9 sensor. - * @details \b Inputs: none - * @details \b Outputs: conductivityP9Data - * @param data The 32-bit data to write to the P9 sensor - * @return none - *************************************************************************/ -U16 getFPGAP40PumpPWM( void ) -{ - SET_FPGA_ACTUATOR_FIELD( conductivityP9Data, data ); -} - -/*********************************************************************//** - * @brief - * The setFPGAP18Control function sets the FPGA P18 sensor control register - * to perform a given action. - * bit 4..7: unused - * bit 3: Enable P18 read transaction; address needed - * bit 2: Enable P18 write transaction; address and data needs to be set - * bit 1: Enable P18 initialization procedure - * bit 0: reset P18 sensor - * @details \b Inputs: none - * @details \b Outputs: conductivityP18Control - * @param control bits indicating control action to take - * @return none - *************************************************************************/ -U16 getFPGAP40PumpTachCount( void ) -{ - SET_FPGA_ACTUATOR_FIELD( conductivityP18Control, control ); -} - -/*********************************************************************//** - * @brief - * The setFPGAP18Address function sets the read/write address for a read/write - * action on the P18 sensor. - * @details \b Inputs: none - * @details \b Outputs: conductivityP18Address - * @param address The P18 sensor address to read from or write to - * @return none - *************************************************************************/ -U08 getFPGAD17CondReadCount( void ) -{ - SET_FPGA_ACTUATOR_FIELD( conductivityP18Address, address ); -} - -/*********************************************************************//** - * @brief - * The setFPGAP18Data function sets the write data for a write action on - * the P18 sensor. - * @details \b Inputs: none - * @details \b Outputs: conductivityP18Data - * @param data The 32-bit data to write to the P18 sensor - * @return none - *************************************************************************/ -U08 getFPGAD17CondErrorCount( void ) -{ - SET_FPGA_ACTUATOR_FIELD( conductivityP18Data, data ); -} - -/*********************************************************************//** - * @brief - * The setFPGAP9Reset function sets the reset command bit for P9 sensor. - * @details \b Inputs: none - * @details \b Outputs: conductivityP9Control - * @return none - *************************************************************************/ -U08 getFPGAD17TempReadCount( void ) -{ - SET_FPGA_ACTUATOR_BITS( conductivityP9Control, FPGA_CONDUCTIVITY_RESET_BIT ); -} - -/*********************************************************************//** - * @brief - * The clearFPGAP9Reset function clears the reset command bit for P9 sensor. - * @details \b Inputs: none - * @details \b Outputs: conductivityP9Control - * @return none - *************************************************************************/ -U08 getFPGAD17TempErrorCount( void ) -{ - CLEAR_FPGA_ACTUATOR_BITS( conductivityP9Control, ~FPGA_CONDUCTIVITY_RESET_BIT ); -} - -/*********************************************************************//** - * @brief - * The setFPGAP9InitEnable function sets the initialize command bit for - * P9 sensor. - * @details \b Inputs: none - * @details \b Outputs: conductivityP9Control - * @return none - *************************************************************************/ -U32 getFPGAD17CondData( void ) -{ - SET_FPGA_ACTUATOR_BITS( conductivityP9Control, FPGA_CONDUCTIVITY_INIT_ENABLE_BIT ); -} - -/*********************************************************************//** - * @brief - * The clearFPGAP9InitEnable function clears the initialize command bit for - * P9 sensor. - * @details \b Inputs: none - * @details \b Outputs: conductivityP9Control - * @return none - *************************************************************************/ -U32 getFPGAD17CondTemp( void ) -{ - CLEAR_FPGA_ACTUATOR_BITS( conductivityP9Control, ~FPGA_CONDUCTIVITY_INIT_ENABLE_BIT ); -} - -/*********************************************************************//** - * @brief - * The setFPGAP9WriteEnable function sets the write enable command bit for - * P9 sensor. - * @details \b Inputs: none - * @details \b Outputs: conductivityP9Control - * @return none - *************************************************************************/ -U32 getFPGAD17CondCalData( void ) -{ - SET_FPGA_ACTUATOR_BITS( conductivityP9Control, FPGA_CONDUCTIVITY_WR_ENABLE_BIT ); -} - -/*********************************************************************//** - * @brief - * The clearFPGAP9WriteEnable function clears the write enable command bit - * for P9 sensor. - * @details \b Inputs: none - * @details \b Outputs: conductivityP9Control - * @return none - *************************************************************************/ -U08 getFPGAD17CalMemCounter( void ) -{ - CLEAR_FPGA_ACTUATOR_BITS( conductivityP9Control, ~FPGA_CONDUCTIVITY_WR_ENABLE_BIT ); -} - -/*********************************************************************//** - * @brief - * The setFPGAP9ReadEnable function sets the read enable command bit for - * P9 sensor. - * @details \b Inputs: none - * @details \b Outputs: conductivityP9Control - * @return none - *************************************************************************/ -U08 getFPGAD27CondReadCount( void ) -{ - SET_FPGA_ACTUATOR_BITS( conductivityP9Control, FPGA_CONDUCTIVITY_RD_ENABLE_BIT ); -} - -/*********************************************************************//** - * @brief - * The clearFPGAP9ReadEnable function clears the read enable command bit - * for P9 sensor. - * @details \b Inputs: none - * @details \b Outputs: conductivityP9Control - * @return none - *************************************************************************/ -U08 getFPGAD27CondErrorCount( void ) -{ - CLEAR_FPGA_ACTUATOR_BITS( conductivityP9Control, ~FPGA_CONDUCTIVITY_RD_ENABLE_BIT ); -} - -/*********************************************************************//** - * @brief - * The setFPGAP18Reset function sets the reset command bit for P18 sensor. - * @details \b Inputs: none - * @details \b Outputs: conductivityP18Control - * @return none - *************************************************************************/ -U08 getFPGAD27TempReadCount( void ) -{ - SET_FPGA_ACTUATOR_BITS( conductivityP18Control, FPGA_CONDUCTIVITY_RESET_BIT ); -} - -/*********************************************************************//** - * @brief - * The clearFPGAP18Reset function clears the reset command bit for P18 sensor. - * @details \b Inputs: none - * @details \b Outputs: conductivityP18Control - * @return none - *************************************************************************/ -U08 getFPGAD27TempErrorCount( void ) -{ - CLEAR_FPGA_ACTUATOR_BITS( conductivityP18Control, ~FPGA_CONDUCTIVITY_RESET_BIT ); -} - -/*********************************************************************//** - * @brief - * The setFPGAP18InitEnable function sets the initialize command bit for - * P18 sensor. - * @details \b Inputs: none - * @details \b Outputs: conductivityP18Control - * @return none - *************************************************************************/ -U32 getFPGAD27CondData( void ) -{ - SET_FPGA_ACTUATOR_BITS( conductivityP18Control, FPGA_CONDUCTIVITY_INIT_ENABLE_BIT ); -} - -/*********************************************************************//** - * @brief - * The clearFPGAP18InitEnable function clears the initialize command bit for - * P18 sensor. - * @details \b Inputs: none - * @details \b Outputs: conductivityP18Control - * @return none - *************************************************************************/ -U32 getFPGAD27CondTemp( void ) -{ - CLEAR_FPGA_ACTUATOR_BITS( conductivityP18Control, ~FPGA_CONDUCTIVITY_INIT_ENABLE_BIT ); -} - -/*********************************************************************//** - * @brief - * The setFPGAP18WriteEnable function sets the write enable command bit for - * P18 sensor. - * @details \b Inputs: none - * @details \b Outputs: conductivityP18Control - * @return none - *************************************************************************/ -U32 getFPGAD27CondCalData( void ) -{ - SET_FPGA_ACTUATOR_BITS( conductivityP18Control, FPGA_CONDUCTIVITY_WR_ENABLE_BIT ); -} - -/*********************************************************************//** - * @brief - * The clearFPGAP18WriteEnable function clears the write enable command bit - * for P18 sensor. - * @details \b Inputs: none - * @details \b Outputs: conductivityP18Control - * @return none - *************************************************************************/ -U08 getFPGAD27CalMemCounter( void ) -{ - CLEAR_FPGA_ACTUATOR_BITS( conductivityP18Control, ~FPGA_CONDUCTIVITY_WR_ENABLE_BIT ); -} - -/*********************************************************************//** - * @brief - * The setFPGAP18ReadEnable function sets the read enable command bit for - * P18 sensor. - * @details \b Inputs: none - * @details \b Outputs: conductivityP18Control - * @return none - *************************************************************************/ -U08 getFPGAD29CondReadCount( void ) -{ - SET_FPGA_ACTUATOR_BITS( conductivityP18Control, FPGA_CONDUCTIVITY_RD_ENABLE_BIT ); -} - -/*********************************************************************//** - * @brief - * The clearFPGAP18ReadEnable function clears the read enable command bit - * for P18 sensor. - * @details \b Inputs: none - * @details \b Outputs: conductivityP18Control - * @return none - *************************************************************************/ -U08 getFPGAD29CondErrorCount( void ) -{ - CLEAR_FPGA_ACTUATOR_BITS( conductivityP18Control, ~FPGA_CONDUCTIVITY_RD_ENABLE_BIT ); -} - -/*********************************************************************//** - * @brief - * The getFPGAP9ReadCount function gets the latest P9 sensor read count. - * @details \b Inputs: conductivityP9ReadCount - * @details \b Outputs: none - * @return D29 (D28) Temperature sensor read count - *************************************************************************/ -U08 getFPGAD29TempReadCount( void ) -{ - return GET_FPGA_SENSOR_FIELD( conductivityP9ReadCount ); -} - -/*********************************************************************//** - * @brief - * The getFPGAP9ErrorCount function gets the latest P9 sensor error count. - * @details \b Inputs: conductivityP9ErrorCount - * @details \b Outputs: none - * @return D29 (D28) Temperature sensor error count - *************************************************************************/ -U08 getFPGAD29TempErrorCount( void ) -{ - return GET_FPGA_SENSOR_FIELD( conductivityP9ErrorCount ); -} - -/*********************************************************************//** - * @brief - * The getFPGAP9Conductivity function gets the latest P9 sensor conductivity - * reading. - * @details \b Inputs: conductivityP9Cond - * @details \b Outputs: none - * @return D29 Conductivity data - *************************************************************************/ -U32 getFPGAD29CondData( void ) -{ - return GET_FPGA_SENSOR_FIELD( conductivityP9Cond ); -} - -/*********************************************************************//** - * @brief - * The getFPGAP9Temperature function gets the latest P9 sensor temperature. - * @details \b Inputs: conductivityP9Temp - * @details \b Outputs: none - * @return D29 (D28) Temperature data - *************************************************************************/ -U32 getFPGAD29CondTemp( void ) -{ - return GET_FPGA_SENSOR_FIELD( conductivityP9Temp ); -} - -/*********************************************************************//** - * @brief - * The getFPGAP9Data function gets the latest P9 sensor data from a read - * action. - * @details \b Inputs: conductivityP9Data - * @details \b Outputs: none - * @return D29 calibration data - *************************************************************************/ -U32 getFPGAD29CondCalData( void ) -{ - return GET_FPGA_SENSOR_FIELD( conductivityP9Data ); -} - -/*********************************************************************//** - * @brief - * The getFPGAP18ReadCount function gets the latest P18 sensor read count. - * @details \b Inputs: conductivityP18ReadCount - * @details \b Outputs: none - * @return D29 memory count - *************************************************************************/ -U08 getFPGAD29CalMemCounter( void ) -{ - return GET_FPGA_SENSOR_FIELD( conductivityP18ReadCount ); -} - -/*********************************************************************//** - * @brief - * The getFPGAP18ErrorCount function gets the latest P18 sensor error count. - * @details \b Inputs: conductivityP18ErrorCount - * @details \b Outputs: none - * @return D437 Conductivity sensor read count - *************************************************************************/ -U08 getFPGAD43CondReadCount( void ) -{ - return GET_FPGA_SENSOR_FIELD( conductivityP18ErrorCount ); -} - -/*********************************************************************//** - * @brief - * The getFPGAP18Conductivity function gets the latest P18 sensor conductivity - * reading. - * @details \b Inputs: conductivityP18Cond - * @details \b Outputs: none - * @return D43 Conductivity sensor error count - *************************************************************************/ -U08 getFPGAD43CondErrorCount( void ) -{ - return GET_FPGA_SENSOR_FIELD( conductivityP18Cond ); -} - -/*********************************************************************//** - * @brief - * The getFPGAP18Temperature function gets the latest P18 sensor temperature. - * @details \b Inputs: conductivityP18Temp - * @details \b Outputs: none - * @return D43 (D44) Temperature sensor read count - *************************************************************************/ -U08 getFPGAD43TempReadCount( void ) -{ - return GET_FPGA_SENSOR_FIELD( conductivityP18Temp ); -} - -/*********************************************************************//** - * @brief - * The getFPGAP18Data function gets the latest P18 sensor data from a read - * action. - * @details \b Inputs: conductivityP18Data - * @details \b Outputs: none - * @return D43 (D44) Temperature sensor error count - *************************************************************************/ -U08 getFPGAD43TempErrorCount( void ) -{ - return GET_FPGA_SENSOR_FIELD( conductivityP18Data ); -} - -/*********************************************************************//** - * @brief * The setFPGAP40PumpEnable function enables or disables the P40 pump. * @details \b Inputs: none * @details \b Outputs: p40PumpControl * @param enable flag indicating whether to enable or disable the P40 pump. * @return none *************************************************************************/ -U32 getFPGAD43CondData( void ) +void setFPGAP40PumpEnable( BOOL enable ) { SET_FPGA_ACTUATOR_FIELD( p40PumpControl, ( TRUE == enable ? 0x1 : 0x0 ) ); } @@ -4802,7 +3725,7 @@ * @param pwm PWM duty cycle magnitude * @return none *************************************************************************/ -U32 getFPGAD43CondTemp( void ) +void setFPGAP40PumpPWM( U16 pwm ) { SET_FPGA_ACTUATOR_FIELD( p40PumpPWMDutyCyclePct, pwm ); } @@ -4813,9 +3736,9 @@ * duty cycle. * @details \b Inputs: p40PumpPWMReadback * @details \b Outputs: none - * @return D43 calibration data + * @return measured speed (RPM) of the P40 pump *************************************************************************/ -U32 getFPGAD43CondCalData( void ) +U16 getFPGAP40PumpPWM( void ) { return GET_FPGA_SENSOR_FIELD( p40PumpPWMReadback ); } @@ -4826,298 +3749,202 @@ * from the P40 pump hall sensor. * @details \b Inputs: p40PumpTachCount * @details \b Outputs: none - * @return D43 memory count + * @return P40 pump tachometer count *************************************************************************/ -U08 getFPGAD43CalMemCounter( void ) +U16 getFPGAP40PumpTachCount( 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 Inputs: fpgaSensorReadings.fpgaP9CondReadCount * @details \b Outputs: none * @return P9 Conductivity sensor read count *************************************************************************/ U08 getFPGAP9CondReadCount( void ) { - return fpgaSensorReadings.p9CondCondReadCount; + return fpgaSensorReadings.fpgaP9CondReadCount; } /*********************************************************************//** * @brief * The getFPGAP9CondErrorCount function gets the P9 conductivity error count. - * @details \b Inputs: fpgaSensorReadings.p9CondCondErrorCount + * @details \b Inputs: fpgaSensorReadings.fpgaP9CondErrorCount * @details \b Outputs: none * @return P9 Conductivity sensor error count *************************************************************************/ U08 getFPGAP9CondErrorCount( void ) { - return fpgaSensorReadings.p9CondCondErrorCount; + return fpgaSensorReadings.fpgaP9CondErrorCount; } /*********************************************************************//** * @brief * The getFPGAP9TempReadCount function gets the P9 (P10) temperature read count. - * @details \b Inputs: fpgaSensorReadings.p9CondTempReadCount + * @details \b Inputs: fpgaSensorReadings.fpgaP9TempReadCount * @details \b Outputs: none * @return P9 (P10) Temperature sensor read count *************************************************************************/ U08 getFPGAP9TempReadCount( void ) { - return fpgaSensorReadings.p9CondTempReadCount; + return fpgaSensorReadings.fpgaP9TempReadCount; } /*********************************************************************//** * @brief * The getFPGAP9TempErrorCount function gets the P9 (P10) temperature error count. - * @details \b Inputs: fpgaSensorReadings.p9CondTempErrorCount + * @details \b Inputs: fpgaSensorReadings.fpgaP9TempErrorCount * @details \b Outputs: none * @return P9 (P10) Temperature sensor error count *************************************************************************/ U08 getFPGAP9TempErrorCount( void ) { - return fpgaSensorReadings.p9CondTempErrorCount; + return fpgaSensorReadings.fpgaP9TempErrorCount; } /*********************************************************************//** * @brief * The getFPGAP9CondData function gets the P9 conductivity data. - * @details \b Inputs: fpgaSensorReadings.p9CondCond + * @details \b Inputs: fpgaSensorReadings.fpgaP9CondResistance * @details \b Outputs: none * @return P9 Conductivity data *************************************************************************/ -U32 getFPGAP9CondData( void ) +F32 getFPGAP9CondData( void ) { - return fpgaSensorReadings.p9CondCond; + return fpgaSensorReadings.fpgaP9CondResistance; } /*********************************************************************//** * @brief * The getFPGAP9CondTemp function gets the P9 (P10) temperature data. - * @details \b Inputs: fpgaSensorReadings.p9CondTemp + * @details \b Inputs: fpgaSensorReadings.fpgaP9TempResistance * @details \b Outputs: none * @return P9 (P10) Temperature data *************************************************************************/ -U32 getFPGAP9CondTemp( void ) +F32 getFPGAP9CondTemp( void ) { - return fpgaSensorReadings.p9CondTemp; + return fpgaSensorReadings.fpgaP9TempResistance; } /*********************************************************************//** * @brief * The getFPGAP9CondCalData function gets the P9 cal data. - * @details \b Inputs: fpgaSensorReadings.p9CondCalData + * @details \b Inputs: fpgaSensorReadings.fpgaP9CalData * @details \b Outputs: none * @return P9 calibration data *************************************************************************/ U32 getFPGAP9CondCalData( void ) { - return fpgaSensorReadings.p9CondCalData; + return fpgaSensorReadings.fpgaP9CalData; } /*********************************************************************//** * @brief * The getFPGAP9CalMemCounter function gets the P9 memory count. - * @details \b Inputs: fpgaSensorReadings.p9CondMemCounter + * @details \b Inputs: fpgaSensorReadings.fpgaP9CalMemCounter * @details \b Outputs: none * @return P9 memory count *************************************************************************/ U08 getFPGAP9CalMemCounter( void ) { - return fpgaSensorReadings.p9CondMemCounter; + return fpgaSensorReadings.fpgaP9CalMemCounter; } /*********************************************************************//** * @brief * The getFPGAP18CondReadCount function gets the P18 conductivity read count. - * @details \b Inputs: fpgaSensorReadings.p18CondCondReadCount + * @details \b Inputs: fpgaSensorReadings.fpgaP18CondReadCount * @details \b Outputs: none * @return P18 Conductivity sensor read count *************************************************************************/ U08 getFPGAP18CondReadCount( void ) { - return fpgaSensorReadings.p18CondCondReadCount; + return fpgaSensorReadings.fpgaP18CondReadCount; } /*********************************************************************//** * @brief * The getFPGAP18CondErrorCount function gets the P18 conductivity error count. - * @details \b Inputs: fpgaSensorReadings.p18CondCondErrorCount + * @details \b Inputs: fpgaSensorReadings.fpgaP18CondErrorCount * @details \b Outputs: none * @return P18 Conductivity sensor error count *************************************************************************/ U08 getFPGAP18CondErrorCount( void ) { - return fpgaSensorReadings.p18CondCondErrorCount; + return fpgaSensorReadings.fpgaP18CondErrorCount; } /*********************************************************************//** * @brief * The getFPGAP18TempReadCount function gets the P18 (P19) temperature read count. - * @details \b Inputs: fpgaSensorReadings.p9CondTempReadCount + * @details \b Inputs: fpgaSensorReadings.fpgaP18TempReadCount * @details \b Outputs: none * @return P18 (P19) Temperature sensor read count *************************************************************************/ U08 getFPGAP18TempReadCount( void ) { - return fpgaSensorReadings.p18CondTempReadCount; + return fpgaSensorReadings.fpgaP18TempReadCount; } /*********************************************************************//** * @brief * The getFPGAP18TempErrorCount function gets the P18 (P19) temperature error count. - * @details \b Inputs: fpgaSensorReadings.p18CondTempErrorCount + * @details \b Inputs: fpgaSensorReadings.fpgaP18TempErrorCount * @details \b Outputs: none * @return P18 (P19) Temperature sensor error count *************************************************************************/ U08 getFPGAP18TempErrorCount( void ) { - return fpgaSensorReadings.p18CondTempErrorCount; + return fpgaSensorReadings.fpgaP18TempErrorCount; } /*********************************************************************//** * @brief * The getFPGAP18CondData function gets the P18 conductivity data. - * @details \b Inputs: fpgaSensorReadings.p18CondCond + * @details \b Inputs: fpgaSensorReadings.fpgaP18CondResistance * @details \b Outputs: none * @return P18 Conductivity data *************************************************************************/ -U32 getFPGAP18CondData( void ) +F32 getFPGAP18CondData( void ) { - return fpgaSensorReadings.p18CondCond; + return fpgaSensorReadings.fpgaP18CondResistance; } /*********************************************************************//** * @brief * The getFPGAP18CondTemp function gets the P18 (P19) temperature data. - * @details \b Inputs: fpgaSensorReadings.p18CondTemp + * @details \b Inputs: fpgaSensorReadings.fpgaP18TempReistance * @details \b Outputs: none * @return P18 (P19) Temperature data *************************************************************************/ -U32 getFPGAP18CondTemp( void ) +F32 getFPGAP18CondTemp( void ) { - return fpgaSensorReadings.p18CondTemp; + return fpgaSensorReadings.fpgaP18TempReistance; } /*********************************************************************//** * @brief * The getFPGAP18CondCalData function gets the P18 cal data. - * @details \b Inputs: fpgaSensorReadings.p18CondCalData + * @details \b Inputs: fpgaSensorReadings.fpgaP18CalData * @details \b Outputs: none * @return P18 calibration data *************************************************************************/ U32 getFPGAP18CondCalData( void ) { - return fpgaSensorReadings.p18CondCalData; + return fpgaSensorReadings.fpgaP18CalData; } /*********************************************************************//** * @brief * The getFPGAP18CalMemCounter function gets the P18 memory count. - * @details \b Inputs: fpgaSensorReadings.p18CondMemCounter + * @details \b Inputs: fpgaSensorReadings.fpgaP18CalMemCounter * @details \b Outputs: none * @return P18 memory count *************************************************************************/ U08 getFPGAP18CalMemCounter( void ) { - return fpgaSensorReadings.p18CondMemCounter; + return fpgaSensorReadings.fpgaP18CalMemCounter; } /**@}*/