Index: firmware/App/Services/TDInterface.c =================================================================== diff -u -r5064632166c39b6e716f6bd14a1d89603b30c088 -r2e284dbe59e4fc8398b9d8c037a0da241ae99064 --- firmware/App/Services/TDInterface.c (.../TDInterface.c) (revision 5064632166c39b6e716f6bd14a1d89603b30c088) +++ firmware/App/Services/TDInterface.c (.../TDInterface.c) (revision 2e284dbe59e4fc8398b9d8c037a0da241ae99064) @@ -44,7 +44,7 @@ #define TD_DIALYSATE_FLOWRATE_MAX_ML_MIN ( 600.0F ) ///< TD Max dialysate flow rate (mL/min) #define TD_UF_RATE_MIN_ML_MIN ( 0.0F ) ///< TD Min UF rate (mL/min) -#define TD_UF_RATE_MAX_ML_MIN ( 2000.0F ) ///< TD Max UF rate (mL/min) +#define TD_UF_RATE_MAX_ML_MIN ( 2000.0F / 60.0F ) ///< TD Max UF rate (mL/min) #define TD_DIALYSATE_TEMP_MIN_DEGC ( 35.0F ) ///< TD Min dialysate temperature (deg C) #define TD_DIALYSATE_TEMP_MAX_DEGC ( 38.0F ) ///< TD Max dialysate temperature (deg C) @@ -74,11 +74,11 @@ static BOOL tdOpModeDataFreshFlag = FALSE; ///< Flag to signal/process fresh TD op mode data -static OVERRIDE_F32_T tdDialysateFlowrateOverride; ///< TD override Dialysate flow rate -static OVERRIDE_F32_T tdUFRateOverride; ///< TD override ultrafiltration rate -static OVERRIDE_F32_T tdDialysateTempOverride; ///< TD override Target Dialysate Temperature -static OVERRIDE_U32_T tdAcidTypeOverride; ///< TD override Acid type -static OVERRIDE_U32_T tdBicarbTypeOverride; ///< TD override Bicarb type +static OVERRIDE_F32_T tdDialysateFlowrate; ///< TD override Dialysate flow rate +static OVERRIDE_F32_T tdUFRate; ///< TD override ultrafiltration rate +static OVERRIDE_F32_T tdDialysateTemp; ///< TD override Target Dialysate Temperature +static OVERRIDE_U32_T tdAcidType; ///< TD override Acid type +static OVERRIDE_U32_T tdBicarbType; ///< TD override Bicarb type // ********** private function prototypes ********** @@ -94,36 +94,36 @@ void initTDInterface( void ) { // Initialize unit state variables - tdCurrentOpMode = MODE_INIT; - tdSubMode = 0U; - tdDialyzerBypass = FALSE; - tdOpModeDataFreshFlag = FALSE; + tdCurrentOpMode = MODE_INIT; + tdSubMode = 0U; + tdDialyzerBypass = FALSE; + tdOpModeDataFreshFlag = FALSE; - // Initialize F32 overrides - tdDialysateFlowrateOverride.data = 0.0F; - tdDialysateFlowrateOverride.ovData = 0.0F; - tdDialysateFlowrateOverride.ovInitData = TD_DIALYSATE_FLOWRATE_MIN_ML_MIN; - tdDialysateFlowrateOverride.override = OVERRIDE_RESET; + // Initialize overrides + tdDialysateFlowrate.data = 0.0F; + tdDialysateFlowrate.ovData = 0.0F; + tdDialysateFlowrate.ovInitData = TD_DIALYSATE_FLOWRATE_MIN_ML_MIN; + tdDialysateFlowrate.override = OVERRIDE_RESET; - tdUFRateOverride.data = 0.0F; - tdUFRateOverride.ovData = 0.0F; - tdUFRateOverride.ovInitData = TD_UF_RATE_MIN_ML_MIN; - tdUFRateOverride.override = OVERRIDE_RESET; + tdUFRate.data = 0.0F; + tdUFRate.ovData = 0.0F; + tdUFRate.ovInitData = TD_UF_RATE_MIN_ML_MIN; + tdUFRate.override = OVERRIDE_RESET; - tdDialysateTempOverride.data = 0.0F; - tdDialysateTempOverride.ovData = 0.0F; - tdDialysateTempOverride.ovInitData = TD_DIALYSATE_TEMP_MIN_DEGC; - tdDialysateTempOverride.override = OVERRIDE_RESET; + tdDialysateTemp.data = 0.0F; + tdDialysateTemp.ovData = 0.0F; + tdDialysateTemp.ovInitData = TD_DIALYSATE_TEMP_MIN_DEGC; + tdDialysateTemp.override = OVERRIDE_RESET; - tdAcidTypeOverride.data = TD_ACID_TYPE_MIN; - tdAcidTypeOverride.ovData = TD_ACID_TYPE_MIN; - tdAcidTypeOverride.ovInitData = TD_ACID_TYPE_MIN; - tdAcidTypeOverride.override = OVERRIDE_RESET; + tdAcidType.data = TD_ACID_TYPE_MIN; + tdAcidType.ovData = TD_ACID_TYPE_MIN; + tdAcidType.ovInitData = TD_ACID_TYPE_MIN; + tdAcidType.override = OVERRIDE_RESET; - tdBicarbTypeOverride.data = TD_BICARB_TYPE_MIN; - tdBicarbTypeOverride.ovData = TD_BICARB_TYPE_MIN; - tdBicarbTypeOverride.ovInitData = TD_BICARB_TYPE_MIN; - tdBicarbTypeOverride.override = OVERRIDE_RESET; + tdBicarbType.data = TD_BICARB_TYPE_MIN; + tdBicarbType.ovData = TD_BICARB_TYPE_MIN; + tdBicarbType.ovInitData = TD_BICARB_TYPE_MIN; + tdBicarbType.override = OVERRIDE_RESET; } /**********************************************************************//** @@ -228,40 +228,40 @@ * The setTDDialysateFlowrate function sets the latest TD dialysate flow * rate. * @details \b Inputs: none - * @details \b Outputs: tdDialysateFlowrateOverride + * @details \b Outputs: tdDialysateFlowrate * @param dialysate flow rate. * @return none. *************************************************************************/ void setTDDialysateFlowrate( F32 dialFlowrate ) { - tdDialysateFlowrateOverride.data = dialFlowrate; + tdDialysateFlowrate.data = dialFlowrate; } /*********************************************************************//** * @brief * The setTDUFRate function sets the latest TD UF rate. * @details \b Inputs: none - * @details \b Outputs: tdUFRateOverride + * @details \b Outputs: tdUFRate * @param ultrafiltration flow rate. * @return none. *************************************************************************/ void setTDUFRate( F32 ufRate ) { - tdUFRateOverride.data = ufRate; + tdUFRate.data = ufRate; } /*********************************************************************//** * @brief * The setTDTargetDialysateTemperature function sets the latest TD dialysate * temperature. * @details \b Inputs: none - * @details \b Outputs: tdDialysateTempOverride + * @details \b Outputs: tdDialysateTemp * @param Target dialysate temperature. * @return none. *************************************************************************/ void setTDTargetDialysateTemperature( F32 dialTemperature ) { - tdDialysateTempOverride.data = dialTemperature; + tdDialysateTemp.data = dialTemperature; } /*********************************************************************//** @@ -290,47 +290,47 @@ *************************************************************************/ void setTDAcidAndBicarbType( U32 acid, U32 bicarb ) { - tdAcidTypeOverride.data = (DD_ACID_TYPES_T)acid; - tdBicarbTypeOverride.data = (DD_BICARB_TYPES_T)bicarb; + tdAcidType.data = (DD_ACID_TYPES_T)acid; + tdBicarbType.data = (DD_BICARB_TYPES_T)bicarb; } /*********************************************************************//** * @brief * The getTDDialysateFlowrate function gets the latest TD dialysate flow * rate. - * @details \b Inputs: tdDialysateFlowrateOverride + * @details \b Inputs: tdDialysateFlowrate * @details \b Outputs: none * @return Latest TD dialysate flow rate. *************************************************************************/ F32 getTDDialysateFlowrate( void ) { - return getF32OverrideValue( &tdDialysateFlowrateOverride ); + return getF32OverrideValue( &tdDialysateFlowrate ); } /*********************************************************************//** * @brief * The getTDUFrate function gets the latest TD ultrafiltration flow * rate. - * @details \b Inputs: tdUFRateOverride + * @details \b Inputs: tdUFRate * @details \b Outputs: none * @return Latest UF rate. *************************************************************************/ F32 getTDUFRate( void ) { - return getF32OverrideValue( &tdUFRateOverride ); + return getF32OverrideValue( &tdUFRate ); } /*********************************************************************//** * @brief * The getTDTargetDialysateTemperature function gets the latest TD * target dialysate temperature rate. - * @details \b Inputs: tdDialysateTempOverride + * @details \b Inputs: tdDialysateTemp * @details \b Outputs: none * @return Latest target dialysate temperature. *************************************************************************/ F32 getTDTargetDialysateTemperature( void ) { - return getF32OverrideValue( &tdDialysateTempOverride ); + return getF32OverrideValue( &tdDialysateTemp ); } /*********************************************************************//** @@ -351,27 +351,27 @@ * @brief * The getTDAcidConcentrateType function gets the latest Acid concentrate * type. - * @details \b Inputs: tdAcidTypeOverride + * @details \b Inputs: tdAcidType * @details \b Outputs: None * @return Latest acid concentrate type. . ******************************************************************************/ DD_ACID_TYPES_T getTDAcidConcentrateType( void ) { - U32 value = getU32OverrideValue( &tdAcidTypeOverride ); + U32 value = getU32OverrideValue( &tdAcidType ); return (DD_ACID_TYPES_T)value; } /*********************************************************************//** * @brief * The getTDBicarbConcentrateType function gets the latest Bicarb concentrate * type. - * @details \b Inputs: tdBicarbTypeOverride + * @details \b Inputs: tdBicarbType * @details \b Outputs: none * @return Latest bicarb concentrate type. *************************************************************************/ DD_BICARB_TYPES_T getTDBicarbConcentrateType( void ) { - U32 value = getU32OverrideValue( &tdBicarbTypeOverride ); + U32 value = getU32OverrideValue( &tdBicarbType ); return (DD_BICARB_TYPES_T)value; } @@ -538,23 +538,23 @@ switch ( (TD_TREATMENT_OVERRIDE_INDEX_T)payload.index ) { case TD_TREATMENT_OVERRIDE_DIALYSATE_FLOWRATE: - result = f32Override( message, &tdDialysateFlowrateOverride ); + result = f32Override( message, &tdDialysateFlowrate ); break; case TD_TREATMENT_OVERRIDE_UF_RATE: - result = f32Override( message, &tdUFRateOverride ); + result = f32Override( message, &tdUFRate ); break; case TD_TREATMENT_OVERRIDE_DIALYSATE_TEMP: - result = f32Override( message, &tdDialysateTempOverride ); + result = f32Override( message, &tdDialysateTemp ); break; case TD_TREATMENT_OVERRIDE_ACID_TYPE: - result = u32Override( message,&tdAcidTypeOverride,TD_ACID_TYPE_MIN,TD_ACID_TYPE_MAX ); + result = u32Override( message,&tdAcidType,TD_ACID_TYPE_MIN,TD_ACID_TYPE_MAX ); break; case TD_TREATMENT_OVERRIDE_BICARB_TYPE: - result = u32Override( message,&tdBicarbTypeOverride,TD_BICARB_TYPE_MIN,TD_BICARB_TYPE_MAX ); + result = u32Override( message,&tdBicarbType,TD_BICARB_TYPE_MIN,TD_BICARB_TYPE_MAX ); break; default: