Index: sources/canbus/MessageGlobals.h =================================================================== diff -u -re08fda600a9ee3cb4ca6b7f46cd8fdaf9db4c4c3 -rdaef2046553a6a04e817a9cff843de0d8769d63c --- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision e08fda600a9ee3cb4ca6b7f46cd8fdaf9db4c4c3) +++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision daef2046553a6a04e817a9cff843de0d8769d63c) @@ -244,7 +244,7 @@ {Gui::GuiActionType::ID_AdjustDisposablesConfirmReq , 0 * 4 }, // 0 parameter {Gui::GuiActionType::ID_AdjustDisposablesConfirmRsp , 2 * 4 }, // 2 parameter // Pre-Treatment SelfTest Dry Progress Data - {Gui::GuiActionType::ID_SelfTestDryData , 2 * 4 }, // 2 parameters each 4bytes + {Gui::GuiActionType::ID_SelfTestDryData , 3 * 4 }, // 3 parameters each 4bytes // Pre-Treatment Disposable Priming {Gui::GuiActionType::ID_AdjustDisposablesPrimeReq , 0 * 4 }, // 0 parameter {Gui::GuiActionType::ID_AdjustDisposablesPrimeRsp , 2 * 4 }, // 2 parameters each 4bytes Index: sources/gui/GuiGlobals.h =================================================================== diff -u -rc1651f840faf3ed767fb19b76742b68401f96272 -rdaef2046553a6a04e817a9cff843de0d8769d63c --- sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision c1651f840faf3ed767fb19b76742b68401f96272) +++ sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision daef2046553a6a04e817a9cff843de0d8769d63c) @@ -175,7 +175,7 @@ ID_AdjustDisposablesConfirmReq = 0x9200, // 146 // there is no specific response message for this request and changing of the state in Pre_Treatment_States is used as the response ID_AdjustDisposablesConfirmRsp = 0x9300, // 147 // there is no specific response message for this request and changing of the state in Pre_Treatment_States is used as the response // Pre-Treatment SelfTest Dry Progress Data - ID_SelfTestDryData = 0x630F, // 99 //// ----- @CRAPIZED: had to change to avoid duplication + ID_SelfTestDryData = 0xAE00, // 174 //// ----- @LEAHIZED // Pre-Treatment Disposable Priming ID_AdjustDisposablesPrimeReq = 0x3C0F, // 60 //// ----- @CRAPIZED: had to change to avoid duplication ID_AdjustDisposablesPrimeRsp = 0x3D0F, // 61 //// ----- @CRAPIZED: had to change to avoid duplication Index: sources/gui/qml/pages/pretreatment/PreTreatmentSelfTests.qml =================================================================== diff -u -r1286d74bd015276aab604808be2766136091c125 -rdaef2046553a6a04e817a9cff843de0d8769d63c --- sources/gui/qml/pages/pretreatment/PreTreatmentSelfTests.qml (.../PreTreatmentSelfTests.qml) (revision 1286d74bd015276aab604808be2766136091c125) +++ sources/gui/qml/pages/pretreatment/PreTreatmentSelfTests.qml (.../PreTreatmentSelfTests.qml) (revision daef2046553a6a04e817a9cff843de0d8769d63c) @@ -26,15 +26,15 @@ * \brief the pre-treatment self tests screen */ PreTreatmentBase { id: _root - isComplete : timeCircleProgressValue >= timeCircleMaximum //vPreTreatmentStates.selfTestConsumables_complete + isComplete : vPreTreatmentSelfTestDry.complete completeText : qsTr("Self Test Complete!") // time circle hasTimeCircle : true timeCircleMinimum : 0 - timeCircleMaximum : 30 - timeCircleProgressValue : 0 - timeCircleTimeTextValue : timeCircleProgressValue * 60 + timeCircleMaximum : vPreTreatmentSelfTestDry.total + timeCircleProgressValue : vPreTreatmentSelfTestDry.elapsed + timeCircleTimeTextValue : vPreTreatmentSelfTestDry.countDown * 60 // check List hasCheckList : true Index: sources/model/hd/data/pretreatment/MPreTreatmentSelfTestDryData.cpp =================================================================== diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -rdaef2046553a6a04e817a9cff843de0d8769d63c --- sources/model/hd/data/pretreatment/MPreTreatmentSelfTestDryData.cpp (.../MPreTreatmentSelfTestDryData.cpp) (revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1) +++ sources/model/hd/data/pretreatment/MPreTreatmentSelfTestDryData.cpp (.../MPreTreatmentSelfTestDryData.cpp) (revision daef2046553a6a04e817a9cff843de0d8769d63c) @@ -18,13 +18,15 @@ QVariantList MPreTreatmentSelfTestDry::parameters() const { return { + _data.mSubstate .value, _data.mTimeout .value, _data.mCountdown .value, }; } bool MPreTreatmentSelfTestDry::fromByteArray(const QByteArray &vByteArray, int *vIndex) { int index = 0; // message data start position + if ( ! GetValue(vByteArray, index, _data.mSubstate )) goto lError; if ( ! GetValue(vByteArray, index, _data.mTimeout )) goto lError; if ( ! GetValue(vByteArray, index, _data.mCountdown )) goto lError; @@ -43,6 +45,7 @@ */ MPreTreatmentSelfTestDry::Data MPreTreatmentSelfTestDry::data() const { Data data; + data.mSubstate = _data.mSubstate .value; data.mTimeout = _data.mTimeout .value; data.mCountdown = _data.mCountdown .value; return data; Index: sources/model/hd/data/pretreatment/MPreTreatmentSelfTestDryData.h =================================================================== diff -u -ra58f91b077c8131bea3dbde0fc338adb113fc9f3 -rdaef2046553a6a04e817a9cff843de0d8769d63c --- sources/model/hd/data/pretreatment/MPreTreatmentSelfTestDryData.h (.../MPreTreatmentSelfTestDryData.h) (revision a58f91b077c8131bea3dbde0fc338adb113fc9f3) +++ sources/model/hd/data/pretreatment/MPreTreatmentSelfTestDryData.h (.../MPreTreatmentSelfTestDryData.h) (revision daef2046553a6a04e817a9cff843de0d8769d63c) @@ -32,20 +32,21 @@ * * | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description | * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: | - * |0x6300| 0x020 | 9 | 1 Hz | N | HD | All | Pre-Treatment Self Test Dry Progress Data | + * |0xAE00| 0x020 | 9 | 1 Hz | N | TD | All | Pre-Treatment Self Test Dry Progress Data | * * | Payload || * | || - * | #1:(U32) | \ref Data::mTimeout | - * | #2:(U32) | \ref Data::mCountDown | + * | #1:(U32) | \ref Data::mSubstate | + * | #2:(U32) | \ref Data::mTimeout | + * | #3:(U32) | \ref Data::mCountDown | * * \sa Data * *

