Index: firmware/App/Modes/ModeHeatDisinfect.c
===================================================================
diff -u -r5026ed04bc2977e2a6d8c854b1e356cbfb2febea -r4dc00d3bb62964e1d93782af96185f55b7eba30e
--- firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision 5026ed04bc2977e2a6d8c854b1e356cbfb2febea)
+++ firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision 4dc00d3bb62964e1d93782af96185f55b7eba30e)
@@ -192,7 +192,7 @@
  * support the special conditions that are needed to be created to test the disinfects. The support codes are not compiled in a release
  * build.
  */
-static NELSON_SUPPORT_T nelsonSupport;                                                                         ///< Nelson support.
+static NELSON_SUPPORT_T nelsonSupport;                                                                         // Nelson support.
 #endif
 
 // ********** private function prototypes **********
@@ -483,22 +483,6 @@
     return status;
 }
 
-#ifndef _RELEASE_
-/*********************************************************************//**
- * @brief
- * The setHeatNelsonSupportMode function sets the requested Nelson support
- * mode (i.e. inoculate, ...)
- * @details Inputs: none
- * @details Outputs: nelsonSupport
- * @param support the type Nelson support (i.e. inoculate, heat disinfect)
- * @return none
- *************************************************************************/
-void setHeatNelsonSupportMode( NELSON_SUPPORT_T support )
-{
-    nelsonSupport = support;
-}
-#endif
-
 // ********** private functions **********
 
 /*********************************************************************//**
@@ -1945,7 +1929,6 @@
         uiData.r82CountdownTimeS       = ( 0 == timeStatus[ RSRVR_AT_82_C ].startTimeMS ? 0 : ( timeStatus[ RSRVR_AT_82_C ].targetTimeMS - calcTimeSince( timeStatus[ RSRVR_AT_82_C ].startTimeMS ) ) / 1000 );
         data.R1FillLevel               = rsrvr1RefVolML;
         data.R2FillLevel               = rsrvr2RefVolML;
-        data.nelsonSupportMode         = (U32)nelsonSupport;
 
         broadcastData( MSG_ID_DG_HEAT_DISINFECT_DATA, COMM_BUFFER_OUT_CAN_DG_BROADCAST, (U08*)&data, sizeof( MODE_HEAT_DISINFECT_DATA_T ) );
         broadcastData( MSG_ID_DG_HEAT_DISINFECT_TIME_DATA, COMM_BUFFER_OUT_CAN_DG_2_UI, (U08*)&uiData, sizeof( MODE_HEAT_DISINFECT_UI_DATA_T ) );
@@ -2010,6 +1993,8 @@
     }
 }
 
+/**@}*/
+
 // ********** Nelson Support Functions **********
 
 #ifndef _RELEASE_
@@ -2177,4 +2162,18 @@
 
 #endif
 
-/**@}*/
+#ifndef _RELEASE_
+/*********************************************************************//**
+ * @brief
+ * The setHeatNelsonSupportMode function sets the requested Nelson support
+ * mode (i.e. inoculate, ...)
+ * @details Inputs: none
+ * @details Outputs: nelsonSupport
+ * @param support the type Nelson support (i.e. inoculate, heat disinfect)
+ * @return none
+ *************************************************************************/
+void setHeatNelsonSupportMode( NELSON_SUPPORT_T support )
+{
+    nelsonSupport = support;
+}
+#endif