Index: firmware/App/Controllers/ConductivitySensors.c =================================================================== diff -u -r16cd633e1d18224face6f977120ccab3846e7671 -r3166d2e825624a3b9304798674cda18e6d69370d --- firmware/App/Controllers/ConductivitySensors.c (.../ConductivitySensors.c) (revision 16cd633e1d18224face6f977120ccab3846e7671) +++ firmware/App/Controllers/ConductivitySensors.c (.../ConductivitySensors.c) (revision 3166d2e825624a3b9304798674cda18e6d69370d) @@ -31,7 +31,7 @@ // ********** private definitions ********** -#define SIEMEN_TO_MICROSIEMEN_CONVERSION 1000000 ///< Siemen to microsiemens conversion factor. +#define SIEMENS_TO_MICROSIEMENS_CONVERSION 1000000 ///< Siemen to microsiemens conversion factor. #define COND_CPO_SENSOR_PROBE_TYPE 10 ///< 0.1 K cell constant conductivity probe. #define COND_SENSOR_DECIMAL_CONVERSION 100 ///< Conductivity value from FPGA has two decimal place. @@ -52,11 +52,11 @@ #define MAX_CPO_CONDUCTIVITY_ALLOW 15.0 ///< Maximum CPo sensor conductivity value. #define RO_REJECTION_RATIO_PERSISTENCE_PERIOD ( 10 * MS_PER_SECOND ) ///< Persistence period for RO rejection ratio. -#define CONCENTRATE_POST_ACID_MIN_CONDUCTIVITY 11.0 ///< Minimum conductivity allow after adding acid. -#define CONCENTRATE_POST_ACID_MAX_CONDUCTIVITY 12.0 ///< Maximum conductivity allow after adding acid. +#define CONCENTRATE_POST_ACID_MIN_CONDUCTIVITY 11.0 ///< Minimum conductivity after adding acid. +#define CONCENTRATE_POST_ACID_MAX_CONDUCTIVITY 12.0 ///< Maximum conductivity after adding acid. -#define CONCENTRATE_POST_BICARB_MIN_CONDUCTIVITY 13.0 ///< Minimum conductivity allow after adding bicarbonate. -#define CONCENTRATE_POST_BICARB_MAX_CONDUCTIVITY 14.0 ///< Maximum conductivity allow after adding bicarbonate. +#define CONCENTRATE_POST_BICARB_MIN_CONDUCTIVITY 13.0 ///< Minimum conductivity after adding bicarbonate. +#define CONCENTRATE_POST_BICARB_MAX_CONDUCTIVITY 14.0 ///< Maximum conductivity after adding bicarbonate. #define POST_ACID_CONDUCTIVITY_PERSISTENCE_PERIOD ( 5 * MS_PER_SECOND ) ///< Persistence period for post-acid concentrate conductivity out of range. #define POST_BICARB_CONDUCTIVITY_PERSISTENCE_PERIOD ( 5 * MS_PER_SECOND ) ///< Persistence period for post-bicarb concentrate conductivity out of range. @@ -425,7 +425,7 @@ F32 const resistance = ( ( F32 )( hexStrToDec( measurementPtr->value, sizeof( measurementPtr->value ) ) - EMSTAT_PICO_MEASUREMENT_OFFSET ) / prefix ); F32 const temperature = getTemperatureValue( associateTempSensor[ sensorId ] ); - F32 const conductivity = ( 1 / resistance * SIEMEN_TO_MICROSIEMEN_CONVERSION ); + F32 const conductivity = ( 1 / resistance * SIEMENS_TO_MICROSIEMENS_CONVERSION ); compensatedConductivityValues[ sensorId ].data = calcCompensatedConductivity( conductivity, temperature ); } else