Index: firmware/App/Controllers/ConcentratePumps.c =================================================================== diff -u -r867521a9810f2218c34d96164fab614494a63f8d -r16341579abe0211c95cb541e40143f0e4670a8cd --- firmware/App/Controllers/ConcentratePumps.c (.../ConcentratePumps.c) (revision 867521a9810f2218c34d96164fab614494a63f8d) +++ firmware/App/Controllers/ConcentratePumps.c (.../ConcentratePumps.c) (revision 16341579abe0211c95cb541e40143f0e4670a8cd) @@ -55,6 +55,7 @@ #define CONCENTRATE_PUMP_VOLUME_PER_PULSE ( CONCENTRATE_PUMP_VOLUME_PER_REV / CONCENTRATE_PUMP_PULSE_PER_REV ) #define CONCENTRATE_PUMP_DATA_PUBLISH_INTERVAL ( 500 / TASK_GENERAL_INTERVAL ) ///< Interval (ms/task time) at which the concentrate pump is monitored. + #define CONCENTRATE_PUMP_CONTROL_INTERVAL ( 1 * MS_PER_SECOND / TASK_GENERAL_INTERVAL ) ///< Interval (ms/task time) at which the concentrate pump is controlled. #define CONCENTRATE_PUMP_SPEED_CONTROL_PERSISTENCE_PERIOD ( 5 * MS_PER_SECOND ) ///< Persistence period for concentrate pump speed control error. Index: firmware/App/Controllers/ConductivitySensors.c =================================================================== diff -u -r867521a9810f2218c34d96164fab614494a63f8d -r16341579abe0211c95cb541e40143f0e4670a8cd --- firmware/App/Controllers/ConductivitySensors.c (.../ConductivitySensors.c) (revision 867521a9810f2218c34d96164fab614494a63f8d) +++ firmware/App/Controllers/ConductivitySensors.c (.../ConductivitySensors.c) (revision 16341579abe0211c95cb541e40143f0e4670a8cd) @@ -301,10 +301,10 @@ *************************************************************************/ static F32 calcCompensatedConductivity( F32 conductivity, F32 temperature ) { - // EC = EC_25 * (1 + temp_coef * ( 25 - temperature )) - F32 const compensatedCoef = ( 1.0 + ( COND_SENSOR_TEMPERATURE_COEF * ( COND_SENSOR_REFERENCE_TEMPERATURE - temperature ) ) ); + // EC = EC_25 * (1 + temp_coef * ( temperature - 25 )) + F32 const compensatedCoef = ( 1.0 + ( COND_SENSOR_TEMPERATURE_COEF * ( temperature - COND_SENSOR_REFERENCE_TEMPERATURE ) ) ); - return conductivity * compensatedCoef; + return conductivity / compensatedCoef; } /*********************************************************************//** Index: firmware/App/DGCommon.h =================================================================== diff -u -r867521a9810f2218c34d96164fab614494a63f8d -r16341579abe0211c95cb541e40143f0e4670a8cd --- firmware/App/DGCommon.h (.../DGCommon.h) (revision 867521a9810f2218c34d96164fab614494a63f8d) +++ firmware/App/DGCommon.h (.../DGCommon.h) (revision 16341579abe0211c95cb541e40143f0e4670a8cd) @@ -25,7 +25,7 @@ #define DG_VERSION_MAJOR 0 #define DG_VERSION_MINOR 6 #define DG_VERSION_MICRO 0 -#define DG_VERSION_BUILD 19 +#define DG_VERSION_BUILD 142 // ********** build switches ********** @@ -55,6 +55,7 @@ #define IGNORE_CONC_PUMP_IN_HEAT_DISINFECT 1 // Not needed // #define NEW_FMD_FLOW_SENSOR 1 // Not needed #define DISABLE_HEATERS_EFFICIENCY 1 + #define DISABLE_DISINFECT_CONDUCTIVITY 1 // Implement // #define DISABLE_CONC_PUMPS 1 // #define DISABLE_CAP_SWITCHES 1 // Implement @@ -95,6 +96,7 @@ U08 fpgaMajor; ///< DG FPGA major revision U08 fpgaMinor; ///< DG FPGA minor revision U08 fpgaLab; ///< DG FPGA lab revision + U32 compatibilityRev; ///< DG compatibility revision } DG_VERSIONS_T; #pragma pack(pop)