Index: firmware/App/Controllers/DGInterface.c =================================================================== diff -u -r766708fceb0bdf1af8c7897df29d4f5036bfd3db -rf3680ff380d9543102406833a48da5a2d20e6029 --- firmware/App/Controllers/DGInterface.c (.../DGInterface.c) (revision 766708fceb0bdf1af8c7897df29d4f5036bfd3db) +++ firmware/App/Controllers/DGInterface.c (.../DGInterface.c) (revision f3680ff380d9543102406833a48da5a2d20e6029) @@ -105,7 +105,6 @@ static U32 dgReservoirDrainVolumeTargetSet = 0; ///< Drain-to volume commanded. static U32 resUseTimer = 0; ///< Used to track time pumping from active reservoir (for volume used calculation). static F32 resUseVolumeMl = 0.0; ///< Accumulated volume used from active reservoir. -static BOOL resHasBeenTared[ NUM_OF_DG_RESERVOIRS ]; ///< Flags indicate whether the reservoir has been tared for this treatment. // ********** private function prototypes ********** @@ -173,21 +172,6 @@ // TODO - make sure DG sensor/state data is coming in timely manner (e.g. load cells s/b every 100 ms) } -/*********************************************************************//** - * @brief - * The initPreTreatmentReservoirMgmt function initializes the pre-treatment - * reservoir management state machine. - * @details Inputs: none - * @details Outputs: pre-treatment reservoir management state machine initialized. - * @return none - *************************************************************************/ -void initPreTreatmentReservoirMgmt( void ) -{ - // TODO - currentPreTrtResMgmtState = TREATMENT_RESERVOIR_MGMT_START_STATE; - resMgmtTimer = 0; - resHasBeenTared[ DG_RESERVOIR_1 ] = FALSE; - resHasBeenTared[ DG_RESERVOIR_2 ] = FALSE; -} /*********************************************************************//** * @brief Index: firmware/App/Controllers/DGInterface.h =================================================================== diff -u -r766708fceb0bdf1af8c7897df29d4f5036bfd3db -rf3680ff380d9543102406833a48da5a2d20e6029 --- firmware/App/Controllers/DGInterface.h (.../DGInterface.h) (revision 766708fceb0bdf1af8c7897df29d4f5036bfd3db) +++ firmware/App/Controllers/DGInterface.h (.../DGInterface.h) (revision f3680ff380d9543102406833a48da5a2d20e6029) @@ -129,7 +129,6 @@ void execDGInterfaceMonitor( void ); -void initPreTreatmentReservoirMgmt( void ); void initTreatmentReservoirMgmt( void ); void execTreatmentReservoirMgmt( void ); Index: firmware/App/Services/SystemCommMessages.c =================================================================== diff -u -r766708fceb0bdf1af8c7897df29d4f5036bfd3db -rf3680ff380d9543102406833a48da5a2d20e6029 --- firmware/App/Services/SystemCommMessages.c (.../SystemCommMessages.c) (revision 766708fceb0bdf1af8c7897df29d4f5036bfd3db) +++ firmware/App/Services/SystemCommMessages.c (.../SystemCommMessages.c) (revision f3680ff380d9543102406833a48da5a2d20e6029) @@ -566,9 +566,7 @@ * and queues the msg for transmit on the appropriate CAN channel. * @details Inputs: none * @details Outputs: DG drain command msg constructed and queued. - * @param drainToVolumeMl volume (in mL) to drain the inactive reservoir to - * @param tareLoadCells set to TRUE if inactive reservoir load cells should be - * tared after draining + * @param drainCmdPtr drain command data record * @return TRUE if msg successfully queued for transmit, FALSE if not *************************************************************************/ BOOL sendDGDrainCommand( DRAIN_RESERVOIR_CMD_PAYLOAD_T *drainCmdPtr )