Logging info

* | || * | || * | typeText | Datum | - * | unitText | HD | + * | unitText | TD | * | infoText | SelfTestDry | * */ @@ -57,6 +58,7 @@ QVariantList parameters() const override; struct { + Types::U32 mSubstate ; Types::U32 mTimeout ; Types::U32 mCountdown ; } _data; @@ -67,6 +69,7 @@ QString infoText () const override { return QString("SelfTestDry"); } struct Data { + quint32 mSubstate = 0; ///< mSubstate Total time in sec */ quint32 mTimeout = 0; ///< Timeout Total time in sec */ quint32 mCountdown = 0; ///< Countdown current time countdown in sec */ }; Index: sources/view/hd/data/pretreatment/VPreTreatmentSelfTestDryData.cpp =================================================================== diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -rdaef2046553a6a04e817a9cff843de0d8769d63c --- sources/view/hd/data/pretreatment/VPreTreatmentSelfTestDryData.cpp (.../VPreTreatmentSelfTestDryData.cpp) (revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1) +++ sources/view/hd/data/pretreatment/VPreTreatmentSelfTestDryData.cpp (.../VPreTreatmentSelfTestDryData.cpp) (revision daef2046553a6a04e817a9cff843de0d8769d63c) @@ -21,6 +21,7 @@ void VPreTreatmentSelfTestDry::onActionReceive(const PreTreatmentSelfTestDryData &vData) { + state (vData.mSubstate ); total (vData.mTimeout ); remaining (vData.mCountdown ); elapsed (vData.mTimeout - vData.mCountdown ); Index: sources/view/hd/data/pretreatment/VPreTreatmentSelfTestDryData.h =================================================================== diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -rdaef2046553a6a04e817a9cff843de0d8769d63c --- sources/view/hd/data/pretreatment/VPreTreatmentSelfTestDryData.h (.../VPreTreatmentSelfTestDryData.h) (revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1) +++ sources/view/hd/data/pretreatment/VPreTreatmentSelfTestDryData.h (.../VPreTreatmentSelfTestDryData.h) (revision daef2046553a6a04e817a9cff843de0d8769d63c) @@ -36,10 +36,14 @@ { Q_OBJECT + PROPERTY( quint32 , state , 0) PROPERTY( quint32 , total , 0) PROPERTY( quint32 , remaining , 0) PROPERTY( quint32 , elapsed , 0) + PROPERTY ( bool , complete , false) + + VIEW_DEC(VPreTreatmentSelfTestDry, PreTreatmentSelfTestDryData) }; }