Index: firmware/App/Modes/StatePreTxDrySelfTests.c
===================================================================
diff -u -ra5bffea070bf63effd45168604722146489c7dbc -r23ab630d1724482241c717fc7cb2d6a3f6d15016
--- firmware/App/Modes/StatePreTxDrySelfTests.c	(.../StatePreTxDrySelfTests.c)	(revision a5bffea070bf63effd45168604722146489c7dbc)
+++ firmware/App/Modes/StatePreTxDrySelfTests.c	(.../StatePreTxDrySelfTests.c)	(revision 23ab630d1724482241c717fc7cb2d6a3f6d15016)
@@ -100,21 +100,21 @@
 static BOOL tubeSetUsedTestRun;                                           ///< Indicates tube set used test executed
 static BOOL barcodeScanResponseReceived;                                  ///< Barcode response received flag
 static BOOL barcodeScanSuccessfull;                                       ///< Barcode scan result
-static U32  authStartTime;
+static U32  authStartTime;                                                ///< Authentication start timer
 static BOOL authResponseReceived;                                         ///< Indicates UI auth response received
 static BOOL authResponseValidTubeSet;                                     ///< Indicates tube set is valid
 static BOOL authResponseModalityAccepted;                                 ///< Indicates tube set modality is accepted
 static U32  pressureSelfTestPreNormalStartTime;                           ///< Start time for pre-normal pressure setup delay
-static U32  venousSetupStartTime;
-static BOOL venousSetupStateEntered;
+static U32  venousSetupStartTime;                                         ///< Venous setup start time
+static BOOL venousSetupStateEntered;                                      ///< Venous pressure setup state entry
 static F32  peakVenousPressure;                                           ///< Peak venous pressure during stabilization
 static U32  venousPressureStabilizationStartTime;                         ///< Start time for venous stabilization
 static F32  venousPressureP1;                                             ///< First stable venous pressure sample
 static F32  venousPressureP2;                                             ///< Second venous pressure sample for leak check
 static U32  venousPressureLeakCheckStartTime;                             ///< Start time for venous leak check
 static U32  venousPressureReliefStartTime;                                ///< Start time for venous pressure relief
-static BOOL arterialSetupStateEntered;
-static U32 arterialSetupStartTime;
+static BOOL arterialSetupStateEntered;                                    ///< Arterial setup start time
+static U32  arterialSetupStartTime;                                       ///< Arterial pressure setup state entry
 static U32  pressureSelfTestArterialStartTime;                            ///< Start time for arterial pressure build-up
 static F32  peakArterialPressure;                                         ///< Peak arterial pressure during stabilization
 static U32  arterialPressureStabilizationStartTime;                       ///< Start time for arterial stabilization
@@ -211,43 +211,41 @@
  *************************************************************************/
 void initSelfTests( void )
 {
-    void initSelfTests( void )
-    {
-       currentDrySelfTestsState                 = DRY_SELF_TESTS_START_STATE;
-       selfTestStartTime                        = 0;
-       selfTestPreviousPublishDataTime          = 0;
-       selfTestTubeSetSettleTime                = 0;
-       pressureSelfTestPreNormalStartTime       = 0;
-       venousSetupStartTime                     = 0;
-       venousPressureStabilizationStartTime     = 0;
-       venousPressureLeakCheckStartTime         = 0;
-       venousPressureReliefStartTime            = 0;
-       pressureSelfTestArterialStartTime        = 0;
-       arterialPressureStabilizationStartTime   = 0;
-       arterialPressureLeakCheckStartTime       = 0;
-       arterialPressureReliefStartTime          = 0;
-       syringeOcclusionDelayStartTime           = 0;
-       authStartTime                            = 0;
-       doorStateAfterTubeSetInstall             = TRUE;
-       selfTestsResumeRequested                 = FALSE;
-       tubeSetUsedTestRun                       = FALSE;
-       barcodeScanResponseReceived              = FALSE;
-       barcodeScanSuccessfull                   = FALSE;
-       authResponseReceived                     = FALSE;
-       authResponseValidTubeSet                 = FALSE;
-       authResponseModalityAccepted             = FALSE;
-       venousSetupStateEntered                  = FALSE;
-       arterialSetupStateEntered                = FALSE;
-       useHeparin                               = FALSE;
-       heparinOcclusionTestRun                  = FALSE;
-       dryPressureTestsCompleted                = FALSE;
-       occlusionBaselineWasSet                  = FALSE;
-       peakVenousPressure                       = 0.0F;
-       venousPressureP1                         = 0.0F;
-       venousPressureP2                         = 0.0F;
-       peakArterialPressure                     = 0.0F;
-       arterialPressureP1                       = 0.0F;
-       arterialPressureP2                       = 0.0F;
+    currentDrySelfTestsState                 = DRY_SELF_TESTS_START_STATE;
+    selfTestStartTime                        = 0;
+    selfTestPreviousPublishDataTime          = 0;
+    selfTestTubeSetSettleTime                = 0;
+    pressureSelfTestPreNormalStartTime       = 0;
+    venousSetupStartTime                     = 0;
+    venousPressureStabilizationStartTime     = 0;
+    venousPressureLeakCheckStartTime         = 0;
+    venousPressureReliefStartTime            = 0;
+    pressureSelfTestArterialStartTime        = 0;
+    arterialPressureStabilizationStartTime   = 0;
+    arterialPressureLeakCheckStartTime       = 0;
+    arterialPressureReliefStartTime          = 0;
+    syringeOcclusionDelayStartTime           = 0;
+    authStartTime                            = 0;
+    doorStateAfterTubeSetInstall             = TRUE;
+    selfTestsResumeRequested                 = FALSE;
+    tubeSetUsedTestRun                       = FALSE;
+    barcodeScanResponseReceived              = FALSE;
+    barcodeScanSuccessfull                   = FALSE;
+    authResponseReceived                     = FALSE;
+    authResponseValidTubeSet                 = FALSE;
+    authResponseModalityAccepted             = FALSE;
+    venousSetupStateEntered                  = FALSE;
+    arterialSetupStateEntered                = FALSE;
+    useHeparin                               = FALSE;
+    heparinOcclusionTestRun                  = FALSE;
+    dryPressureTestsCompleted                = FALSE;
+    occlusionBaselineWasSet                  = FALSE;
+    peakVenousPressure                       = 0.0F;
+    venousPressureP1                         = 0.0F;
+    venousPressureP2                         = 0.0F;
+    peakArterialPressure                     = 0.0F;
+    arterialPressureP1                       = 0.0F;
+    arterialPressureP2                       = 0.0F;
 }
 
 /*********************************************************************//**