Index: firmware/App/Controllers/Heaters.c
===================================================================
diff -u -r2e89a75592087ba15cae7070a92173e9f1efa8fe -r2c61c4a7037fd5a22ecbcd5732d91d3166ef8c5b
--- firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision 2e89a75592087ba15cae7070a92173e9f1efa8fe)
+++ firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision 2c61c4a7037fd5a22ecbcd5732d91d3166ef8c5b)
@@ -40,6 +40,7 @@
  */
 
 // ********** private definitions **********
+
 #define AC_HEATER_TX_MAX_DUTY_CYCLE                                0.50F                                                           ///< AC Heater treatment mode max duty cycle (50% of 1400W : 700W )
 #define AC_HEATER_HEAT_MAX_DUTY_CYCLE                              0.70F                                                           ///< AC Heater heat disinfect mode max duty cycle (70% of 1400W : 980W )
 #define AC_HEATER_MAX_DUTY_CYCLE                                   1.0F                                                            ///< AC Heater max duty cycle (100.0%) or ON state
Index: firmware/App/Drivers/TemperatureSensors.c
===================================================================
diff -u -r2e89a75592087ba15cae7070a92173e9f1efa8fe -r2c61c4a7037fd5a22ecbcd5732d91d3166ef8c5b
--- firmware/App/Drivers/TemperatureSensors.c	(.../TemperatureSensors.c)	(revision 2e89a75592087ba15cae7070a92173e9f1efa8fe)
+++ firmware/App/Drivers/TemperatureSensors.c	(.../TemperatureSensors.c)	(revision 2c61c4a7037fd5a22ecbcd5732d91d3166ef8c5b)
@@ -34,6 +34,8 @@
 
 // ********** private definitions **********
 
+#define USE_PT_100                                              1                                               ///< flag to check PT100 use in calculations
+
 #define PRIMARY_HEATER_TEMP_SENSORS_GAIN                        8U                                              ///< Primary heater temperature sensors gain.
 #define PRIMARY_HEATER_TEMP_SENSORS_REF_RESISTANCE              20000                                           ///< Primary heater temperature sensors reference resistance.
 #define PRIMARY_HEATER_TEMP_SENSORS_0_DEGREE_RESISTANCE         1000U                                           ///< Primary heater temperature sensors zero degree resistance.
Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -rf6fb03f1e20395a61a5d5996f11f802ab8eacb2f -r2c61c4a7037fd5a22ecbcd5732d91d3166ef8c5b
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision f6fb03f1e20395a61a5d5996f11f802ab8eacb2f)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 2c61c4a7037fd5a22ecbcd5732d91d3166ef8c5b)
@@ -199,6 +199,11 @@
     {
         execBalancingChamberControl();
     }
+    //Test request to handle only balancing chamber switching
+    else if ( TRUE == pendingBalanceChamberSwOnlyRequest )
+    {
+        execBalancingChamberControl();
+    }
 //    else if ( TRUE == pendingStartDDFlushRequest )
 //    {
 //        pendingStartDDFlushRequest = FALSE;
Index: firmware/App/Services/ROInterface.c
===================================================================
diff -u -rd1527b612b7af4bd3103743b5a61ecad3a133ac0 -r2c61c4a7037fd5a22ecbcd5732d91d3166ef8c5b
--- firmware/App/Services/ROInterface.c	(.../ROInterface.c)	(revision d1527b612b7af4bd3103743b5a61ecad3a133ac0)
+++ firmware/App/Services/ROInterface.c	(.../ROInterface.c)	(revision 2c61c4a7037fd5a22ecbcd5732d91d3166ef8c5b)
@@ -38,7 +38,7 @@
 
 // ********** private data **********
 
-static RO_OP_MODE_T roCurrentOpMode;                                        ///< Current TD operation mode.
+static FP_OP_MODE_T roCurrentOpMode;                                        ///< Current TD operation mode.
 static U32  roSubMode;                                                      ///< Current state (sub-mode) of current TD operation mode.
 static F32  roFlowRate;                                                     ///< RO flow rate
 
