Index: leahi.pro =================================================================== diff -u -r5e5c936f26d0dd06c89e9fd32de5775a37b52493 -r22886a1f71adf76a99c158634f8749a824ba5418 --- leahi.pro (.../leahi.pro) (revision 5e5c936f26d0dd06c89e9fd32de5775a37b52493) +++ leahi.pro (.../leahi.pro) (revision 22886a1f71adf76a99c158634f8749a824ba5418) @@ -153,10 +153,18 @@ sources/ApplicationController.h \ sources/device/DeviceController.h \ sources/model/confirm/MDuetConfirmTDi.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/MDDCalibrationConcentratePumpRecordResponse.h \ + sources/model/dd/adjustment/settings/MDDCalibrationD12DialysatePumpRecordResponse.h \ + sources/model/dd/adjustment/settings/MDDCalibrationD48DialysatePumpRecordResponse.h \ sources/model/dd/adjustment/settings/MDDCalibrationPressureRecordResponse.h \ + sources/model/dd/adjustment/settings/MDDCalibrationTemperatureRecordResponse.h \ sources/model/dd/data/MDDBloodLeakData.h \ sources/model/dd/data/MDDConcentratePumpData.h \ sources/model/dd/data/MDDConductivityData.h \ @@ -542,10 +550,18 @@ sources/ApplicationController.cpp \ sources/device/DeviceController.cpp \ sources/model/confirm/MDuetConfirmTDi.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/MDDCalibrationConcentratePumpRecordResponse.cpp \ + sources/model/dd/adjustment/settings/MDDCalibrationD12DialysatePumpRecordResponse.cpp \ + sources/model/dd/adjustment/settings/MDDCalibrationD48DialysatePumpRecordResponse.cpp \ sources/model/dd/adjustment/settings/MDDCalibrationPressureRecordResponse.cpp \ + sources/model/dd/adjustment/settings/MDDCalibrationTemperatureRecordResponse.cpp \ sources/model/dd/data/MDDBloodLeakData.cpp \ sources/model/dd/data/MDDConcentratePumpData.cpp \ sources/model/dd/data/MDDConductivityData.cpp \ Index: sources/model/dd/adjustment/settings/MAdjustDDCalibrationAcidConcentratesRecordResponse.cpp =================================================================== diff -u --- sources/model/dd/adjustment/settings/MAdjustDDCalibrationAcidConcentratesRecordResponse.cpp (revision 0) +++ sources/model/dd/adjustment/settings/MAdjustDDCalibrationAcidConcentratesRecordResponse.cpp (revision 22886a1f71adf76a99c158634f8749a824ba5418) @@ -0,0 +1,47 @@ +#include "MAdjustDDCalibrationPressureRecordResponse.h" + +using namespace Model; + +QVariantList MAdjustDDCalibrationPressureRecordResponse::parameters() const { + return { + _data.mAccepted .value, + _data.mReason .value, + _data.mIndex .value, + _data.mGainRejectReason .value, + _data.mOffsetRejectReason .value, + _data.mCalibrationTimeRejectReason .value, + }; +} + +bool MAdjustDDCalibrationPressureRecordResponse::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; + + return true ; + +lError: + if(vIndex) { *vIndex = index; } + + return false ; +} + +/*! + * \brief MAdjustDDCalibrationPressureRecordResponse::data + * \details Provides model's Data from the received messages data values + * \return Data + */ +AdjustDDCalibrationPressureResponseData MAdjustDDCalibrationPressureRecordResponse::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; + return data; +} Index: sources/model/dd/adjustment/settings/MAdjustDDCalibrationAcidConcentratesRecordResponse.h =================================================================== diff -u --- sources/model/dd/adjustment/settings/MAdjustDDCalibrationAcidConcentratesRecordResponse.h (revision 0) +++ sources/model/dd/adjustment/settings/MAdjustDDCalibrationAcidConcentratesRecordResponse.h (revision 22886a1f71adf76a99c158634f8749a824ba5418) @@ -0,0 +1,80 @@ +#pragma once + +// Qt +#include + +// Project +#include "MAbstract.h" +#include "types.h" + +// forward declarations +class tst_models; + +namespace Model { + +/*! + * \brief The MAdjustDDCalibrationPressureRecordResponse 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 | + * + * | 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 | + * + * \sa Data + * + *

Logging info

