Index: firmware/App/Controllers/DGInterface.h =================================================================== diff -u -rbc8403b288e167f51c9e991c2a07bb455c77c19a -r934a19c673175bc12c5634326f4f1af821c1916c --- firmware/App/Controllers/DGInterface.h (.../DGInterface.h) (revision bc8403b288e167f51c9e991c2a07bb455c77c19a) +++ firmware/App/Controllers/DGInterface.h (.../DGInterface.h) (revision 934a19c673175bc12c5634326f4f1af821c1916c) @@ -38,33 +38,7 @@ #else #define FILL_RESERVOIR_TO_VOLUME_ML 1300 ///< Fill reservoir to this volume (in mL) during treatment. #endif - -/// Enumeration of load cell sensors. -typedef enum Load_Cells -{ - LOAD_CELL_RESERVOIR_1_PRIMARY = 0, ///< Primary load cell for reservoir 1. - LOAD_CELL_RESERVOIR_1_BACKUP, ///< Backup load cell for reservoir 1. - LOAD_CELL_RESERVOIR_2_PRIMARY, ///< Primary load cell for reservoir 2. - LOAD_CELL_RESERVOIR_2_BACKUP, ///< Backup load cell for reservoir 2. - NUM_OF_LOAD_CELLS ///< Number of load cell sensors. -} LOAD_CELL_T; -/// Enumeration of DG reservoirs. -typedef enum DG_Reservoirs -{ - DG_RESERVOIR_1 = 0, ///< Reservoir number 1. - DG_RESERVOIR_2, ///< Reservoir number 2. - NUM_OF_DG_RESERVOIRS ///< Number of reservoirs. -} DG_RESERVOIR_ID_T; - -/// Enumeration of DG valve settings. -typedef enum DG_Valve_Setting -{ - VALVE_SETTING_R1_TO_R2 = 0, ///< Valve setting for displacement from reservoir 1 to reservoir 2 - VALVE_SETTING_R2_TO_R1, ///< Valve setting for displacement from reservoir 2 to reservoir 1 - NUM_OF_VALVE_SETTTINGS ///< Number of valve settings -} DG_VALVE_SETTING_ID_T; - /// Enumeration of DG pressure sensors. typedef enum DG_PressureSensors { @@ -156,7 +130,7 @@ U32 getDGROPumpPressureSetPt( void ); F32 getDGROPumpFlowRateMlMin( void ); U32 getDGDrainPumpRPMSetPt( void ); -F32 getLoadCellWeightInGrams( LOAD_CELL_T loadCellID ); +F32 getLoadCellWeightInGrams( LOAD_CELL_ID_T loadCellID ); F32 getReservoirWeightSmallFilter( DG_RESERVOIR_ID_T resID ); F32 getReservoirWeightLargeFilter( DG_RESERVOIR_ID_T resID );