Index: firmware/App/Controllers/DGInterface.c =================================================================== diff -u -r182a81ed78f66f05ef286e2456c6c86f5e4f3e28 -r867eed1d3a71f8fac87ac6dece093a391663188a --- firmware/App/Controllers/DGInterface.c (.../DGInterface.c) (revision 182a81ed78f66f05ef286e2456c6c86f5e4f3e28) +++ firmware/App/Controllers/DGInterface.c (.../DGInterface.c) (revision 867eed1d3a71f8fac87ac6dece093a391663188a) @@ -720,11 +720,11 @@ DRAIN_RESERVOIR_CMD_PAYLOAD_T payload; dgCmdResp[ DG_CMD_START_DRAIN ].commandID = DG_CMD_NONE; - payload.drainToVolumeML = drainToVolMl; - payload.tareLoadCells = tareLoadCell; - payload.rinseConcentrateLines = rinse; - payload.cmd = start; - dgReservoirDrainVolumeTargetSet = drainToVolMl; + payload.drainToVolumeML = drainToVolMl; + payload.tareLoadCells = tareLoadCell; + payload.rinseConcentrateLines = rinse; + payload.cmd = start; + dgReservoirDrainVolumeTargetSet = drainToVolMl; sendDGDrainCommand( &payload ); } Index: firmware/App/Controllers/Fans.c =================================================================== diff -u -r284948857d8d212e25bd379fa3e7f6305fbc56e4 -r867eed1d3a71f8fac87ac6dece093a391663188a --- firmware/App/Controllers/Fans.c (.../Fans.c) (revision 284948857d8d212e25bd379fa3e7f6305fbc56e4) +++ firmware/App/Controllers/Fans.c (.../Fans.c) (revision 867eed1d3a71f8fac87ac6dece093a391663188a) @@ -92,10 +92,10 @@ static FANS_EXEC_STATES_T handleExecStateRun( void ); static void setInletFansDutyCycle( F32 pwm ); -static F32 getMaximumTemperature( void ); +static F32 getMaximumTemperature( void ); static void convertTogglePeriod2RPM( void ); static void monitorFans( void ); -static U32 getPublishFansDataInterval( void ); +static U32 getPublishFansDataInterval( void ); static void publishFansData( void ); /*********************************************************************//** @@ -350,16 +350,16 @@ // NOTE: A for loop was not used because the venous pressure sensor's temperature // is not used as one of temperature values to decide the hottest temperature - temperature = getTemperatureValue( THERMISTOR_ONBOARD_NTC ); + temperature = getTemperatureValue( THERMISTOR_ONBOARD_NTC ); maxTemperature = ( temperature > maxTemperature ? temperature : maxTemperature ); - temperature = getTemperatureValue( THERMISTOR_POWER_SUPPLY_1 ); + temperature = getTemperatureValue( THERMISTOR_POWER_SUPPLY_1 ); maxTemperature = ( temperature > maxTemperature ? temperature : maxTemperature ); - temperature = getTemperatureValue( TEMPSENSOR_FPGA_BOARD_SENSOR ); + temperature = getTemperatureValue( TEMPSENSOR_FPGA_BOARD_SENSOR ); maxTemperature = ( temperature > maxTemperature ? temperature : maxTemperature ); - temperature = getTemperatureValue( TEMPSENSOR_PBA_ADC_SENSOR ); + temperature = getTemperatureValue( TEMPSENSOR_PBA_ADC_SENSOR ); maxTemperature = ( temperature > maxTemperature ? temperature : maxTemperature ); return maxTemperature; @@ -411,8 +411,8 @@ { FAN_NAMES_T fan; BOOL isFanRPMOutOfRange = FALSE; - BOOL isAlarmTriggered = FALSE; - F32 rpm = 0.0; + BOOL isAlarmTriggered = FALSE; + F32 rpm = 0.0; // The RPM is expected to be 5500 @ 100% duty cycle // The nominal RPM = duty cycle * 5500 / 1.0 Index: firmware/App/Services/Reservoirs.c =================================================================== diff -u -r284948857d8d212e25bd379fa3e7f6305fbc56e4 -r867eed1d3a71f8fac87ac6dece093a391663188a --- firmware/App/Services/Reservoirs.c (.../Reservoirs.c) (revision 284948857d8d212e25bd379fa3e7f6305fbc56e4) +++ firmware/App/Services/Reservoirs.c (.../Reservoirs.c) (revision 867eed1d3a71f8fac87ac6dece093a391663188a) @@ -193,6 +193,19 @@ publishReservoirData(); } +/*********************************************************************//** + * @brief + * The getReservoirCycleTime function returns the depletion time which is the + * cycle time in milliseconds. + * @details Inputs: none + * @details Outputs: timeDepleteMS + * @return timeDepleteMS which is the reservoir cycle time + *************************************************************************/ +U32 getReservoirCycleTime( void ) +{ + return timeDepleteMS; +} + // ********** private functions ********** /*********************************************************************//** Index: firmware/App/Services/Reservoirs.h =================================================================== diff -u -r284948857d8d212e25bd379fa3e7f6305fbc56e4 -r867eed1d3a71f8fac87ac6dece093a391663188a --- firmware/App/Services/Reservoirs.h (.../Reservoirs.h) (revision 284948857d8d212e25bd379fa3e7f6305fbc56e4) +++ firmware/App/Services/Reservoirs.h (.../Reservoirs.h) (revision 867eed1d3a71f8fac87ac6dece093a391663188a) @@ -42,6 +42,8 @@ void execReservoirs( void ); +U32 getReservoirCycleTime( void ); + /**@}*/ #endif