Index: firmware/App/Controllers/ConductivitySensors.c =================================================================== diff -u -r487057777532342a4034df8296310270c8827f14 -re9e5137f937e88f5c523bcaa5eca01607d084545 --- firmware/App/Controllers/ConductivitySensors.c (.../ConductivitySensors.c) (revision 487057777532342a4034df8296310270c8827f14) +++ firmware/App/Controllers/ConductivitySensors.c (.../ConductivitySensors.c) (revision e9e5137f937e88f5c523bcaa5eca01607d084545) @@ -141,7 +141,7 @@ setFPGACPoProbeType( COND_CPO_SENSOR_PROBE_TYPE ); initTimeWindowedCount( TIME_WINDOWED_COUNT_FPGA_CONDUCTIVITY_SENSOR_ERROR, MAX_CONDUCTIVITY_SENSOR_FAILURES, MAX_CONDUCTIVITY_SENSOR_FAILURE_WINDOW_MS ); - initPersistentAlarm( ALARM_ID_INLET_WATER_HIGH_CONDUCTIVITY, COND_SENSOR_PERSISTENCE_PERIOD, COND_SENSOR_PERSISTENCE_PERIOD ); +// initPersistentAlarm( ALARM_ID_INLET_WATER_HIGH_CONDUCTIVITY, COND_SENSOR_PERSISTENCE_PERIOD, COND_SENSOR_PERSISTENCE_PERIOD ); initPersistentAlarm( ALARM_ID_INLET_WATER_CONDUCTIVITY_IN_WARNING_RANGE, COND_SENSOR_PERSISTENCE_PERIOD, COND_SENSOR_PERSISTENCE_PERIOD ); initPersistentAlarm( ALARM_ID_INLET_WATER_LOW_CONDUCTIVITY, COND_SENSOR_PERSISTENCE_PERIOD, COND_SENSOR_PERSISTENCE_PERIOD ); initPersistentAlarm( ALARM_ID_RO_REJECTION_RATIO_OUT_OF_RANGE, RO_REJECTION_RATIO_PERSISTENCE_PERIOD, RO_REJECTION_RATIO_PERSISTENCE_PERIOD ); Index: firmware/App/Controllers/TemperatureSensors.c =================================================================== diff -u -r487057777532342a4034df8296310270c8827f14 -re9e5137f937e88f5c523bcaa5eca01607d084545 --- firmware/App/Controllers/TemperatureSensors.c (.../TemperatureSensors.c) (revision 487057777532342a4034df8296310270c8827f14) +++ firmware/App/Controllers/TemperatureSensors.c (.../TemperatureSensors.c) (revision e9e5137f937e88f5c523bcaa5eca01607d084545) @@ -274,11 +274,11 @@ initPersistentAlarm( ALARM_ID_INLET_WATER_LOW_TEMPERATURE, INLET_WATER_TEMPERATURE_PERSISTENCE_PERIOD, INLET_WATER_TEMPERATURE_PERSISTENCE_PERIOD ); - initPersistentAlarm( ALARM_ID_INLET_WATER_TEMPERATURE_IN_LOW_RANGE, INLET_WATER_TEMPERATURE_PERSISTENCE_PERIOD, - INLET_WATER_TEMPERATURE_PERSISTENCE_PERIOD ); +// initPersistentAlarm( ALARM_ID_INLET_WATER_TEMPERATURE_IN_LOW_RANGE, INLET_WATER_TEMPERATURE_PERSISTENCE_PERIOD, +// INLET_WATER_TEMPERATURE_PERSISTENCE_PERIOD ); - initPersistentAlarm( ALARM_ID_INLET_WATER_TEMPERATURE_IN_HIGH_RANGE, INLET_WATER_TEMPERATURE_PERSISTENCE_PERIOD, - INLET_WATER_TEMPERATURE_PERSISTENCE_PERIOD ); +// initPersistentAlarm( ALARM_ID_INLET_WATER_TEMPERATURE_IN_HIGH_RANGE, INLET_WATER_TEMPERATURE_PERSISTENCE_PERIOD, +// INLET_WATER_TEMPERATURE_PERSISTENCE_PERIOD ); // Persistent alarm for the temperature sensors range check initPersistentAlarm( ALARM_ID_DG_TEMPERATURE_SENSOR_OUT_OF_RANGE, TEMP_SENSORS_OUT_OF_RANGE_PERSISTENT_PEROID_MS, Index: firmware/App/Modes/ModeFill.c =================================================================== diff -u -r487057777532342a4034df8296310270c8827f14 -re9e5137f937e88f5c523bcaa5eca01607d084545 --- firmware/App/Modes/ModeFill.c (.../ModeFill.c) (revision 487057777532342a4034df8296310270c8827f14) +++ firmware/App/Modes/ModeFill.c (.../ModeFill.c) (revision e9e5137f937e88f5c523bcaa5eca01607d084545) @@ -45,8 +45,9 @@ // ********** private definitions ********** #define TARGET_RO_PRESSURE_PSI 130 ///< Target pressure for RO pump. -#define RO_PUMP_400_ML_PER_MIN 0.4 ///< RO pump speed of 400.0 mL/minute. -#define RO_PUMP_800_ML_PER_MIN 0.8 ///< RO pump speed of 800.0 mL/minute. +#define RO_PUMP_400_ML_PER_MIN 400.0 ///< RO pump speed of 400.0 mL/minute. +#define RO_PUMP_800_ML_PER_MIN 800.0 ///< RO pump speed of 800.0 mL/minute. +#define MILLILITERS_PER_LITER 1000.0 ///< One liter is 1000 milliliters #define ACID_PUMP_20_ML_PER_MIN 20.0 ///< Acid pump speed of 20.0 mL/minute. #define BICARB_PUMP_40_ML_PER_MIN 40.0 ///< Bicarb pump speed of 40.0 mL/minute. #define CONCENTRATE_PUMP_40_ML_PER_MIN 40.0 ///< Concentrate pump speed of 40.0 mL/minute. @@ -393,7 +394,7 @@ { #ifndef DISABLE_MIXING // Prepare the acid and bicarb pumps to prime the concentrate lines - setROPumpTargetFlowRateLPM( RO_PUMP_800_ML_PER_MIN, TARGET_RO_PRESSURE_PSI ); + setROPumpTargetFlowRateLPM( RO_PUMP_800_ML_PER_MIN / MILLILITERS_PER_LITER, TARGET_RO_PRESSURE_PSI ); setConcentratePumpTargetSpeed( CONCENTRATEPUMPS_CP1_ACID, CONCENTRATE_PUMP_MAX_SPEED ); setConcentratePumpTargetSpeed( CONCENTRATEPUMPS_CP2_BICARB, CONCENTRATE_PUMP_MAX_SPEED ); requestConcentratePumpOn( CONCENTRATEPUMPS_CP1_ACID ); // TODO if @@ -437,7 +438,7 @@ // Set the RO pump flow rate in according to the roPumpFlushBubblesSpeed table to flush bubbles pumpSpeedIndex = 0; - setROPumpTargetFlowRateLPM( roPumpFlushBubblesSpeed[ pumpSpeedIndex ], TARGET_RO_PRESSURE_PSI ); + setROPumpTargetFlowRateLPM( roPumpFlushBubblesSpeed[ pumpSpeedIndex ] / MILLILITERS_PER_LITER, TARGET_RO_PRESSURE_PSI ); flushBubblesStartTime = getMSTimerCount(); // State transition result = DG_FILL_MODE_STATE_FLUSH_BUBBLES; @@ -465,7 +466,7 @@ { if ( ++pumpSpeedIndex < RO_PUMP_LOOKUP_TABLE_SIZE ) { - setROPumpTargetFlowRateLPM( roPumpFlushBubblesSpeed[ pumpSpeedIndex ], TARGET_RO_PRESSURE_PSI ); + setROPumpTargetFlowRateLPM( roPumpFlushBubblesSpeed[ pumpSpeedIndex ] / MILLILITERS_PER_LITER, TARGET_RO_PRESSURE_PSI ); flushBubblesStartTime = getMSTimerCount(); } else @@ -475,7 +476,7 @@ averageBicardConductivity = 0.0; bicardConductivitySampleCount = 0; // Set pumps flow rate to prepare for bicarb conductivity testing - setROPumpTargetFlowRateLPM( RO_PUMP_400_ML_PER_MIN, TARGET_RO_PRESSURE_PSI ); + setROPumpTargetFlowRateLPM( RO_PUMP_400_ML_PER_MIN / MILLILITERS_PER_LITER, TARGET_RO_PRESSURE_PSI ); setConcentratePumpTargetSpeed( CONCENTRATEPUMPS_CP2_BICARB, BICARB_PUMP_40_ML_PER_MIN ); requestConcentratePumpOn( CONCENTRATEPUMPS_CP2_BICARB ); // State transition @@ -519,7 +520,7 @@ bicardConductivitySampleCount = 0; acidConductivitySampleCount = 0; // Set pumps flow rate to prepare for acid conductivity testing - setROPumpTargetFlowRateLPM( RO_PUMP_800_ML_PER_MIN, TARGET_RO_PRESSURE_PSI ); + setROPumpTargetFlowRateLPM( RO_PUMP_800_ML_PER_MIN / MILLILITERS_PER_LITER, TARGET_RO_PRESSURE_PSI ); setConcentratePumpTargetSpeed( CONCENTRATEPUMPS_CP1_ACID, ACID_PUMP_20_ML_PER_MIN ); requestConcentratePumpOn( CONCENTRATEPUMPS_CP1_ACID ); // State transition @@ -776,9 +777,9 @@ BOOL isInletPressureGood = ( FALSE == isAlarmActive( ALARM_ID_INLET_WATER_LOW_PRESSURE ) ? FALSE : TRUE ); BOOL isWaterTemperatureGood = ( ( FALSE == isAlarmActive( ALARM_ID_INLET_WATER_HIGH_TEMPERATURE ) && - FALSE == isAlarmActive( ALARM_ID_INLET_WATER_LOW_TEMPERATURE ) && - FALSE == isAlarmActive( ALARM_ID_INLET_WATER_TEMPERATURE_IN_LOW_RANGE) && - FALSE == isAlarmActive( ALARM_ID_INLET_WATER_TEMPERATURE_IN_HIGH_RANGE) ) ? FALSE : TRUE ); + FALSE == isAlarmActive( ALARM_ID_INLET_WATER_LOW_TEMPERATURE ) && + FALSE == isAlarmActive( ALARM_ID_INLET_WATER_TEMPERATURE_IN_LOW_RANGE ) && + FALSE == isAlarmActive( ALARM_ID_INLET_WATER_TEMPERATURE_IN_HIGH_RANGE ) ) ? FALSE : TRUE ); BOOL isWaterConductivityGood = ( ( FALSE == isAlarmActive( ALARM_ID_INLET_WATER_CONDUCTIVITY_IN_WARNING_RANGE ) && FALSE == isAlarmActive( ALARM_ID_INLET_WATER_LOW_CONDUCTIVITY ) &&