Index: firmware/App/Monitors/Conductivity.c
===================================================================
diff -u -r145fd716a856f864f39fb0f9884865f6e45b9256 -r313fa2d93236d6aa9de1a7e8e65c8c908e6b0c59
--- firmware/App/Monitors/Conductivity.c	(.../Conductivity.c)	(revision 145fd716a856f864f39fb0f9884865f6e45b9256)
+++ firmware/App/Monitors/Conductivity.c	(.../Conductivity.c)	(revision 313fa2d93236d6aa9de1a7e8e65c8c908e6b0c59)
@@ -17,12 +17,14 @@
 #include <math.h>               // Used for calculating the polynomial calibration equation.
 #include <string.h>             // For memcpy
 
+#include "BalancingChamber.h"
 #include "Conductivity.h"
 #include "MessageSupport.h"
 #include "Messaging.h"
 #include "ModeGenPermeate.h"
 #include "OperationModes.h"
 #include "TaskPriority.h"
+#include "TDInterface.h"
 #include "Utilities.h"
 
 /**
@@ -38,7 +40,7 @@
 #define FP_CONDUCTIVITY_DATA_PUBLISH_COUNTER_START_COUNT    41                                                          ///< FP Conductivity data publish counter start count.
 #define RO_DATA_PUBLISH_COUNTER_START_COUNT                 42                                                          ///< FP RO Data publish counter start count.
 #define RESISTANCE_DATA_PUBLISH_COUNTER_START_COUNT         43                                                          ///< DD Resistance data publish counter start count.
-#define CONDUCTIVITY_SAMPLE_FILTER_MS           ( 210 )                                                                 ///< Filter conductivity data for given time. Currently set to have 5 samples over 3.5s ( 700ms sample rate )
+#define CONDUCTIVITY_SAMPLE_FILTER_MS           ( 70 )                                                                  ///< Filter conductivity data for given time. Currently set to have 5 samples over 3.5s ( 700ms sample rate )
 #define CONDUCTIVITY_TEMP_SAMPLE_FILTER_MS      ( 30 )                                                                  ///< Filter conductivity temperature data for given time. Currently set to have 5 samples over 3.5s ( 700ms sample rate )
 #define SIZE_OF_COND_ROLLING_AVG                ( CONDUCTIVITY_SAMPLE_FILTER_MS / TASK_PRIORITY_INTERVAL )              ///< Filtered conductivity moving average sample count.
 #define SIZE_OF_COND_TEMP_ROLLING_AVG           ( CONDUCTIVITY_TEMP_SAMPLE_FILTER_MS / TASK_PRIORITY_INTERVAL )         ///< Filtered conductivity temprature moving average sample count.
@@ -88,6 +90,7 @@
 static F32 roRRTankFillAvg;                                                                                             ///< Average RO rejection ratio during permeate tank fill state.
 static U32 roRRSampleIntervalCounter;                                                                                   ///< RO rejection ratio sample collection timer counter.
 static U32 conductivityResistancePublishTimerCounter;                                                                   ///< DD and FP Conductivity data publication counter.
+static U32 conductivityFilterSize;                                                                                      ///< Active conductivity filter sample count.
 static OVERRIDE_U32_T conductivityResistanceDataPublishInterval;                                                        ///< DD and FP Conductivity sensors publish time interval override.
 
 // ********** private function prototypes **********
@@ -99,6 +102,8 @@
 static void calcRORejectionRatio( void );
 static void filterRORejectionRatioReadings( void );
 static void broadcastResistanceData( void );
+static U32 getConductivityFilterSize( void );
+static void resetConductivityFilterReadings( void );
 
 /*********************************************************************//**
  * @brief
@@ -259,8 +264,15 @@
 {
     CONDUCTIVITY_SENSORS_T sensor;
     F32 calculatedConductivity = 0.0F;
+    U32 activeFilterSize = getConductivityFilterSize();
     BOOL freshData = FALSE;
 
+    if ( conductivityFilterSize != activeFilterSize )
+    {
+        conductivityFilterSize = activeFilterSize;
+        resetConductivityFilterReadings();
+    }
+
     for ( sensor = FIRST_DD_COND_SENSOR; sensor < NUM_OF_CONDUCTIVITY_SENSORS; sensor++ )
     {
         if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_9_HW ) == TRUE )
@@ -292,21 +304,81 @@
         {
             freshData = FALSE;
             // TODO - calibrate
-            if ( filteredConductivityReadings[ sensor ].conductivityReadingsCount >= SIZE_OF_COND_ROLLING_AVG )
+            if ( filteredConductivityReadings[ sensor ].conductivityReadingsCount >= conductivityFilterSize )
             {
                 filteredConductivityReadings[ sensor ].conductivityReadingsTotal -= filteredConductivityReadings[ sensor ].conductivityReadings[ filteredConductivityReadings[ sensor ].conductivityReadingsIdx ];
             }
             filteredConductivityReadings[ sensor ].conductivityReadings[ filteredConductivityReadings[ sensor ].conductivityReadingsIdx ] = calculatedConductivity;
             filteredConductivityReadings[ sensor ].conductivityReadingsTotal += calculatedConductivity;
-            filteredConductivityReadings[ sensor ].conductivityReadingsIdx = INC_WRAP( filteredConductivityReadings[ sensor ].conductivityReadingsIdx, 0, SIZE_OF_COND_ROLLING_AVG - 1 );
-            filteredConductivityReadings[ sensor ].conductivityReadingsCount = INC_CAP( filteredConductivityReadings[ sensor ].conductivityReadingsCount, SIZE_OF_COND_ROLLING_AVG );
+            filteredConductivityReadings[ sensor ].conductivityReadingsIdx = INC_WRAP( filteredConductivityReadings[ sensor ].conductivityReadingsIdx, 0, conductivityFilterSize - 1 );
+            filteredConductivityReadings[ sensor ].conductivityReadingsCount = INC_CAP( filteredConductivityReadings[ sensor ].conductivityReadingsCount, conductivityFilterSize );
             filteredcurrentConductivityReadings[ sensor ].data = filteredConductivityReadings[ sensor ].conductivityReadingsTotal / (F32)filteredConductivityReadings[ sensor ].conductivityReadingsCount;
         }
     }
 }
 
 /*********************************************************************//**
  * @brief
+ * The getConductivityFilterSize function gets the active conductivity filter
+ * sample count based on the Qd balancing chamber switching period.
+ * @details \b Inputs: TD dialysate flow rate
+ * @details \b Outputs: none
+ * @return active conductivity filter sample count.
+ *************************************************************************/
+static U32 getConductivityFilterSize( void )
+{
+    F32 tdDialysateFlowRate = getTDDialysateFlowrate();
+    U32 result = SIZE_OF_COND_ROLLING_AVG;
+
+    if ( tdDialysateFlowRate > NEARLY_ZERO )
+    {
+        F32 balChamberSwitchingFreq = tdDialysateFlowRate / BAL_CHAMBER_FILL_VOLUME_ML;
+        F32 balChamberSwitchingPeriod = (F32)SEC_PER_MIN / balChamberSwitchingFreq;
+
+        result = (U32)( (F32)SIZE_OF_COND_ROLLING_AVG * balChamberSwitchingPeriod );
+    }
+
+    if ( result < 1 )
+    {
+        result = 1;
+    }
+    else if ( result > SIZE_OF_COND_ROLLING_AVG )
+    {
+        result = SIZE_OF_COND_ROLLING_AVG;
+    }
+
+    return result;
+}
+
+/*********************************************************************//**
+ * @brief
+ * The resetConductivityFilterReadings function clears conductivity rolling
+ * average data when the active filter window changes.
+ * @details \b Inputs: none
+ * @details \b Outputs: filteredConductivityReadings
+ * @return none
+ *************************************************************************/
+static void resetConductivityFilterReadings( void )
+{
+    CONDUCTIVITY_SENSORS_T sensor;
+
+    for ( sensor = FIRST_DD_COND_SENSOR; sensor < NUM_OF_CONDUCTIVITY_SENSORS; sensor++ )
+    {
+        U32 readingIndex;
+
+        for ( readingIndex = 0; readingIndex < SIZE_OF_COND_ROLLING_AVG; readingIndex++ )
+        {
+            filteredConductivityReadings[ sensor ].conductivityReadings[ readingIndex ] = 0.0F;
+        }
+
+        filteredConductivityReadings[ sensor ].conductivityReadingsIdx = 0;
+        filteredConductivityReadings[ sensor ].conductivityReadingsTotal = 0.0F;
+        filteredConductivityReadings[ sensor ].conductivityReadingsCount = 0;
+    }
+}
+
+/*********************************************************************//**
+ * @brief
  * The getFilteredConductivitySensorTemperature function gets the filtered
  * temperature (in C) for a given conductivity sensor.
  * @details \b Alarm: ALARM_ID_DD_SOFTWARE_FAULT if given sensor is invalid.