Index: sources/canbus/MessageGlobals.h =================================================================== diff -u -r00d9bb06ec2bad14f6dc2db678b750c244f694ef -rda39155b9644400a654a22bc010d5d7fa3526716 --- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 00d9bb06ec2bad14f6dc2db678b750c244f694ef) +++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision da39155b9644400a654a22bc010d5d7fa3526716) @@ -171,7 +171,7 @@ eChlid_HD_UI = 0x020, ///< HD => UI eChlid_UI_HD = 0x100, ///< UI => HD [Out] - // UI lessens occasionally + // UI listens occasionally eChlid_DG_UI = 0x070, ///< DG => UI eChlid_UI_DG = eChlid_UI_Sync , ///< No direct channel has been defined between DG&UI, May be required for logging }; Index: sources/model/hd/adjustment/MTreatmentAdjustBloodDialysateResponse.cpp =================================================================== diff -u -r30f83b2813e68ae3c2806399bf808b642c215b67 -rda39155b9644400a654a22bc010d5d7fa3526716 --- sources/model/hd/adjustment/MTreatmentAdjustBloodDialysateResponse.cpp (.../MTreatmentAdjustBloodDialysateResponse.cpp) (revision 30f83b2813e68ae3c2806399bf808b642c215b67) +++ sources/model/hd/adjustment/MTreatmentAdjustBloodDialysateResponse.cpp (.../MTreatmentAdjustBloodDialysateResponse.cpp) (revision da39155b9644400a654a22bc010d5d7fa3526716) @@ -20,7 +20,7 @@ _data.mAccepted .value, _data.mReason .value, _data.mBloodRate .value, - _data.mDialydateReate.value + _data.mDialysateRate .value }; } @@ -29,7 +29,7 @@ if (GetValue(vByteArray, index, _data.mAccepted )) if (GetValue(vByteArray, index, _data.mReason )) if (GetValue(vByteArray, index, _data.mBloodRate )) - if (GetValue(vByteArray, index, _data.mDialydateReate )) + if (GetValue(vByteArray, index, _data.mDialysateRate )) return true ; else { if(vIndex) *vIndex = index; return false; } else { if(vIndex) *vIndex = index; return false; } @@ -42,6 +42,6 @@ data.mAccepted = _data.mAccepted .value; data.mReason = _data.mReason .value; data.mBloodRate = _data.mBloodRate .value; - data.mDialydateReate = _data.mDialydateReate.value; + data.mDialysateRate = _data.mDialysateRate .value; return data; } Index: sources/model/hd/adjustment/MTreatmentAdjustBloodDialysateResponse.h =================================================================== diff -u -r00d9bb06ec2bad14f6dc2db678b750c244f694ef -rda39155b9644400a654a22bc010d5d7fa3526716 --- sources/model/hd/adjustment/MTreatmentAdjustBloodDialysateResponse.h (.../MTreatmentAdjustBloodDialysateResponse.h) (revision 00d9bb06ec2bad14f6dc2db678b750c244f694ef) +++ sources/model/hd/adjustment/MTreatmentAdjustBloodDialysateResponse.h (.../MTreatmentAdjustBloodDialysateResponse.h) (revision da39155b9644400a654a22bc010d5d7fa3526716) @@ -36,7 +36,7 @@ Types::U32 mAccepted ; Types::U32 mReason ; Types::U32 mBloodRate ; - Types::U32 mDialydateReate ; + Types::U32 mDialysateRate ; } _data; public: @@ -49,7 +49,7 @@ bool mAccepted = 0; /*!< Accepted value of type quint32 extracted out */ quint32 mReason = 0; /*!< Reason value of type quint32 extracted out */ quint32 mBloodRate = 0; /*!< BloodRate value of type quint32 extracted out */ - quint32 mDialydateReate = 0; /*!< DialydateReate value of type quint32 extracted out */ + quint32 mDialysateRate = 0; /*!< DialysateRate value of type quint32 extracted out */ }; MAdjustBloodDialysateResponse () { } Index: sources/view/hd/adjustment/VTreatmentAdjustmentFlows.cpp =================================================================== diff -u -r00d9bb06ec2bad14f6dc2db678b750c244f694ef -rda39155b9644400a654a22bc010d5d7fa3526716 --- sources/view/hd/adjustment/VTreatmentAdjustmentFlows.cpp (.../VTreatmentAdjustmentFlows.cpp) (revision 00d9bb06ec2bad14f6dc2db678b750c244f694ef) +++ sources/view/hd/adjustment/VTreatmentAdjustmentFlows.cpp (.../VTreatmentAdjustmentFlows.cpp) (revision da39155b9644400a654a22bc010d5d7fa3526716) @@ -1,16 +1,16 @@ /*! - * + * * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. * \copyright * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. - * + * * \file vtreatmentadjustmentflows.cpp * \author (last) Behrouz NemaiPour * \date (last) 09-Jun-2020 * \author (original) Behrouz NematiPour * \date (original) 19-May-2020 - * + * */ #include "VTreatmentAdjustmentFlows.h" @@ -28,7 +28,7 @@ adjustment_Accepted ( vData.mAccepted ); adjustment_Reason ( vData.mReason ); bloodFlow_FlowSetPoint ( vData.mBloodRate ); - dialysateFlow_FlowSetPoint ( vData.mDialydateReate ); + dialysateFlow_FlowSetPoint ( vData.mDialysateRate ); // *** has to be the last to let the information to be set and then emit the signal *** // *** otherwise will use the previous values before being set. *** Index: unittests/tst_models.cpp =================================================================== diff -u -r0e528e5f706308c7b0e8f22a4d9dbb5b5715db7c -rda39155b9644400a654a22bc010d5d7fa3526716 --- unittests/tst_models.cpp (.../tst_models.cpp) (revision 0e528e5f706308c7b0e8f22a4d9dbb5b5715db7c) +++ unittests/tst_models.cpp (.../tst_models.cpp) (revision da39155b9644400a654a22bc010d5d7fa3526716) @@ -76,10 +76,10 @@ QTest::newRow("mBloodRate ")<< 3 << QByteArray::fromHex(QByteArray("00" "01" "02" "03" "04" "05" "06" "07" "08")); QTest::newRow("mBloodRate ")<< 3 << QByteArray::fromHex(QByteArray("00" "01" "02" "03" "04" "05" "06" "07" "08" "09")); QTest::newRow("mBloodRate ")<< 3 << QByteArray::fromHex(QByteArray("00" "01" "02" "03" "04" "05" "06" "07" "08" "09" "0A")); - QTest::newRow("mDialydateReate")<< 4 << QByteArray::fromHex(QByteArray("00" "01" "02" "03" "04" "05" "06" "07" "08" "09" "0A" "0B")); - QTest::newRow("mDialydateReate")<< 4 << QByteArray::fromHex(QByteArray("00" "01" "02" "03" "04" "05" "06" "07" "08" "09" "0A" "0B" "0C")); - QTest::newRow("mDialydateReate")<< 4 << QByteArray::fromHex(QByteArray("00" "01" "02" "03" "04" "05" "06" "07" "08" "09" "0A" "0B" "0C" "0D")); - QTest::newRow("mDialydateReate")<< 4 << QByteArray::fromHex(QByteArray("00" "01" "02" "03" "04" "05" "06" "07" "08" "09" "0A" "0B" "0C" "0D" "0E")); + QTest::newRow("mDialysateRate ")<< 4 << QByteArray::fromHex(QByteArray("00" "01" "02" "03" "04" "05" "06" "07" "08" "09" "0A" "0B")); + QTest::newRow("mDialysateRate ")<< 4 << QByteArray::fromHex(QByteArray("00" "01" "02" "03" "04" "05" "06" "07" "08" "09" "0A" "0B" "0C")); + QTest::newRow("mDialysateRate ")<< 4 << QByteArray::fromHex(QByteArray("00" "01" "02" "03" "04" "05" "06" "07" "08" "09" "0A" "0B" "0C" "0D")); + QTest::newRow("mDialysateRate ")<< 4 << QByteArray::fromHex(QByteArray("00" "01" "02" "03" "04" "05" "06" "07" "08" "09" "0A" "0B" "0C" "0D" "0E")); } void tst_models::tst_MAdjustBloodDialysateResponse () @@ -102,7 +102,7 @@ case 1: { index = index * sizeof mData._data.mAccepted ; QVERIFY (! mData.fromByteArray(data)); QCOMPARE( index, startIndex ); } break; case 2: { index = index * sizeof mData._data.mReason ; QVERIFY (! mData.fromByteArray(data)); QCOMPARE( index, startIndex ); } break; case 3: { index = index * sizeof mData._data.mBloodRate ; QVERIFY (! mData.fromByteArray(data)); QCOMPARE( index, startIndex ); } break; - case 4: { index = index * sizeof mData._data.mDialydateReate; QVERIFY (! mData.fromByteArray(data)); QCOMPARE( index, startIndex ); } break; + case 4: { index = index * sizeof mData._data.mDialysateRate ; QVERIFY (! mData.fromByteArray(data)); QCOMPARE( index, startIndex ); } break; default: QVERIFY2(false, "Incorrect Test"); break;