@@ -58,7 +58,7 @@
 void initROInterface( void )
 {
    // Initialize unit variables
-    roCurrentOpMode         = RO_MODE_INIT;
+    roCurrentOpMode         = FP_MODE_INIT;
     roSubMode               = 0;
     roFlowRate              = MAX_RO_FLOW_RATE;
 }
@@ -120,7 +120,7 @@
  *************************************************************************/
 BOOL cmdROStartStop( BOOL startStop, RO_CMD_ID cmdMode)
 {
-    RO_WATER_REQ_PAYLOAD_T roStartRequest;
+    FP_WATER_REQ_PAYLOAD_T roStartRequest;
     BOOL result;
     MESSAGE_T msg;
     U08 *payloadPtr = msg.payload;
@@ -132,10 +132,10 @@
 
     // Create a message record
     blankMessage( &msg );
-    msg.hdr.msgID = MSG_ID_DD_RO_START_STOP_CMD_REQUEST;
-    msg.hdr.payloadLen = sizeof( RO_WATER_REQ_PAYLOAD_T );
+    msg.hdr.msgID = MSG_ID_DD_FP_START_STOP_CMD_REQUEST;
+    msg.hdr.payloadLen = sizeof( FP_WATER_REQ_PAYLOAD_T );
 
-    memcpy( payloadPtr, &roStartRequest, sizeof( RO_WATER_REQ_PAYLOAD_T ) );
+    memcpy( payloadPtr, &roStartRequest, sizeof( FP_WATER_REQ_PAYLOAD_T ) );
 
     // Serialize the message (w/ sync, CRC, and appropriate CAN padding) and add serialized message data to appropriate comm buffer
     result = serializeMessage( msg, COMM_BUFFER_OUT_CAN_DD_2_RO, ACK_REQUIRED );
@@ -175,7 +175,7 @@
  * @details \b Outputs: none
  * @return Latest reported RO operating mode.
  *************************************************************************/
-RO_OP_MODE_T getROOpMode( void )
+FP_OP_MODE_T getROOpMode( void )
 {
     return roCurrentOpMode;
 }
@@ -205,10 +205,10 @@
  *************************************************************************/
 void setROOpMode( U32 opMode, U32 subMode )
 {
-    if ( opMode < NUM_OF_RO_MODES )
+    if ( opMode < NUM_OF_FP_MODES )
     {
         // update RO op mode and sub-mode
-        roCurrentOpMode = (RO_OP_MODE_T)opMode;
+        roCurrentOpMode = (FP_OP_MODE_T)opMode;
         roSubMode = subMode;
     }
     else
Index: firmware/App/Services/ROInterface.h
===================================================================
diff -u -rd1527b612b7af4bd3103743b5a61ecad3a133ac0 -r2c61c4a7037fd5a22ecbcd5732d91d3166ef8c5b
--- firmware/App/Services/ROInterface.h	(.../ROInterface.h)	(revision d1527b612b7af4bd3103743b5a61ecad3a133ac0)
+++ firmware/App/Services/ROInterface.h	(.../ROInterface.h)	(revision 2c61c4a7037fd5a22ecbcd5732d91d3166ef8c5b)
@@ -21,7 +21,7 @@
 #include "DDCommon.h"
 #include "MessagePayloads.h"
 #include "TDDefs.h"
-#include "RODefs.h"
+#include "FPDefs.h"
 
 /**
  *  @defgroup ROInterface ROInterface
@@ -46,7 +46,7 @@
 F32 getROFlowRate( void );
 
 void setROOpMode( U32 opMode, U32 subMode );
-RO_OP_MODE_T      getROOpMode( void );
+FP_OP_MODE_T      getROOpMode( void );
 U32  getROSubMode( void );
 
 /**@}*/