Index: firmware/App/Monitors/Level.h
===================================================================
diff -u -r50144ec3e96785cf76d5bfd22ee65029c82e732b -r902889c30391b6ca8c9f19adfd3c841c86a5d49f
--- firmware/App/Monitors/Level.h	(.../Level.h)	(revision 50144ec3e96785cf76d5bfd22ee65029c82e732b)
+++ firmware/App/Monitors/Level.h	(.../Level.h)	(revision 902889c30391b6ca8c9f19adfd3c841c86a5d49f)
@@ -35,40 +35,45 @@
 /// DD floater and level sensor enumeration
 typedef enum level_names
 {
-    D6_LEVL = 0,                        ///< floater switch low, medium and high status
-    FIRST_DD_LEVL = D6_LEVL,            ///< First DD level
-    D63_LEVL,                           ///< Bicarb upper level low or high status
-    D98_LEVL,                           ///< Bicarb lower level low or high status
-    D46_LEVL,                           ///< Spent dialysate air separation chamber level low or high status
-    LAST_DD_LEVL = D46_LEVL,            ///< Last DD level
-    P25_LEVL,                           ///< FP level sensor
-    FIRST_FP_LEVL = P25_LEVL,           ///< FP first level sensor
-    LAST_FP_LEVL = P25_LEVL,            ///< FP last level sensor
+    D46_LEVL = 0,                       ///< Spent dialysate air separation chamber level low or high status
+    FIRST_LEVEL = D46_LEVL,
+    D63_LEVL,                           ///< Bicarb lower level conductive level sensor low or high status
+    D98_LEVL,                           ///< Bicarb upper level conductive level sensor low or high status
+    LAST_LEVEL = D98_LEVL,
+    D6_LEVL,                            ///< DD float level sensor low, medium and high status
+    FIRST_FLOAT = D6_LEVL,
+    P25_LEVL,                           ///< FP float level sensor low medium high status
+    LAST_FLOAT = P25_LEVL,
     NUM_OF_LEVELS                       ///< Number of levels
 } LEVEL_T;
 
-#define NUM_OF_DD_LEVL      ( ( LAST_DD_LEVL - FIRST_DD_LEVL ) + 1 )
-#define NUM_OF_IOFP_LEVL    ( ( LAST_FP_LEVL - FIRST_FP_LEVL ) + 1 )
-
-/// floater and level sensor states.
+/// level sensor states.
 typedef enum level_States
 {
-    LEVEL_STATE_EMPTY = 0,               ///< Empty level
     LEVEL_STATE_LOW,                     ///< Low level
-    LEVEL_STATE_MEDIUM,                  ///< Medium level
     LEVEL_STATE_HIGH,                    ///< High level
-    LEVEL_STATE_ILLEGAL,                 ///< Illegal level
-    NUM_OF_LEVELS_STATES                 ///< Number of level states
+    NUM_OF_LEVEL_STATES                  ///< Number of level states
 } LEVEL_STATE_T;
 
+/// floater and bicarb level sensor states.
+typedef enum lvl_States
+{
+    LVL_STATE_EMPTY = 0,                ///< Empty level
+    LVL_STATE_LOW,                      ///< Low level
+    LVL_STATE_MEDIUM,                   ///< Medium level
+    LVL_STATE_HIGH,                     ///< High level
+    LVL_STATE_ILLEGAL,                  ///< Illegal level
+    NUM_OF_LVL_STATES                   ///< Number of level states
+} LVL_STATE_T;
+
 /// DD floater and level sensor data publish structure
 typedef struct
 {
     U32 d6Level;                        ///< Floater level
-    U32 d63Level;                       ///< Bicarb upper level
-    U32 d98Level;                       ///< Bicarb lower level
-    U32 bicarbLevel;                    ///< Bicarb chamber level combination ( D63 + D98 )
     U32 d46Level;                       ///< Spent dialysate level
+    U32 d63Level;                       ///< Bicarb lower level
+    U32 d98Level;                       ///< Bicarb upper level
+    U32 bicarbLevel;                    ///< Bicarb chamber level combination ( D63 + D98 )
 } DD_LEVEL_DATA_T;
 
 /// FP floater and level sensor data publish structure
@@ -82,12 +87,14 @@
 void initLevels( void );
 void execLevels( void );
 LEVEL_STATE_T getLevelStatus( LEVEL_T levelId );
-LEVEL_STATE_T getBicarbChamberLevelStatus( void );
+LVL_STATE_T getFloaterStatus( LEVEL_T levelId );
+LVL_STATE_T getBicarbChamberLevelStatus( void );
 
 BOOL testLevelsDataPublishIntervalOverride( MESSAGE_T *message );
 BOOL testLevelStatusOverride( MESSAGE_T *message );
 BOOL testFPLevelsDataPublishIntervalOverride( MESSAGE_T *message );
-BOOL testFPLevelStateOverride( MESSAGE_T *message );
+BOOL testFPFloaterLevelStateOverride( MESSAGE_T *message );
+BOOL testDDFloaterLevelStateOverride( MESSAGE_T *message );
 
 /**@}*/