Index: firmware/App/Controllers/ROPump.c =================================================================== diff -u -r19d00df76fc906db9e514b10f259c39958ff25bb -r373b25b7e3229e9203f4af6bfa491def69e2ce83 --- firmware/App/Controllers/ROPump.c (.../ROPump.c) (revision 19d00df76fc906db9e514b10f259c39958ff25bb) +++ firmware/App/Controllers/ROPump.c (.../ROPump.c) (revision 373b25b7e3229e9203f4af6bfa491def69e2ce83) @@ -64,8 +64,12 @@ #define FLOW_SAMPLES_TO_AVERAGE ( 250 / TASK_PRIORITY_INTERVAL ) ///< Averaging flow data over 250 ms intervals. #define FLOW_AVERAGE_MULTIPLIER ( 1.0 / (F32)FLOW_SAMPLES_TO_AVERAGE ) ///< Optimization - multiplying is faster than dividing. -#define RO_FLOW_ADC_TO_LPM_FACTOR 5555 ///< Conversion factor from ADC counts to LPM (liters/min) for RO flow rate (multiply this by inverse of FPGA reading). +//#define RO_FLOW_ADC_TO_LPM_FACTOR 5555 ///< Conversion factor from ADC counts to LPM (liters/min) for RO flow rate (multiply this by inverse of FPGA reading). +// TODO new flow sensor k factor for testing only +#define RO_FLOW_ADC_TO_LPM_FACTOR 300 ///< Conversion factor from ADC counts to LPM (liters/min) for RO flow rate (multiply this by inverse of FPGA reading). + + #define ROP_FLOW_TO_PWM_SLOPE 0.1 ///< Slope of flow to PWM line equation. #define ROP_FLOW_TO_PWM_INTERCEPT 0.0 ///< Intercept of flow to PWM line equation. Index: firmware/App/Controllers/UVReactors.c =================================================================== diff -u -rd3819286869611f9c02add72a0f8e321598fdf42 -r373b25b7e3229e9203f4af6bfa491def69e2ce83 --- firmware/App/Controllers/UVReactors.c (.../UVReactors.c) (revision d3819286869611f9c02add72a0f8e321598fdf42) +++ firmware/App/Controllers/UVReactors.c (.../UVReactors.c) (revision 373b25b7e3229e9203f4af6bfa491def69e2ce83) @@ -110,6 +110,7 @@ reactorsStatus[ reactor ].pinSignalState = PIN_SIGNAL_LOW; reactorsStatus[ reactor ].execState = UV_REACTOR_STATE_OFF; reactorsStatus[ reactor ].switchState = TURN_OFF; + setReactorEnableStatus( reactor, PIN_SIGNAL_LOW ); } initPersistentAlarm( ALARM_ID_UV_REACTOR_NOT_HEALTHY, MAX_ALLOWED_UNHEALTHY_REACTOR_PERIOD, MAX_ALLOWED_UNHEALTHY_REACTOR_PERIOD ); Index: firmware/App/Modes/ModeGenIdle.c =================================================================== diff -u -rb1a0571d530426aefd393d07dbaf7675cd0e4c02 -r373b25b7e3229e9203f4af6bfa491def69e2ce83 --- firmware/App/Modes/ModeGenIdle.c (.../ModeGenIdle.c) (revision b1a0571d530426aefd393d07dbaf7675cd0e4c02) +++ firmware/App/Modes/ModeGenIdle.c (.../ModeGenIdle.c) (revision 373b25b7e3229e9203f4af6bfa491def69e2ce83) @@ -110,7 +110,7 @@ // the new PWMs for the main and small primary heaters //setROPumpTargetFlowRate( TARGET_FLUSH_LINES_RO_FLOW_RATE_L, TARGET_RO_PRESSURE_PSI ); - //testSetTargetDutyCycle( 0.55 ); + //testSetTargetDutyCycle( 0.8 ); setHeaterTargetTemperature( DG_PRIMARY_HEATER, 39.0 ); // TODO remove this line. It comes form HD startHeater( DG_PRIMARY_HEATER ); Index: firmware/App/Modes/ModeInitPOST.c =================================================================== diff -u -rd74b98a3b101ec827cc7da59dd617df9435d79e3 -r373b25b7e3229e9203f4af6bfa491def69e2ce83 --- firmware/App/Modes/ModeInitPOST.c (.../ModeInitPOST.c) (revision d74b98a3b101ec827cc7da59dd617df9435d79e3) +++ firmware/App/Modes/ModeInitPOST.c (.../ModeInitPOST.c) (revision 373b25b7e3229e9203f4af6bfa491def69e2ce83) @@ -180,7 +180,6 @@ case DG_POST_STATE_UV_REACTORS: testStatus = execUVReactorsSelfTest(); - testStatus = SELF_TEST_STATUS_PASSED; // TODO why is this failing in unit 2? postState = handlePOSTStatus( testStatus ); break;