Index: firmware/App/Controllers/DGInterface.h =================================================================== diff -u -r8f4112033e1c247f629202cdc97389ffd5cb0170 -rd39ef6232e746a4f2d425135208602670fae60bd --- firmware/App/Controllers/DGInterface.h (.../DGInterface.h) (revision 8f4112033e1c247f629202cdc97389ffd5cb0170) +++ firmware/App/Controllers/DGInterface.h (.../DGInterface.h) (revision d39ef6232e746a4f2d425135208602670fae60bd) @@ -37,46 +37,12 @@ #define FILL_RESERVOIR_TO_VOLUME_LOW_FLOW_ML 1300 ///< Fill reservoir to this volume (in mL) during treatment if dialysate flow is slow. #define SLOW_DIALYSATE_FLOW_ML_MIN 250 ///< Threshold for slow dialysate flow designation. -/// Enumeration of DG pressure sensors. -typedef enum DG_PressureSensors -{ - DG_PRESSURE_SENSOR_RO_PUMP_INLET = 0, ///< RO pump pressure sensor - DG_PRESSURE_SENSOR_RO_PUMP_OUTLET, ///< RO pump pressure sensor - DG_PRESSURE_SENSOR_DRAIN_PUMP_INLET, ///< Drain pump inlet pressure - DG_PRESSURE_SENSOR_DRAIN_PUMP_OUTLET, ///< Drain pump outlet pressure - NUM_OF_DG_PRESSURE_SENSORS ///< Number of pressure sensors -} DG_PRESSURE_SENSORS_T; - -/// Payload record structure for an RO pump data message. -typedef struct -{ - U32 setPtPSI; ///< RO pump set target pressure - F32 measFlowRateMlMin; ///< RO pump measured flow rate in mL per min - F32 setPWMDutyCyclePct; ///< RO pump set PWM duty cycle percent -} DG_RO_PUMP_DATA_PAYLOAD_T; - /// Dialysate flow meter data struct. typedef struct { F32 measuredDialysateFlowRate; ///< Dialysate flow meter rate average measurement } DIALYSATE_FLOW_METER_DATA_T; -/// Payload record structure for a drain pump data message. -typedef struct -{ - U32 setPtRPM; ///< Drain pump set RPM value - F32 setDAC; ///< Drain pump set DAC value -} DG_DRAIN_PUMP_DATA_PAYLOAD_T; - -/// Payload record structure for a DG pressures data message. -typedef struct -{ - F32 roInPSI; ///< DG inlet pressure in PSI - F32 roOutPSI; ///< DG outlet pressure in PSI - F32 drainInPSI; ///< DG drain inlet pressure in PSI - F32 drainOutPSI; ///< DG drain outlet pressure in PSI -} DG_PRESSURES_DATA_PAYLOAD_T; - /// Payload record structure for a reservoirs data message. typedef struct { @@ -153,11 +119,7 @@ DG_RESERVOIR_ID_T getDGActiveReservoir( void ); DG_RESERVOIR_ID_T getDGInactiveReservoir( void ); BOOL hasDGCompletedReservoirSwitch( void ); -F32 getDGPressure( DG_PRESSURE_SENSORS_T sensorID ); -U32 getDGROPumpPressureSetPt( void ); -F32 getDGROPumpFlowRateMlMin( void ); F32 getDGDialysateFlowRateMlMin( void ); -U32 getDGDrainPumpRPMSetPt( void ); F32 getLoadCellWeight( LOAD_CELL_ID_T loadCellID ); F32 getReservoirWeight( DG_RESERVOIR_ID_T resID ); F32 getReservoirWeightLargeFilter( DG_RESERVOIR_ID_T resID ); @@ -168,10 +130,7 @@ void setDialysateTemperatureReadings( F32 temp1, F32 temp2 ); void setDGDialysateTemperatures( F32 primaryHtrTemp, F32 trimmerHtrTemp ); void setDGReservoirsData( DG_RESERVOIR_ID_T resID, U32 fillVol, U32 drainVol ); -void setDGPressures( F32 roIn, F32 roOut, F32 drainIn, F32 drainOut ); -void setDGROPumpData( U32 presSetPt, F32 flowRate ); -void setDialysateFlowData( F32 flowRate ); -void setDGDrainPumpData( U32 rpmSetPt ); +void setDialysateFlowData( F32 flowRate ); void setNewLoadCellReadings( F32 res1Primary, F32 res1Backup, F32 res2Primary, F32 res2Backup ); void setDGDisinfectsStates( DG_DISINFECT_UI_STATES_T states );