+ * | || + * | || + * | typeText | Event | + * | unitText | DD | + * | infoText | AdjustDDCalibrationPressureResponseData | + * + */ +class MAdjustDDCalibrationPressureRecordResponse : 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 ; + } _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") ; } + + 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; + }; + + MAdjustDDCalibrationPressureRecordResponse () { } + + bool fromByteArray (const QByteArray &vByteArray , int *vIndex = nullptr) override; + Data data ( ) const ; +}; +} + +typedef Model::MAdjustDDCalibrationPressureRecordResponse::Data AdjustDDCalibrationPressureResponseData; Index: sources/model/dd/adjustment/settings/MAdjustDDCalibrationConcentratePumpRecordResponse.cpp =================================================================== diff -u --- sources/model/dd/adjustment/settings/MAdjustDDCalibrationConcentratePumpRecordResponse.cpp (revision 0) +++ sources/model/dd/adjustment/settings/MAdjustDDCalibrationConcentratePumpRecordResponse.cpp (revision 22886a1f71adf76a99c158634f8749a824ba5418) @@ -0,0 +1,47 @@ +#include "MAdjustDDCalibrationConcentratePumpRecordResponse.h" + +using namespace Model; + +QVariantList MAdjustDDCalibrationConcentratePumpRecordResponse::parameters() const { + return { + _data.mAccepted .value, + _data.mReason .value, + _data.mIndex .value, + _data.mGainRejectReason .value, + _data.mOffsetRejectReason .value, + _data.mCalibrationTimeRejectReason .value, + }; +} + +bool MAdjustDDCalibrationConcentratePumpRecordResponse::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; + + return true ; + +lError: + if(vIndex) { *vIndex = index; } + + return false ; +} + +/*! + * \brief MAdjustDDCalibrationConcentratePumpRecordResponse::data + * \details Provides model's Data from the received messages data values + * \return Data + */ +AdjustDDCalibrationConcentratePumpResponseData MAdjustDDCalibrationConcentratePumpRecordResponse::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; + return data; +} Index: sources/model/dd/adjustment/settings/MAdjustDDCalibrationConcentratePumpRecordResponse.h =================================================================== diff -u --- sources/model/dd/adjustment/settings/MAdjustDDCalibrationConcentratePumpRecordResponse.h (revision 0) +++ sources/model/dd/adjustment/settings/MAdjustDDCalibrationConcentratePumpRecordResponse.h (revision 22886a1f71adf76a99c158634f8749a824ba5418) @@ -0,0 +1,80 @@ +#pragma once + +// Qt +#include + +// Project +#include "MAbstract.h" +#include "types.h" + +// forward declarations +class tst_models; + +namespace Model { + +/*! + * \brief The MAdjustDDCalibrationConcentratePumpRecordResponse class + * \details The DD adjsut calibration Conc Pump response model + * + * | MSG | CAN ID | Type | Ack | Src | Dest | Description | + * |:----:|:------:|:----:|:---:|:---:|:----:|:-------------------------------: | + * |0x1230| 0x070 | Rsp | Y | DG | UI | Set DD Calib Con Pump 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 | + * + * \sa Data + * + *

Logging info

