Index: firmware/App/Services/Reservoirs.h =================================================================== diff -u -r1aeab08c1baf6445514b81fe51fc60a3e536e782 -r7d293e18ea5ac0fce443c68525100e44df80b4fd --- firmware/App/Services/Reservoirs.h (.../Reservoirs.h) (revision 1aeab08c1baf6445514b81fe51fc60a3e536e782) +++ firmware/App/Services/Reservoirs.h (.../Reservoirs.h) (revision 7d293e18ea5ac0fce443c68525100e44df80b4fd) @@ -35,12 +35,12 @@ #define MAX_RESERVOIR_VOLUME_ML 2000 ///< Maximum reservoir volume in mL. #pragma pack(push,1) - /// Fill command data structure. typedef struct { U32 fillToVolumeMl; ///< Target volume to fill to (in mL) U32 cmd; ///< General command (start/stop) + F32 targetFlowLPM; ///< Target flow rate L/min } FILL_CMD_T; /// Drain command data structure. @@ -67,7 +67,6 @@ U32 fillToVolumeMl; ///< Volume target to fill to U32 drainToVolumeMl; ///< Volume target to drain to } RESERVOIR_DATA_T; - #pragma pack(pop) // ********** public function prototypes ********** @@ -79,7 +78,7 @@ void setActiveReservoirCmd( DG_RESERVOIR_ID_T resID ); // handle switch reservoirs command from HD void changeValveSettingCmd( DG_VALVE_SETTING_ID_T valveSettingID ); // handle valve setting change command from HD -void startFillCmd( U32 fillToVolMl ); // handle fill command from HD +void startFillCmd( U32 fillToVolMl, F32 fillTargetFlowLPM ); // handle fill command from HD void stopFillCmd( void ); // handle stop fill command from HD void startDrainCmd( DRAIN_CMD_T drainCmd ); // handle drain command from HD void stopDrainCmd( void ); // handle stop drain command from HD @@ -89,6 +88,7 @@ DG_RESERVOIR_ID_T getInactiveReservoir( void ); F32 getReservoirWeight( DG_RESERVOIR_ID_T reservoirId ); +F32 getTargetFillFlowRateLPM( void ); DG_RESERVOIR_VOLUME_RECORD_T getReservoirsCalRecord( void );