Index: firmware/App/Monitors/Temperature.c
===================================================================
diff -u -rae7a7f0dc06fd31a53b0db564d515ce4c39acf67 -rffd0828ba7d0c1ed6ae4624cfb2c502a2e7a203d
--- firmware/App/Monitors/Temperature.c	(.../Temperature.c)	(revision ae7a7f0dc06fd31a53b0db564d515ce4c39acf67)
+++ firmware/App/Monitors/Temperature.c	(.../Temperature.c)	(revision ffd0828ba7d0c1ed6ae4624cfb2c502a2e7a203d)
@@ -43,7 +43,8 @@
 #define TEMP_SENSORS_FPGA_ERROR_TIMEOUT_MS                      ( 2 * MS_PER_SECOND )                           ///< Temperature sensors FPGA error timeout in milliseconds.
 #define D4_TEMP_MOVING_AVG_NUM_OF_SAMPLES                       50                                              ///< D4 temperature sensor moving average number of samples.
 #define D50_TEMP_MOVING_AVG_NUM_OF_SAMPLES                      25                                              ///< D50 temperature sensor moving average number of samples ( 250ms filter ).
-#define D99_TEMP_MOVING_AVG_NUM_OF_SAMPLES                                                                      ///< D99 temperature sensor moving average number of samples //TODO
+//TODO for D99 the sample size will be defined as needed
+#define D99_TEMP_MOVING_AVG_NUM_OF_SAMPLES                      50                                              ///< D99 temperature sensor moving average number of samples
 #define DATA_PUBLISH_COUNTER_START_COUNT                        30                                              ///< Data publish counter start count.
 #define DIAL_TEMP_MOVING_AVG_NUM_OF_SAMPLES                     30                                              ///< Dialysate temperature sensors moving average number of samples.
 #define D28_D30_DATA_COLLECTION_TIME_MS                         ( 1 * MS_PER_SECOND )                           ///< Dialysate temperature sensors data collection time in milliseconds.
@@ -141,6 +142,10 @@
     d50TempAvgC                             = 0.0F;
     d50TempSamplesNextIndex                 = 0;
     d50TempCount                            = 0;
+    d99TempRunningSumC                      = 0.0F;
+    d99TempAvgC                             = 0.0F;
+    d99TempSamplesNextIndex                 = 0;
+    d99TempCount                            = 0;
     d4TempSampleIntervalCounter             = 0;
     tempDataColTimeInterval                 = 0;
     tempDriftEventCheck                     = FALSE;
@@ -292,7 +297,8 @@
  * @details \b Inputs: D4 and D50 Temperature
  * @details \b Outputs: d4TempSamplesC[], d4TempSamplesNextIndex, d4TempRunningSumC,
  * d4TempCount, d4TempAvgC, d50TempSamplesC, d50TempRunningSumC, d50TempSamplesNextIndex,
- * d50TempCount, d50TempAvgC
+ * d50TempCount, d50TempAvgC, d99TempSamplesC, d99TempRunningSumC, d99TempSamplesNextIndex,
+ * d99TempCount, d99TempAvgC
  * @return none
  *************************************************************************/
 static void filterTemperatureReadings( void )
@@ -328,6 +334,19 @@
     d50TempCount                                 = INC_CAP( d50TempCount, D50_TEMP_MOVING_AVG_NUM_OF_SAMPLES );
     d50TempAvgC                                  = d50TempRunningSumC / (F32)d50TempCount;
 
+    // Filter D99 Temperature for fresh dialysate temperature
+    if ( d99TempCount >= D99_TEMP_MOVING_AVG_NUM_OF_SAMPLES )
+    {
+        d99TempRunningSumC -= d99TempSamplesC[ d99TempSamplesNextIndex ];
+    }
+
+    F32 d99Temp                                  = getTemperatureValue( D99_TEMP );
+    d99TempSamplesC[ d99TempSamplesNextIndex ]   = d99Temp;
+    d99TempRunningSumC                           += d99Temp;
+    d99TempSamplesNextIndex                      = INC_WRAP( d99TempSamplesNextIndex, 0, D99_TEMP_MOVING_AVG_NUM_OF_SAMPLES - 1 );
+    d99TempCount                                 = INC_CAP( d99TempCount, D99_TEMP_MOVING_AVG_NUM_OF_SAMPLES );
+    d99TempAvgC                                  = d99TempRunningSumC / (F32)d99TempCount;
+
     // dailysate temperature moving average
     filterDialTemperatureReadings();
 }
@@ -432,6 +451,19 @@
 
 /*********************************************************************//**
  * @brief
+ * The getD99AverageTemperature function returns the average temperature
+ * for D99 temperature sensor.
+ * @details \b Inputs: none
+ * @details \b Outputs: none
+ * @return the D99 average temperature
+ *************************************************************************/
+F32 getD99AverageTemperature( void )
+{
+    return d99TempAvgC;
+}
+
+/*********************************************************************//**
+ * @brief
  * The getTempMovingAverageTimeInterval function calculates the temperature
  * interval used for sample collection based on the dialysate flow rate,
  * to find the average value.
@@ -470,6 +502,7 @@
         data.d78Temp        = getTemperatureValue( D78_TEMP );
         data.d4Temp         = getTemperatureValue( D4_TEMP );
         data.d50Temp        = getTemperatureValue( D50_TEMP );
+        data.d99Temp        = getTemperatureValue( D99_TEMP );
         data.boardTemp      = getTemperatureValue( BRD_TEMP );
         data.d16CondTemp    = getConductivityTemperatureValue( D17_COND );
         data.d28CondTemp    = getConductivityTemperatureValue( D27_COND );
@@ -478,6 +511,7 @@
         data.d75CondTemp    = getConductivityTemperatureValue( D74_COND );
         data.d4AvgTemp      = getD4AverageTemperature();
         data.d50AvgTemp     = getD50AverageTemperature();
+        data.d99AvgTemp     = getD99AverageTemperature();
         data.d28AvgTemp     = dialTempMovingAvgData[ DIAL_TEMP_D28 ].dialTempAvgC;
         data.d30AvgTemp     = dialTempMovingAvgData[ DIAL_TEMP_D30 ].dialTempAvgC;
         data.d9PresTemp     = getFilteredPressureSensorTemperature( D9_PRES );