Index: firmware/App/Modes/ModeGenIdle.c
===================================================================
diff -u -rd19a072db6880577f677093929b53445e34a33e3 -r8c5fef6b7ab382db81084a3abe9604e01882aef9
--- firmware/App/Modes/ModeGenIdle.c	(.../ModeGenIdle.c)	(revision d19a072db6880577f677093929b53445e34a33e3)
+++ firmware/App/Modes/ModeGenIdle.c	(.../ModeGenIdle.c)	(revision 8c5fef6b7ab382db81084a3abe9604e01882aef9)
@@ -9,7 +9,7 @@
 * @file    ModeGenIdle.c
 *
 * @author  (last)      Dara Navaei
-* @date    (last)      04-May-2023
+* @date    (last)      11-May-2023
 *
 * @author  (original)  Quang Nguyen
 * @date    (original)  06-Aug-2021
@@ -115,6 +115,9 @@
     setValveState( VDR, VALVE_STATE_DRAIN_C_TO_NO );
     setValveState( VPO, VALVE_STATE_NOFILL_C_TO_NO );
 
+    // Set back the conductivity of CD2 calibration table to the normal calibration table
+    setCondcutivitySensorCalTable( CONDUCTIVITYSENSORS_CD2_SENSOR, CAL_DATA_CD2_COND_SENSOR );
+
     signalDrainPumpHardStop();
     requestConcentratePumpOff( CONCENTRATEPUMPS_CP1_ACID, NO_PARK_CONC_PUMPS );
     requestConcentratePumpOff( CONCENTRATEPUMPS_CP2_BICARB, NO_PARK_CONC_PUMPS );
@@ -409,7 +412,7 @@
  * The handleRefillState function executes refill state of the handle bad
  * fill state machine.
  * @details Inputs: none
- * @details Outputs: none
+ * @details Outputs: handleBadFillFlag
  * @param idleState reference variable for the next idle state
  * @return the next state
  *************************************************************************/