Index: firmware/App/Services/FpgaDD.c =================================================================== diff -u -rb70fce59adda1145aaf8f39a09d85d3d4b5ccb9d -r10027b4839277984c029a6cb05b2b76e1432da52 --- firmware/App/Services/FpgaDD.c (.../FpgaDD.c) (revision b70fce59adda1145aaf8f39a09d85d3d4b5ccb9d) +++ firmware/App/Services/FpgaDD.c (.../FpgaDD.c) (revision 10027b4839277984c029a6cb05b2b76e1432da52) @@ -3699,428 +3699,6 @@ /*********************************************************************//** * @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 setFPGAP9Control( U08 control ) -{ - SET_FPGA_ACTUATOR_FIELD( conductivityP9Control, control ); -} - -/*********************************************************************//** - * @brief - * The setFPGAP9Address function sets the read/write address for a read/write - * action on the P9 sensor. - * @details \b Inputs: none - * @details \b Outputs: conductivityP9Address - * @param address The P9 sensor address to read from or write to - * @return none - *************************************************************************/ -void setFPGAP9Address( U16 address ) -{ - 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 - *************************************************************************/ -void setFPGAP9Data( U32 data ) -{ - 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 - *************************************************************************/ -void setFPGAP18Control( U08 control ) -{ - 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 - *************************************************************************/ -void setFPGAP18Address( U16 address ) -{ - 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 - *************************************************************************/ -void setFPGAP18Data( U32 data ) -{ - 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 - *************************************************************************/ -void setFPGAP9Reset( 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 - *************************************************************************/ -void clearFPGAP9Reset( 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 - *************************************************************************/ -void setFPGAP9InitEnable( 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 - *************************************************************************/ -void clearFPGAP9InitEnable( 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 - *************************************************************************/ -void setFPGAP9WriteEnable( 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 - *************************************************************************/ -void clearFPGAP9WriteEnable( 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 - *************************************************************************/ -void setFPGAP9ReadEnable( 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 - *************************************************************************/ -void clearFPGAP9ReadEnable( 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 - *************************************************************************/ -void setFPGAP18Reset( 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 - *************************************************************************/ -void clearFPGAP18Reset( 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 - *************************************************************************/ -void setFPGAP18InitEnable( 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 - *************************************************************************/ -void clearFPGAP18InitEnable( 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 - *************************************************************************/ -void setFPGAP18WriteEnable( 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 - *************************************************************************/ -void clearFPGAP18WriteEnable( 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 - *************************************************************************/ -void setFPGAP18ReadEnable( 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 - *************************************************************************/ -void clearFPGAP18ReadEnable( 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 Current read count for P9 sensor. - *************************************************************************/ -U08 getFPGAP9ReadCount( 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 Current error count for P9 sensor. - *************************************************************************/ -U08 getFPGAP9ErrorCount( 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 Current conductivity reading from P9 sensor. - *************************************************************************/ -U16 getFPGAP9Conductivity( 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 Current temperature from P9 sensor. - *************************************************************************/ -U16 getFPGAP9Temperature( 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 Latest data read from P9 sensor. - *************************************************************************/ -U32 getFPGAP9Data( 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 Current read count for P18 sensor. - *************************************************************************/ -U08 getFPGAP18ReadCount( 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 Current error count for P18 sensor. - *************************************************************************/ -U08 getFPGAP18ErrorCount( 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 Current conductivity reading from P18 sensor. - *************************************************************************/ -U16 getFPGAP18Conductivity( 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 Current temperature from P18 sensor. - *************************************************************************/ -U16 getFPGAP18Temperature( 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 Latest data read from P18 sensor. - *************************************************************************/ -U32 getFPGAP18Data( 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 @@ -4176,390 +3754,6 @@ /*********************************************************************//** * @brief - * The getFPGAD17CondReadCount function gets the D17 conductivity read count. - * @details \b Inputs: fpgaSensorReadings.d17CondCondReadCount - * @details \b Outputs: none - * @return D17 Conductivity sensor read count - *************************************************************************/ -U08 getFPGAD17CondReadCount( void ) -{ - return fpgaSensorReadings.d17CondCondReadCount; -} - -/*********************************************************************//** - * @brief - * The getFPGAD17CondErrorCount function gets the D17 conductivity error count. - * @details \b Inputs: fpgaSensorReadings.d17CondCondErrorCount - * @details \b Outputs: none - * @return D17 Conductivity sensor error count - *************************************************************************/ -U08 getFPGAD17CondErrorCount( void ) -{ - return fpgaSensorReadings.d17CondCondErrorCount; -} - -/*********************************************************************//** - * @brief - * The getFPGAD17TempReadCount function gets the D17 (D16) temperature read count. - * @details \b Inputs: fpgaSensorReadings.d17CondTempReadCount - * @details \b Outputs: none - * @return D17 (D16) Temperature sensor read count - *************************************************************************/ -U08 getFPGAD17TempReadCount( void ) -{ - return fpgaSensorReadings.d17CondTempReadCount; -} - -/*********************************************************************//** - * @brief - * The getFPGAD17TempErrorCount function gets the D17 (D16) temperature error count. - * @details \b Inputs: fpgaSensorReadings.d17CondTempErrorCount - * @details \b Outputs: none - * @return D17 (D16) Temperature sensor error count - *************************************************************************/ -U08 getFPGAD17TempErrorCount( void ) -{ - return fpgaSensorReadings.d17CondTempErrorCount; -} - -/*********************************************************************//** - * @brief - * The getFPGAD17CondData function gets the D17 conductivity data. - * @details \b Inputs: fpgaSensorReadings.d17CondCond - * @details \b Outputs: none - * @return D17 Conductivity data - *************************************************************************/ -U32 getFPGAD17CondData( void ) -{ - return fpgaSensorReadings.d17CondCond; -} - -/*********************************************************************//** - * @brief - * The getFPGAD17CondTemp function gets the D17 (D16) temperature data. - * @details \b Inputs: fpgaSensorReadings.d17CondTemp - * @details \b Outputs: none - * @return D17 (D16) Temperature data - *************************************************************************/ -U32 getFPGAD17CondTemp( void ) -{ - return fpgaSensorReadings.d17CondTemp; -} - -/*********************************************************************//** - * @brief - * The getFPGAD17CondData function gets the D17 cal data. - * @details \b Inputs: fpgaSensorReadings.d17CondCalData - * @details \b Outputs: none - * @return D17 calibration data - *************************************************************************/ -U32 getFPGAD17CondCalData( void ) -{ - return fpgaSensorReadings.d17CondCalData; -} - -/*********************************************************************//** - * @brief - * The getFPGAD17CalMemCounter function gets the D17 memory count. - * @details \b Inputs: fpgaSensorReadings.d17CondMemCounter - * @details \b Outputs: none - * @return D17 memory count - *************************************************************************/ -U08 getFPGAD17CalMemCounter( void ) -{ - return fpgaSensorReadings.d17CondMemCounter; -} - -/*********************************************************************//** - * @brief - * The getFPGAD27CondReadCount function gets the D27 conductivity read count. - * @details \b Inputs: fpgaSensorReadings.d27CondCondReadCount - * @details \b Outputs: none - * @return D27 Conductivity sensor read count - *************************************************************************/ -U08 getFPGAD27CondReadCount( void ) -{ - return fpgaSensorReadings.d27CondCondReadCount; -} - -/*********************************************************************//** - * @brief - * The getFPGAD27CondErrorCount function gets the D27 conductivity error count. - * @details \b Inputs: fpgaSensorReadings.d27CondCondErrorCount - * @details \b Outputs: none - * @return D27 Conductivity sensor error count - *************************************************************************/ -U08 getFPGAD27CondErrorCount( void ) -{ - return fpgaSensorReadings.d27CondCondErrorCount; -} - -/*********************************************************************//** - * @brief - * The getFPGAD27TempReadCount function gets the D27 (D28) temperature read count. - * @details \b Inputs: fpgaSensorReadings.d27CondTempReadCount - * @details \b Outputs: none - * @return D27 (D28) Temperature sensor read count - *************************************************************************/ -U08 getFPGAD27TempReadCount( void ) -{ - return fpgaSensorReadings.d27CondTempReadCount; -} - -/*********************************************************************//** - * @brief - * The getFPGAD27TempErrorCount function gets the D27 (D28) temperature error count. - * @details \b Inputs: fpgaSensorReadings.d27CondTempErrorCount - * @details \b Outputs: none - * @return D27 (D28) Temperature sensor error count - *************************************************************************/ -U08 getFPGAD27TempErrorCount( void ) -{ - return fpgaSensorReadings.d27CondTempErrorCount; -} - -/*********************************************************************//** - * @brief - * The getFPGAD27CondData function gets the D27 conductivity data. - * @details \b Inputs: fpgaSensorReadings.d27CondCond - * @details \b Outputs: none - * @return D27 Conductivity data - *************************************************************************/ -U32 getFPGAD27CondData( void ) -{ - return fpgaSensorReadings.d27CondCond; -} - -/*********************************************************************//** - * @brief - * The getFPGAD27CondTemp function gets the D27 (D28) temperature data. - * @details \b Inputs: fpgaSensorReadings.d27CondTemp - * @details \b Outputs: none - * @return D27 (D28) Temperature data - *************************************************************************/ -U32 getFPGAD27CondTemp( void ) -{ - return fpgaSensorReadings.d27CondTemp; -} - -/*********************************************************************//** - * @brief - * The getFPGAD27CondCalData function gets the D27 cal data. - * @details \b Inputs: fpgaSensorReadings.d27CondCalData - * @details \b Outputs: none - * @return D27 calibration data - *************************************************************************/ -U32 getFPGAD27CondCalData( void ) -{ - return fpgaSensorReadings.d27CondCalData; -} - -/*********************************************************************//** - * @brief - * The getFPGAD27CalMemCounter function gets the D27 memory count. - * @details \b Inputs: fpgaSensorReadings.d27CondMemCounter - * @details \b Outputs: none - * @return D27 memory count - *************************************************************************/ -U08 getFPGAD27CalMemCounter( void ) -{ - return fpgaSensorReadings.d27CondMemCounter; -} - -/*********************************************************************//** - * @brief - * The getFPGAD29CondReadCount function gets the D29 conductivity read count. - * @details \b Inputs: fpgaSensorReadings.d29CondCondReadCount - * @details \b Outputs: none - * @return D29 Conductivity sensor read count - *************************************************************************/ -U08 getFPGAD29CondReadCount( void ) -{ - return fpgaSensorReadings.d29CondCondReadCount; -} - -/*********************************************************************//** - * @brief - * The getFPGAD29CondErrorCount function gets the D29 conductivity error count. - * @details \b Inputs: fpgaSensorReadings.d29CondCondErrorCount - * @details \b Outputs: none - * @return D29 Conductivity sensor error count - *************************************************************************/ -U08 getFPGAD29CondErrorCount( void ) -{ - return fpgaSensorReadings.d29CondCondErrorCount; -} - -/*********************************************************************//** - * @brief - * The getFPGAD29TempReadCount function gets the D29 (D28) temperature read count. - * @details \b Inputs: fpgaSensorReadings.d29CondTempReadCount - * @details \b Outputs: none - * @return D29 (D28) Temperature sensor read count - *************************************************************************/ -U08 getFPGAD29TempReadCount( void ) -{ - return fpgaSensorReadings.d29CondTempReadCount; -} - -/*********************************************************************//** - * @brief - * The getFPGAD29TempErrorCount function gets the D29 (D28) temperature error count. - * @details \b Inputs: fpgaSensorReadings.d29CondTempErrorCount - * @details \b Outputs: none - * @return D29 (D28) Temperature sensor error count - *************************************************************************/ -U08 getFPGAD29TempErrorCount( void ) -{ - return fpgaSensorReadings.d29CondTempErrorCount; -} - -/*********************************************************************//** - * @brief - * The getFPGAD29CondData function gets the D29 conductivity data. - * @details \b Inputs: fpgaSensorReadings.d29CondCond - * @details \b Outputs: none - * @return D29 Conductivity data - *************************************************************************/ -U32 getFPGAD29CondData( void ) -{ - return fpgaSensorReadings.d29CondCond; -} - -/*********************************************************************//** - * @brief - * The getFPGAD29CondTemp function gets the D29 (D30) temperature data. - * @details \b Inputs: fpgaSensorReadings.d29CondTemp - * @details \b Outputs: none - * @return D29 (D28) Temperature data - *************************************************************************/ -U32 getFPGAD29CondTemp( void ) -{ - return fpgaSensorReadings.d29CondTemp; -} - -/*********************************************************************//** - * @brief - * The getFPGAD29CondCalData function gets the D29 cal data. - * @details \b Inputs: fpgaSensorReadings.d29CondCalData - * @details \b Outputs: none - * @return D29 calibration data - *************************************************************************/ -U32 getFPGAD29CondCalData( void ) -{ - return fpgaSensorReadings.d29CondCalData; -} - -/*********************************************************************//** - * @brief - * The getFPGAD29CalMemCounter function gets the D29 memory count. - * @details \b Inputs: fpgaSensorReadings.d29CondMemCounter - * @details \b Outputs: none - * @return D29 memory count - *************************************************************************/ -U08 getFPGAD29CalMemCounter( void ) -{ - return fpgaSensorReadings.d29CondMemCounter; -} - -/*********************************************************************//** - * @brief - * The getFPGAD43CondReadCount function gets the D43 conductivity read count. - * @details \b Inputs: fpgaSensorReadings.d43CondCondReadCount - * @details \b Outputs: none - * @return D437 Conductivity sensor read count - *************************************************************************/ -U08 getFPGAD43CondReadCount( void ) -{ - return fpgaSensorReadings.d43CondCondReadCount; -} - -/*********************************************************************//** - * @brief - * The getFPGAD43CondErrorCount function gets the D43 conductivity error count. - * @details \b Inputs: fpgaSensorReadings.d43CondCondErrorCount - * @details \b Outputs: none - * @return D43 Conductivity sensor error count - *************************************************************************/ -U08 getFPGAD43CondErrorCount( void ) -{ - return fpgaSensorReadings.d43CondCondErrorCount; -} - -/*********************************************************************//** - * @brief - * The getFPGAD43TempReadCount function gets the D43 (D44) temperature read count. - * @details \b Inputs: fpgaSensorReadings.d43CondTempReadCount - * @details \b Outputs: none - * @return D43 (D44) Temperature sensor read count - *************************************************************************/ -U08 getFPGAD43TempReadCount( void ) -{ - return fpgaSensorReadings.d43CondTempReadCount; -} - -/*********************************************************************//** - * @brief - * The getFPGAD43TempErrorCount function gets the D43 (D44) temperature error count. - * @details \b Inputs: fpgaSensorReadings.d43CondTempErrorCount - * @details \b Outputs: none - * @return D43 (D44) Temperature sensor error count - *************************************************************************/ -U08 getFPGAD43TempErrorCount( void ) -{ - return fpgaSensorReadings.d43CondTempErrorCount; -} - -/*********************************************************************//** - * @brief - * The getFPGAD43CondData function gets the D43 conductivity data. - * @details \b Inputs: fpgaSensorReadings.d43CondCond - * @details \b Outputs: none - * @return D43 Conductivity data - *************************************************************************/ -U32 getFPGAD43CondData( void ) -{ - return fpgaSensorReadings.d43CondCond; -} - -/*********************************************************************//** - * @brief - * The getFPGAD43CondTemp function gets the D43 (D44) temperature data. - * @details \b Inputs: fpgaSensorReadings.d43CondTemp - * @details \b Outputs: none - * @return D43 (D44) Temperature data - *************************************************************************/ -U32 getFPGAD43CondTemp( void ) -{ - return fpgaSensorReadings.d43CondTemp; -} - -/*********************************************************************//** - * @brief - * The getFPGAD43CondCalData function gets the D43 cal data. - * @details \b Inputs: fpgaSensorReadings.d43CondCalData - * @details \b Outputs: none - * @return D43 calibration data - *************************************************************************/ -U32 getFPGAD43CondCalData( void ) -{ - return fpgaSensorReadings.d43CondCalData; -} - -/*********************************************************************//** - * @brief - * The getFPGAD43CalMemCounter function gets the D43 memory count. - * @details \b Inputs: fpgaSensorReadings.d43CondMemCounter - * @details \b Outputs: none - * @return D43 memory count - *************************************************************************/ -U16 getFPGAP40PumpTachCount( void ) -{ - return fpgaSensorReadings.d43CondMemCounter; -} - -/*********************************************************************//** - * @brief * The getFPGAP9CondReadCount function gets the P9 conductivity read count. * @details \b Inputs: fpgaSensorReadings.fpgaP9CondReadCount * @details \b Outputs: none Index: firmware/App/Services/FpgaDD.h =================================================================== diff -u -rfd63d4e5294ee1c3585359936e9b9afd06c08314 -r10027b4839277984c029a6cb05b2b76e1432da52 --- firmware/App/Services/FpgaDD.h (.../FpgaDD.h) (revision fd63d4e5294ee1c3585359936e9b9afd06c08314) +++ firmware/App/Services/FpgaDD.h (.../FpgaDD.h) (revision 10027b4839277984c029a6cb05b2b76e1432da52) @@ -294,13 +294,6 @@ 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 );