Index: firmware/App/Services/TDInterface.c =================================================================== diff -u -r0e6a31089c00ac89f121c538bf0e8576b38b25e7 -r8be347eb6f2bf0bc7ce8be64dd72fe0ce35e9eff --- firmware/App/Services/TDInterface.c (.../TDInterface.c) (revision 0e6a31089c00ac89f121c538bf0e8576b38b25e7) +++ firmware/App/Services/TDInterface.c (.../TDInterface.c) (revision 8be347eb6f2bf0bc7ce8be64dd72fe0ce35e9eff) @@ -40,31 +40,29 @@ // ********** private definitions ********** -#define TD_DATA_FRESHNESS_TIMEOUT_MS ( 3 * MS_PER_SECOND ) ///< TD data freshness timeout (in ms). +#define TD_DATA_FRESHNESS_TIMEOUT_MS ( 3 * MS_PER_SECOND ) ///< TD data freshness timeout (in ms). -#define TD_DIALYSATE_FLOWRATE_MIN_ML_MIN ( 50.0F ) ///< TD Min dialysate flow rate (mL/min) -#define TD_DIALYSATE_FLOWRATE_MAX_ML_MIN ( 600.0F ) ///< TD Max dialysate flow rate (mL/min) +#define TD_DIALYSATE_FLOWRATE_MIN_ML_MIN ( 50.0F ) ///< TD Min dialysate flow rate (mL/min) +#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 / 60.0F ) ///< TD Max UF 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 / 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) +#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) -#define TD_ACID_TYPE_MIN ( 0U ) ///< TD Min acid type index -#define TD_ACID_TYPE_MAX ( (U32)( NUM_OF_ACID_TYPE - 1U ) ) ///< TD Max acid type index +#define TD_ACID_TYPE_MIN ( 0U ) ///< TD Min acid type index +#define TD_ACID_TYPE_MAX ( (U32)( NUM_OF_ACID_TYPE - 1U ) ) ///< TD Max acid type index -#define TD_SODIUM_MIN ( 130U ) ///< TD Min acid type index -#define TD_SODIUM_MAX ( 155U ) ///< TD Max acid type index +#define TD_SODIUM_MIN ( 130U ) ///< TD Min acid type index +#define TD_SODIUM_MAX ( 155U ) ///< TD Max acid type index +#define TD_BICARBONATE_MIN ( 20U ) ///< TD Min acid type index +#define TD_BICARBONATE_MAX ( 40U ) ///< TD Max acid type index +#define BICARBONATE_CONVERSION_FACTOR 0.073371212F ///< Bicarbonate conversion factor mS/cm per mmol/L +#define MAX_ACID_CONC_TYPES 10 ///< Number of acid concentrate conversion factors -#define TD_BICARBONATE_MIN ( 20U ) ///< TD Min acid type index -#define TD_BICARBONATE_MAX ( 40U ) ///< TD Max acid type index - -#define BICARBONATE_CONVERSION_FACTOR 0.073371212F ///< Bicarbonate conversion factor mS/cm per mmol/L -#define MAX_ACID_CONC_TYPES 10 ///< Number of acid concentrate conversion factors - // TODO move to institutional records once implemented /// Acid concentration conversion factors for each acid type const F32 ACID_CONVERSION_FACTOR[ MAX_ACID_CONC_TYPES ] = { 0.1119255F, @@ -211,7 +209,7 @@ *************************************************************************/ void execTDInterfaceMonitor( void ) { - + // TODO:implementation pending } /*********************************************************************//**