Index: leahi.pro =================================================================== diff -u -r242f311d48e57e738383d3b1d6881dee5747be4a -r2f5eb769ab37dc3c9c02e9746458c52a35af00d9 --- leahi.pro (.../leahi.pro) (revision 242f311d48e57e738383d3b1d6881dee5747be4a) +++ leahi.pro (.../leahi.pro) (revision 2f5eb769ab37dc3c9c02e9746458c52a35af00d9) @@ -153,16 +153,24 @@ sources/ApplicationController.h \ sources/device/DeviceController.h \ sources/model/confirm/MDuetConfirmTDi.h \ + sources/model/dd/adjustment/settings/MAdjustDDCalibrationAccelerometerSensorRecordResponse.h \ sources/model/dd/adjustment/settings/MAdjustDDCalibrationAcidConcentratesRecordResponse.h \ + sources/model/dd/adjustment/settings/MAdjustDDCalibrationBicarbConcentratesRecordResponse.h \ + sources/model/dd/adjustment/settings/MAdjustDDCalibrationBloodLeakSensorRecordResponse.h \ sources/model/dd/adjustment/settings/MAdjustDDCalibrationConcentratePumpRecordResponse.h \ + sources/model/dd/adjustment/settings/MAdjustDDCalibrationConductivitySensorRecordResponse.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/MDDCalibrationAccelerometerSensorRecordResponse.h \ sources/model/dd/adjustment/settings/MDDCalibrationAcidConcentratesRecordResponse.h \ + sources/model/dd/adjustment/settings/MDDCalibrationBicarbConcentratesRecordResponse.h \ + sources/model/dd/adjustment/settings/MDDCalibrationBloodLeakSensorRecordResponse.h \ sources/model/dd/adjustment/settings/MDDCalibrationConcentratePumpRecordResponse.h \ + sources/model/dd/adjustment/settings/MDDCalibrationConductivitySensorRecordResponse.h \ sources/model/dd/adjustment/settings/MDDCalibrationD12DialysatePumpRecordResponse.h \ sources/model/dd/adjustment/settings/MDDCalibrationD48DialysatePumpRecordResponse.h \ sources/model/dd/adjustment/settings/MDDCalibrationPressureRecordResponse.h \ @@ -552,16 +560,24 @@ sources/ApplicationController.cpp \ sources/device/DeviceController.cpp \ sources/model/confirm/MDuetConfirmTDi.cpp \ + sources/model/dd/adjustment/settings/MAdjustDDCalibrationAccelerometerSensorRecordResponse.cpp \ sources/model/dd/adjustment/settings/MAdjustDDCalibrationAcidConcentratesRecordResponse.cpp \ + sources/model/dd/adjustment/settings/MAdjustDDCalibrationBicarbConcentratesRecordResponse.cpp \ + sources/model/dd/adjustment/settings/MAdjustDDCalibrationBloodLeakSensorRecordResponse.cpp \ sources/model/dd/adjustment/settings/MAdjustDDCalibrationConcentratePumpRecordResponse.cpp \ + sources/model/dd/adjustment/settings/MAdjustDDCalibrationConductivitySensorRecordResponse.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/MDDCalibrationAccelerometerSensorRecordResponse.cpp \ sources/model/dd/adjustment/settings/MDDCalibrationAcidConcentratesRecordResponse.cpp \ + sources/model/dd/adjustment/settings/MDDCalibrationBicarbConcentratesRecordResponse.cpp \ + sources/model/dd/adjustment/settings/MDDCalibrationBloodLeakSensorRecordResponse.cpp \ sources/model/dd/adjustment/settings/MDDCalibrationConcentratePumpRecordResponse.cpp \ + sources/model/dd/adjustment/settings/MDDCalibrationConductivitySensorRecordResponse.cpp \ sources/model/dd/adjustment/settings/MDDCalibrationD12DialysatePumpRecordResponse.cpp \ sources/model/dd/adjustment/settings/MDDCalibrationD48DialysatePumpRecordResponse.cpp \ sources/model/dd/adjustment/settings/MDDCalibrationPressureRecordResponse.cpp \ Index: sources/model/dd/adjustment/settings/MAdjustDDCalibrationAccelerometerSensorRecordResponse.cpp =================================================================== diff -u --- sources/model/dd/adjustment/settings/MAdjustDDCalibrationAccelerometerSensorRecordResponse.cpp (revision 0) +++ sources/model/dd/adjustment/settings/MAdjustDDCalibrationAccelerometerSensorRecordResponse.cpp (revision 2f5eb769ab37dc3c9c02e9746458c52a35af00d9) @@ -0,0 +1,47 @@ +#include "MAdjustDDCalibrationAccelerometerSensorRecordResponse.h" + +using namespace Model; + +QVariantList MAdjustDDCalibrationAccelerometerSensorRecordResponse::parameters() const { + return { + _data.mAccepted .value, + _data.mReason .value, + _data.accelXOffsetRejectReason .value, + _data.accelYOffsetRejectReason .value, + _data.accelZOffsetRejectReason .value, + _data.mCalibrationTimeRejectReason .value, + }; +} + +bool MAdjustDDCalibrationAccelerometerSensorRecordResponse::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.accelXOffsetRejectReason )) goto lError; + if ( ! GetValue(vByteArray, index, _data.accelYOffsetRejectReason )) goto lError; + if ( ! GetValue(vByteArray, index, _data.accelZOffsetRejectReason )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mCalibrationTimeRejectReason )) goto lError; + + return true ; + +lError: + if(vIndex) { *vIndex = index; } + + return false ; +} + +/*! + * \brief MAdjustDDCalibrationAccelerometerSensorRecordResponse::data + * \details Provides model's Data from the received messages data values + * \return Data + */ +AdjustDDCalibrationAccelerometerSensorResponseData MAdjustDDCalibrationAccelerometerSensorRecordResponse::data() const { + Data data; + data.mAccepted = _data.mAccepted .value; + data.mReason = _data.mReason .value; + data.accelXOffsetRejectReason = _data.accelXOffsetRejectReason .value; + data.accelYOffsetRejectReason = _data.accelYOffsetRejectReason .value; + data.accelZOffsetRejectReason = _data.accelZOffsetRejectReason .value; + data.mCalibrationTimeRejectReason = _data.mCalibrationTimeRejectReason .value; + return data; +} Index: sources/model/dd/adjustment/settings/MAdjustDDCalibrationAccelerometerSensorRecordResponse.h =================================================================== diff -u --- sources/model/dd/adjustment/settings/MAdjustDDCalibrationAccelerometerSensorRecordResponse.h (revision 0) +++ sources/model/dd/adjustment/settings/MAdjustDDCalibrationAccelerometerSensorRecordResponse.h (revision 2f5eb769ab37dc3c9c02e9746458c52a35af00d9) @@ -0,0 +1,80 @@ +#pragma once + +// Qt +#include + +// Project +#include "MAbstract.h" +#include "types.h" + +// forward declarations +class tst_models; + +namespace Model { + +/*! + * \brief The MAdjustDDCalibrationAccelerometerSensorRecordResponse class + * \details The DD adjsut calibration AccelerometerSensor response model + * + * | MSG | CAN ID | Type | Ack | Src | Dest | Description | + * |:----:|:------:|:----:|:---:|:---:|:----:|:-------------------------------: | + * |0x1370| 0x070 | Rsp | Y | DD | UI | Set DD Calib AccelerometerSensor Response | + * + * | Payload || + * | || + * | #1:(U32) | \ref Data::mAccepted | + * | #2:(U32) | \ref Data::mReason | + * | #3:(U32) | \ref Data::accelXOffsetRejectReason | + * | #4:(U32) | \ref Data::accelYOffsetRejectReason | + * | #5:(U32) | \ref Data::accelZOffsetRejectReason | + * | #6:(U32) | \ref Data::mCalibrationTimeRejectReason | + * + * \sa Data + * + *

