Index: firmware/App/Controllers/BloodLeak.c
===================================================================
diff -u -r4760b847bd262dfc693b3d3458864c05b1c816d7 -r88a6a776015d6aee3a403a785bf9bbbec26028a8
--- firmware/App/Controllers/BloodLeak.c	(.../BloodLeak.c)	(revision 4760b847bd262dfc693b3d3458864c05b1c816d7)
+++ firmware/App/Controllers/BloodLeak.c	(.../BloodLeak.c)	(revision 88a6a776015d6aee3a403a785bf9bbbec26028a8)
@@ -876,15 +876,15 @@
         }
     }
 
-    // Check whether zeroing the sensor has been requested or not if yes, transition to zero command state otherwise, stay in this state
-    state = ( TRUE == hasZeroBloodLeakBeenRequested() ? BLOOD_LEAK_PREP_FOR_ZERO_CMD_STATE : state );
-
     if ( TRUE == bloodLeakExitNormalRequested )
     {
         state                        = BLOOD_LEAK_INIT_STATE;
         bloodLeakExitNormalRequested = FALSE;
     }
 
+    // Check whether zeroing the sensor has been requested or not if yes, transition to zero command state otherwise, stay in this state
+    state = ( TRUE == hasZeroBloodLeakBeenRequested() ? BLOOD_LEAK_PREP_FOR_ZERO_CMD_STATE : state );
+
     return state;
 }
 