+ * | || + * | || + * | typeText | Event | + * | unitText | DD | + * | infoText | AdjustDDCalibrationConcentratePumpResponseData | + * + */ +class MAdjustDDCalibrationConcentratePumpRecordResponse : 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 ; + } _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") ; } + + 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; + }; + + MAdjustDDCalibrationConcentratePumpRecordResponse () { } + + bool fromByteArray (const QByteArray &vByteArray , int *vIndex = nullptr) override; + Data data ( ) const ; +}; +} + +typedef Model::MAdjustDDCalibrationConcentratePumpRecordResponse::Data AdjustDDCalibrationConcentratePumpResponseData; Index: sources/model/dd/adjustment/settings/MAdjustDDCalibrationD12DialysatePumpRecordResponse.cpp =================================================================== diff -u --- sources/model/dd/adjustment/settings/MAdjustDDCalibrationD12DialysatePumpRecordResponse.cpp (revision 0) +++ sources/model/dd/adjustment/settings/MAdjustDDCalibrationD12DialysatePumpRecordResponse.cpp (revision 22886a1f71adf76a99c158634f8749a824ba5418) @@ -0,0 +1,41 @@ +#include "MAdjustDDCalibrationD12DialysatePumpRecordResponse.h" + +using namespace Model; + +QVariantList MAdjustDDCalibrationD12DialysatePumpRecordResponse::parameters() const { + return { + _data.mAccepted .value, + _data.mReason .value, + _data.mTargetPumpSpeedRejectReason .value, + _data.mCalibrationTimeRejectReason .value, + }; +} + +bool MAdjustDDCalibrationD12DialysatePumpRecordResponse::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.mTargetPumpSpeedRejectReason )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mCalibrationTimeRejectReason )) goto lError; + + return true ; + +lError: + if(vIndex) { *vIndex = index; } + + return false ; +} + +/*! + * \brief MAdjustDDCalibrationD12DialysatePumpRecordResponse::data + * \details Provides model's Data from the received messages data values + * \return Data + */ +AdjustDDCalibrationD12DialysatePumpResponseData MAdjustDDCalibrationD12DialysatePumpRecordResponse::data() const { + Data data; + data.mAccepted = _data.mAccepted .value; + data.mReason = _data.mReason .value; + data.mTargetPumpSpeedRejectReason = _data.mTargetPumpSpeedRejectReason .value; + data.mCalibrationTimeRejectReason = _data.mCalibrationTimeRejectReason .value; + return data; +} Index: sources/model/dd/adjustment/settings/MAdjustDDCalibrationD12DialysatePumpRecordResponse.h =================================================================== diff -u --- sources/model/dd/adjustment/settings/MAdjustDDCalibrationD12DialysatePumpRecordResponse.h (revision 0) +++ sources/model/dd/adjustment/settings/MAdjustDDCalibrationD12DialysatePumpRecordResponse.h (revision 22886a1f71adf76a99c158634f8749a824ba5418) @@ -0,0 +1,74 @@ +#pragma once + +// Qt +#include + +// Project +#include "MAbstract.h" +#include "types.h" + +// forward declarations +class tst_models; + +namespace Model { + +/*! + * \brief The MAdjustDDCalibrationD12DialysatePumpRecordResponse class + * \details The DD adjsut calibration Pressure response model + * + * | MSG | CAN ID | Type | Ack | Src | Dest | Description | + * |:----:|:------:|:----:|:---:|:---:|:----:|:-------------------------------: | + * |0x1270| 0x070 | Rsp | Y | DG | UI | Set DD Calib D12 Dialysate Pump Response | + * + * | Payload || + * | || + * | #1:(U32) | \ref Data::mAccepted | + * | #2:(U32) | \ref Data::mReason | + * | #3:(U32) | \ref Data::mTargetPumpSpeedRejectReason | + * | #4:(U32) | \ref Data::mCalibrationTimeRejectReason | + * + * \sa Data + * + *

Logging info

