Index: sources/canbus/MessageGlobals.h =================================================================== diff -u -rfe301ed4aa3b3e5cd2a279488652338ee66366a1 -r772bbb399f7ee2c6ccc0829443772cdd522a9976 --- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision fe301ed4aa3b3e5cd2a279488652338ee66366a1) +++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 772bbb399f7ee2c6ccc0829443772cdd522a9976) @@ -86,7 +86,7 @@ {Gui::GuiActionType::ID_HDBloodLeakData , 10 * 4 }, // 2 parameters each 4bytes // ---- {Gui::GuiActionType::ID_HDOperationModeData , 2 * 4 }, // 2 parameter each 4bytes - {Gui::GuiActionType::ID_PreTreatmentStates , 9 * 4 }, // 9 parameters each 4bytes + {Gui::GuiActionType::ID_PreTreatmentStates , 11 * 4 }, //11 parameters each 4bytes {Gui::GuiActionType::ID_TreatmentStates , 10 * 4 }, // 9 parameters each 4bytes {Gui::GuiActionType::ID_PostTreatmentStates , 1 * 4 }, // 1 parameter each 4bytes Index: sources/model/hd/data/pretreatment/MPreTreatmentStatesData.cpp =================================================================== diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -r772bbb399f7ee2c6ccc0829443772cdd522a9976 --- sources/model/hd/data/pretreatment/MPreTreatmentStatesData.cpp (.../MPreTreatmentStatesData.cpp) (revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263) +++ sources/model/hd/data/pretreatment/MPreTreatmentStatesData.cpp (.../MPreTreatmentStatesData.cpp) (revision 772bbb399f7ee2c6ccc0829443772cdd522a9976) @@ -27,6 +27,8 @@ _data.mPrimeState .value, _data.mRecirculateState .value, _data.mPatientConnectionState .value, + _data.mWetSelfTestsState .value, + _data.mPreTreatmentRsrvrState .value, }; } @@ -41,6 +43,8 @@ if (GetValue(vByteArray, index, _data.mPrimeState )) if (GetValue(vByteArray, index, _data.mRecirculateState )) if (GetValue(vByteArray, index, _data.mPatientConnectionState )) + if (GetValue(vByteArray, index, _data.mWetSelfTestsState )) + if (GetValue(vByteArray, index, _data.mPreTreatmentRsrvrState )) return true ; else { if(vIndex) *vIndex = index; return false; } else { if(vIndex) *vIndex = index; return false; } @@ -51,6 +55,8 @@ else { if(vIndex) *vIndex = index; return false; } else { if(vIndex) *vIndex = index; return false; } else { if(vIndex) *vIndex = index; return false; } + else { if(vIndex) *vIndex = index; return false; } + else { if(vIndex) *vIndex = index; return false; } } /*! @@ -69,5 +75,7 @@ data.mPrimeState = _data.mPrimeState .value; data.mRecirculateState = _data.mRecirculateState .value; data.mPatientConnectionState = _data.mPatientConnectionState .value; + data.mWetSelfTestsState = _data.mWetSelfTestsState .value; + data.mPreTreatmentRsrvrState = _data.mPreTreatmentRsrvrState .value; return data; } Index: sources/model/hd/data/pretreatment/MPreTreatmentStatesData.h =================================================================== diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -r772bbb399f7ee2c6ccc0829443772cdd522a9976 --- sources/model/hd/data/pretreatment/MPreTreatmentStatesData.h (.../MPreTreatmentStatesData.h) (revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263) +++ sources/model/hd/data/pretreatment/MPreTreatmentStatesData.h (.../MPreTreatmentStatesData.h) (revision 772bbb399f7ee2c6ccc0829443772cdd522a9976) @@ -36,17 +36,19 @@ * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: | * |0x5C00| 0x040 | 7 | 1 Hz | N | HD | All | Pre-Treatment States Data | * - * | Payload || - * | || - * | #1:(U32) | \ref Data::mSubMode | - * | #2:(U32) | \ref Data::mWaterSampleState | - * | #3:(U32) | \ref Data::mSelfTestConsumablesState | - * | #4:(U32) | \ref Data::mSelfTestNoCartridgeState | - * | #5:(U32) | \ref Data::mInstallationState | - * | #6:(U32) | \ref Data::mSelfTestDryState | - * | #7:(U32) | \ref Data::mPrimeState | - * | #8:(U32) | \ref Data::mRecirculateState | - * | #9:(U32) | \ref Data::mPatientConnectionState | + * | Payload || + * | || + * | # 1:(U32) | \ref Data::mSubMode | + * | # 2:(U32) | \ref Data::mWaterSampleState | + * | # 3:(U32) | \ref Data::mSelfTestConsumablesState | + * | # 4:(U32) | \ref Data::mSelfTestNoCartridgeState | + * | # 5:(U32) | \ref Data::mInstallationState | + * | # 6:(U32) | \ref Data::mSelfTestDryState | + * | # 7:(U32) | \ref Data::mPrimeState | + * | # 8:(U32) | \ref Data::mRecirculateState | + * | # 9:(U32) | \ref Data::mPatientConnectionState | + * | #10:(U32) | \ref Data::mWetSelfTestsState | + * | #11:(U32) | \ref Data::mPreTreatmentRsrvrState | * * \sa Data * \sa HD_Pre_Treatment_Mode_States @@ -73,15 +75,17 @@ QVariantList parameters() const override; struct { - Types::U32 mSubMode ; - Types::U32 mWaterSampleState ; - Types::U32 mSelfTestConsumablesState ; - Types::U32 mSelfTestNoCartridgeState ; - Types::U32 mInstallationState ; - Types::U32 mSelfTestDryState ; - Types::U32 mPrimeState ; - Types::U32 mRecirculateState ; - Types::U32 mPatientConnectionState ; + Types::U32 mSubMode ; ///< Current pre-treatment sub-mode + Types::U32 mWaterSampleState ; ///< Current sample water state + Types::U32 mSelfTestConsumablesState ; ///< Current consumable self-tests state + Types::U32 mSelfTestNoCartridgeState ; ///< Current no cartridge self-tests state + Types::U32 mInstallationState ; ///< Current disposable installation state + Types::U32 mSelfTestDryState ; ///< Current dry self-tests state + Types::U32 mPrimeState ; ///< Current prime state + Types::U32 mRecirculateState ; ///< Current re-circulate state + Types::U32 mPatientConnectionState ; ///< Current patient connection state + Types::U32 mWetSelfTestsState ; ///< Current wet self-tests state + Types::U32 mPreTreatmentRsrvrState ; ///< Current pre-treatment reservoir state } _data; public: @@ -91,15 +95,17 @@ QString infoText () const override { return QString("PreTreatmentStates"); } struct Data { - quint32 mSubMode = 0; ///< SubMode State - HD_Pre_Treatment_Mode_States - quint32 mWaterSampleState = 0; ///< WaterSample State - HD_Pre_Treatment_Sample_Water_States - quint32 mSelfTestConsumablesState = 0; ///< selfTestConsumables State - HD_Pre_Treatment_Consumable_Self_Test_States - quint32 mSelfTestNoCartridgeState = 0; ///< SelfTestNoCartridge State - HD_Pre_Treatment_No_Cart_Self_Tests_States - quint32 mInstallationState = 0; ///< Installation State - 0 = One state only - quint32 mSelfTestDryState = 0; ///< SelfTestDry State - HD_Pre_Treatment_Dry_Self_Tests_States - quint32 mPrimeState = 0; ///< Prime State - HD_Pre_Treatment_Prime_States - quint32 mRecirculateState = 0; ///< Recirculate State - HD_Pre_Treatment_Recirc_States - quint32 mPatientConnectionState = 0; ///< PatientConnection State - 0 = One state only + quint32 mSubMode = 0; ///< SubMode State - HD_Pre_Treatment_Mode_States + quint32 mWaterSampleState = 0; ///< WaterSample State - HD_Pre_Treatment_Sample_Water_States + quint32 mSelfTestConsumablesState = 0; ///< selfTestConsumables State - HD_Pre_Treatment_Consumable_Self_Test_States + quint32 mSelfTestNoCartridgeState = 0; ///< SelfTestNoCartridge State - HD_Pre_Treatment_No_Cart_Self_Tests_States + quint32 mInstallationState = 0; ///< Installation State - 0 = One state only + quint32 mSelfTestDryState = 0; ///< SelfTestDry State - HD_Pre_Treatment_Dry_Self_Tests_States + quint32 mPrimeState = 0; ///< Prime State - HD_Pre_Treatment_Prime_States + quint32 mRecirculateState = 0; ///< Recirculate State - HD_Pre_Treatment_Recirc_States + quint32 mPatientConnectionState = 0; ///< PatientConnection State - 0 = One state only + quint32 mWetSelfTestsState = 0; ///< ??? State - Current wet self-tests state + quint32 mPreTreatmentRsrvrState = 0; ///< ??? State - Current pre-treatment reservoir state }; MPreTreatmentStates() { } Index: sources/view/hd/data/pretreatment/VPreTreatmentStatesData.cpp =================================================================== diff -u -r8172c6aa4187be26aa9c0e73a130bc6183ad10dd -r772bbb399f7ee2c6ccc0829443772cdd522a9976 --- sources/view/hd/data/pretreatment/VPreTreatmentStatesData.cpp (.../VPreTreatmentStatesData.cpp) (revision 8172c6aa4187be26aa9c0e73a130bc6183ad10dd) +++ sources/view/hd/data/pretreatment/VPreTreatmentStatesData.cpp (.../VPreTreatmentStatesData.cpp) (revision 772bbb399f7ee2c6ccc0829443772cdd522a9976) @@ -36,6 +36,8 @@ primeState ( vData.mPrimeState ); recirculateState ( vData.mRecirculateState ); patientConnectionState ( vData.mPatientConnectionState ); + wetSelfTestsState ( vData.mWetSelfTestsState ); + preTreatmentRsrvrState ( vData.mPreTreatmentRsrvrState ); // water sample state bool mWaterSample = vData.mSubMode == GuiPreTreatmentStates ::HD_PRE_TREATMENT_WATER_SAMPLE_STATE ; Index: sources/view/hd/data/pretreatment/VPreTreatmentStatesData.h =================================================================== diff -u -r8172c6aa4187be26aa9c0e73a130bc6183ad10dd -r772bbb399f7ee2c6ccc0829443772cdd522a9976 --- sources/view/hd/data/pretreatment/VPreTreatmentStatesData.h (.../VPreTreatmentStatesData.h) (revision 8172c6aa4187be26aa9c0e73a130bc6183ad10dd) +++ sources/view/hd/data/pretreatment/VPreTreatmentStatesData.h (.../VPreTreatmentStatesData.h) (revision 772bbb399f7ee2c6ccc0829443772cdd522a9976) @@ -49,6 +49,8 @@ PROPERTY( quint8 , primeState , 0 ) ///< HD_PRE_TREATMENT_PRIME_STATE , Prime blood and dialysate circuits and run wet self-tests state PROPERTY( quint8 , recirculateState , 0 ) ///< HD_PRE_TREATMENT_RECIRCULATE_STATE , Re-circulate blood and dialysate circuits state PROPERTY( quint8 , patientConnectionState , 0 ) ///< HD_PRE_TREATMENT_PATIENT_CONNECTION_STATE , Patient connection state + PROPERTY( quint8 , wetSelfTestsState , 0 ) ///< ??? , ??? + PROPERTY( quint8 , preTreatmentRsrvrState , 0 ) ///< ??? , ??? // Start pre-treatment mode state PROPERTY( bool , waterSample , false ) ///< HD_PRE_TREATMENT_WATER_SAMPLE_STATE , Water sample state