Index: firmware/App/Controllers/ConductivitySensors.c =================================================================== diff -u -r3e5c98eae83ce4efe2b36031d4e920bbf71fd098 -r4d7d40a27130dc813d653f044cbb856b1b7d8481 --- firmware/App/Controllers/ConductivitySensors.c (.../ConductivitySensors.c) (revision 3e5c98eae83ce4efe2b36031d4e920bbf71fd098) +++ firmware/App/Controllers/ConductivitySensors.c (.../ConductivitySensors.c) (revision 4d7d40a27130dc813d653f044cbb856b1b7d8481) @@ -79,9 +79,8 @@ /*********************************************************************//** * @brief * The initConductivitySensors function initializes the ConductivitySensors module. - * @details - * Inputs : none - * Outputs : ConductivitySensors module initialized + * @details Inputs: none + * @details Outputs: ConductivitySensors module initialized * @return none *************************************************************************/ void initConductivitySensors( void ) @@ -115,9 +114,8 @@ * @brief * The execConductivitySensors function gets conductivity sensors' latest * readings from FPGA and advertises them over CAN. - * @details - * Inputs : none - * Outputs : Conductivity sensors' latest reading is updated and advertised. + * @details Inputs: none + * @details Outputs: Conductivity sensors' latest reading is updated and advertised. * @return none *************************************************************************/ void execConductivitySensors( void ) @@ -139,9 +137,8 @@ * @brief * The checkInletWaterConductivity checks inlet water conductivity value * and triggers an alarm when conductivity value is out of allowed range. - * @details - * Inputs : CPi sensor conductivity - * Outputs : Trigger alarms when conductivity is out of allowed range + * @details Inputs: CPi sensor conductivity + * @details Outputs: Trigger alarms when conductivity is out of allowed range * @return none *************************************************************************/ void checkInletWaterConductivity( void ) @@ -159,9 +156,8 @@ * The checkRORejectionRatio checks RO rejection ratio and outlet water * conductivity. The function triggers an alarm when RO rejection ratio or * outlet water conductivity is out of allowed range for period of time. - * @details - * Inputs : roRejectionRatio, CPo sensor conductivity - * Outputs : Triggered alarm + * @details Inputs: roRejectionRatio, CPo sensor conductivity + * @details Outputs: Triggered alarm * @return none *************************************************************************/ void checkRORejectionRatio( void ) @@ -175,9 +171,8 @@ * @brief * The getConductivityValue function gets the compensated conductivity * value for a given conductivity sensor id. - * @details - * Inputs : compensatedConductivityValues[] - * Outputs : none + * @details Inputs: compensatedConductivityValues[] + * @details Outputs: none * @param sensorId conductivity sensor id * @return compensated conductivity *************************************************************************/ @@ -209,9 +204,8 @@ * The calcCompensatedConductivity function calculates the compensated * conductivity based on given temperature and conductivity taken at * reference temperature of 25 Celcius. - * @details - * Inputs : conductivity, temperature - * Outputs : none + * @details Inputs: conductivity, temperature + * @details Outputs: none * @param conductivity conductivity value * @param temperature temperature to compensate conductivity with * @return compensated conductivity based on temperature @@ -228,9 +222,8 @@ * @brief * The calcRORejectionRatio function calculates the RO rejection ratio using * the CPi sensor conductivity value and CPo sensor conductivity value. - * @details - * Inputs: CPi sensor conductivity, CPo sensor conductivity - * Outputs: RO rejection ratio + * @details Inputs: CPi sensor conductivity, CPo sensor conductivity + * @details Outputs: RO rejection ratio * @return none *************************************************************************/ static void calcRORejectionRatio( void ) @@ -250,9 +243,8 @@ * The processCPiCPoSensorRead function checks if there is an error in FPGA * and FPGA read count. If there is any error in the FPGA error, it raises an * alarm. If the read count has changed, the new reading will be processed. - * @details - * Inputs : none - * Outputs : none + * @details Inputs: none + * @details Outputs: none * @param sensorId Conductivity sensor id to process * @param fgpaRead FPGA conductivity reading value * @param fpgaReadCount FPGA read count @@ -294,9 +286,8 @@ * @brief * The getConductivityDataPublishInterval function gets the conductivity * data publication interval. - * @details - * Inputs : conductivityDataPublishInterval - * Outputs : none + * @details Inputs: conductivityDataPublishInterval + * @details Outputs: none * @return the current conductivity data publication interval (in ms/task interval). *************************************************************************/ static U32 getConductivityDataPublishInterval( void ) @@ -321,9 +312,8 @@ * @brief * The testSetConductivityOverride function overrides the compensated * conductivity value of given sensor id. - * @details - * Inputs : compensatedConductivityValues[] - * Outputs : compensatedConductivityValues[] + * @details Inputs: compensatedConductivityValues[] + * @details Outputs: compensatedConductivityValues[] * @param sensorId conductivity sensor id * @param value override compensated conductivity value * @return TRUE if override successful, FALSE if not @@ -349,9 +339,8 @@ * @brief * The testResetConductivityOverride function resets the override of the \n * conductivity sensor value. - * @details - * Inputs : compensatedConductivityValues[] - * Outputs : compensatedConductivityValues[] + * @details Inputs: compensatedConductivityValues[] + * @details Outputs: compensatedConductivityValues[] * @param sensorId conductivity sensor id * @return TRUE if reset successful, FALSE if not *************************************************************************/ @@ -376,9 +365,8 @@ * @brief * The testSetConductivityDataPublishIntervalOverride function overrides * the conductivity data publish interval. - * @details - * Inputs : conductivityDataPublishInterval - * Outputs : conductivityDataPublishInterval + * @details Inputs: conductivityDataPublishInterval + * @details Outputs: conductivityDataPublishInterval * @param value override conductivity data publish interval with (in ms) * @return TRUE if override successful, FALSE if not *************************************************************************/ @@ -400,9 +388,8 @@ * @brief * The testResetConductivityDataPublishIntervalOverride function resets * the override of the conductivity data publish interval. - * @details - * Inputs : conductivityDataPublishInterval - * Outputs : conductivityDataPublishInterval + * @details Inputs: conductivityDataPublishInterval + * @details Outputs: conductivityDataPublishInterval * @return TRUE if override reset successful, FALSE if not *************************************************************************/ BOOL testResetConductivityDataPublishIntervalOverride( void )