Index: firmware/App/Controllers/BloodLeak.c
===================================================================
diff -u -rb442cce89b3fde168017fa38c6f5f799da8b4510 -r1949c8bc59aab6710c6ead6876598eb929d698d5
--- firmware/App/Controllers/BloodLeak.c	(.../BloodLeak.c)	(revision b442cce89b3fde168017fa38c6f5f799da8b4510)
+++ firmware/App/Controllers/BloodLeak.c	(.../BloodLeak.c)	(revision 1949c8bc59aab6710c6ead6876598eb929d698d5)
@@ -90,7 +90,7 @@
 #define BLOOD_LEAK_EMB_MODE_NUM_OF_INFO_CMDS  3                                                  ///< Blood leak embedded mode number of informative commands.
 
 #define BLOOD_LEAK_FPGA_ERROR_TIMEOUT_MS     ( 2 * MS_PER_SECOND )                               ///< Blood leak embedded mode FPGA error timeout in milliseconds.
-#define BLOOD_LEAK_RXFIFO_COUNT_MASK         0x03ff                                              ///< Mask high order bits of blood leak sensor rx count
+#define BLOOD_LEAK_RXFIFO_COUNT_MASK         0x03FF                                              ///< Mask high order bits of blood leak sensor rx count
 
 #define MAX_BLOOD_LEAK_COMM_FAILURES_WINDOW_MS ( 1 * SEC_PER_MIN * MS_PER_SECOND )              ///< Blood Leak comm failures window
 #define MAX_BLOOD_LEAK_COMM_FAILURES          3                                                 ///< Blood Leak maximum comm failures per MAX_BLOOD_LEAK_COMM_FAILURES_WINDOW_MS
@@ -346,6 +346,11 @@
         case BLOOD_LEAK_EMB_MODE_WAIT_FOR_COMMAND_RESPONSE_STATE:
             bloodLeakEmbModeSubstate = handleBloodLeakEmbModeWaitForCommandResponseState();
             break;
+
+        default:
+            SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, SW_FAULT_ID_BLOOD_LEAK_EMBEDDED_MODE_INVALID_STATE )
+            bloodLeakEmbModeSubstate = BLOOD_LEAK_EMB_MODE_WAIT_FOR_COMAND_STATE;
+            break;
     }
 }
 
@@ -563,6 +568,10 @@
                 // All the commands shall be processed and have data prior to checking the results
                 areCommandsReady &= bloodLeakEmbModeCmd[ i ].isCmdRespRdy;
                 break;
+
+            default:
+                // Do nothing with the rest of the commands
+                break;
         }
     }
 
@@ -593,6 +602,10 @@
                     hasCmdSqncFailed |= hasCurrCmdFailed;
                     failedCmd         = ( TRUE == hasCurrCmdFailed ? i : NU_EMB_MODE_CMD );
                     break;
+
+                default:
+                    // Do nothing with the rest of the commands
+                    break;
             }
         }
 
@@ -926,7 +939,8 @@
     {
         // If the element in the first index of the command sequence buffer is the read a byte request, set the variable to TRUE so the
         // wait for data to receive state knows that the request has been sent and it can read the byte.
-        U08 commandInIndex0               = bloodLeakEmbModeCmdSeq[ BLOOD_LEAK_EMB_MODE_REQUEST_RX_INDEX ][ BLOOD_LEAK_EMB_MODE_CMD_COL_INDEX ];
+        U08 commandInIndex0 = bloodLeakEmbModeCmdSeq[ BLOOD_LEAK_EMB_MODE_REQUEST_RX_INDEX ][ BLOOD_LEAK_EMB_MODE_CMD_COL_INDEX ];
+
         bloodLeakEmbModeHasRxRqstBeenSent = ( BLOOD_LEAK_EMB_MODE_COMM_READ_REQST == commandInIndex0 ? TRUE : FALSE );
         bloodLeakUARTCmdIndex             = 0;
         bloodLeakEmbModeCmdSeqLength      = 0;
@@ -1261,6 +1275,7 @@
 
         data.bloodLeakStatus            = (U32)getBloodLeakStatus();
         data.bloodLeakState             = (U32)bloodLeakState;
+        data.bloodLeakPersitentCounter  = bloodLeakPersistenceCtr;
         bloodLeakDataPublicationCounter = 0;
 
         broadcastData( MSG_ID_HD_BLOOD_LEAK_DATA, COMM_BUFFER_OUT_CAN_HD_BROADCAST, (U08*)&data, sizeof( BLOOD_LEAK_DATA_T ) );
@@ -1491,7 +1506,20 @@
     }
 }
 
+/*********************************************************************//**
+ * @brief
+ * The getBloodLeakRxBytesAvailable function returns the number of received
+ * bytes available from FPGA.
+ * @details Inputs: none
+ * @details Outputs: none
+ * @return Number of received bytes available
+ *************************************************************************/
+static U16 getBloodLeakRxBytesAvailable( void )
+{
+    return getFPGABloodLeakRxFIFOCount() & BLOOD_LEAK_RXFIFO_COUNT_MASK;
+}
 
+
 /*************************************************************************
  *                       TEST SUPPORT FUNCTIONS
  *************************************************************************/
@@ -1648,9 +1676,4 @@
     return result;
 }
 
-static U16 getBloodLeakRxBytesAvailable( void )
-{
-    return getFPGABloodLeakRxFIFOCount() & BLOOD_LEAK_RXFIFO_COUNT_MASK;
-}
-
 /**@}*/