Index: sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustParametersValidationResponse.h
===================================================================
diff -u -rb1462640e36df3f567c42aa8c8cbd6dafe865625 -r56381aae237db191956aff493907cd1f0801216b
--- sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustParametersValidationResponse.h	(.../MPreTreatmentAdjustParametersValidationResponse.h)	(revision b1462640e36df3f567c42aa8c8cbd6dafe865625)
+++ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustParametersValidationResponse.h	(.../MPreTreatmentAdjustParametersValidationResponse.h)	(revision 56381aae237db191956aff493907cd1f0801216b)
@@ -36,33 +36,36 @@
  * | Payload   ||
  * |           ||
  * | #01:(U32) | \ref Data::mAccepted                                       |
- * | #02:(U32) | \ref Data::mBloodFlowRateRejectReason                      |
- * | #03:(U32) | \ref Data::mDialysateFlowRateRejectReason                  |
- * | #04:(U32) | \ref Data::mTreatmentDurationRejectReason                  |
- * | #05:(U32) | \ref Data::mSalineBolusVolumeRejectReason                  |
- * | #06:(U32) | \ref Data::mHeparinStopTimeRejectReason                    |
- * | #07:(U32) | \ref Data::mHeparinTypeRejectReason                        |
- * | #08:(U32) | \ref Data::mAcidConcentrateRejectReason                    |
- * | #09:(U32) | \ref Data::mBicarbonateConcentrateRejectReason             |
- * | #10:(U32) | \ref Data::mDialyzerTypeRejectReason                       |
- * | #11:(U32) | \ref Data::mBloodPressureMeasureIntervalRejectReason       |
- * | #12:(U32) | \ref Data::mRinsebackFlowRateRejectReason                  |
- * | #13:(U32) | \ref Data::mRinsebackVolumeRejectReason                    |
- * | #14:(U32) | \ref Data::mArterialPressureLimitWindowRejectReason        |
- * | #15:(U32) | \ref Data::mVenousPressureLimitWindowRejectReason          |
- * | #16:(U32) | \ref Data::mVenousPressureLimitAsymtrcRejectReason         |
- * | #17:(U32) | \ref Data::mTransmembranePressureLimitWindowRejectReason   |
- * | #18:(U32) | \ref Data::mDialysateTempRejectReason                      |
- * | #19:(U32) | \ref Data::mHeparinDispensingRateRejectReason              |
- * | #20:(U32) | \ref Data::mHeparinBolusVolumeRejectReason                 |
+ * | #02:(U32) | \ref Data::mTreatmentModalityRejectionReason               |
+ * | #03:(U32) | \ref Data::mHDFTreatmentModeRejectionReason                |
+ * | #04:(U32) | \ref Data::mBloodFlowRateRejectionReason                   |
+ * | #05:(U32) | \ref Data::mDialysateFlowRateRejectionReason               |
+ * | #06:(U32) | \ref Data::mTreatmentDurationRejectionReason               |
+ * | #07:(U32) | \ref Data::mHeparinDeliveryDurationRejectionReason         |
+ * | #08:(U32) | \ref Data::mHeparinTypeRejectionReason                     |
+ * | #09:(U32) | \ref Data::mDryBicarbCartSizeRejectionReason               |
+ * | #10:(U32) | \ref Data::mSodiumRejectionReason                          |
+ * | #11:(U32) | \ref Data::mBicarbonateRejectionReason                     |
+ * | #12:(U32) | \ref Data::mDialyzerTypeRejectionReason                    |
+ * | #13:(U32) | \ref Data::mFluidBolusVolumeRejectionReason                |
+ * | #14:(U32) | \ref Data::mBloodPressureMeasureIntervalRejectionReason    |
+ * | #15:(U32) | \ref Data::mPrimeDiscardVolumeRejectionReason              |
+ * | #16:(U32) | \ref Data::mRinsebackVolumeRejectionReason                 |
+ * | #17:(U32) | \ref Data::mHepatitusBStatusRejectionReason                |
+ * | #18:(U32) | \ref Data::mSubstitutionFluidVolumeRejectionReason         |
+ * | #19:(U32) | \ref Data::mHeparinBolusVolumeRejectionReason              |
+ * | #20:(U32) | \ref Data::mHeparinDispensingRateRejectionReason           |
+ * | #21:(U32) | \ref Data::mDialysateTempRejectionReason                   |
+ * | #22:(U32) | \ref Data::mPotassiumRejectionReason                       |
+ * | #23:(U32) | \ref Data::mCalciumRejectionReason                         |
  *
  * \sa Data
  *
  * <h2 class="groupheader">Logging info</h2>
  * |              ||
  * |              ||
  * | typeText     | Event                        |
- * | unitText     | HD                           |
+ * | unitText     | TD                           |
  * | infoText     | TreatmentParametersResponse  |
  *
  */