Logging info

+ * | || + * | || + * | typeText | Event | + * | unitText | DD | + * | infoText | AdjustDDCalibrationAccelerometerSensorResponseData | + * + */ +class MAdjustDDCalibrationAccelerometerSensorRecordResponse : public MAbstract { + + // friends + friend class ::tst_models; + + QVariantList parameters() const override; + + struct { + Types::U32 mAccepted ; + Types::U32 mReason ; + Types::U32 accelXOffsetRejectReason ; + Types::U32 accelYOffsetRejectReason ; + Types::U32 accelZOffsetRejectReason ; + 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("AdjustDDalibrationAccelerometerSensor") ; } + + struct Data { + quint32 mAccepted = 0; /*!< Accepted value of type quint32 extracted out */ + quint32 mReason = 0; /*!< Reason value of type quint32 extracted out */ + quint32 accelXOffsetRejectReason = 0; + quint32 accelYOffsetRejectReason = 0; + quint32 accelZOffsetRejectReason = 0; + quint32 mCalibrationTimeRejectReason = 0; + }; + + MAdjustDDCalibrationAccelerometerSensorRecordResponse () { } + + bool fromByteArray (const QByteArray &vByteArray , int *vIndex = nullptr) override; + Data data ( ) const ; +}; +} + +typedef Model::MAdjustDDCalibrationAccelerometerSensorRecordResponse::Data AdjustDDCalibrationAccelerometerSensorResponseData; Index: sources/model/dd/adjustment/settings/MAdjustDDCalibrationBicarbConcentratesRecordResponse.cpp =================================================================== diff -u -re04d9a7a152b35b7623e0ca54dc77f0593459ad4 -r2f5eb769ab37dc3c9c02e9746458c52a35af00d9 --- sources/model/dd/adjustment/settings/MAdjustDDCalibrationBicarbConcentratesRecordResponse.cpp (.../MAdjustDDCalibrationBicarbConcentratesRecordResponse.cpp) (revision e04d9a7a152b35b7623e0ca54dc77f0593459ad4) +++ sources/model/dd/adjustment/settings/MAdjustDDCalibrationBicarbConcentratesRecordResponse.cpp (.../MAdjustDDCalibrationBicarbConcentratesRecordResponse.cpp) (revision 2f5eb769ab37dc3c9c02e9746458c52a35af00d9) @@ -4,23 +4,27 @@ QVariantList MAdjustDDCalibrationBicarbConcentratesRecordResponse::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.mBicarbConcMixRatioRejectReason .value, + _data.mBicarbStartVolumeMLRejectReason .value, + _data.mBicarbConductivityUSPerCMRejectReason .value, + _data.mBicarbBottleTemperatureRejectReason .value, + _data.mCalibrationTimeRejectReason .value, }; } bool MAdjustDDCalibrationBicarbConcentratesRecordResponse::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.mBicarbConcMixRatioRejectReason )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mBicarbStartVolumeMLRejectReason )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mBicarbConductivityUSPerCMRejectReason )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mBicarbBottleTemperatureRejectReason )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mCalibrationTimeRejectReason )) goto lError; return true ; @@ -31,17 +35,19 @@ } /*! - * \brief MAdjustDDCalibrationPressureRecordResponse::data + * \brief MAdjustDDCalibrationBicarbConcentratesRecordResponse::data * \details Provides model's Data from the received messages data values * \return Data */ AdjustDDCalibrationBicarbConcentratesResponseData MAdjustDDCalibrationBicarbConcentratesRecordResponse::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.mBicarbConcMixRatioRejectReason = _data.mBicarbConcMixRatioRejectReason .value; + data.mBicarbStartVolumeMLRejectReason = _data.mBicarbStartVolumeMLRejectReason .value; + data.mBicarbConductivityUSPerCMRejectReason = _data.mBicarbConductivityUSPerCMRejectReason .value; + data.mBicarbBottleTemperatureRejectReason = _data.mBicarbBottleTemperatureRejectReason .value; + data.mCalibrationTimeRejectReason = _data.mCalibrationTimeRejectReason .value; return data; } Index: sources/model/dd/adjustment/settings/MAdjustDDCalibrationBicarbConcentratesRecordResponse.h =================================================================== diff -u -re04d9a7a152b35b7623e0ca54dc77f0593459ad4 -r2f5eb769ab37dc3c9c02e9746458c52a35af00d9 --- sources/model/dd/adjustment/settings/MAdjustDDCalibrationBicarbConcentratesRecordResponse.h (.../MAdjustDDCalibrationBicarbConcentratesRecordResponse.h) (revision e04d9a7a152b35b7623e0ca54dc77f0593459ad4) +++ sources/model/dd/adjustment/settings/MAdjustDDCalibrationBicarbConcentratesRecordResponse.h (.../MAdjustDDCalibrationBicarbConcentratesRecordResponse.h) (revision 2f5eb769ab37dc3c9c02e9746458c52a35af00d9) @@ -18,16 +18,18 @@ * * | MSG | CAN ID | Type | Ack | Src | Dest | Description | * |:----:|:------:|:----:|:---:|:---:|:----:|:-------------------------------: | - * |0x11B0| 0x070 | Rsp | Y | DG | UI | Set DD Calib BicarbConcentrates Response | + * |0x1330| 0x070 | Rsp | Y | DG | UI | Set DD Calib BicarbConcentrates 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::mBicarbConcMixRatioRejectReason | + * | #5:(U32) | \ref Data::mBicarbStartVolumeMLRejectReason | + * | #6:(U32) | \ref Data::mBicarbConductivityUSPerCMRejectReason | + * | #7:(U32) | \ref Data::mBicarbBottleTemperatureRejectReason | + * | #8:(U32) | \ref Data::mCalibrationTimeRejectReason | * * \sa Data * @@ -47,12 +49,14 @@ 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 mBicarbConcMixRatioRejectReason ; + Types::U32 mBicarbStartVolumeMLRejectReason ; + Types::U32 mBicarbConductivityUSPerCMRejectReason ; + Types::U32 mBicarbBottleTemperatureRejectReason ; + Types::U32 mCalibrationTimeRejectReason ; } _data; public: @@ -62,12 +66,14 @@ QString infoText () const override { return QString("AdjustDDalibrationBicarbConcentrates") ; } 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 mBicarbConcMixRatioRejectReason = 0; + quint32 mBicarbStartVolumeMLRejectReason = 0; + quint32 mBicarbConductivityUSPerCMRejectReason = 0; + quint32 mBicarbBottleTemperatureRejectReason = 0; + quint32 mCalibrationTimeRejectReason = 0; }; MAdjustDDCalibrationBicarbConcentratesRecordResponse () { } Index: sources/model/dd/adjustment/settings/MAdjustDDCalibrationBloodLeakSensorRecordResponse.cpp =================================================================== diff -u --- sources/model/dd/adjustment/settings/MAdjustDDCalibrationBloodLeakSensorRecordResponse.cpp (revision 0) +++ sources/model/dd/adjustment/settings/MAdjustDDCalibrationBloodLeakSensorRecordResponse.cpp (revision 2f5eb769ab37dc3c9c02e9746458c52a35af00d9) @@ -0,0 +1,41 @@ +#include "MAdjustDDCalibrationBloodLeakSensorRecordResponse.h" + +using namespace Model; + +QVariantList MAdjustDDCalibrationBloodLeakSensorRecordResponse::parameters() const { + return { + _data.mAccepted .value, + _data.mReason .value, + _data.mSetPointRejectReason .value, + _data.mCalibrationTimeRejectReason .value, + }; +} + +bool MAdjustDDCalibrationBloodLeakSensorRecordResponse::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.mSetPointRejectReason )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mCalibrationTimeRejectReason )) goto lError; + + return true ; + +lError: + if(vIndex) { *vIndex = index; } + + return false ; +} + +/*! + * \brief MAdjustDDCalibrationBloodLeakSensorRecordResponse::data + * \details Provides model's Data from the received messages data values + * \return Data + */ +AdjustDDCalibrationBloodLeakSensorResponseData MAdjustDDCalibrationBloodLeakSensorRecordResponse::data() const { + Data data; + data.mAccepted = _data.mAccepted .value; + data.mReason = _data.mReason .value; + data.mSetPointRejectReason = _data.mSetPointRejectReason .value; + data.mCalibrationTimeRejectReason = _data.mCalibrationTimeRejectReason .value; + return data; +} Index: sources/model/dd/adjustment/settings/MAdjustDDCalibrationBloodLeakSensorRecordResponse.h =================================================================== diff -u --- sources/model/dd/adjustment/settings/MAdjustDDCalibrationBloodLeakSensorRecordResponse.h (revision 0) +++ sources/model/dd/adjustment/settings/MAdjustDDCalibrationBloodLeakSensorRecordResponse.h (revision 2f5eb769ab37dc3c9c02e9746458c52a35af00d9) @@ -0,0 +1,74 @@ +#pragma once + +// Qt +#include + +// Project +#include "MAbstract.h" +#include "types.h" + +// forward declarations +class tst_models; + +namespace Model { + +/*! + * \brief The MAdjustDDCalibrationBloodLeakSensorRecordResponse class + * \details The DD adjsut calibration BloodLeakSensor response model + * + * | MSG | CAN ID | Type | Ack | Src | Dest | Description | + * |:----:|:------:|:----:|:---:|:---:|:----:|:-------------------------------: | + * |0x13B0| 0x070 | Rsp | Y | DD | UI | Set DD Calib BloodLeakSensor Response | + * + * | Payload || + * | || + * | #1:(U32) | \ref Data::mAccepted | + * | #2:(U32) | \ref Data::mReason | + * | #3:(U32) | \ref Data::mSetPointRejectReason | + * | #4:(U32) | \ref Data::mCalibrationTimeRejectReason | + * + * \sa Data + * + *

Logging info

+ * | || + * | || + * | typeText | Event | + * | unitText | DD | + * | infoText | AdjustDDCalibrationBloodLeakSensorResponseData | + * + */ +class MAdjustDDCalibrationBloodLeakSensorRecordResponse : public MAbstract { + + // friends + friend class ::tst_models; + + QVariantList parameters() const override; + + struct { + Types::U32 mAccepted ; + Types::U32 mReason ; + Types::U32 mSetPointRejectReason ; + 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("AdjustDDalibrationBloodLeakSensor") ; } + + struct Data { + quint32 mAccepted = 0; /*!< Accepted value of type quint32 extracted out */ + quint32 mReason = 0; /*!< Reason value of type quint32 extracted out */ + quint32 mSetPointRejectReason = 0; + quint32 mCalibrationTimeRejectReason = 0; + }; + + MAdjustDDCalibrationBloodLeakSensorRecordResponse () { } + + bool fromByteArray (const QByteArray &vByteArray , int *vIndex = nullptr) override; + Data data ( ) const ; +}; +} + +typedef Model::MAdjustDDCalibrationBloodLeakSensorRecordResponse::Data AdjustDDCalibrationBloodLeakSensorResponseData; Index: sources/model/dd/adjustment/settings/MAdjustDDCalibrationConductivitySensorRecordResponse.cpp =================================================================== diff -u --- sources/model/dd/adjustment/settings/MAdjustDDCalibrationConductivitySensorRecordResponse.cpp (revision 0) +++ sources/model/dd/adjustment/settings/MAdjustDDCalibrationConductivitySensorRecordResponse.cpp (revision 2f5eb769ab37dc3c9c02e9746458c52a35af00d9) @@ -0,0 +1,77 @@ +#include "MAdjustDDCalibrationConductivitySensorRecordResponse.h" + +using namespace Model; + +QVariantList MAdjustDDCalibrationConductivitySensorRecordResponse::parameters() const { + return { + _data.mAccepted .value, + _data.mReason .value, + _data.mIndex .value, + _data.mK_highRejectReason .value, + _data.mAlpha_higRejectReason .value, + _data.mEta_highRejectReason .value, + _data.mZeta_highRejectReason .value, + _data.mK_lowRejectReason .value, + _data.mAlpha_lowRejectReason .value, + _data.mEta_lowRejectReason .value, + _data.mZeta_lowRejectReason .value, + _data.mBetaRejectReason .value, + _data.mDeltaRejectReason .value, + _data.mReserved1RejectReason .value, + _data.mReserved2RejectReason .value, + _data.mCalibrationTimeRejectReason .value, + }; +} + +bool MAdjustDDCalibrationConductivitySensorRecordResponse::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.mK_highRejectReason )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mAlpha_higRejectReason )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mEta_highRejectReason )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mZeta_highRejectReason )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mK_lowRejectReason )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mAlpha_lowRejectReason )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mEta_lowRejectReason )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mZeta_lowRejectReason )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mBetaRejectReason )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mDeltaRejectReason )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mReserved1RejectReason )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mReserved2RejectReason )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mCalibrationTimeRejectReason )) goto lError; + + return true ; + +lError: + if(vIndex) { *vIndex = index; } + + return false ; +} + +/*! + * \brief MAdjustDDCalibrationConductivitySensorRecordResponse::data + * \details Provides model's Data from the received messages data values + * \return Data + */ +AdjustDDCalibrationConductivitySensorResponseData MAdjustDDCalibrationConductivitySensorRecordResponse::data() const { + Data data; + data.mAccepted = _data.mAccepted .value; + data.mReason = _data.mReason .value; + data.mIndex = _data.mIndex .value; + data.mK_highRejectReason = _data.mK_highRejectReason .value; + data.mAlpha_higRejectReason = _data.mAlpha_higRejectReason .value; + data.mEta_highRejectReason = _data.mEta_highRejectReason .value; + data.mZeta_highRejectReason = _data.mZeta_highRejectReason .value; + data.mK_lowRejectReason = _data.mK_lowRejectReason .value; + data.mAlpha_lowRejectReason = _data.mAlpha_lowRejectReason .value; + data.mEta_lowRejectReason = _data.mEta_lowRejectReason .value; + data.mZeta_lowRejectReason = _data.mZeta_lowRejectReason .value; + data.mBetaRejectReason = _data.mBetaRejectReason .value; + data.mDeltaRejectReason = _data.mDeltaRejectReason .value; + data.mReserved1RejectReason = _data.mReserved1RejectReason .value; + data.mReserved2RejectReason = _data.mReserved2RejectReason .value; + data.mCalibrationTimeRejectReason = _data.mCalibrationTimeRejectReason .value; + return data; +} Index: sources/model/dd/adjustment/settings/MAdjustDDCalibrationConductivitySensorRecordResponse.h =================================================================== diff -u --- sources/model/dd/adjustment/settings/MAdjustDDCalibrationConductivitySensorRecordResponse.h (revision 0) +++ sources/model/dd/adjustment/settings/MAdjustDDCalibrationConductivitySensorRecordResponse.h (revision 2f5eb769ab37dc3c9c02e9746458c52a35af00d9) @@ -0,0 +1,110 @@ +#pragma once + +// Qt +#include + +// Project +#include "MAbstract.h" +#include "types.h" + +// forward declarations +class tst_models; + +namespace Model { + +/*! + * \brief The MAdjustDDCalibrationConductivitySensorRecordResponse class + * \details The DD adjsut calibration ConductivitySensor response model + * + * | MSG | CAN ID | Type | Ack | Src | Dest | Description | + * |:----:|:------:|:----:|:---:|:---:|:----:|:-------------------------------: | + * |0x13F0| 0x070 | Rsp | Y | DD | UI | Set DD Calib ConductivitySensor Response | + * + * | Payload || + * | || + * | #1:(U32) | \ref Data::mAccepted | + * | #2:(U32) | \ref Data::mReason | + * | #3:(U32) | \ref Data::mIndex | + * | #4:(U32) | \ref Data::mK_highRejectReason | + * | #5:(U32) | \ref Data::mAlpha_higRejectReason | + * | #6:(U32) | \ref Data::mEta_highRejectReason | + * | #7:(U32) | \ref Data::mZeta_highRejectReason | + * | #8:(U32) | \ref Data::mK_lowRejectReason | + * | #9:(U32) | \ref Data::mAlpha_lowRejectReason | + * | #10:(U32)| \ref Data::mEta_lowRejectReason | + * | #11:(U32)| \ref Data::mZeta_lowRejectReason | + * | #12:(U32)| \ref Data::mBetaRejectReason | + * | #13:(U32)| \ref Data::mDeltaRejectReason | + * | #14:(U32)| \ref Data::mReserved1RejectReason | + * | #15:(U32)| \ref Data::mReserved2RejectReason | + * | #16:(U32)| \ref Data::mCalibrationTimeRejectReason | + * + * \sa Data + * + *

Logging info

+ * | || + * | || + * | typeText | Event | + * | unitText | DD | + * | infoText | AdjustDDCalibrationConductivitySensorResponseData | + * + */ +class MAdjustDDCalibrationConductivitySensorRecordResponse : public MAbstract { + + // friends + friend class ::tst_models; + + QVariantList parameters() const override; + + struct { + Types::U32 mAccepted ; + Types::U32 mReason ; + Types::U32 mIndex ; + Types::U32 mK_highRejectReason ; + Types::U32 mAlpha_higRejectReason ; + Types::U32 mEta_highRejectReason ; + Types::U32 mZeta_highRejectReason ; + Types::U32 mK_lowRejectReason ; + Types::U32 mAlpha_lowRejectReason ; + Types::U32 mEta_lowRejectReason ; + Types::U32 mZeta_lowRejectReason ; + Types::U32 mBetaRejectReason ; + Types::U32 mDeltaRejectReason ; + Types::U32 mReserved1RejectReason ; + Types::U32 mReserved2RejectReason ; + 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("AdjustDDCalibrationConductivitySensor") ; } + + 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 mK_highRejectReason = 0; + quint32 mAlpha_higRejectReason = 0; + quint32 mEta_highRejectReason = 0; + quint32 mZeta_highRejectReason = 0; + quint32 mK_lowRejectReason = 0; + quint32 mAlpha_lowRejectReason = 0; + quint32 mEta_lowRejectReason = 0; + quint32 mZeta_lowRejectReason = 0; + quint32 mBetaRejectReason = 0; + quint32 mDeltaRejectReason = 0; + quint32 mReserved1RejectReason = 0; + quint32 mReserved2RejectReason = 0; + quint32 mCalibrationTimeRejectReason = 0; + }; + + MAdjustDDCalibrationConductivitySensorRecordResponse () { } + + bool fromByteArray (const QByteArray &vByteArray , int *vIndex = nullptr) override; + Data data ( ) const ; +}; +} + +typedef Model::MAdjustDDCalibrationConductivitySensorRecordResponse::Data AdjustDDCalibrationConductivitySensorResponseData; Index: sources/model/dd/adjustment/settings/MDDCalibrationAccelerometerSensorRecordResponse.cpp =================================================================== diff -u --- sources/model/dd/adjustment/settings/MDDCalibrationAccelerometerSensorRecordResponse.cpp (revision 0) +++ sources/model/dd/adjustment/settings/MDDCalibrationAccelerometerSensorRecordResponse.cpp (revision 2f5eb769ab37dc3c9c02e9746458c52a35af00d9) @@ -0,0 +1,48 @@ + +#include "MDDCalibrationAccelerometerSensorRecordResponse.h" + +using namespace Model; + +QVariantList MDDCalibrationAccelerometerSensorRecordResponse::parameters() const { + return { + _data.mAccepted .value, + _data.mReason .value, + _data.mAccelXOffset .value, + _data.mAccelYOffset .value, + _data.mAccelZOffset .value, + _data.mCalTime .value, + }; +} + +bool MDDCalibrationAccelerometerSensorRecordResponse::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.mAccelXOffset )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mAccelYOffset )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mAccelZOffset )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mCalTime )) goto lError; + + return true ; + +lError: + if(vIndex) { *vIndex = index; } + + return false ; +} + +/*! + * \brief MDDCalibrationAccelerometerSensorRecordResponse::data + * \details Provides model's Data from the received messages data values + * \return Data + */ +DDCalibrationAccelerometerSensorResponseData MDDCalibrationAccelerometerSensorRecordResponse::data() const { + Data data; + data.mAccepted = _data.mAccepted .value; + data.mReason = _data.mReason .value; + data.mAccelXOffset = _data.mAccelXOffset .value; + data.mAccelYOffset = _data.mAccelYOffset .value; + data.mAccelZOffset = _data.mAccelZOffset .value; + data.mCalTime = _data.mCalTime .value; + return data; +} Index: sources/model/dd/adjustment/settings/MDDCalibrationAccelerometerSensorRecordResponse.h =================================================================== diff -u --- sources/model/dd/adjustment/settings/MDDCalibrationAccelerometerSensorRecordResponse.h (revision 0) +++ sources/model/dd/adjustment/settings/MDDCalibrationAccelerometerSensorRecordResponse.h (revision 2f5eb769ab37dc3c9c02e9746458c52a35af00d9) @@ -0,0 +1,80 @@ +#pragma once + +// Qt +#include + +// Project +#include "MAbstract.h" +#include "types.h" + +// forward declarations +class tst_models; + +namespace Model { + +/*! + * \brief The MDDCalibrationAccelerometerSensorRecordResponse class + * \details The DD calibration Pressure response model + * + * | MSG | CAN ID | Type | Ack | Src | Dest | Description | + * |:----:|:------:|:----:|:---:|:---:|:----:|:---------------------: | + * |0x1350| 0x070 | Rsp | Y | DD | UI | Get DD Calib AccelerometerSensor | + * + * | Payload || + * | || + * | #1:(U32) | \ref Data::mAccepted | + * | #2:(U32) | \ref Data::mReason | + * | #3:(F32) | \ref Data::mAccelXOffset | + * | #4:(F32) | \ref Data::mAccelYOffset | + * | #5:(F32) | \ref Data::mAccelZOffset | + * | #6:(U32) | \ref Data::mCalTime | + * + * \sa Data + * + *

Logging info

+ * | || + * | || + * | typeText | Event | + * | unitText | DD | + * | infoText | DDalibrationAccelerometerSensor | + * + */ +class MDDCalibrationAccelerometerSensorRecordResponse : public MAbstract { + + // friends + friend class ::tst_models; + + QVariantList parameters() const override; + + struct { + Types::U32 mAccepted ; + Types::U32 mReason ; + Types::F32 mAccelXOffset; + Types::F32 mAccelYOffset; + Types::F32 mAccelZOffset; + 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("DDalibrationAccelerometerSensor") ; } + + struct Data { + quint32 mAccepted = 0; /*!< Accepted value of type quint32 extracted out */ + quint32 mReason = 0; /*!< Reason value of type quint32 extracted out */ + float mAccelXOffset = 0; + float mAccelYOffset = 0; + float mAccelZOffset = 0; + quint32 mCalTime = 0; + }; + + MDDCalibrationAccelerometerSensorRecordResponse () { } + + bool fromByteArray (const QByteArray &vByteArray , int *vIndex = nullptr) override; + Data data ( ) const ; +}; +} + +typedef Model::MDDCalibrationAccelerometerSensorRecordResponse::Data DDCalibrationAccelerometerSensorResponseData; Index: sources/model/dd/adjustment/settings/MDDCalibrationBicarbConcentratesRecordResponse.cpp =================================================================== diff -u -re04d9a7a152b35b7623e0ca54dc77f0593459ad4 -r2f5eb769ab37dc3c9c02e9746458c52a35af00d9 --- sources/model/dd/adjustment/settings/MDDCalibrationBicarbConcentratesRecordResponse.cpp (.../MDDCalibrationBicarbConcentratesRecordResponse.cpp) (revision e04d9a7a152b35b7623e0ca54dc77f0593459ad4) +++ sources/model/dd/adjustment/settings/MDDCalibrationBicarbConcentratesRecordResponse.cpp (.../MDDCalibrationBicarbConcentratesRecordResponse.cpp) (revision 2f5eb769ab37dc3c9c02e9746458c52a35af00d9) @@ -5,23 +5,27 @@ QVariantList MDDCalibrationBicarbConcentratesRecordResponse::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.mBicarbConcMixRatio .value, + _data.mBicarbStartVolumeML .value, + _data.mBicarbConductivityUSPerCM .value, + _data.mBicarbBottleTemperature .value, + _data.mCalTime .value, }; } bool MDDCalibrationBicarbConcentratesRecordResponse::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.mBicarbConcMixRatio )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mBicarbStartVolumeML )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mBicarbConductivityUSPerCM )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mBicarbBottleTemperature )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mCalTime )) goto lError; return true ; @@ -38,11 +42,13 @@ */ BicarbConcentrates MDDCalibrationBicarbConcentratesRecordResponse::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.mBicarbConcMixRatio = _data.mBicarbConcMixRatio .value; + data.mBicarbStartVolumeML = _data.mBicarbStartVolumeML .value; + data.mBicarbConductivityUSPerCM = _data.mBicarbConductivityUSPerCM .value; + data.mBicarbBottleTemperature = _data.mBicarbBottleTemperature .value; + data.mCalTime = _data.mCalTime .value; return data; } Index: sources/model/dd/adjustment/settings/MDDCalibrationBicarbConcentratesRecordResponse.h =================================================================== diff -u -re04d9a7a152b35b7623e0ca54dc77f0593459ad4 -r2f5eb769ab37dc3c9c02e9746458c52a35af00d9 --- sources/model/dd/adjustment/settings/MDDCalibrationBicarbConcentratesRecordResponse.h (.../MDDCalibrationBicarbConcentratesRecordResponse.h) (revision e04d9a7a152b35b7623e0ca54dc77f0593459ad4) +++ sources/model/dd/adjustment/settings/MDDCalibrationBicarbConcentratesRecordResponse.h (.../MDDCalibrationBicarbConcentratesRecordResponse.h) (revision 2f5eb769ab37dc3c9c02e9746458c52a35af00d9) @@ -18,16 +18,18 @@ * * | MSG | CAN ID | Type | Ack | Src | Dest | Description | * |:----:|:------:|:----:|:---:|:---:|:----:|:---------------------: | - * |0x1190| 0x070 | Rsp | Y | DD | UI | Get DD Calib BicarbConcentrates | + * |0x1310| 0x070 | Rsp | Y | DD | UI | Get DD Calib BicarbConcentrates | * * | 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::mBicarbConcMixRatio | + * | #5:(F32) | \ref Data::mBicarbStartVolumeML | + * | #6:(F32) | \ref Data::mBicarbConductivityUSPerCM | + * | #7:(F32) | \ref Data::mBicarbBottleTemperature | + * | #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 mBicarbConcMixRatio ; + Types::F32 mBicarbStartVolumeML ; + Types::F32 mBicarbConductivityUSPerCM ; + Types::F32 mBicarbBottleTemperature ; + Types::U32 mCalTime ; } _data; public: @@ -62,12 +66,14 @@ QString infoText () const override { return QString("DDalibrationBicarbConcentrates") ; } 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 mBicarbConcMixRatio = 0; + float mBicarbStartVolumeML = 0; + float mBicarbConductivityUSPerCM = 0; + float mBicarbBottleTemperature = 0; + quint32 mCalTime = 0; }; MDDCalibrationBicarbConcentratesRecordResponse () { } Index: sources/model/dd/adjustment/settings/MDDCalibrationBloodLeakSensorRecordResponse.cpp =================================================================== diff -u --- sources/model/dd/adjustment/settings/MDDCalibrationBloodLeakSensorRecordResponse.cpp (revision 0) +++ sources/model/dd/adjustment/settings/MDDCalibrationBloodLeakSensorRecordResponse.cpp (revision 2f5eb769ab37dc3c9c02e9746458c52a35af00d9) @@ -0,0 +1,42 @@ + +#include "MDDCalibrationBloodLeakSensorRecordResponse.h" + +using namespace Model; + +QVariantList MDDCalibrationBloodLeakSensorRecordResponse::parameters() const { + return { + _data.mAccepted.value, + _data.mReason .value, + _data.mSetPoint.value, + _data.mCalTime .value, + }; +} + +bool MDDCalibrationBloodLeakSensorRecordResponse::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.mSetPoint )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mCalTime )) goto lError; + + return true ; + +lError: + if(vIndex) { *vIndex = index; } + + return false ; +} + +/*! + * \brief MDDCalibrationBloodLeakSensorRecordResponse::data + * \details Provides model's Data from the received messages data values + * \return Data + */ +DDCalibrationBloodLeakSensorResponseData MDDCalibrationBloodLeakSensorRecordResponse::data() const { + Data data; + data.mAccepted = _data.mAccepted .value; + data.mReason = _data.mReason .value; + data.mSetPoint = _data.mSetPoint .value; + data.mCalTime = _data.mCalTime .value; + return data; +} Index: sources/model/dd/adjustment/settings/MDDCalibrationBloodLeakSensorRecordResponse.h =================================================================== diff -u --- sources/model/dd/adjustment/settings/MDDCalibrationBloodLeakSensorRecordResponse.h (revision 0) +++ sources/model/dd/adjustment/settings/MDDCalibrationBloodLeakSensorRecordResponse.h (revision 2f5eb769ab37dc3c9c02e9746458c52a35af00d9) @@ -0,0 +1,74 @@ +#pragma once + +// Qt +#include + +// Project +#include "MAbstract.h" +#include "types.h" + +// forward declarations +class tst_models; + +namespace Model { + +/*! + * \brief The MDDCalibrationBloodLeakSensorRecordResponse class + * \details The DD calibration BloodLeakSensor response model + * + * | MSG | CAN ID | Type | Ack | Src | Dest | Description | + * |:----:|:------:|:----:|:---:|:---:|:----:|:---------------------: | + * |0x1390| 0x070 | Rsp | Y | DD | UI | Get DD Calib BloodLeakSensor | + * + * | Payload || + * | || + * | #1:(U32) | \ref Data::mAccepted | + * | #2:(U32) | \ref Data::mReason | + * | #3:(U32) | \ref Data::mSetPoint | + * | #4:(U32) | \ref Data::mCalTime | + * + * \sa Data + * + *

Logging info

+ * | || + * | || + * | typeText | Event | + * | unitText | DD | + * | infoText | DDalibrationBloodLeakSensor | + * + */ +class MDDCalibrationBloodLeakSensorRecordResponse : public MAbstract { + + // friends + friend class ::tst_models; + + QVariantList parameters() const override; + + struct { + Types::U32 mAccepted ; + Types::U32 mReason ; + Types::U32 mSetPoint ; + 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("DDalibrationBloodLeakSensor") ; } + + struct Data { + quint32 mAccepted = 0; /*!< Accepted value of type quint32 extracted out */ + quint32 mReason = 0; /*!< Reason value of type quint32 extracted out */ + quint32 mSetPoint = 0; + quint32 mCalTime = 0; + }; + + MDDCalibrationBloodLeakSensorRecordResponse () { } + + bool fromByteArray (const QByteArray &vByteArray , int *vIndex = nullptr) override; + Data data ( ) const ; +}; +} + +typedef Model::MDDCalibrationBloodLeakSensorRecordResponse::Data DDCalibrationBloodLeakSensorResponseData; Index: sources/model/dd/adjustment/settings/MDDCalibrationConductivitySensorRecordResponse.cpp =================================================================== diff -u --- sources/model/dd/adjustment/settings/MDDCalibrationConductivitySensorRecordResponse.cpp (revision 0) +++ sources/model/dd/adjustment/settings/MDDCalibrationConductivitySensorRecordResponse.cpp (revision 2f5eb769ab37dc3c9c02e9746458c52a35af00d9) @@ -0,0 +1,78 @@ + +#include "MDDCalibrationConductivitySensorRecordResponse.h" + +using namespace Model; + +QVariantList MDDCalibrationConductivitySensorRecordResponse::parameters() const { + return { + _data.mAccepted .value, + _data.mReason .value, + _data.mIndex .value, + _data.mK_high .value, + _data.mAlpha_high .value, + _data.mEta_high .value, + _data.mZeta_high .value, + _data.mK_low .value, + _data.mAlpha_low .value, + _data.mEta_low .value, + _data.mZeta_low .value, + _data.mBeta .value, + _data.mDelta .value, + _data.mReserved1 .value, + _data.mReserved2 .value, + _data.mCalTime .value, + }; +} + +bool MDDCalibrationConductivitySensorRecordResponse::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.mK_high )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mAlpha_hig)) goto lError; + if ( ! GetValue(vByteArray, index, _data.mEta_high )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mZeta_high)) goto lError; + if ( ! GetValue(vByteArray, index, _data.mK_low )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mAlpha_low)) goto lError; + if ( ! GetValue(vByteArray, index, _data.mEta_low )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mZeta_low )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mBeta )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mDelta )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mReserved1)) goto lError; + if ( ! GetValue(vByteArray, index, _data.mReserved2)) goto lError; + if ( ! GetValue(vByteArray, index, _data.mCalTime )) goto lError; + + return true ; + +lError: + if(vIndex) { *vIndex = index; } + + return false ; +} + +/*! + * \brief MDDCalibrationConductivitySensorRecordResponse::data + * \details Provides model's Data from the received messages data values + * \return Data + */ +DDCalibrationConductivitySensorResponseData MDDCalibrationConductivitySensorRecordResponse::data() const { + Data data; + data.mAccepted = _data.mAccepted .value; + data.mReason = _data.mReason .value; + data.mIndex = _data.mIndex .value; + data.mK_high = _data.mK_high .value; + data.mAlpha_high= _data.mAlpha_high .value; + data.mEta_high = _data.mEta_high .value; + data.mZeta_high = _data.mZeta_high .value; + data.mK_low = _data.mK_low .value; + data.mAlpha_low = _data.mAlpha_low .value; + data.mEta_low = _data.mEta_low .value; + data.mZeta_low = _data.mZeta_low .value; + data.mBeta = _data.mBeta .value; + data.mDelta = _data.mDelta .value; + data.mReserved1 = _data.mReserved1 .value; + data.mReserved2 = _data.mReserved2 .value; + data.mCalTime = _data.mCalTime .value; + return data; +} Index: sources/model/dd/adjustment/settings/MDDCalibrationConductivitySensorRecordResponse.h =================================================================== diff -u --- sources/model/dd/adjustment/settings/MDDCalibrationConductivitySensorRecordResponse.h (revision 0) +++ sources/model/dd/adjustment/settings/MDDCalibrationConductivitySensorRecordResponse.h (revision 2f5eb769ab37dc3c9c02e9746458c52a35af00d9) @@ -0,0 +1,110 @@ +#pragma once + +// Qt +#include + +// Project +#include "MAbstract.h" +#include "types.h" + +// forward declarations +class tst_models; + +namespace Model { + +/*! + * \brief The MDDCalibrationConductivitySensorRecordResponse class + * \details The DD calibration ConductivitySensor response model + * + * | MSG | CAN ID | Type | Ack | Src | Dest | Description | + * |:----:|:------:|:----:|:---:|:---:|:----:|:---------------------: | + * |0x13D0| 0x070 | Rsp | Y | DD | UI | Get DD Calib ConductivitySensor | + * + * | Payload || + * | || + * | #1:(U32) | \ref Data::mAccepted | + * | #2:(U32) | \ref Data::mReason | + * | #3:(U32) | \ref Data::mIndex | + * | #4:(U32) | \ref Data::mK_high | + * | #5:(U32) | \ref Data::mAlpha_high | + * | #6:(U32) | \ref Data::mEta_high | + * | #7:(U32) | \ref Data::mZeta_high | + * | #8:(U32) | \ref Data::mK_low | + * | #9:(U32) | \ref Data::mAlpha_low | + * | #10:(U32)| \ref Data::mEta_low | + * | #11:(U32)| \ref Data::mZeta_low | + * | #12:(U32)| \ref Data::mBeta | + * | #13:(U32)| \ref Data::mDelta | + * | #14:(U32)| \ref Data::mReserved1 | + * | #15:(U32)| \ref Data::mReserved2 | + * | #16:(U32)| \ref Data::mCalTime | + * + * \sa Data + * + *

Logging info

+ * | || + * | || + * | typeText | Event | + * | unitText | DD | + * | infoText | DDalibrationConductivitySensor | + * + */ +class MDDCalibrationConductivitySensorRecordResponse : public MAbstract { + + // friends + friend class ::tst_models; + + QVariantList parameters() const override; + + struct { + Types::U32 mAccepted ; + Types::U32 mReason ; + Types::U32 mIndex ; + Types::U32 mK_high ; + Types::U32 mAlpha_high ; + Types::U32 mEta_high ; + Types::U32 mZeta_high ; + Types::U32 mK_low ; + Types::U32 mAlpha_low ; + Types::U32 mEta_low ; + Types::U32 mZeta_low ; + Types::U32 mBeta ; + Types::U32 mDelta ; + Types::U32 mReserved1 ; + Types::U32 mReserved2 ; + 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("DDCalibrationConductivitySensor"); } + + 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 mK_high = 0; + quint32 mAlpha_high = 0; + quint32 mEta_high = 0; + quint32 mZeta_high = 0; + quint32 mK_low = 0; + quint32 mAlpha_low = 0; + quint32 mEta_low = 0; + quint32 mZeta_low = 0; + quint32 mBeta = 0; + quint32 mDelta = 0; + quint32 mReserved1 = 0; + quint32 mReserved2 = 0; + quint32 mCalTime = 0; + }; + + MDDCalibrationConductivitySensorRecordResponse () { } + + bool fromByteArray (const QByteArray &vByteArray , int *vIndex = nullptr) override; + Data data ( ) const ; +}; +} + +typedef Model::MDDCalibrationConductivitySensorRecordResponse::Data DDCalibrationConductivitySensorResponseData;