+ * | || + * | || + * | typeText | Event | + * | unitText | DD | + * | infoText | AdjustDDCalibrationPressureResponseData | + * + */ +class MAdjustDDCalibrationD12DialysatePumpRecordResponse : public MAbstract { + + // friends + friend class ::tst_models; + + QVariantList parameters() const override; + + struct { + Types::U32 mAccepted ; + Types::U32 mReason ; + Types::U32 mTargetPumpSpeedRejectReason ; + 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("AdjustDDalibrationD12DialysatePump") ; } + + struct Data { + quint32 mAccepted = 0; /*!< Accepted value of type quint32 extracted out */ + quint32 mReason = 0; /*!< Reason value of type quint32 extracted out */ + quint32 mTargetPumpSpeedRejectReason = 0; + quint32 mCalibrationTimeRejectReason = 0; + }; + + MAdjustDDCalibrationD12DialysatePumpRecordResponse () { } + + bool fromByteArray (const QByteArray &vByteArray , int *vIndex = nullptr) override; + Data data ( ) const ; +}; +} + +typedef Model::MAdjustDDCalibrationD12DialysatePumpRecordResponse::Data AdjustDDCalibrationD12DialysatePumpResponseData; Index: sources/model/dd/adjustment/settings/MAdjustDDCalibrationD48DialysatePumpRecordResponse.cpp =================================================================== diff -u --- sources/model/dd/adjustment/settings/MAdjustDDCalibrationD48DialysatePumpRecordResponse.cpp (revision 0) +++ sources/model/dd/adjustment/settings/MAdjustDDCalibrationD48DialysatePumpRecordResponse.cpp (revision 22886a1f71adf76a99c158634f8749a824ba5418) @@ -0,0 +1,44 @@ +#include "MAdjustDDCalibrationD48DialysatePumpRecordResponse.h" + +using namespace Model; + +QVariantList MAdjustDDCalibrationD48DialysatePumpRecordResponse::parameters() const { + return { + _data.mAccepted .value, + _data.mReason .value, + _data.mGainRejectReason .value, + _data.mOffsetRejectReason .value, + _data.mCalibrationTimeRejectReason .value, + }; +} + +bool MAdjustDDCalibrationD48DialysatePumpRecordResponse::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.mGainRejectReason )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mOffsetRejectReason )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mCalibrationTimeRejectReason )) goto lError; + + return true ; + +lError: + if(vIndex) { *vIndex = index; } + + return false ; +} + +/*! + * \brief MAdjustDDCalibrationPressureRecordResponse::data + * \details Provides model's Data from the received messages data values + * \return Data + */ +AdjustDDCalibrationD48DialysatePumpResponseData MAdjustDDCalibrationD48DialysatePumpRecordResponse::data() const { + Data data; + data.mAccepted = _data.mAccepted .value; + data.mReason = _data.mReason .value; + data.mGainRejectReason = _data.mGainRejectReason .value; + data.mOffsetRejectReason = _data.mOffsetRejectReason .value; + data.mCalibrationTimeRejectReason = _data.mCalibrationTimeRejectReason .value; + return data; +} Index: sources/model/dd/adjustment/settings/MAdjustDDCalibrationD48DialysatePumpRecordResponse.h =================================================================== diff -u --- sources/model/dd/adjustment/settings/MAdjustDDCalibrationD48DialysatePumpRecordResponse.h (revision 0) +++ sources/model/dd/adjustment/settings/MAdjustDDCalibrationD48DialysatePumpRecordResponse.h (revision 22886a1f71adf76a99c158634f8749a824ba5418) @@ -0,0 +1,77 @@ +#pragma once + +// Qt +#include + +// Project +#include "MAbstract.h" +#include "types.h" + +// forward declarations +class tst_models; + +namespace Model { + +/*! + * \brief The MAdjustDDCalibrationD48DialysatePumpRecordResponse class + * \details The DD adjsut calibration Pressure response model + * + * | MSG | CAN ID | Type | Ack | Src | Dest | Description | + * |:----:|:------:|:----:|:---:|:---:|:----:|:-------------------------------: | + * |0x12B0| 0x070 | Rsp | Y | DG | UI | Set DD Calib D48DialysatePump Response | + * + * | Payload || + * | || + * | #1:(U32) | \ref Data::mAccepted | + * | #2:(U32) | \ref Data::mReason | + * | #3:(U32) | \ref Data::mGainRejectReason | + * | #4:(U32) | \ref Data::mOffsetRejectReason | + * | #5:(U32) | \ref Data::mCalibrationTimeRejectReason | + * + * \sa Data + * + *

Logging info

+ * | || + * | || + * | typeText | Event | + * | unitText | DD | + * | infoText | MAdjustDDCalibrationTemperatureRecordResponse | + * + */ +class MAdjustDDCalibrationD48DialysatePumpRecordResponse : public MAbstract { + + // friends + friend class ::tst_models; + + QVariantList parameters() const override; + + struct { + Types::U32 mAccepted ; + Types::U32 mReason ; + Types::U32 mGainRejectReason ; + Types::U32 mOffsetRejectReason ; + 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("AdjustDDCalibrationD48DialysatePump") ; } + + struct Data { + quint32 mAccepted = 0; /*!< Accepted value of type quint32 extracted out */ + quint32 mReason = 0; /*!< Reason value of type quint32 extracted out */ + quint32 mGainRejectReason = 0; + quint32 mOffsetRejectReason = 0; + quint32 mCalibrationTimeRejectReason = 0; + }; + + MAdjustDDCalibrationD48DialysatePumpRecordResponse () { } + + bool fromByteArray (const QByteArray &vByteArray , int *vIndex = nullptr) override; + Data data ( ) const ; +}; +} + +typedef Model::MAdjustDDCalibrationD48DialysatePumpRecordResponse::Data AdjustDDCalibrationD48DialysatePumpResponseData; Index: sources/model/dd/adjustment/settings/MAdjustDDCalibrationTemperatureRecordResponse.cpp =================================================================== diff -u -r56b3b76d1a22c122e5f8d64ce543f64dfc86db6e -r22886a1f71adf76a99c158634f8749a824ba5418 --- sources/model/dd/adjustment/settings/MAdjustDDCalibrationTemperatureRecordResponse.cpp (.../MAdjustDDCalibrationTemperatureRecordResponse.cpp) (revision 56b3b76d1a22c122e5f8d64ce543f64dfc86db6e) +++ sources/model/dd/adjustment/settings/MAdjustDDCalibrationTemperatureRecordResponse.cpp (.../MAdjustDDCalibrationTemperatureRecordResponse.cpp) (revision 22886a1f71adf76a99c158634f8749a824ba5418) @@ -1,8 +1,8 @@ -#include "MAdjustDDCalibrationPressureRecordResponse.h" +#include "MAdjustDDCalibrationTemperatureRecordResponse.h" using namespace Model; -QVariantList MAdjustDDCalibrationPressureRecordResponse::parameters() const { +QVariantList MAdjustDDCalibrationTemperatureRecordResponse::parameters() const { return { _data.mAccepted .value, _data.mReason .value, @@ -13,7 +13,7 @@ }; } -bool MAdjustDDCalibrationPressureRecordResponse::fromByteArray(const QByteArray &vByteArray, int *vIndex) { +bool MAdjustDDCalibrationTemperatureRecordResponse::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; @@ -35,7 +35,7 @@ * \details Provides model's Data from the received messages data values * \return Data */ -AdjustDDCalibrationPressureResponseData MAdjustDDCalibrationPressureRecordResponse::data() const { +AdjustDDCalibrationTemperatureResponseData MAdjustDDCalibrationTemperatureRecordResponse::data() const { Data data; data.mAccepted = _data.mAccepted .value; data.mReason = _data.mReason .value; Index: sources/model/dd/adjustment/settings/MAdjustDDCalibrationTemperatureRecordResponse.h =================================================================== diff -u -r56b3b76d1a22c122e5f8d64ce543f64dfc86db6e -r22886a1f71adf76a99c158634f8749a824ba5418 --- sources/model/dd/adjustment/settings/MAdjustDDCalibrationTemperatureRecordResponse.h (.../MAdjustDDCalibrationTemperatureRecordResponse.h) (revision 56b3b76d1a22c122e5f8d64ce543f64dfc86db6e) +++ sources/model/dd/adjustment/settings/MAdjustDDCalibrationTemperatureRecordResponse.h (.../MAdjustDDCalibrationTemperatureRecordResponse.h) (revision 22886a1f71adf76a99c158634f8749a824ba5418) @@ -36,10 +36,10 @@ * | || * | typeText | Event | * | unitText | DD | - * | infoText | AdjustDDCalibrationPressureResponseData | + * | infoText | MAdjustDDCalibrationTemperatureRecordResponse | * */ -class MAdjustDDCalibrationPressureRecordResponse : public MAbstract { +class MAdjustDDCalibrationTemperatureRecordResponse : public MAbstract { // friends friend class ::tst_models; @@ -70,11 +70,11 @@ quint32 mCalibrationTimeRejectReason = 0; }; - MAdjustDDCalibrationPressureRecordResponse () { } + MAdjustDDCalibrationTemperatureRecordResponse () { } bool fromByteArray (const QByteArray &vByteArray , int *vIndex = nullptr) override; Data data ( ) const ; }; } -typedef Model::MAdjustDDCalibrationPressureRecordResponse::Data AdjustDDCalibrationPressureResponseData; +typedef Model::MAdjustDDCalibrationTemperatureRecordResponse::Data AdjustDDCalibrationTemperatureResponseData; Index: sources/model/dd/adjustment/settings/MDDCalibrationAcidConcentratesRecordResponse.cpp =================================================================== diff -u --- sources/model/dd/adjustment/settings/MDDCalibrationAcidConcentratesRecordResponse.cpp (revision 0) +++ sources/model/dd/adjustment/settings/MDDCalibrationAcidConcentratesRecordResponse.cpp (revision 22886a1f71adf76a99c158634f8749a824ba5418) @@ -0,0 +1,48 @@ + +#include "MDDCalibrationAcidConcentratesRecordResponse.h" + +using namespace Model; + +QVariantList MDDCalibrationAcidConcentratesRecordResponse::parameters() const { + return { + _data.mAccepted.value, + _data.mReason .value, + _data.mIndex .value, + _data.mGain .value, + _data.mOffset .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; + + return true ; + +lError: + if(vIndex) { *vIndex = index; } + + return false ; +} + +/*! + * \brief MDDCalibrationPressureRecordResponse::data + * \details Provides model's Data from the received messages data values + * \return Data + */ +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; + return data; +} Index: sources/model/dd/adjustment/settings/MDDCalibrationAcidConcentratesRecordResponse.h =================================================================== diff -u --- sources/model/dd/adjustment/settings/MDDCalibrationAcidConcentratesRecordResponse.h (revision 0) +++ sources/model/dd/adjustment/settings/MDDCalibrationAcidConcentratesRecordResponse.h (revision 22886a1f71adf76a99c158634f8749a824ba5418) @@ -0,0 +1,80 @@ +#pragma once + +// Qt +#include + +// Project +#include "MAbstract.h" +#include "types.h" + +// forward declarations +class tst_models; + +namespace Model { + +/*! + * \brief The MDDCalibrationAcidConcentratesRecordResponse class + * \details The DD calibration Pressure response model + * + * | MSG | CAN ID | Type | Ack | Src | Dest | Description | + * |:----:|:------:|:----:|:---:|:---:|:----:|:---------------------: | + * |0x12D0| 0x070 | Rsp | Y | DD | UI | Get DD Calib AcidConcentrates | + * + * | 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 | + * + * \sa Data + * + *

Logging info

+ * | || + * | || + * | typeText | Event | + * | unitText | DD | + * | infoText | DDalibrationAcidConcentrates | + * + */ +class MDDCalibrationAcidConcentratesRecordResponse : public MAbstract { + + // friends + friend class ::tst_models; + + QVariantList parameters() const override; + + struct { + Types::U32 mAccepted ; + Types::U32 mReason ; + Types::U32 mIndex ; + Types::F32 mGain ; + Types::F32 mOffset ; + Types::U32 mCalTime ; + } _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("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; + }; + + MDDCalibrationAcidConcentratesRecordResponse () { } + + bool fromByteArray (const QByteArray &vByteArray , int *vIndex = nullptr) override; + Data data ( ) const ; +}; +} + +typedef Model::MDDCalibrationAcidConcentratesRecordResponse::Data DDCalibrationAcidConcentratesResponseData; Index: sources/model/dd/adjustment/settings/MDDCalibrationConcentratePumpRecordResponse.cpp =================================================================== diff -u --- sources/model/dd/adjustment/settings/MDDCalibrationConcentratePumpRecordResponse.cpp (revision 0) +++ sources/model/dd/adjustment/settings/MDDCalibrationConcentratePumpRecordResponse.cpp (revision 22886a1f71adf76a99c158634f8749a824ba5418) @@ -0,0 +1,48 @@ + +#include "MDDCalibrationConcentratePumpRecordResponse.h" + +using namespace Model; + +QVariantList MDDCalibrationConcentratePumpRecordResponse::parameters() const { + return { + _data.mAccepted.value, + _data.mReason .value, + _data.mIndex .value, + _data.mGain .value, + _data.mOffset .value, + _data.mCalTime .value, + }; +} + +bool MDDCalibrationConcentratePumpRecordResponse::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; + + return true ; + +lError: + if(vIndex) { *vIndex = index; } + + return false ; +} + +/*! + * \brief MDDCalibrationConcentratePumpRecordResponse::data + * \details Provides model's Data from the received messages data values + * \return Data + */ +DDCalibrationConcentratePumpResponseData MDDCalibrationConcentratePumpRecordResponse::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; + return data; +} Index: sources/model/dd/adjustment/settings/MDDCalibrationConcentratePumpRecordResponse.h =================================================================== diff -u --- sources/model/dd/adjustment/settings/MDDCalibrationConcentratePumpRecordResponse.h (revision 0) +++ sources/model/dd/adjustment/settings/MDDCalibrationConcentratePumpRecordResponse.h (revision 22886a1f71adf76a99c158634f8749a824ba5418) @@ -0,0 +1,80 @@ +#pragma once + +// Qt +#include + +// Project +#include "MAbstract.h" +#include "types.h" + +// forward declarations +class tst_models; + +namespace Model { + +/*! + * \brief The MDDCalibrationConcentratePumpRecordResponse class + * \details The DD calibration Conc Pump response model + * + * | MSG | CAN ID | Type | Ack | Src | Dest | Description | + * |:----:|:------:|:----:|:---:|:---:|:----:|:---------------------: | + * |0x1210| 0x070 | Rsp | Y | DD | UI | Get DD Calib Conc Pump | + * + * | 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 | + * + * \sa Data + * + *

Logging info

+ * | || + * | || + * | typeText | Event | + * | unitText | DD | + * | infoText | MDDCalibrationConcentratePumpRecordResponse | + * + */ +class MDDCalibrationConcentratePumpRecordResponse : public MAbstract { + + // friends + friend class ::tst_models; + + QVariantList parameters() const override; + + struct { + Types::U32 mAccepted ; + Types::U32 mReason ; + Types::U32 mIndex ; + Types::F32 mGain ; + Types::F32 mOffset ; + Types::U32 mCalTime ; + } _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("DDalibrationPressure") ; } + + 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; + }; + + MDDCalibrationConcentratePumpRecordResponse () { } + + bool fromByteArray (const QByteArray &vByteArray , int *vIndex = nullptr) override; + Data data ( ) const ; +}; +} + +typedef Model::MDDCalibrationConcentratePumpRecordResponse::Data DDCalibrationConcentratePumpResponseData; Index: sources/model/dd/adjustment/settings/MDDCalibrationD12DialysatePumpRecordResponse.cpp =================================================================== diff -u --- sources/model/dd/adjustment/settings/MDDCalibrationD12DialysatePumpRecordResponse.cpp (revision 0) +++ sources/model/dd/adjustment/settings/MDDCalibrationD12DialysatePumpRecordResponse.cpp (revision 22886a1f71adf76a99c158634f8749a824ba5418) @@ -0,0 +1,42 @@ + +#include "MDDCalibrationD12DialysatePumpRecordResponse.h" + +using namespace Model; + +QVariantList MDDCalibrationD12DialysatePumpRecordResponse::parameters() const { + return { + _data.mAccepted .value, + _data.mReason .value, + _data.mTargetPumpSpeed .value, + _data.mCalTime .value, + }; +} + +bool MDDCalibrationD12DialysatePumpRecordResponse::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.mTargetPumpSpeed )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mCalTime )) goto lError; + + return true ; + +lError: + if(vIndex) { *vIndex = index; } + + return false ; +} + +/*! + * \brief MDDCalibrationPressureRecordResponse::data + * \details Provides model's Data from the received messages data values + * \return Data + */ +DDCalibrationD12DialysatePumpResponseData MDDCalibrationD12DialysatePumpRecordResponse::data() const { + Data data; + data.mAccepted = _data.mAccepted .value; + data.mReason = _data.mReason .value; + data.mTargetPumpSpeed = _data.mTargetPumpSpeed .value; + data.mCalTime = _data.mCalTime .value; + return data; +} Index: sources/model/dd/adjustment/settings/MDDCalibrationD12DialysatePumpRecordResponse.h =================================================================== diff -u --- sources/model/dd/adjustment/settings/MDDCalibrationD12DialysatePumpRecordResponse.h (revision 0) +++ sources/model/dd/adjustment/settings/MDDCalibrationD12DialysatePumpRecordResponse.h (revision 22886a1f71adf76a99c158634f8749a824ba5418) @@ -0,0 +1,74 @@ +#pragma once + +// Qt +#include + +// Project +#include "MAbstract.h" +#include "types.h" + +// forward declarations +class tst_models; + +namespace Model { + +/*! + * \brief The MDDCalibrationD12DialysatePumpRecordResponse class + * \details The DD calibration Pressure response model + * + * | MSG | CAN ID | Type | Ack | Src | Dest | Description | + * |:----:|:------:|:----:|:---:|:---:|:----:|:---------------------: | + * |0x1250| 0x070 | Rsp | Y | DD | UI | Get DD Calib D12 pump | + * + * | Payload || + * | || + * | #1:(U32) | \ref Data::mAccepted | + * | #2:(U32) | \ref Data::mReason | + * | #3:(F32) | \ref Data::mTargetPumpSpeed | + * | #4:(U32) | \ref Data::mCalTime | + *targetPumpSpeed + * \sa Data + * + *

Logging info

+ * | || + * | || + * | typeText | Event | + * | unitText | DD | + * | infoText | DDCalibrationD12DialysatePumpResponseData | + * + */ +class MDDCalibrationD12DialysatePumpRecordResponse : public MAbstract { + + // friends + friend class ::tst_models; + + QVariantList parameters() const override; + + struct { + Types::U32 mAccepted ; + Types::U32 mReason ; + Types::F32 mTargetPumpSpeed ; + Types::U32 mCalTime ; + } _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("DDalibrationD12DialysatePump") ; } + + struct Data { + quint32 mAccepted = 0; /*!< Accepted value of type quint32 extracted out */ + quint32 mReason = 0; /*!< Reason value of type quint32 extracted out */ + float mTargetPumpSpeed = 0; + quint32 mCalTime = 0; + }; + + MDDCalibrationD12DialysatePumpRecordResponse () { } + + bool fromByteArray (const QByteArray &vByteArray , int *vIndex = nullptr) override; + Data data ( ) const ; +}; +} + +typedef Model::MDDCalibrationD12DialysatePumpRecordResponse::Data DDCalibrationD12DialysatePumpResponseData; Index: sources/model/dd/adjustment/settings/MDDCalibrationD48DialysatePumpRecordResponse.cpp =================================================================== diff -u --- sources/model/dd/adjustment/settings/MDDCalibrationD48DialysatePumpRecordResponse.cpp (revision 0) +++ sources/model/dd/adjustment/settings/MDDCalibrationD48DialysatePumpRecordResponse.cpp (revision 22886a1f71adf76a99c158634f8749a824ba5418) @@ -0,0 +1,44 @@ +#include "MDDCalibrationD48DialysatePumpRecordResponse.h" + +using namespace Model; + +QVariantList MDDCalibrationD48DialysatePumpRecordResponse::parameters() const { + return { + _data.mAccepted .value, + _data.mReason .value, + _data.mGain .value, + _data.mOffset .value, + _data.mCalibrationTime .value, + }; +} + +bool MDDCalibrationD48DialysatePumpRecordResponse::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.mGain )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mOffset )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mCalibrationTime )) goto lError; + + return true ; + +lError: + if(vIndex) { *vIndex = index; } + + return false ; +} + +/*! + * \brief MDDCalibrationD48DialysatePumpRecordResponse::data + * \details Provides model's Data from the received messages data values + * \return Data + */ +DDCalibrationD48DialysatePumpResponseData MDDCalibrationD48DialysatePumpRecordResponse::data() const { + Data data; + data.mAccepted = _data.mAccepted .value; + data.mReason = _data.mReason .value; + data.mGain = _data.mGain .value; + data.mOffset = _data.mOffset .value; + data.mCalibrationTime = _data.mCalibrationTime .value; + return data; +} Index: sources/model/dd/adjustment/settings/MDDCalibrationD48DialysatePumpRecordResponse.h =================================================================== diff -u --- sources/model/dd/adjustment/settings/MDDCalibrationD48DialysatePumpRecordResponse.h (revision 0) +++ sources/model/dd/adjustment/settings/MDDCalibrationD48DialysatePumpRecordResponse.h (revision 22886a1f71adf76a99c158634f8749a824ba5418) @@ -0,0 +1,77 @@ +#pragma once + +// Qt +#include + +// Project +#include "MAbstract.h" +#include "types.h" + +// forward declarations +class tst_models; + +namespace Model { + +/*! + * \brief The MDDCalibrationD48DialysatePumpRecordResponse class + * \details The DD adjsut calibration Pressure response model + * + * | MSG | CAN ID | Type | Ack | Src | Dest | Description | + * |:----:|:------:|:----:|:---:|:---:|:----:|:-------------------------------: | + * |0x1290| 0x070 | Rsp | Y | DG | UI | Set DD Calib D48DialysatePump Response | + * + * | Payload || + * | || + * | #1:(U32) | \ref Data::mAccepted | + * | #2:(U32) | \ref Data::mReason | + * | #3:(U32) | \ref Data::mGain | + * | #4:(U32) | \ref Data::mOffset | + * | #5:(U32) | \ref Data::mCalibrationTime | + * + * \sa Data + * + *

Logging info

+ * | || + * | || + * | typeText | Event | + * | unitText | DD | + * | infoText | AdjustDDCalibrationD48DialysatePumpResponseData | + * + */ +class MDDCalibrationD48DialysatePumpRecordResponse : public MAbstract { + + // friends + friend class ::tst_models; + + QVariantList parameters() const override; + + struct { + Types::U32 mAccepted ; + Types::U32 mReason ; + Types::U32 mGain ; + Types::U32 mOffset ; + Types::U32 mCalibrationTime ; + } _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("DDCalibrationD48DialysatePump") ; } + + struct Data { + quint32 mAccepted = 0; /*!< Accepted value of type quint32 extracted out */ + quint32 mReason = 0; /*!< Reason value of type quint32 extracted out */ + quint32 mGain = 0; + quint32 mOffset = 0; + quint32 mCalibrationTime = 0; + }; + + MDDCalibrationD48DialysatePumpRecordResponse () { } + + bool fromByteArray (const QByteArray &vByteArray , int *vIndex = nullptr) override; + Data data ( ) const ; +}; +} + +typedef Model::MDDCalibrationD48DialysatePumpRecordResponse::Data DDCalibrationD48DialysatePumpResponseData; Index: sources/model/dd/adjustment/settings/MDDCalibrationTemperatureRecordResponse.cpp =================================================================== diff -u -r56b3b76d1a22c122e5f8d64ce543f64dfc86db6e -r22886a1f71adf76a99c158634f8749a824ba5418 --- sources/model/dd/adjustment/settings/MDDCalibrationTemperatureRecordResponse.cpp (.../MDDCalibrationTemperatureRecordResponse.cpp) (revision 56b3b76d1a22c122e5f8d64ce543f64dfc86db6e) +++ sources/model/dd/adjustment/settings/MDDCalibrationTemperatureRecordResponse.cpp (.../MDDCalibrationTemperatureRecordResponse.cpp) (revision 22886a1f71adf76a99c158634f8749a824ba5418) @@ -36,7 +36,7 @@ * \details Provides model's Data from the received messages data values * \return Data */ -DDCalibrationTemperatureesponseData MDDCalibrationTemperatureRecordResponse::data() const { +DDCalibrationTemperatureResponseData MDDCalibrationTemperatureRecordResponse::data() const { Data data; data.mAccepted = _data.mAccepted .value; data.mReason = _data.mReason .value;