@@ -74,25 +77,28 @@
 
     struct {
         Types::U32 mAccepted                                    ;
-        Types::U32 mBloodFlowRateRejectReason                   ;
-        Types::U32 mDialysateFlowRateRejectReason               ;
-        Types::U32 mTreatmentDurationRejectReason               ;
-        Types::U32 mSalineBolusVolumeRejectReason               ;
-        Types::U32 mHeparinStopTimeRejectReason                 ;
-        Types::U32 mHeparinTypeRejectReason                     ;
-        Types::U32 mAcidConcentrateRejectReason                 ;
-        Types::U32 mBicarbonateConcentrateRejectReason          ;
-        Types::U32 mDialyzerTypeRejectReason                    ;
-        Types::U32 mBloodPressureMeasureIntervalRejectReason    ;
-        Types::U32 mRinsebackFlowRateRejectReason               ;
-        Types::U32 mRinsebackVolumeRejectReason                 ;
-        Types::U32 mArterialPressureLimitWindowRejectReason     ;
-        Types::U32 mVenousPressureLimitWindowRejectReason       ;
-        Types::U32 mVenousPressureLimitAsymtrcRejectReason      ;
-        Types::U32 mTransmembranePressureLimitWindowRejectReason  ;
-        Types::U32 mDialysateTempRejectReason                   ;
-        Types::U32 mHeparinDispensingRateRejectReason           ;
-        Types::U32 mHeparinBolusVolumeRejectReason              ;
+        Types::U32 mTreatmentModalityRejectionReason            ;
+        Types::U32 mHDFTreatmentModeRejectionReason             ;
+        Types::U32 mBloodFlowRateRejectionReason                ;
+        Types::U32 mDialysateFlowRateRejectionReason            ;
+        Types::U32 mTreatmentDurationRejectionReason            ;
+        Types::U32 mHeparinDeliveryDurationRejectionReason      ;
+        Types::U32 mHeparinTypeRejectionReason                  ;
+        Types::U32 mDryBicarbCartSizeRejectionReason            ;
+        Types::U32 mSodiumRejectionReason                       ;
+        Types::U32 mBicarbonateRejectionReason                  ;
+        Types::U32 mDialyzerTypeRejectionReason                 ;
+        Types::U32 mFluidBolusVolumeRejectionReason             ;
+        Types::U32 mBloodPressureMeasureIntervalRejectionReason ;
+        Types::U32 mPrimeDiscardVolumeRejectionReason           ;
+        Types::U32 mRinsebackVolumeRejectionReason              ;
+        Types::U32 mHepatitusBStatusRejectionReason             ;
+        Types::U32 mSubstitutionFluidVolumeRejectionReason      ;
+        Types::U32 mHeparinBolusVolumeRejectionReason           ;
+        Types::U32 mHeparinDispensingRateRejectionReason        ;
+        Types::U32 mDialysateTempRejectionReason                ;
+        Types::U32 mPotassiumRejectionReason                    ;
+        Types::U32 mCalciumRejectionReason                      ;
     } _data;
 
 public:
@@ -103,25 +109,28 @@
 
     struct Data {
         quint32 mAccepted                                       = 0;
-        quint32 mBloodFlowRateRejectReason                      = 0;
-        quint32 mDialysateFlowRateRejectReason                  = 0;
-        quint32 mTreatmentDurationRejectReason                  = 0;
-        quint32 mSalineBolusVolumeRejectReason                  = 0;
-        quint32 mHeparinStopTimeRejectReason                    = 0;
-        quint32 mHeparinTypeRejectReason                        = 0;
-        quint32 mAcidConcentrateRejectReason                    = 0;
-        quint32 mBicarbonateConcentrateRejectReason             = 0;
-        quint32 mDialyzerTypeRejectReason                       = 0;
-        quint32 mBloodPressureMeasureIntervalRejectReason       = 0;
-        quint32 mRinsebackFlowRateRejectReason                  = 0;
-        quint32 mRinsebackVolumeRejectReason                    = 0;
-        quint32 mArterialPressureLimitWindowRejectReason        = 0;
-        quint32 mVenousPressureLimitWindowRejectReason          = 0;
-        quint32 mVenousPressureLimitAsymtrcRejectReason         = 0;
-        quint32 mTransmembranePressureLimitWindowRejectReason   = 0;
-        quint32 mDialysateTempRejectReason                      = 0;
-        quint32 mHeparinDispensingRateRejectReason              = 0;
-        quint32 mHeparinBolusVolumeRejectReason                 = 0;
+        quint32 mTreatmentModalityRejectionReason               = 0;
+        quint32 mHDFTreatmentModeRejectionReason                = 0;
+        quint32 mBloodFlowRateRejectionReason                   = 0;
+        quint32 mDialysateFlowRateRejectionReason               = 0;
+        quint32 mTreatmentDurationRejectionReason               = 0;
+        quint32 mHeparinDeliveryDurationRejectionReason         = 0;
+        quint32 mHeparinTypeRejectionReason                     = 0;
+        quint32 mDryBicarbCartSizeRejectionReason               = 0;
+        quint32 mSodiumRejectionReason                          = 0;
+        quint32 mBicarbonateRejectionReason                     = 0;
+        quint32 mDialyzerTypeRejectionReason                    = 0;
+        quint32 mFluidBolusVolumeRejectionReason                = 0;
+        quint32 mBloodPressureMeasureIntervalRejectionReason    = 0;
+        quint32 mPrimeDiscardVolumeRejectionReason              = 0;
+        quint32 mRinsebackVolumeRejectionReason                 = 0;
+        quint32 mHepatitusBStatusRejectionReason                = 0;
+        quint32 mSubstitutionFluidVolumeRejectionReason         = 0;
+        quint32 mHeparinBolusVolumeRejectionReason              = 0;
+        quint32 mHeparinDispensingRateRejectionReason           = 0;
+        quint32 mDialysateTempRejectionReason                   = 0;
+        quint32 mPotassiumRejectionReason                       = 0;
+        quint32 mCalciumRejectionReason                         = 0;
     };
 
     MAdjustParametersValidationResponse () {}