Index: PIControllers.c =================================================================== diff -u -r60445c6741155ce578e3c036950b8e1fd7147f78 -r340920f9ade742e56bba30519dfd329a2b7db721 --- PIControllers.c (.../PIControllers.c) (revision 60445c6741155ce578e3c036950b8e1fd7147f78) +++ PIControllers.c (.../PIControllers.c) (revision 340920f9ade742e56bba30519dfd329a2b7db721) @@ -75,10 +75,6 @@ { 0.0, 0.0, 50.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 100.0, CONTROLLER_BIDIRECTIONAL, FALSE, 0.0 }, // PI_CONTROLLER_ID_D5_HEAT_OUTER_HIGHER_QD { 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 5.0, CONTROLLER_BIDIRECTIONAL, FALSE, 0.0 }, // PI_CONTROLLER_ID_D45_HEAT { 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 5.0, CONTROLLER_BIDIRECTIONAL, FALSE, 0.0 }, // PI_CONTROLLER_ID_D45_HEAT_HIGHER_QD - { 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 25.0, CONTROLLER_UNIDIRECTIONAL, FALSE, 0.0 }, // PI_CONTROLLER_ID_RO_PUMP - { 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.1, CONTROLLER_UNIDIRECTIONAL, FALSE, 0.0 }, // PI_CONTROLLER_ID_RO_PUMP_MAX_PRES - { 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.5, CONTROLLER_UNIDIRECTIONAL, FALSE, 0.0 }, // PI_CONTROLLER_ID_BOOST_PUMP_FLOW - { 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.1, CONTROLLER_UNIDIRECTIONAL, FALSE, 0.0 }, // PI_CONTROLLER_ID_BOOST_PUMP_PRES { 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 75.0, CONTROLLER_UNIDIRECTIONAL, FALSE, 0.0 }, // PI_CONTROLLER_ID_BICARB_VOL { 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 1000.0, CONTROLLER_UNIDIRECTIONAL, FALSE, 0.0 }, // PI_CONTROLLER_ID_ACID_VOL #endif Index: PIControllers.h =================================================================== diff -u -r60445c6741155ce578e3c036950b8e1fd7147f78 -r340920f9ade742e56bba30519dfd329a2b7db721 --- PIControllers.h (.../PIControllers.h) (revision 60445c6741155ce578e3c036950b8e1fd7147f78) +++ PIControllers.h (.../PIControllers.h) (revision 340920f9ade742e56bba30519dfd329a2b7db721) @@ -49,10 +49,6 @@ PI_CONTROLLER_ID_D5_HEAT_OUTER_HIGHER_QD, ///< Primary heater controller outer loop for higher flow rates PI_CONTROLLER_ID_D45_HEAT, ///< Trimmer heater controller PI_CONTROLLER_ID_D45_HEAT_HIGHER_QD, ///< Trimmer heater controller for higher flow rates - PI_CONTROLLER_ID_RO_PUMP_FLOW, ///< RO Pump controller to flow - PI_CONTROLLER_ID_RO_PUMP_PRES, ///< RO pump controller to maximum pressure - PI_CONTROLLER_ID_BOOST_PUMP_FLOW, ///< Boost pump controller to flow - PI_CONTROLLER_ID_BOOST_PUMP_PRES, ///< Boost pump controller to maximum pressure PI_CONTROLLER_ID_BICARB_VOL, ///< Bicarb dose volume PI_CONTROLLER_ID_ACID_VOL, ///< Acid dose volume #endif Index: PIDControllers.c =================================================================== diff -u -r33962c12ea22f86cf59f3ba0b9372f4056b86c2d -r340920f9ade742e56bba30519dfd329a2b7db721 --- PIDControllers.c (.../PIDControllers.c) (revision 33962c12ea22f86cf59f3ba0b9372f4056b86c2d) +++ PIDControllers.c (.../PIDControllers.c) (revision 340920f9ade742e56bba30519dfd329a2b7db721) @@ -69,7 +69,10 @@ { 0.0, 0.0, 0.0, 0.9, 0.10, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 100.0, CONTROLLER_UNIDIRECTIONAL, FALSE, 0.0 }, // PI_CONTROLLER_ID_BLOOD_FLOW #endif #ifdef _DD_ - { 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 100.0, CONTROLLER_UNIDIRECTIONAL, FALSE, 0.0 }, // PID_CONTROLLER_ID_RO_PUMP + { 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 100.0, CONTROLLER_UNIDIRECTIONAL, FALSE, 0.0 }, // PID_CONTROLLER_ID_RO_PUMP_FLOW + { 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 100.0, CONTROLLER_UNIDIRECTIONAL, FALSE, 0.0 }, // PID_CONTROLLER_ID_RO_PUMP_PRES + { 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 100.0, CONTROLLER_UNIDIRECTIONAL, FALSE, 0.0 }, // PID_CONTROLLER_ID_BOOST_PUMP_PRES + { 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 100.0, CONTROLLER_UNIDIRECTIONAL, FALSE, 0.0 }, // PID_CONTROLLER_ID_BOOST_PUMP_FLOW #endif }; Index: PIDControllers.h =================================================================== diff -u -rea72906b97ea39180babfef7dd9a6de22cbc8c10 -r340920f9ade742e56bba30519dfd329a2b7db721 --- PIDControllers.h (.../PIDControllers.h) (revision ea72906b97ea39180babfef7dd9a6de22cbc8c10) +++ PIDControllers.h (.../PIDControllers.h) (revision 340920f9ade742e56bba30519dfd329a2b7db721) @@ -43,6 +43,9 @@ #endif #ifdef _DD_ PID_CONTROLLER_ID_RO_PUMP_FLOW, ///< RO Pump controller to flow + PID_CONTROLLER_ID_RO_PUMP_PRES, + PID_CONTROLLER_ID_BOOST_PUMP_PRES, + PID_CONTROLLER_ID_BOOST_PUMP_FLOW, #endif NUM_OF_PID_CONTROLLERS_IDS ///< Number of PID controllers } PID_CONTROLLER_ID_T;