Index: firmware/App/Services/TxParams.h =================================================================== diff -u -r6f02ff4686ec9dfc60247e9ed3fc9c5cc7771543 -r7652af03a25dfbaa4af4a7aeb0a228a16dcf979f --- firmware/App/Services/TxParams.h (.../TxParams.h) (revision 6f02ff4686ec9dfc60247e9ed3fc9c5cc7771543) +++ firmware/App/Services/TxParams.h (.../TxParams.h) (revision 7652af03a25dfbaa4af4a7aeb0a228a16dcf979f) @@ -41,25 +41,38 @@ /// Record structure for a treatment parameters payload from UI. typedef struct { + U32 treatmentModality; ///< User set treatment modality option + U32 hdfTreatmentMode; ///< User set HDF treatment mode option U32 bloodFlowRate_mL_min; ///< User set blood flow rate (in mL/min) U32 dialysateFlowRate_mL_min; ///< User set dialysate flow rate (in mL/min) U32 treatmentDuration_min; ///< User set treatment duration (in min) - U32 salineBolusVolume_mL; ///< User set saline bolus volume (in mL) - U32 hepStopTime_min; ///< User set Heparin stop time (in min) + U32 hepDeliveryDuration_min; ///< User set Heparin delivery duration (in min) U32 hepType; ///< User set Heparin type option - U32 acidConcentrate; ///< User set acid concentrate option - U32 bicarbConcentrate; ///< User set bicarbonate concentrate option + U32 dryBicarbCartSize; ///< User set dry bicarb cart size option + U32 sodium_mEq_L; ///< User set sodium (in mEq/L) + U32 bicarbonate_mEq_L; ///< User set bicarbonate (in mEq/L) U32 dialyzerType; ///< User set dialyzer type option + U32 fluidBolusVolume_mL; ///< User set fluid bolus volume (in mL) + U32 arterialPressureLimitWindow_mmHg; ///< User set alarm limit window for arterial pressure (in mmHg) + U32 venousPressureLimitWindow_mmHg; ///< User set alarm limit window for venous pressure (in mmHg) + U32 venousPressureLimitAsymmetric_mmHg; ///< User set alarm limit asymmetric for venous pressure (in mmHg) + U32 tmpLimitWindow_mmHg; ///< User set alarm limit window for trans-membrane pressure (in mmHg) U32 bpInterval_min; ///< User set blood pressure measurement interval (in min) - U32 rinsebackFlowRate_mL_min; ///< User set rinseback flow rate (in mL/min) + U32 primeDiscardVolume_mL; ///< User set rinseback flow rate (in mL) U32 rinsebackVolume_mL; ///< User set rinseback volume (in mL) - S32 arterialPressureLimitWindow_mmHg; ///< User set alarm limit window for arterial pressure (in mmHg) - S32 venousPressureLimitWindow_mmHg; ///< User set alarm limit window for venous pressure (in mmHg) - S32 venousPressureLimitAsymmetric_mmHg; ///< User set alarm limit asymmetric for venous pressure (in mmHg) - S32 tmpLimitWindow_mmHg; ///< User set alarm limit window for trans-membrane pressure (in mmHg) - F32 dialysateTemperature_degC; ///< User set dialysate temperature (in deg C) - F32 hepDispenseRate_mL_hr; ///< User set Heparin dispense rate (in mL/hr) + U32 rinsebackFlowRate_mL_min; ///< User set rinseback flow rate (in mL/min) + U32 hepatitisBStatus; ///< User set Hepatitis B status option + U32 systolicBPLowAlarmLimit_mmHg; ///< User set systolic BP low alarm limit (in mmHg) + U32 systolicBPHighAlarmLimit_mmHg; ///< User set systolic BP high alarm limit (in mmHg) + U32 heartRateLowAlarmLimit_BPM; ///< User set heart rate low alarm limit (in BPM) + U32 heartRateHighAlarmLimit_BPM; ///< User set heart rate high alarm limit (in BPM) + U32 pressureAlarmPersistence_sec; ///< User set pressure alarm persistence (in seconds) + F32 substitutionFluidVolume_L; ///< User set substitution fluid volume (in L) F32 hepBolusVolume_mL; ///< User set Heparin bolus volume (in mL) + F32 hepDeliveryRate_mL_hr; ///< User set Heparin delivery rate (in mL/hr) + F32 dialysateTemperature_degC; ///< User set dialysate temperature (in deg C) + F32 acidKConcentrate_mEq_L; ///< User set acid K+ concentrate (in mEq/L) + F32 acidCa2Concentrate_mEq_L; ///< User set acid Ca2+ concentrate (in mEq/L) } TREATMENT_PARAMS_DATA_PAYLOAD_T; /// Record structure for reporting all current treatment parameters to Dialin @@ -83,12 +96,9 @@ // ********** public function prototypes **************** BOOL setTreatmentParameterU32( TREATMENT_PARAM_T param, U32 value ); // Set a specified unsigned integer treatment parameter value -BOOL setTreatmentParameterS32( TREATMENT_PARAM_T param, S32 value ); // Set a specified signed integer treatment parameter value BOOL setTreatmentParameterF32( TREATMENT_PARAM_T param, F32 value ); // Set a specified floating point treatment parameter value U32 getTreatmentParameterU32( TREATMENT_PARAM_T param ); // Get a specified unsigned integer treatment parameter -S32 getTreatmentParameterS32( TREATMENT_PARAM_T param ); // Get a specified signed integer treatment parameter F32 getTreatmentParameterF32( TREATMENT_PARAM_T param ); // Get a specified floating point treatment parameter -S32 getTreatmentParameterS32DefaultValue( TREATMENT_PARAM_T param ); // Get the default value for a specified signed integer treatment parameter BOOL validateAndSetTreatmentParameters( MESSAGE_T *message ); // User provided treatment params to be set and validated BOOL validateAndSetUFVolume( MESSAGE_T *message ); // User provided ultrafiltration volume to be set and validated @@ -100,13 +110,10 @@ BOOL getTreatParamsConfirmed( void ); // Determine whether user confirmed the parameters BOOL isTreatmentParamInRange( TREATMENT_PARAM_T param, CRITICAL_DATAS_T value ); // Check range for a proposed treatment parameter value -S32 getS32TreatmentParamLowerRangeLimit( TREATMENT_PARAM_T param ); // Get lower range limit for signed integer treatment parameter -S32 getS32TreatmentParamUpperRangeLimit( TREATMENT_PARAM_T param ); // Get upper range limit for signed integer treatment parameter U32 getU32TreatmentParamLowerRangeLimit( TREATMENT_PARAM_T param ); // Get lower range limit for unsigned integer treatment parameter U32 getU32TreatmentParamUpperRangeLimit( TREATMENT_PARAM_T param ); // Get upper range limit for unsigned integer treatment parameter F32 getF32TreatmentParamLowerRangeLimit( TREATMENT_PARAM_T param ); // Get lower range limit for floating point treatment parameter F32 getF32TreatmentParamUpperRangeLimit( TREATMENT_PARAM_T param ); // Get upper range limit for floating point treatment parameter -S32 getS32DefaultTreatmentParamEdge( TREATMENT_PARAM_T param, BOOL isMin ); // Get default min/max edge for signed integer treatment parameter U32 getU32DefaultTreatmentParamEdge( TREATMENT_PARAM_T param, BOOL isMin ); // Get default min/max edge for unsigned integer treatment parameter F32 getF32DefaultTreatmentParamEdge( TREATMENT_PARAM_T param, BOOL isMin ); // Get default min/max edge for floating point treatment parameter