Index: firmware/App/Monitors/Level.h =================================================================== diff -u -rc85d9f0a8023fabdf1cd557965958d225e2b9085 -r8c5ca1982c53f4702c6f019ce9bcfedb9e513548 --- firmware/App/Monitors/Level.h (.../Level.h) (revision c85d9f0a8023fabdf1cd557965958d225e2b9085) +++ firmware/App/Monitors/Level.h (.../Level.h) (revision 8c5ca1982c53f4702c6f019ce9bcfedb9e513548) @@ -35,8 +35,7 @@ /// DD floater and level sensor enumeration typedef enum level_names { - FLOATER_1 = 0, ///< floater switch low to medium status - FLOATER_2, ///< floater switch medium to high status + FLOATER_LEVEL = 0, ///< floater switch low, medium and high status BICARB_LEVEL, ///< bicarb level low or high status SPENT_DIALYSATE_LEVEL, ///< Spent dialysate air separation chamber level low or high status NUM_OF_LEVELS ///< Number of levels @@ -45,17 +44,16 @@ /// floater and level sensor states. typedef enum level_States { - STATE_LOW = 0, ///< Low level - STATE_HIGH, ///< High level - STATE_MEDIUM, ///< Medium level - NUM_OF_LEVELS_STATES ///< Number of level states + LEVEL_STATE_LOW = 0, ///< Low level + LEVEL_STATE_HIGH, ///< High level + LEVEL_STATE_MEDIUM, ///< Medium level + NUM_OF_LEVELS_STATES ///< Number of level states } LEVEL_STATE_T; /// DD floater and level sensor data publish structure typedef struct { - U32 floater1Level; ///< Floater 1 level - U32 floater2Level; ///< Floater 2 level + U32 floaterLevel; ///< Floater level U32 bicarbLevel; ///< Bicarb level U32 spentDialysateLevel; ///< Spent dialysate level } LEVEL_DATA_T;