Index: leahi.pro =================================================================== diff -u -r22886a1f71adf76a99c158634f8749a824ba5418 -r242f311d48e57e738383d3b1d6881dee5747be4a --- leahi.pro (.../leahi.pro) (revision 22886a1f71adf76a99c158634f8749a824ba5418) +++ leahi.pro (.../leahi.pro) (revision 242f311d48e57e738383d3b1d6881dee5747be4a) @@ -153,13 +153,15 @@ sources/ApplicationController.h \ sources/device/DeviceController.h \ sources/model/confirm/MDuetConfirmTDi.h \ + sources/model/dd/adjustment/settings/MAdjustDDCalibrationAcidConcentratesRecordResponse.h \ sources/model/dd/adjustment/settings/MAdjustDDCalibrationConcentratePumpRecordResponse.h \ sources/model/dd/adjustment/settings/MAdjustDDCalibrationD12DialysatePumpRecordResponse.h \ sources/model/dd/adjustment/settings/MAdjustDDCalibrationD48DialysatePumpRecordResponse.h \ sources/model/dd/adjustment/settings/MAdjustDDCalibrationPressureRecordResponse.h \ sources/model/dd/adjustment/settings/MAdjustDDCalibrationTemperatureRecordResponse.h \ sources/model/dd/adjustment/settings/MAdjustDDSerialNumberResponse.h \ sources/model/dd/adjustment/settings/MAdjustDDVersionsResponse.h \ + sources/model/dd/adjustment/settings/MDDCalibrationAcidConcentratesRecordResponse.h \ sources/model/dd/adjustment/settings/MDDCalibrationConcentratePumpRecordResponse.h \ sources/model/dd/adjustment/settings/MDDCalibrationD12DialysatePumpRecordResponse.h \ sources/model/dd/adjustment/settings/MDDCalibrationD48DialysatePumpRecordResponse.h \ @@ -550,13 +552,15 @@ sources/ApplicationController.cpp \ sources/device/DeviceController.cpp \ sources/model/confirm/MDuetConfirmTDi.cpp \ + sources/model/dd/adjustment/settings/MAdjustDDCalibrationAcidConcentratesRecordResponse.cpp \ sources/model/dd/adjustment/settings/MAdjustDDCalibrationConcentratePumpRecordResponse.cpp \ sources/model/dd/adjustment/settings/MAdjustDDCalibrationD12DialysatePumpRecordResponse.cpp \ sources/model/dd/adjustment/settings/MAdjustDDCalibrationD48DialysatePumpRecordResponse.cpp \ sources/model/dd/adjustment/settings/MAdjustDDCalibrationPressureRecordResponse.cpp \ sources/model/dd/adjustment/settings/MAdjustDDCalibrationTemperatureRecordResponse.cpp \ sources/model/dd/adjustment/settings/MAdjustDDSerialNumberResponse.cpp \ sources/model/dd/adjustment/settings/MAdjustDDVersionsResponse.cpp \ + sources/model/dd/adjustment/settings/MDDCalibrationAcidConcentratesRecordResponse.cpp \ sources/model/dd/adjustment/settings/MDDCalibrationConcentratePumpRecordResponse.cpp \ sources/model/dd/adjustment/settings/MDDCalibrationD12DialysatePumpRecordResponse.cpp \ sources/model/dd/adjustment/settings/MDDCalibrationD48DialysatePumpRecordResponse.cpp \ Index: sources/model/dd/adjustment/settings/MAdjustDDCalibrationAcidConcentratesRecordResponse.cpp =================================================================== diff -u -r22886a1f71adf76a99c158634f8749a824ba5418 -r242f311d48e57e738383d3b1d6881dee5747be4a --- sources/model/dd/adjustment/settings/MAdjustDDCalibrationAcidConcentratesRecordResponse.cpp (.../MAdjustDDCalibrationAcidConcentratesRecordResponse.cpp) (revision 22886a1f71adf76a99c158634f8749a824ba5418) +++ sources/model/dd/adjustment/settings/MAdjustDDCalibrationAcidConcentratesRecordResponse.cpp (.../MAdjustDDCalibrationAcidConcentratesRecordResponse.cpp) (revision 242f311d48e57e738383d3b1d6881dee5747be4a) @@ -1,26 +1,30 @@ -#include "MAdjustDDCalibrationPressureRecordResponse.h" +#include "MAdjustDDCalibrationAcidConcentratesRecordResponse.h" using namespace Model; -QVariantList MAdjustDDCalibrationPressureRecordResponse::parameters() const { +QVariantList MAdjustDDCalibrationAcidConcentratesRecordResponse::parameters() const { return { - _data.mAccepted .value, - _data.mReason .value, - _data.mIndex .value, - _data.mGainRejectReason .value, - _data.mOffsetRejectReason .value, - _data.mCalibrationTimeRejectReason .value, + _data.mAccepted .value, + _data.mReason .value, + _data.mIndex .value, + _data.mAcidConcMixRatioRejectReason .value, + _data.mAcidFullBottleVolumeMLRejectReason .value, + _data.mAcidConductivityUSPerCMRejectReason .value, + _data.mAcidBottleTemperatureRejectReason .value, + _data.mCalibrationTimeRejectReason .value, }; } -bool MAdjustDDCalibrationPressureRecordResponse::fromByteArray(const QByteArray &vByteArray, int *vIndex) { +bool MAdjustDDCalibrationAcidConcentratesRecordResponse::fromByteArray(const QByteArray &vByteArray, int *vIndex) { int index = 0; // message data start position - if ( ! GetValue(vByteArray, index, _data.mAccepted )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mReason )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mIndex )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mGainRejectReason )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mOffsetRejectReason )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mCalibrationTimeRejectReason )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mAccepted )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mReason )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mIndex )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mAcidConcMixRatioRejectReason )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mAcidFullBottleVolumeMLRejectReason )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mAcidConductivityUSPerCMRejectReason )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mAcidBottleTemperatureRejectReason )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mCalibrationTimeRejectReason )) goto lError; return true ; @@ -31,17 +35,19 @@ } /*! - * \brief MAdjustDDCalibrationPressureRecordResponse::data + * \brief MAdjustDDCalibrationAcidConcentratesRecordResponse::data * \details Provides model's Data from the received messages data values * \return Data */ -AdjustDDCalibrationPressureResponseData MAdjustDDCalibrationPressureRecordResponse::data() const { +AdjustDDCalibrationAcidConcentratesResponseData MAdjustDDCalibrationAcidConcentratesRecordResponse::data() const { Data data; - data.mAccepted = _data.mAccepted .value; - data.mReason = _data.mReason .value; - data.mIndex = _data.mIndex .value; - data.mGainRejectReason = _data.mGainRejectReason .value; - data.mOffsetRejectReason = _data.mOffsetRejectReason .value; - data.mCalibrationTimeRejectReason = _data.mCalibrationTimeRejectReason .value; + data.mAccepted = _data.mAccepted .value; + data.mReason = _data.mReason .value; + data.mIndex = _data.mIndex .value; + data.mAcidConcMixRatioRejectReason = _data.mAcidConcMixRatioRejectReason .value; + data.mAcidFullBottleVolumeMLRejectReason = _data.mAcidFullBottleVolumeMLRejectReason .value; + data.mAcidConductivityUSPerCMRejectReason = _data.mAcidConductivityUSPerCMRejectReason .value; + data.mAcidBottleTemperatureRejectReason = _data.mAcidBottleTemperatureRejectReason .value; + data.mCalibrationTimeRejectReason = _data.mCalibrationTimeRejectReason .value; return data; } Index: sources/model/dd/adjustment/settings/MAdjustDDCalibrationAcidConcentratesRecordResponse.h =================================================================== diff -u -r22886a1f71adf76a99c158634f8749a824ba5418 -r242f311d48e57e738383d3b1d6881dee5747be4a --- sources/model/dd/adjustment/settings/MAdjustDDCalibrationAcidConcentratesRecordResponse.h (.../MAdjustDDCalibrationAcidConcentratesRecordResponse.h) (revision 22886a1f71adf76a99c158634f8749a824ba5418) +++ sources/model/dd/adjustment/settings/MAdjustDDCalibrationAcidConcentratesRecordResponse.h (.../MAdjustDDCalibrationAcidConcentratesRecordResponse.h) (revision 242f311d48e57e738383d3b1d6881dee5747be4a) @@ -13,21 +13,23 @@ namespace Model { /*! - * \brief The MAdjustDDCalibrationPressureRecordResponse class + * \brief The MAdjustDDCalibrationAcidConcentratesRecordResponse class * \details The DD adjsut calibration Pressure response model * * | MSG | CAN ID | Type | Ack | Src | Dest | Description | * |:----:|:------:|:----:|:---:|:---:|:----:|:-------------------------------: | - * |0x11B0| 0x070 | Rsp | Y | DG | UI | Set DD Calib Pressures Response | + * |0x12F0| 0x070 | Rsp | Y | DG | UI | Set DD Calib AcidConcentrates Response | * * | Payload || * | || - * | #1:(U32) | \ref Data::mAccepted | - * | #2:(U32) | \ref Data::mReason | - * | #3:(U32) | \ref Data::mIndex | - * | #4:(U32) | \ref Data::mGainRejectReason | - * | #5:(U32) | \ref Data::mOffsetRejectReason | - * | #6:(U32) | \ref Data::mCalibrationTimeRejectReason | + * | #1:(U32) | \ref Data::mAccepted | + * | #2:(U32) | \ref Data::mReason | + * | #3:(U32) | \ref Data::mIndex | + * | #4:(U32) | \ref Data::mAcidConcMixRatioRejectReason | + * | #5:(U32) | \ref Data::mAcidFullBottleVolumeMLRejectReason | + * | #6:(U32) | \ref Data::mAcidConductivityUSPerCMRejectReason | + * | #7:(U32) | \ref Data::mAcidBottleTemperatureRejectReason | + * | #8:(U32) | \ref Data::mCalibrationTimeRejectReason | * * \sa Data * @@ -36,45 +38,49 @@ * | || * | typeText | Event | * | unitText | DD | - * | infoText | AdjustDDCalibrationPressureResponseData | + * | infoText | AdjustDDCalibrationAcidConcentratesResponseData | * */ -class MAdjustDDCalibrationPressureRecordResponse : public MAbstract { +class MAdjustDDCalibrationAcidConcentratesRecordResponse : public MAbstract { // friends friend class ::tst_models; QVariantList parameters() const override; struct { - Types::U32 mAccepted ; - Types::U32 mReason ; - Types::U32 mIndex ; - Types::U32 mGainRejectReason ; - Types::U32 mOffsetRejectReason ; - Types::U32 mCalibrationTimeRejectReason ; + Types::U32 mAccepted ; + Types::U32 mReason ; + Types::U32 mIndex ; + Types::U32 mAcidConcMixRatioRejectReason ; + Types::U32 mAcidFullBottleVolumeMLRejectReason ; + Types::U32 mAcidConductivityUSPerCMRejectReason ; + Types::U32 mAcidBottleTemperatureRejectReason ; + Types::U32 mCalibrationTimeRejectReason ; } _data; public: Type_Enum typeText () const override { return Type_Enum::eEvent ; } Unit_Enum unitText () const override { return Unit_Enum::eDD ; } - QString infoText () const override { return QString("AdjustDDalibrationPressure") ; } + QString infoText () const override { return QString("AdjustDDalibrationAcidConcentrates") ; } struct Data { - quint32 mAccepted = 0; /*!< Accepted value of type quint32 extracted out */ - quint32 mReason = 0; /*!< Reason value of type quint32 extracted out */ - quint32 mIndex = 0; - quint32 mGainRejectReason = 0; - quint32 mOffsetRejectReason = 0; - quint32 mCalibrationTimeRejectReason = 0; + quint32 mAccepted = 0; /*!< Accepted value of type quint32 extracted out */ + quint32 mReason = 0; /*!< Reason value of type quint32 extracted out */ + quint32 mIndex = 0; + quint32 mAcidConcMixRatioRejectReason = 0; + quint32 mAcidFullBottleVolumeMLRejectReason = 0; + quint32 mAcidConductivityUSPerCMRejectReason = 0; + quint32 mAcidBottleTemperatureRejectReason = 0; + quint32 mCalibrationTimeRejectReason = 0; }; - MAdjustDDCalibrationPressureRecordResponse () { } + MAdjustDDCalibrationAcidConcentratesRecordResponse () { } bool fromByteArray (const QByteArray &vByteArray , int *vIndex = nullptr) override; Data data ( ) const ; }; } -typedef Model::MAdjustDDCalibrationPressureRecordResponse::Data AdjustDDCalibrationPressureResponseData; +typedef Model::MAdjustDDCalibrationAcidConcentratesRecordResponse::Data AdjustDDCalibrationAcidConcentratesResponseData; Index: sources/model/dd/adjustment/settings/MDDCalibrationAcidConcentratesRecordResponse.cpp =================================================================== diff -u -r22886a1f71adf76a99c158634f8749a824ba5418 -r242f311d48e57e738383d3b1d6881dee5747be4a --- sources/model/dd/adjustment/settings/MDDCalibrationAcidConcentratesRecordResponse.cpp (.../MDDCalibrationAcidConcentratesRecordResponse.cpp) (revision 22886a1f71adf76a99c158634f8749a824ba5418) +++ sources/model/dd/adjustment/settings/MDDCalibrationAcidConcentratesRecordResponse.cpp (.../MDDCalibrationAcidConcentratesRecordResponse.cpp) (revision 242f311d48e57e738383d3b1d6881dee5747be4a) @@ -5,23 +5,27 @@ QVariantList MDDCalibrationAcidConcentratesRecordResponse::parameters() const { return { - _data.mAccepted.value, - _data.mReason .value, - _data.mIndex .value, - _data.mGain .value, - _data.mOffset .value, - _data.mCalTime .value, + _data.mAccepted .value, + _data.mReason .value, + _data.mIndex .value, + _data.mAcidConcMixRatio .value, + _data.mAcidFullBottleVolumeML .value, + _data.mAcidConductivityUSPerCM .value, + _data.mAcidBottleTemperature .value, + _data.mCalTime .value, }; } bool MDDCalibrationAcidConcentratesRecordResponse::fromByteArray(const QByteArray &vByteArray, int *vIndex) { int index = 0; // message data start position - if ( ! GetValue(vByteArray, index, _data.mAccepted )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mReason )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mIndex )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mGain )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mOffset )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mCalTime )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mAccepted )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mReason )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mIndex )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mAcidConcMixRatio )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mAcidFullBottleVolumeML )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mAcidConductivityUSPerCM )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mAcidBottleTemperature )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mCalTime )) goto lError; return true ; @@ -38,11 +42,13 @@ */ DDCalibrationAcidConcentratesResponseData MDDCalibrationAcidConcentratesRecordResponse::data() const { Data data; - data.mAccepted = _data.mAccepted .value; - data.mReason = _data.mReason .value; - data.mIndex = _data.mIndex .value; - data.mGain = _data.mGain .value; - data.mOffset = _data.mOffset .value; - data.mCalTime = _data.mCalTime .value; + data.mAccepted = _data.mAccepted .value; + data.mReason = _data.mReason .value; + data.mIndex = _data.mIndex .value; + data.mAcidConcMixRatio = _data.mAcidConcMixRatio .value; + data.mAcidFullBottleVolumeML = _data.mAcidFullBottleVolumeML .value; + data.mAcidConductivityUSPerCM = _data.mAcidConductivityUSPerCM .value; + data.mAcidBottleTemperature = _data.mAcidBottleTemperature .value; + data.mCalTime = _data.mCalTime .value; return data; } Index: sources/model/dd/adjustment/settings/MDDCalibrationAcidConcentratesRecordResponse.h =================================================================== diff -u -r22886a1f71adf76a99c158634f8749a824ba5418 -r242f311d48e57e738383d3b1d6881dee5747be4a --- sources/model/dd/adjustment/settings/MDDCalibrationAcidConcentratesRecordResponse.h (.../MDDCalibrationAcidConcentratesRecordResponse.h) (revision 22886a1f71adf76a99c158634f8749a824ba5418) +++ sources/model/dd/adjustment/settings/MDDCalibrationAcidConcentratesRecordResponse.h (.../MDDCalibrationAcidConcentratesRecordResponse.h) (revision 242f311d48e57e738383d3b1d6881dee5747be4a) @@ -22,12 +22,14 @@ * * | Payload || * | || - * | #1:(U32) | \ref Data::mAccepted | - * | #2:(U32) | \ref Data::mReason | - * | #3:(U32) | \ref Data::mIndex | - * | #4:(F32) | \ref Data::mGain | - * | #5:(F32) | \ref Data::mOffset | - * | #6:(U32) | \ref Data::mCalTime | + * | #1:(U32) | \ref Data::mAccepted | + * | #2:(U32) | \ref Data::mReason | + * | #3:(U32) | \ref Data::mIndex | + * | #4:(F32) | \ref Data::mAcidConcMixRatio | + * | #5:(F32) | \ref Data::mAcidFullBottleVolumeML | + * | #6:(F32) | \ref Data::mAcidConductivityUSPerCM | + * | #7:(F32) | \ref Data::mAcidBottleTemperature | + * | #8:(U32) | \ref Data::mCalTime | * * \sa Data * @@ -47,12 +49,14 @@ QVariantList parameters() const override; struct { - Types::U32 mAccepted ; - Types::U32 mReason ; - Types::U32 mIndex ; - Types::F32 mGain ; - Types::F32 mOffset ; - Types::U32 mCalTime ; + Types::U32 mAccepted ; + Types::U32 mReason ; + Types::U32 mIndex ; + Types::F32 mAcidConcMixRatio ; + Types::F32 mAcidFullBottleVolumeML ; + Types::F32 mAcidConductivityUSPerCM ; + Types::F32 mAcidBottleTemperature ; + Types::U32 mCalTime ; } _data; public: @@ -62,12 +66,14 @@ QString infoText () const override { return QString("DDalibrationAcidConcentrates") ; } struct Data { - quint32 mAccepted = 0; /*!< Accepted value of type quint32 extracted out */ - quint32 mReason = 0; /*!< Reason value of type quint32 extracted out */ - quint32 mIndex = 0; - float mGain = 0; - float mOffset = 0; - quint32 mCalTime = 0; + quint32 mAccepted = 0; /*!< Accepted value of type quint32 extracted out */ + quint32 mReason = 0; /*!< Reason value of type quint32 extracted out */ + quint32 mIndex = 0; + float mAcidConcMixRatio = 0; + float mAcidFullBottleVolumeML = 0; + float mAcidConductivityUSPerCM = 0; + float mAcidBottleTemperature = 0; + quint32 mCalTime = 0; }; MDDCalibrationAcidConcentratesRecordResponse () { } Index: sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustRequests.h =================================================================== diff -u -r4b5d1e497ef4f425cd03540dbbeef1d8197aed1d -r242f311d48e57e738383d3b1d6881dee5747be4a --- sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustRequests.h (.../MPreTreatmentAdjustRequests.h) (revision 4b5d1e497ef4f425cd03540dbbeef1d8197aed1d) +++ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustRequests.h (.../MPreTreatmentAdjustRequests.h) (revision 242f311d48e57e738383d3b1d6881dee5747be4a) @@ -217,7 +217,7 @@ * * | MSG | CAN ID | M.Box | Type | Ack | Src | Dest | Description | * |:----:|:------:|:-----:|:----:|:---:|:---:|:----:|:----------------------------------------:| - * |0x6200| 0x100 | 9 | Req | Y | UI | HD | Disposables Installation Confirm Request | + * |0x9200| 0x100 | 9 | Req | Y | UI | TD | Disposables Installation Confirm Request | * * | Payload || * | ||