@@ -974,56 +974,56 @@
 
     switch( bloodLeakEmbModeRqstedCmd )
     {
-       case NU_EMB_MODE_CMD:
-         // Null command do nothing
-         break;
+        case NU_EMB_MODE_CMD:
+          // Null command do nothing
+          break;
 
-       case CS_EMB_MODE_CMD:
-       case T_EMB_MODE_CMD:
-       case G_EMB_MODE_CMD:
-       case I_EMB_MODE_CMD:
-       case V_EMB_MODE_CMD:
-       case Z_EMB_MODE_CMD:
-       case Q_EMB_MODE_CMD:
-       case D_EMB_MODE_CMD:
-       case C_EMB_MODE_CMD:
-           // First clear the buffer from the older data
-           memset( bloodLeakEmbModeCmdSquence, 0x0, 2 * BLOOD_LEAK_EMB_MODE_CMD_SEQ_LENGTH );
-           // Set the command sequence
-           bloodLeakEmbModeCmdSquence[ BLOOD_LEAK_EMB_MODE_RESET_INDEX ][ BLOOD_LEAK_EMB_MODE_CMD_COL_INDEX ]               = BLOOD_LEAK_EMB_MODE_COMM_RESET;
-           bloodLeakEmbModeCmdSquence[ BLOOD_LEAK_EMB_MODE_RESET_INDEX ][ BLOOD_LEAK_EMB_MODE_IS_UART_COL_INDEX ]           = TRUE;
-           bloodLeakEmbModeCmdSquence[ BLOOD_LEAK_EMB_MODE_RESET_INDEX + 1 ][ BLOOD_LEAK_EMB_MODE_CMD_COL_INDEX ]           = BLOOD_LEAK_EMB_MODE_COMM_ACTIVE_LOW;
-           bloodLeakEmbModeCmdSquence[ BLOOD_LEAK_EMB_MODE_RESET_INDEX + 1 ][ BLOOD_LEAK_EMB_MODE_IS_UART_COL_INDEX ]       = TRUE;
-           bloodLeakEmbModeCmdSquence[ BLOOD_LEAK_EMB_MODE_CMD_INDEX ][ BLOOD_LEAK_EMB_MODE_CMD_COL_INDEX ]                 = command;
-           bloodLeakEmbModeCmdSquence[ BLOOD_LEAK_EMB_MODE_CMD_INDEX ][ BLOOD_LEAK_EMB_MODE_IS_UART_COL_INDEX ]             = FALSE;
-           bloodLeakEmbModeCmdSquence[ BLOOD_LEAK_EMB_MODE_STOP_WRITE_INDEX ][ BLOOD_LEAK_EMB_MODE_CMD_COL_INDEX ]          = BLOOD_LEAK_STOP_WRITE_FIFO_COMMAND;
-           bloodLeakEmbModeCmdSquence[ BLOOD_LEAK_EMB_MODE_STOP_WRITE_INDEX ][ BLOOD_LEAK_EMB_MODE_IS_UART_COL_INDEX ]      = FALSE;
-           bloodLeakEmbModeCmdSquence[ BLOOD_LEAK_EMB_MODE_ACTIVE_HIGH_INDEX ][ BLOOD_LEAK_EMB_MODE_CMD_COL_INDEX ]         = BLOOD_LEAK_EMB_MODE_COMM_ACTIVE_HIGH;
-           bloodLeakEmbModeCmdSquence[ BLOOD_LEAK_EMB_MODE_ACTIVE_HIGH_INDEX ][ BLOOD_LEAK_EMB_MODE_IS_UART_COL_INDEX ]     = TRUE;
-           bloodLeakEmbModeCmdSquence[ BLOOD_LEAK_EMB_MODE_ACTIVE_HIGH_INDEX + 1 ][ BLOOD_LEAK_EMB_MODE_CMD_COL_INDEX ]     = BLOOD_LEAK_EMB_MODE_COMM_ACTIVE_LOW;
-           bloodLeakEmbModeCmdSquence[ BLOOD_LEAK_EMB_MODE_ACTIVE_HIGH_INDEX + 1 ][ BLOOD_LEAK_EMB_MODE_IS_UART_COL_INDEX ] = TRUE;
+        case CS_EMB_MODE_CMD:
+        case T_EMB_MODE_CMD:
+        case G_EMB_MODE_CMD:
+        case I_EMB_MODE_CMD:
+        case V_EMB_MODE_CMD:
+        case Z_EMB_MODE_CMD:
+        case Q_EMB_MODE_CMD:
+        case D_EMB_MODE_CMD:
+        case C_EMB_MODE_CMD:
+            // First clear the buffer from the older data
+            memset( bloodLeakEmbModeCmdSquence, 0x0, 2 * BLOOD_LEAK_EMB_MODE_CMD_SEQ_LENGTH );
+            // Set the command sequence
+            bloodLeakEmbModeCmdSquence[ BLOOD_LEAK_EMB_MODE_RESET_INDEX ][ BLOOD_LEAK_EMB_MODE_CMD_COL_INDEX ]               = BLOOD_LEAK_EMB_MODE_COMM_RESET;
+            bloodLeakEmbModeCmdSquence[ BLOOD_LEAK_EMB_MODE_RESET_INDEX ][ BLOOD_LEAK_EMB_MODE_IS_UART_COL_INDEX ]           = TRUE;
+            bloodLeakEmbModeCmdSquence[ BLOOD_LEAK_EMB_MODE_RESET_INDEX + 1 ][ BLOOD_LEAK_EMB_MODE_CMD_COL_INDEX ]           = BLOOD_LEAK_EMB_MODE_COMM_ACTIVE_LOW;
+            bloodLeakEmbModeCmdSquence[ BLOOD_LEAK_EMB_MODE_RESET_INDEX + 1 ][ BLOOD_LEAK_EMB_MODE_IS_UART_COL_INDEX ]       = TRUE;
+            bloodLeakEmbModeCmdSquence[ BLOOD_LEAK_EMB_MODE_CMD_INDEX ][ BLOOD_LEAK_EMB_MODE_CMD_COL_INDEX ]                 = command;
+            bloodLeakEmbModeCmdSquence[ BLOOD_LEAK_EMB_MODE_CMD_INDEX ][ BLOOD_LEAK_EMB_MODE_IS_UART_COL_INDEX ]             = FALSE;
+            bloodLeakEmbModeCmdSquence[ BLOOD_LEAK_EMB_MODE_STOP_WRITE_INDEX ][ BLOOD_LEAK_EMB_MODE_CMD_COL_INDEX ]          = BLOOD_LEAK_STOP_WRITE_FIFO_COMMAND;
+            bloodLeakEmbModeCmdSquence[ BLOOD_LEAK_EMB_MODE_STOP_WRITE_INDEX ][ BLOOD_LEAK_EMB_MODE_IS_UART_COL_INDEX ]      = FALSE;
+            bloodLeakEmbModeCmdSquence[ BLOOD_LEAK_EMB_MODE_ACTIVE_HIGH_INDEX ][ BLOOD_LEAK_EMB_MODE_CMD_COL_INDEX ]         = BLOOD_LEAK_EMB_MODE_COMM_ACTIVE_HIGH;
+            bloodLeakEmbModeCmdSquence[ BLOOD_LEAK_EMB_MODE_ACTIVE_HIGH_INDEX ][ BLOOD_LEAK_EMB_MODE_IS_UART_COL_INDEX ]     = TRUE;
+            bloodLeakEmbModeCmdSquence[ BLOOD_LEAK_EMB_MODE_ACTIVE_HIGH_INDEX + 1 ][ BLOOD_LEAK_EMB_MODE_CMD_COL_INDEX ]     = BLOOD_LEAK_EMB_MODE_COMM_ACTIVE_LOW;
+            bloodLeakEmbModeCmdSquence[ BLOOD_LEAK_EMB_MODE_ACTIVE_HIGH_INDEX + 1 ][ BLOOD_LEAK_EMB_MODE_IS_UART_COL_INDEX ] = TRUE;
 
-           // Set the variables for the next state
-           bloodLeakUARTCmdIndex        = 0;
-           bloodLeakEmbModeRespIndex    = 0;
-           bloodLeakEmbModeCmdSeqLength = BLOOD_LEAK_EMB_MODE_CMD_SEQ_LENGTH;
-           bloodLeakEmbModeOpsStartTime = getMSTimerCount();
-           state                        = BLOOD_LEAK_CAL_SEND_COMMAND_STATE;
-           // Clear the response buffer to able to receive fresh data
-           memset( bloodLeakEmbModeRespBuffer, 0x0, BLOOD_LEAK_EMB_MODE_RESP_BUFFER_LEN );
-         break;
+            // Set the variables for the next state
+            bloodLeakUARTCmdIndex        = 0;
+            bloodLeakEmbModeRespIndex    = 0;
+            bloodLeakEmbModeCmdSeqLength = BLOOD_LEAK_EMB_MODE_CMD_SEQ_LENGTH;
+            bloodLeakEmbModeOpsStartTime = getMSTimerCount();
+            state                        = BLOOD_LEAK_CAL_SEND_COMMAND_STATE;
+            // Clear the response buffer to able to receive fresh data
+            memset( bloodLeakEmbModeRespBuffer, 0x0, BLOOD_LEAK_EMB_MODE_RESP_BUFFER_LEN );
+          break;
 
-       case SP_EMB_MODE_CMD:
-           prepareSetPointSeq( bloodLeakEmbModeSetPoint );
-           bloodLeakEmbModeRespIndex    = 0;
-           bloodLeakEmbModeOpsStartTime = getMSTimerCount();
-           state                        = BLOOD_LEAK_CAL_SEND_COMMAND_STATE;
-           // Clear the command sequence buffer in case it is needed to send byte read request. The byte
-           // read requests are sent using this buffer while the set point is set using the set point buffer
-           memset( bloodLeakEmbModeCmdSquence, 0x0, 2 * BLOOD_LEAK_EMB_MODE_CMD_SEQ_LENGTH );
-           // Clear the response buffer to able to receive fresh data
-           memset( bloodLeakEmbModeRespBuffer, 0x0, BLOOD_LEAK_EMB_MODE_RESP_BUFFER_LEN );
-           break;
+        case SP_EMB_MODE_CMD:
+            prepareSetPointSeq( bloodLeakEmbModeSetPoint );
+            bloodLeakEmbModeRespIndex    = 0;
+            bloodLeakEmbModeOpsStartTime = getMSTimerCount();
+            state                        = BLOOD_LEAK_CAL_SEND_COMMAND_STATE;
+            // Clear the command sequence buffer in case it is needed to send byte read request. The byte
+            // read requests are sent using this buffer while the set point is set using the set point buffer
+            memset( bloodLeakEmbModeCmdSquence, 0x0, 2 * BLOOD_LEAK_EMB_MODE_CMD_SEQ_LENGTH );
+            // Clear the response buffer to able to receive fresh data
+            memset( bloodLeakEmbModeRespBuffer, 0x0, BLOOD_LEAK_EMB_MODE_RESP_BUFFER_LEN );
+            break;
     }
 
     return state;
Index: firmware/App/Modes/ModePostTreat.c
===================================================================
diff -u -rfe91ec494378a7df34e3c14853a797f9f8f044e9 -r88a6a776015d6aee3a403a785bf9bbbec26028a8
--- firmware/App/Modes/ModePostTreat.c	(.../ModePostTreat.c)	(revision fe91ec494378a7df34e3c14853a797f9f8f044e9)
+++ firmware/App/Modes/ModePostTreat.c	(.../ModePostTreat.c)	(revision 88a6a776015d6aee3a403a785bf9bbbec26028a8)
@@ -328,7 +328,7 @@
  *************************************************************************/
 void signalAlarmActionToPostTreatmentMode( ALARM_ACTION_T action )
 {
-
+    // Do nothing for now
 }
 
 /*********************************************************************//**