Index: firmware/App/Drivers/ConductivitySensors.c =================================================================== diff -u -rd7abd9c0c214ec3b7704e7f89b6de83c341b9b0e -rfd63d4e5294ee1c3585359936e9b9afd06c08314 --- firmware/App/Drivers/ConductivitySensors.c (.../ConductivitySensors.c) (revision d7abd9c0c214ec3b7704e7f89b6de83c341b9b0e) +++ firmware/App/Drivers/ConductivitySensors.c (.../ConductivitySensors.c) (revision fd63d4e5294ee1c3585359936e9b9afd06c08314) @@ -57,7 +57,7 @@ #define COND_SENSORS_READ_ERR_MAX_CNT 255 ///< Conductivity sensors read and error count max value. #define COND_TEMP_OFFSET 25 ///< Temperature offset constant used in RTD calculations. -#define SIEMENS_TO_MICROSIEMENS_CONVERSION 1000000 ///< Siemens to microSiemens conversion factor. +#define SIEMENS_TO_MICROSIEMENS_CONVERSION 1000000.0F ///< Siemens to microSiemens conversion factor. /// Defined states for the conductivity write transaction. typedef enum Conductvity_States @@ -206,22 +206,22 @@ void readConductivitySensorData( void ) { // Read raw conductivity - currentConductivityReadings[ D17_COND ].data = (F32)getFPGAD17CondData(); - currentConductivityReadings[ D27_COND ].data = (F32)getFPGAD27CondData(); - currentConductivityReadings[ D29_COND ].data = (F32)getFPGAD29CondData(); - currentConductivityReadings[ D43_COND ].data = (F32)getFPGAD43CondData(); - currentConductivityReadings[ D74_COND ].data = (F32)getFPGAD74CondData(); - currentConductivityReadings[ P9_COND ].data = (F32)getFPGAP9CondData(); - currentConductivityReadings[ P18_COND ].data = (F32)getFPGAP18CondData(); + currentConductivityReadings[ D17_COND ].data = getFPGAD17CondData(); + currentConductivityReadings[ D27_COND ].data = getFPGAD27CondData(); + currentConductivityReadings[ D29_COND ].data = getFPGAD29CondData(); + currentConductivityReadings[ D43_COND ].data = getFPGAD43CondData(); + currentConductivityReadings[ D74_COND ].data = getFPGAD74CondData(); + currentConductivityReadings[ P9_COND ].data = getFPGAP9CondData(); + currentConductivityReadings[ P18_COND ].data = getFPGAP18CondData(); // Read temperature associated to conductivity sensor - currentTemperatureReadings[ D17_COND ].data = (F32)getFPGAD17CondTemp(); - currentTemperatureReadings[ D27_COND ].data = (F32)getFPGAD27CondTemp(); - currentTemperatureReadings[ D29_COND ].data = (F32)getFPGAD29CondTemp(); - currentTemperatureReadings[ D43_COND ].data = (F32)getFPGAD43CondTemp(); - currentTemperatureReadings[ D74_COND ].data = (F32)getFPGAD74CondTemp(); - currentTemperatureReadings[ P9_COND ].data = (F32)getFPGAP9CondTemp(); - currentTemperatureReadings[ P18_COND ].data = (F32)getFPGAP18CondTemp(); + currentTemperatureReadings[ D17_COND ].data = getFPGAD17CondTemp(); + currentTemperatureReadings[ D27_COND ].data = getFPGAD27CondTemp(); + currentTemperatureReadings[ D29_COND ].data = getFPGAD29CondTemp(); + currentTemperatureReadings[ D43_COND ].data = getFPGAD43CondTemp(); + currentTemperatureReadings[ D74_COND ].data = getFPGAD74CondTemp(); + currentTemperatureReadings[ P9_COND ].data = getFPGAP9CondTemp(); + currentTemperatureReadings[ P18_COND ].data = getFPGAP18CondTemp(); } /*********************************************************************//** @@ -235,21 +235,21 @@ static void readConductivitySensorReadCounts( void ) { // Update read counters for each conductivity sensor - lastConductivityReadCounter[ D17_COND ].data = (U32)getFPGAD17CondReadCount(); - lastConductivityReadCounter[ D27_COND ].data = (U32)getFPGAD27CondReadCount(); - lastConductivityReadCounter[ D29_COND ].data = (U32)getFPGAD29CondReadCount(); - lastConductivityReadCounter[ D43_COND ].data = (U32)getFPGAD43CondReadCount(); - lastConductivityReadCounter[ D74_COND ].data = (U32)getFPGAD74CondReadCount(); - lastConductivityReadCounter[ P9_COND ].data = (U32)getFPGAP9CondReadCount(); - lastConductivityReadCounter[ P18_COND ].data = (U32)getFPGAP18CondReadCount(); + lastConductivityReadCounter[ D17_COND ].data = getFPGAD17CondReadCount(); + lastConductivityReadCounter[ D27_COND ].data = getFPGAD27CondReadCount(); + lastConductivityReadCounter[ D29_COND ].data = getFPGAD29CondReadCount(); + lastConductivityReadCounter[ D43_COND ].data = getFPGAD43CondReadCount(); + lastConductivityReadCounter[ D74_COND ].data = getFPGAD74CondReadCount(); + lastConductivityReadCounter[ P9_COND ].data = getFPGAP9CondReadCount(); + lastConductivityReadCounter[ P18_COND ].data = getFPGAP18CondReadCount(); - lastTemperatureReadCounter[ D17_COND ].data = (U32)getFPGAD17TempReadCount(); - lastTemperatureReadCounter[ D27_COND ].data = (U32)getFPGAD27TempReadCount(); - lastTemperatureReadCounter[ D29_COND ].data = (U32)getFPGAD29TempReadCount(); - lastTemperatureReadCounter[ D43_COND ].data = (U32)getFPGAD43TempReadCount(); - lastTemperatureReadCounter[ D74_COND ].data = (U32)getFPGAD74TempReadCount(); - lastTemperatureReadCounter[ P9_COND ].data = (U32)getFPGAP9TempReadCount(); - lastTemperatureReadCounter[ P18_COND ].data = (U32)getFPGAP18TempReadCount(); + lastTemperatureReadCounter[ D17_COND ].data = getFPGAD17TempReadCount(); + lastTemperatureReadCounter[ D27_COND ].data = getFPGAD27TempReadCount(); + lastTemperatureReadCounter[ D29_COND ].data = getFPGAD29TempReadCount(); + lastTemperatureReadCounter[ D43_COND ].data = getFPGAD43TempReadCount(); + lastTemperatureReadCounter[ D74_COND ].data = getFPGAD74TempReadCount(); + lastTemperatureReadCounter[ P9_COND ].data = getFPGAP9TempReadCount(); + lastTemperatureReadCounter[ P18_COND ].data = getFPGAP18TempReadCount(); } /*********************************************************************//** @@ -263,21 +263,21 @@ static void readConductivitySensorErrorCounts( void ) { // Update error counters for each conductivity sensor - lastConductivityErrorCounter[ D17_COND ].data = (U32)getFPGAD17CondErrorCount(); - lastConductivityErrorCounter[ D27_COND ].data = (U32)getFPGAD27CondErrorCount(); - lastConductivityErrorCounter[ D29_COND ].data = (U32)getFPGAD29CondErrorCount(); - lastConductivityErrorCounter[ D43_COND ].data = (U32)getFPGAD43CondErrorCount(); - lastConductivityErrorCounter[ D74_COND ].data = (U32)getFPGAD74CondErrorCount(); - lastConductivityErrorCounter[ P9_COND ].data = (U32)getFPGAP9CondErrorCount(); - lastConductivityErrorCounter[ P18_COND ].data = (U32)getFPGAP18CondErrorCount(); + lastConductivityErrorCounter[ D17_COND ].data = getFPGAD17CondErrorCount(); + lastConductivityErrorCounter[ D27_COND ].data = getFPGAD27CondErrorCount(); + lastConductivityErrorCounter[ D29_COND ].data = getFPGAD29CondErrorCount(); + lastConductivityErrorCounter[ D43_COND ].data = getFPGAD43CondErrorCount(); + lastConductivityErrorCounter[ D74_COND ].data = getFPGAD74CondErrorCount(); + lastConductivityErrorCounter[ P9_COND ].data = getFPGAP9CondErrorCount(); + lastConductivityErrorCounter[ P18_COND ].data = getFPGAP18CondErrorCount(); - lastTemperatureErrorCounter[ D17_COND ].data = (U32)getFPGAD17TempErrorCount(); - lastTemperatureErrorCounter[ D27_COND ].data = (U32)getFPGAD27TempErrorCount(); - lastTemperatureErrorCounter[ D29_COND ].data = (U32)getFPGAD29TempErrorCount(); - lastTemperatureErrorCounter[ D43_COND ].data = (U32)getFPGAD43TempErrorCount(); - lastTemperatureErrorCounter[ D74_COND ].data = (U32)getFPGAD74TempErrorCount(); - lastTemperatureErrorCounter[ P9_COND ].data = (U32)getFPGAP9TempErrorCount(); - lastTemperatureErrorCounter[ P18_COND ].data = (U32)getFPGAP18TempErrorCount(); + lastTemperatureErrorCounter[ D17_COND ].data = getFPGAD17TempErrorCount(); + lastTemperatureErrorCounter[ D27_COND ].data = getFPGAD27TempErrorCount(); + lastTemperatureErrorCounter[ D29_COND ].data = getFPGAD29TempErrorCount(); + lastTemperatureErrorCounter[ D43_COND ].data = getFPGAD43TempErrorCount(); + lastTemperatureErrorCounter[ D74_COND ].data = getFPGAD74TempErrorCount(); + lastTemperatureErrorCounter[ P9_COND ].data = getFPGAP9TempErrorCount(); + lastTemperatureErrorCounter[ P18_COND ].data = getFPGAP18TempErrorCount(); } /*********************************************************************//** @@ -291,21 +291,21 @@ static void readConductivitySensorCalData( void ) { // Update cal data and counter for each conductivity sensor - conductivitySensorStatus[ D17_COND ].calData = (U32)getFPGAD17CondCalData(); - conductivitySensorStatus[ D27_COND ].calData = (U32)getFPGAD27CondCalData(); - conductivitySensorStatus[ D29_COND ].calData = (U32)getFPGAD29CondCalData(); - conductivitySensorStatus[ D43_COND ].calData = (U32)getFPGAD43CondCalData(); - conductivitySensorStatus[ D74_COND ].calData = (U32)getFPGAD74CondCalData(); - conductivitySensorStatus[ P9_COND ].calData = (U32)getFPGAP9CondCalData(); - conductivitySensorStatus[ P18_COND ].calData = (U32)getFPGAP18CondCalData(); + conductivitySensorStatus[ D17_COND ].calData = getFPGAD17CondCalData(); + conductivitySensorStatus[ D27_COND ].calData = getFPGAD27CondCalData(); + conductivitySensorStatus[ D29_COND ].calData = getFPGAD29CondCalData(); + conductivitySensorStatus[ D43_COND ].calData = getFPGAD43CondCalData(); + conductivitySensorStatus[ D74_COND ].calData = getFPGAD74CondCalData(); + conductivitySensorStatus[ P9_COND ].calData = getFPGAP9CondCalData(); + conductivitySensorStatus[ P18_COND ].calData = getFPGAP18CondCalData(); - conductivitySensorStatus[ D17_COND ].calMemCount = (U32)getFPGAD17CalMemCounter(); - conductivitySensorStatus[ D27_COND ].calMemCount = (U32)getFPGAD27CalMemCounter(); - conductivitySensorStatus[ D29_COND ].calMemCount = (U32)getFPGAD29CalMemCounter(); - conductivitySensorStatus[ D43_COND ].calMemCount = (U32)getFPGAD43CalMemCounter(); - conductivitySensorStatus[ D74_COND ].calMemCount = (U32)getFPGAD74CalMemCounter(); - conductivitySensorStatus[ P9_COND ].calMemCount = (U32)getFPGAP9CalMemCounter(); - conductivitySensorStatus[ P18_COND ].calMemCount = (U32)getFPGAP18CalMemCounter(); + conductivitySensorStatus[ D17_COND ].calMemCount = getFPGAD17CalMemCounter(); + conductivitySensorStatus[ D27_COND ].calMemCount = getFPGAD27CalMemCounter(); + conductivitySensorStatus[ D29_COND ].calMemCount = getFPGAD29CalMemCounter(); + conductivitySensorStatus[ D43_COND ].calMemCount = getFPGAD43CalMemCounter(); + conductivitySensorStatus[ D74_COND ].calMemCount = getFPGAD74CalMemCounter(); + conductivitySensorStatus[ P9_COND ].calMemCount = getFPGAP9CalMemCounter(); + conductivitySensorStatus[ P18_COND ].calMemCount = getFPGAP18CalMemCounter(); } /*********************************************************************//** Index: firmware/App/Services/FpgaDD.c =================================================================== diff -u -r65aab053022c1cab102e503012833f4879501fd1 -rfd63d4e5294ee1c3585359936e9b9afd06c08314 --- firmware/App/Services/FpgaDD.c (.../FpgaDD.c) (revision 65aab053022c1cab102e503012833f4879501fd1) +++ firmware/App/Services/FpgaDD.c (.../FpgaDD.c) (revision fd63d4e5294ee1c3585359936e9b9afd06c08314) @@ -408,59 +408,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 @@ -1315,744 +1315,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 @@ -2786,7 +2048,7 @@ *************************************************************************/ U08 getFPGAD17CondReadCount( void ) { - return GET_FPGA_SENSOR_FIELD( fpgaD17CondReadCnt ); + return fpgaSensorReadings.fpgaD17CondReadCnt; } /*********************************************************************//** @@ -2798,31 +2060,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; } /*********************************************************************//** @@ -2832,21 +2106,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; } /*********************************************************************//** @@ -2858,19 +2155,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; } /*********************************************************************//** @@ -2880,33 +2201,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; } /*********************************************************************//** @@ -2918,55 +2251,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; } /*********************************************************************//** @@ -2978,31 +2346,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; } /*********************************************************************//** @@ -3012,21 +2392,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; } /*********************************************************************//** @@ -3038,31 +2442,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; } /*********************************************************************//** @@ -3072,13 +2488,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 @@ -5114,296 +4553,200 @@ * @details \b Outputs: none * @return D43 memory count *************************************************************************/ -U08 getFPGAD43CalMemCounter( void ) +U16 getFPGAP40PumpTachCount( void ) { return fpgaSensorReadings.d43CondMemCounter; } /*********************************************************************//** * @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; } /**@}*/ Index: firmware/App/Services/FpgaDD.h =================================================================== diff -u -r65aab053022c1cab102e503012833f4879501fd1 -rfd63d4e5294ee1c3585359936e9b9afd06c08314 --- firmware/App/Services/FpgaDD.h (.../FpgaDD.h) (revision 65aab053022c1cab102e503012833f4879501fd1) +++ firmware/App/Services/FpgaDD.h (.../FpgaDD.h) (revision fd63d4e5294ee1c3585359936e9b9afd06c08314) @@ -82,58 +82,48 @@ void setFPGAValveSPPWMPeriod( U16 valvePWMPeriod ); // Conductivity and Temperature Sensor -void setFPGAD17D74Control( U08 control ); -void setFPGAD27D29Control( U08 control ); -void setFPGAD43Control( U08 control ); -void setFPGAD17D74Address( U16 address ); -void setFPGAD27D29Address( U16 address ); -void setFPGAD43Address( U16 address ); -void setFPGAD17D74Data( U32 data ); -void setFPGAD27D29Data( U32 data ); -void setFPGAD43Data( U32 data ); - U08 getFPGAD17CondReadCount( void ); U08 getFPGAD17CondErrorCount( void ); U08 getFPGAD17TempReadCount( void ); U08 getFPGAD17TempErrorCount( void ); -U32 getFPGAD17CondData( void ); -U32 getFPGAD17CondTemp( void ); +F32 getFPGAD17CondData( void ); +F32 getFPGAD17CondTemp( void ); U32 getFPGAD17CondCalData( void ); U08 getFPGAD17CalMemCounter( void ); U08 getFPGAD27CondReadCount( void ); U08 getFPGAD27CondErrorCount( void ); U08 getFPGAD27TempReadCount( void ); U08 getFPGAD27TempErrorCount( void ); -U32 getFPGAD27CondData( void ); -U32 getFPGAD27CondTemp( void ); +F32 getFPGAD27CondData( void ); +F32 getFPGAD27CondTemp( void ); U32 getFPGAD27CondCalData( void ); U08 getFPGAD27CalMemCounter( void ); U08 getFPGAD29CondReadCount( void ); U08 getFPGAD29CondErrorCount( void ); U08 getFPGAD29TempReadCount( void ); U08 getFPGAD29TempErrorCount( void ); -U32 getFPGAD29CondData( void ); -U32 getFPGAD29CondTemp( void ); +F32 getFPGAD29CondData( void ); +F32 getFPGAD29CondTemp( void ); U32 getFPGAD29CondCalData( void ); U08 getFPGAD29CalMemCounter( void ); U08 getFPGAD43CondReadCount( void ); U08 getFPGAD43CondErrorCount( void ); U08 getFPGAD43TempReadCount( void ); U08 getFPGAD43TempErrorCount( void ); -U32 getFPGAD43CondData( void ); -U32 getFPGAD43CondTemp( void ); +F32 getFPGAD43CondData( void ); +F32 getFPGAD43CondTemp( void ); U32 getFPGAD43CondCalData( void ); U08 getFPGAD43CalMemCounter( void ); U08 getFPGAD74CondReadCount( void ); U08 getFPGAD74CondErrorCount( void ); U08 getFPGAD74TempReadCount( void ); U08 getFPGAD74TempErrorCount( void ); -U32 getFPGAD74CondData( void ); -U32 getFPGAD74CondTemp( void ); +F32 getFPGAD74CondData( void ); +F32 getFPGAD74CondTemp( void ); U32 getFPGAD74CondCalData( void ); U08 getFPGAD74CalMemCounter( void ); @@ -304,22 +294,29 @@ U08 getFPGAFlowP16ReadCount( void ); U08 getFPGAFlowP16ErrorCount( void ); +void setFPGAP9Control( U08 control ); +void setFPGAP9Address( U16 address ); +void setFPGAP9Data( U32 data ); +void setFPGAP18Control( U08 control ); +void setFPGAP18Address( U16 address ); +void setFPGAP18Data( U32 data ); + // Conductivity U08 getFPGAP9CondReadCount( void ); U08 getFPGAP9CondErrorCount( void ); U08 getFPGAP9TempReadCount( void ); U08 getFPGAP9TempErrorCount( void ); -U32 getFPGAP9CondData( void ); -U32 getFPGAP9CondTemp( void ); +F32 getFPGAP9CondData( void ); +F32 getFPGAP9CondTemp( void ); U32 getFPGAP9CondCalData( void ); U08 getFPGAP9CalMemCounter( void ); U08 getFPGAP18CondReadCount( void ); U08 getFPGAP18CondErrorCount( void ); U08 getFPGAP18TempReadCount( void ); U08 getFPGAP18TempErrorCount( void ); -U32 getFPGAP18CondData( void ); -U32 getFPGAP18CondTemp( void ); +F32 getFPGAP18CondData( void ); +F32 getFPGAP18CondTemp( void ); U32 getFPGAP18CondCalData( void ); U08 getFPGAP18CalMemCounter( void );