Index: firmware/App/Controllers/DialOutFlow.h =================================================================== diff -u -r933a18d740285e70be9d00696ed0f5a5381bc8e4 -raeb1dea9ea10fcc70ae66023a87b565f29924c07 --- firmware/App/Controllers/DialOutFlow.h (.../DialOutFlow.h) (revision 933a18d740285e70be9d00696ed0f5a5381bc8e4) +++ firmware/App/Controllers/DialOutFlow.h (.../DialOutFlow.h) (revision aeb1dea9ea10fcc70ae66023a87b565f29924c07) @@ -32,16 +32,6 @@ // ********** public definitions ********** -/// 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; - #pragma pack(push, 1) /// Dialysate outlet pump broadcast record @@ -81,15 +71,12 @@ BOOL homeDialOutPump( void ); BOOL isDialOutPumpRunning( void ); -BOOL setNewLoadCellReadings( F32 res1Primary, F32 res1Backup, F32 res2Primary, F32 res2Backup ); - // SELF_TEST_STATUS_T execDialOutFlowTest( void ); // TODO - implement later F32 getTotalTargetDialOutUFVolumeInMl( void ); F32 getTotalMeasuredUFVolumeInMl( void ); F32 getMeasuredDialOutPumpMCSpeed( void ); F32 getMeasuredDialOutPumpMCCurrent( void ); -F32 getLoadCellWeightInGrams( U32 loadCellID ); F32 getMeasuredDialOutPumpRotorSpeed( void ); F32 getMeasuredDialOutPumpSpeed( void ); @@ -108,8 +95,6 @@ BOOL testResetMeasuredDialOutPumpMCSpeedOverride( void ); BOOL testSetMeasuredDialOutPumpMCCurrentOverride( F32 value ); BOOL testResetMeasuredDialOutPumpMCCurrentOverride( void ); -BOOL testSetDialOutLoadCellWeightOverride( U32 sensor, F32 value ); -BOOL testResetDialOutLoadCellWeightOverride( U32 sensor ); /**@}*/