Index: sources/gui/qml/dialogs/DiagnosticsDialog.qml =================================================================== diff -u -r86274f18e9356126c41d848bc78bfba318638aee -r1439734e9dc8384eff68c061b2930a737f4cfb5e --- sources/gui/qml/dialogs/DiagnosticsDialog.qml (.../DiagnosticsDialog.qml) (revision 86274f18e9356126c41d848bc78bfba318638aee) +++ sources/gui/qml/dialogs/DiagnosticsDialog.qml (.../DiagnosticsDialog.qml) (revision 1439734e9dc8384eff68c061b2930a737f4cfb5e) @@ -77,15 +77,15 @@ ] label: [ - "sFLow ", - "mFlow ", - "rSpd ", - "mSpd ", - "mCurr ", - "RPM ", - "rCnt ", - "pFlow ", - "rHall ", + "sFLow (H4) ", + "mFlow (H4) ", + "rSpd (H4) ", + "mSpd (H4) ", + "mCurr (H4) ", + "RPM (H4) ", + "rCnt (H4) ", + "pFlow (H4) ", + "rHall (H4) ", ] } @@ -95,21 +95,21 @@ x: col(1.5) y: row(0) model: [ - vTDAirTrap.lowLevel , - vTDAirTrap.upLevel , - vTDAirTrap.lowLevelRaw , - vTDAirTrap.upLevelRaw , - vTDAirTrap.valveStateH13 , - vTDAirTrap.valveStateH20 , - vTDAirTrap.controlling , + vTDAirTrap.lowLevel , + vTDAirTrap.upLevel , + vTDAirTrap.lowLevelRaw , + vTDAirTrap.upLevelRaw , + vTDAirTrap.valveIntakeState , + vTDAirTrap.valveOutletState , + vTDAirTrap.controlling , ] label: [ - "ATL", - "ATU", - "rATL", - "rATU", - "H13", - "H20", + "ATL (H17)", + "ATH (H16)", + "rARL (H17)", + "rATH (H16)", + "IState (H13)", + "OState (H20)", "ctrl", ] } @@ -147,8 +147,8 @@ ] label: [ - "state ", - "Spd " , + "State (H5) ", + "Spd (H5) " , ] } @@ -163,8 +163,8 @@ ] label: [ - "door(H9) ", - "rot1(H6) ", + "door (H9) ", + "rHall (H4) ", ] } Index: sources/model/dd/data/MDDConductivityData.cpp =================================================================== diff -u -rf9abb75101e8cbe4c3a388361cfd3bbf592605f8 -r1439734e9dc8384eff68c061b2930a737f4cfb5e --- sources/model/dd/data/MDDConductivityData.cpp (.../MDDConductivityData.cpp) (revision f9abb75101e8cbe4c3a388361cfd3bbf592605f8) +++ sources/model/dd/data/MDDConductivityData.cpp (.../MDDConductivityData.cpp) (revision 1439734e9dc8384eff68c061b2930a737f4cfb5e) @@ -18,21 +18,21 @@ QVariantList MDDConductivityData::parameters() const { return { - _data.mCD1 .value, - _data.mCD2 .value, - _data.mCD3 .value, - _data.mCD4 .value, - _data.mCD5 .value, + _data.mD17Conductivity .value, + _data.mD27Conductivity .value, + _data.mD29Conductivity .value, + _data.mD43Conductivity .value, + _data.mD74Conductivity .value, }; } bool MDDConductivityData::fromByteArray(const QByteArray &vByteArray, int *vIndex) { int index = 0; // message data start position - if ( ! GetValue(vByteArray, index, _data.mCD1 )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mCD2 )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mCD3 )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mCD4 )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mCD5 )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mD17Conductivity )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mD27Conductivity )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mD29Conductivity )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mD43Conductivity )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mD74Conductivity )) goto lError; return true ; @@ -49,10 +49,10 @@ */ MDDConductivityData::Data MDDConductivityData::data() const { Data data; - data.mCD1 = _data.mCD1 .value; - data.mCD2 = _data.mCD2 .value; - data.mCD3 = _data.mCD3 .value; - data.mCD4 = _data.mCD4 .value; - data.mCD5 = _data.mCD5 .value; + data.mBicarbCondutivity1 = _data.mD17Conductivity .value; + data.mAcidBicarbCondutivity1 = _data.mD27Conductivity .value; + data.mAcidBicarbCondutivity2 = _data.mD29Conductivity .value; + data.mSpentCondutivity1 = _data.mD43Conductivity .value; + data.mBicarbCondutivity2 = _data.mD74Conductivity .value; return data; } Index: sources/model/dd/data/MDDConductivityData.h =================================================================== diff -u -rf9abb75101e8cbe4c3a388361cfd3bbf592605f8 -r1439734e9dc8384eff68c061b2930a737f4cfb5e --- sources/model/dd/data/MDDConductivityData.h (.../MDDConductivityData.h) (revision f9abb75101e8cbe4c3a388361cfd3bbf592605f8) +++ sources/model/dd/data/MDDConductivityData.h (.../MDDConductivityData.h) (revision 1439734e9dc8384eff68c061b2930a737f4cfb5e) @@ -35,11 +35,11 @@ * * | Payload || * | || - * | #01:(F32) | \ref Data::mCD1 | - * | #02:(F32) | \ref Data::mCD2 | - * | #03:(F32) | \ref Data::mCD3 | - * | #04:(F32) | \ref Data::mCD4 | - * | #05:(F32) | \ref Data::mCD5 | + * | #01:(F32) | \ref Data::mBicarbCondutivity1 | + * | #02:(F32) | \ref Data::mAcidBicarbCondutivity1 | + * | #03:(F32) | \ref Data::mAcidBicarbCondutivity2 | + * | #04:(F32) | \ref Data::mSpentCondutivity1 | + * | #05:(F32) | \ref Data::mBicarbCondutivity2 | * * * \sa Data @@ -60,11 +60,11 @@ QVariantList parameters() const override; struct { - Types::F32 mCD1 ; - Types::F32 mCD2 ; - Types::F32 mCD3 ; - Types::F32 mCD4 ; - Types::F32 mCD5 ; + Types::F32 mD17Conductivity ; + Types::F32 mD27Conductivity ; + Types::F32 mD29Conductivity ; + Types::F32 mD43Conductivity ; + Types::F32 mD74Conductivity ; } _data; @@ -74,11 +74,11 @@ QString infoText () const override { return QString("Conductivity"); } struct Data{ - float mCD1 = 0; ///< Bicarb only conductivity sensor 1 - float mCD2 = 0; ///< Acid and Bicarb mix conductivity sensor 1 - float mCD3 = 0; ///< Acid and Bicarb mix conductivity sensor 2 - float mCD4 = 0; ///< Spent dialysate conductivity sensor - float mCD5 = 0; ///< Bicarb only conductivity sensor 2 + float mBicarbCondutivity1 = 0; ///< Bicarb only conductivity sensor 1 + float mAcidBicarbCondutivity1 = 0; ///< Acid and Bicarb mix conductivity sensor 1 + float mAcidBicarbCondutivity2 = 0; ///< Acid and Bicarb mix conductivity sensor 2 + float mSpentCondutivity1 = 0; ///< Spent dialysate conductivity sensor + float mBicarbCondutivity2 = 0; ///< Bicarb only conductivity sensor 2 }; MDDConductivityData () { } Index: sources/model/dd/data/MDDGenDialysateData.cpp =================================================================== diff -u -rf9abb75101e8cbe4c3a388361cfd3bbf592605f8 -r1439734e9dc8384eff68c061b2930a737f4cfb5e --- sources/model/dd/data/MDDGenDialysateData.cpp (.../MDDGenDialysateData.cpp) (revision f9abb75101e8cbe4c3a388361cfd3bbf592605f8) +++ sources/model/dd/data/MDDGenDialysateData.cpp (.../MDDGenDialysateData.cpp) (revision 1439734e9dc8384eff68c061b2930a737f4cfb5e) @@ -17,29 +17,29 @@ QVariantList MDDGenDialysateData::parameters() const { return { - _data.mGenDialysateExec .value, - _data.mDDInProgress .value, - _data.mFltLevel1 .value, - _data.mBicarbLevel .value, - _data.mSpentLevel .value, - _data.mHydNegativePressure .value, - _data.mHydPositivePressure .value, - _data.mSpendPressure .value, - _data.mDialGood .value, + _data.mGenDialysateExec .value, + _data.mDDInProgress .value, + _data.mD6Level .value, + _data.mD63Level .value, + _data.mD46Level .value, + _data.mD9Pressure .value, + _data.mD18Pressure .value, + _data.mD51Pressure .value, + _data.mDialGood .value, }; } bool MDDGenDialysateData::fromByteArray(const QByteArray &vByteArray, int *vIndex) { int index = 0; // message data start position - if ( ! GetValue(vByteArray, index, _data.mGenDialysateExec )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mDDInProgress )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mFltLevel1 )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mBicarbLevel )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mSpentLevel )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mHydNegativePressure )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mHydPositivePressure )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mSpendPressure )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mDialGood )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mGenDialysateExec )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mDDInProgress )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mD6Level )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mD63Level )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mD46Level )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mD9Pressure )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mD18Pressure )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mD51Pressure )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mDialGood )) goto lError; return true ; @@ -56,14 +56,14 @@ */ MDDGenDialysateData::Data MDDGenDialysateData::data() const { Data data; - data.mGenDialysateExec = _data.mGenDialysateExec .value; - data.mDDInProgress = _data.mDDInProgress .value; - data.mFltLevel1 = _data.mFltLevel1 .value; - data.mBicarbLevel = _data.mBicarbLevel .value; - data.mSpentLevel = _data.mSpentLevel .value; - data.mHydNegativePressure = _data.mHydNegativePressure .value; - data.mHydPositivePressure = _data.mHydPositivePressure .value; - data.mSpendPressure = _data.mSpendPressure .value; - data.mDialGood = _data.mDialGood .value; + data.mGenDialysateExec = _data.mGenDialysateExec .value; + data.mDDInProgress = _data.mDDInProgress .value; + data.mFltLevel1 = _data.mD6Level .value; + data.mBicarbLevel = _data.mD63Level .value; + data.mSpentLevel = _data.mD46Level .value; + data.mHydNegativePressure = _data.mD9Pressure .value; + data.mHydPositivePressure = _data.mD18Pressure .value; + data.mSpendPressure = _data.mD51Pressure .value; + data.mDialGood = _data.mDialGood .value; return data; } Index: sources/model/dd/data/MDDGenDialysateData.h =================================================================== diff -u -rf9abb75101e8cbe4c3a388361cfd3bbf592605f8 -r1439734e9dc8384eff68c061b2930a737f4cfb5e --- sources/model/dd/data/MDDGenDialysateData.h (.../MDDGenDialysateData.h) (revision f9abb75101e8cbe4c3a388361cfd3bbf592605f8) +++ sources/model/dd/data/MDDGenDialysateData.h (.../MDDGenDialysateData.h) (revision 1439734e9dc8384eff68c061b2930a737f4cfb5e) @@ -64,15 +64,15 @@ QVariantList parameters() const override; struct { - Types::U32 mGenDialysateExec ; - Types::U32 mDDInProgress ; - Types::U32 mFltLevel1 ; - Types::U32 mBicarbLevel ; - Types::U32 mSpentLevel ; - Types::F32 mHydNegativePressure ; - Types::F32 mHydPositivePressure ; - Types::F32 mSpendPressure ; - Types::U32 mDialGood ; + Types::U32 mGenDialysateExec ; + Types::U32 mDDInProgress ; + Types::U32 mD6Level ; + Types::U32 mD63Level ; + Types::U32 mD46Level ; + Types::F32 mD9Pressure ; + Types::F32 mD18Pressure ; + Types::F32 mD51Pressure ; + Types::U32 mDialGood ; } _data; Index: sources/model/td/data/MTDAirTrapData.cpp =================================================================== diff -u -rf9abb75101e8cbe4c3a388361cfd3bbf592605f8 -r1439734e9dc8384eff68c061b2930a737f4cfb5e --- sources/model/td/data/MTDAirTrapData.cpp (.../MTDAirTrapData.cpp) (revision f9abb75101e8cbe4c3a388361cfd3bbf592605f8) +++ sources/model/td/data/MTDAirTrapData.cpp (.../MTDAirTrapData.cpp) (revision 1439734e9dc8384eff68c061b2930a737f4cfb5e) @@ -18,25 +18,25 @@ QVariantList MTDAirTrapData::parameters() const { return { - _data.mLowLevel .value, - _data.mUpLevel .value, - _data.mLowLevelRaw .value, - _data.mUpLevelRaw .value, - _data.mValveStateH13.value, - _data.mValveStateH20.value, - _data.mControlling .value, + _data.mH17State .value, + _data.mH16State .value, + _data.mH17RawState .value, + _data.mH16RawState .value, + _data.mH13State .value, + _data.mH20State .value, + _data.mControlling .value, }; } bool MTDAirTrapData::fromByteArray(const QByteArray &vByteArray, int *vIndex) { int index = 0; - if ( ! GetValue(vByteArray, index, _data.mLowLevel )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mUpLevel )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mLowLevelRaw )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mUpLevelRaw )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mValveStateH13)) goto lError; - if ( ! GetValue(vByteArray, index, _data.mValveStateH20)) goto lError; - if ( ! GetValue(vByteArray, index, _data.mControlling )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mH17State )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mH16State )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mH17RawState )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mH16RawState )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mH13State )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mH20State )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mControlling )) goto lError; return true ; @@ -53,12 +53,12 @@ */ MTDAirTrapData::Data MTDAirTrapData::data() const{ Data data; - data.mLowLevel = _data.mLowLevel .value; - data.mUpLevel = _data.mUpLevel .value; - data.mLowLevelRaw = _data.mLowLevelRaw .value; - data.mUpLevelRaw = _data.mUpLevelRaw .value; - data.mValveStateH13 = _data.mValveStateH13 .value; - data.mValveStateH20 = _data.mValveStateH20 .value; - data.mControlling = _data.mControlling .value; + data.mLowLevel = _data.mH17State .value; + data.mUpLevel = _data.mH16State .value; + data.mLowLevelRaw = _data.mH17RawState .value; + data.mUpLevelRaw = _data.mH16RawState .value; + data.mValveIntakeState = _data.mH13State .value; + data.mValveOutletState = _data.mH20State .value; + data.mControlling = _data.mControlling .value; return data; } Index: sources/model/td/data/MTDAirTrapData.h =================================================================== diff -u -rf9abb75101e8cbe4c3a388361cfd3bbf592605f8 -r1439734e9dc8384eff68c061b2930a737f4cfb5e --- sources/model/td/data/MTDAirTrapData.h (.../MTDAirTrapData.h) (revision f9abb75101e8cbe4c3a388361cfd3bbf592605f8) +++ sources/model/td/data/MTDAirTrapData.h (.../MTDAirTrapData.h) (revision 1439734e9dc8384eff68c061b2930a737f4cfb5e) @@ -35,13 +35,13 @@ * * | Payload || * | || - * | #1:(U32) | \ref Data::mLowLevel | - * | #2:(U32) | \ref Data::mUpLevel | - * | #3:(U32) | \ref Data::mLowLevelRaw | - * | #4:(U32) | \ref Data::mUpLevelRaw | - * | #5:(U32) | \ref Data::mValveStateH13 | - * | #6:(U32) | \ref Data::mValveStateH20 | - * | #7:(U32) | \ref Data::mControlling | + * | #1:(U32) | \ref Data::mLowLevel | + * | #2:(U32) | \ref Data::mUpLevel | + * | #3:(U32) | \ref Data::mLowLevelRaw | + * | #4:(U32) | \ref Data::mUpLevelRaw | + * | #5:(U32) | \ref Data::mValveIntakeState | + * | #6:(U32) | \ref Data::mValveOutletState | + * | #7:(U32) | \ref Data::mControlling | * * \sa Data * @@ -61,12 +61,12 @@ QVariantList parameters() const override; struct { - Types::U32 mLowLevel ; - Types::U32 mUpLevel ; - Types::U32 mLowLevelRaw ; - Types::U32 mUpLevelRaw ; - Types::U32 mValveStateH13 ; - Types::U32 mValveStateH20 ; + Types::U32 mH17State ; + Types::U32 mH16State ; + Types::U32 mH17RawState ; + Types::U32 mH16RawState ; + Types::U32 mH13State ; + Types::U32 mH20State ; Types::U32 mControlling ; } _data; @@ -78,13 +78,13 @@ struct Data { - quint32 mLowLevel = 0; ///< lower level value - quint32 mUpLevel = 0; ///< upper level value - quint32 mLowLevelRaw = 0; ///< lower level raw value - quint32 mUpLevelRaw = 0; ///< upper level raw value - quint32 mValveStateH13 = 0; ///< air valve H13 state - quint32 mValveStateH20 = 0; ///< air valve H20 state - quint32 mControlling = 0; ///< air control + quint32 mLowLevel = 0; ///< lower level value + quint32 mUpLevel = 0; ///< upper level value + quint32 mLowLevelRaw = 0; ///< lower level raw value + quint32 mUpLevelRaw = 0; ///< upper level raw value + quint32 mValveIntakeState = 0; ///< Air trap intake Valve state (open/closed) + quint32 mValveOutletState = 0; ///< Air trap outlet valve state (open/closed) + quint32 mControlling = 0; ///< air control }; MTDAirTrapData () { } Index: sources/model/td/data/MTDEjectorData.cpp =================================================================== diff -u -rf9abb75101e8cbe4c3a388361cfd3bbf592605f8 -r1439734e9dc8384eff68c061b2930a737f4cfb5e --- sources/model/td/data/MTDEjectorData.cpp (.../MTDEjectorData.cpp) (revision f9abb75101e8cbe4c3a388361cfd3bbf592605f8) +++ sources/model/td/data/MTDEjectorData.cpp (.../MTDEjectorData.cpp) (revision 1439734e9dc8384eff68c061b2930a737f4cfb5e) @@ -18,15 +18,15 @@ QVariantList MTDEjectorData::parameters() const { return { - _data.mState .value, - _data.mSetSpeed .value, + _data.mH5State .value, + _data.mH5SetSpeed .value, }; } bool MTDEjectorData::fromByteArray(const QByteArray &vByteArray, int *vIndex) { int index = 0; - if ( ! GetValue(vByteArray, index, _data.mState )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mSetSpeed )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mH5State )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mH5SetSpeed )) goto lError; return true ; @@ -43,7 +43,7 @@ */ MTDEjectorData::Data MTDEjectorData::data() const{ Data data; - data.mState = _data.mState .value; - data.mSetSpeed = _data.mSetSpeed .value; + data.mState = _data.mH5State .value; + data.mSetSpeed = _data.mH5SetSpeed .value; return data; } Index: sources/model/td/data/MTDEjectorData.h =================================================================== diff -u -rf9abb75101e8cbe4c3a388361cfd3bbf592605f8 -r1439734e9dc8384eff68c061b2930a737f4cfb5e --- sources/model/td/data/MTDEjectorData.h (.../MTDEjectorData.h) (revision f9abb75101e8cbe4c3a388361cfd3bbf592605f8) +++ sources/model/td/data/MTDEjectorData.h (.../MTDEjectorData.h) (revision 1439734e9dc8384eff68c061b2930a737f4cfb5e) @@ -56,8 +56,8 @@ QVariantList parameters() const override; struct { - Types::U32 mState ; - Types::F32 mSetSpeed ; + Types::U32 mH5State ; + Types::F32 mH5SetSpeed ; } _data; public: Index: sources/model/td/data/MTDSwitchesData.cpp =================================================================== diff -u -rf9abb75101e8cbe4c3a388361cfd3bbf592605f8 -r1439734e9dc8384eff68c061b2930a737f4cfb5e --- sources/model/td/data/MTDSwitchesData.cpp (.../MTDSwitchesData.cpp) (revision f9abb75101e8cbe4c3a388361cfd3bbf592605f8) +++ sources/model/td/data/MTDSwitchesData.cpp (.../MTDSwitchesData.cpp) (revision 1439734e9dc8384eff68c061b2930a737f4cfb5e) @@ -18,13 +18,13 @@ QVariantList MTDSwitchesData::parameters() const { return { - _data.mDoor .value, + _data.mH9Door .value, }; } bool MTDSwitchesData::fromByteArray(const QByteArray &vByteArray, int *vIndex) { int index = 0; - if ( ! GetValue(vByteArray, index, _data.mDoor )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mH9Door )) goto lError; return true ; @@ -41,6 +41,6 @@ */ MTDSwitchesData::Data MTDSwitchesData::data() const{ Data data; - data.mDoor = _data.mDoor .value; + data.mDoor = _data.mH9Door .value; return data; } Index: sources/model/td/data/MTDSwitchesData.h =================================================================== diff -u -rf9abb75101e8cbe4c3a388361cfd3bbf592605f8 -r1439734e9dc8384eff68c061b2930a737f4cfb5e --- sources/model/td/data/MTDSwitchesData.h (.../MTDSwitchesData.h) (revision f9abb75101e8cbe4c3a388361cfd3bbf592605f8) +++ sources/model/td/data/MTDSwitchesData.h (.../MTDSwitchesData.h) (revision 1439734e9dc8384eff68c061b2930a737f4cfb5e) @@ -55,7 +55,7 @@ QVariantList parameters() const override; struct { - Types::U32 mDoor ; + Types::U32 mH9Door ; } _data; public: Index: sources/model/td/data/treatment/MTreatmentBloodFlowData.cpp =================================================================== diff -u -rf9abb75101e8cbe4c3a388361cfd3bbf592605f8 -r1439734e9dc8384eff68c061b2930a737f4cfb5e --- sources/model/td/data/treatment/MTreatmentBloodFlowData.cpp (.../MTreatmentBloodFlowData.cpp) (revision f9abb75101e8cbe4c3a388361cfd3bbf592605f8) +++ sources/model/td/data/treatment/MTreatmentBloodFlowData.cpp (.../MTreatmentBloodFlowData.cpp) (revision 1439734e9dc8384eff68c061b2930a737f4cfb5e) @@ -18,29 +18,29 @@ QVariantList MBloodFlow::parameters() const { return { - _data.mFlowSetPoint .value, - _data.mMeasuredFlow .value, - _data.mRotorSpeed .value, - _data.mMotorSpeed .value, - _data.mMotorCtlCurrent .value, - _data.mRPM .value, - _data.mRotorCount .value, - _data.mPresFlow .value, - _data.mRotorHall .value, + _data.mH4FlowSetPoint .value, + _data.mH4MeasuredFlow .value, + _data.mH4RotorSpeed .value, + _data.mH4MotorSpeed .value, + _data.mH4MotorCtlCurrent .value, + _data.mH4RPM .value, + _data.mH4RotorCount .value, + _data.mH4PresFlow .value, + _data.mH4RotorHall .value, }; } bool MBloodFlow::fromByteArray(const QByteArray &vByteArray, int *vIndex) { int index = 0; // message data start position - if ( ! GetValue(vByteArray, index, _data.mFlowSetPoint )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mMeasuredFlow )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mRotorSpeed )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mMotorSpeed )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mMotorCtlCurrent )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mRPM )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mRotorCount )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mPresFlow )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mRotorHall )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mH4FlowSetPoint )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mH4MeasuredFlow )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mH4RotorSpeed )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mH4MotorSpeed )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mH4MotorCtlCurrent )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mH4RPM )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mH4RotorCount )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mH4PresFlow )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mH4RotorHall )) goto lError; return true ; @@ -58,14 +58,14 @@ */ MBloodFlow::Data MBloodFlow::data() const { Data data; - data.mFlowSetPoint = _data.mFlowSetPoint .value; - data.mMeasuredFlow = _data.mMeasuredFlow .value; - data.mRotorSpeed = _data.mRotorSpeed .value; - data.mMotorSpeed = _data.mMotorSpeed .value; - data.mMotorCtlCurrent = _data.mMotorCtlCurrent .value; - data.mRPM = _data.mRPM .value; - data.mRotorCount = _data.mRotorCount .value; - data.mPresFlow = _data.mPresFlow .value; - data.mRotorHall = _data.mRotorHall .value; + data.mFlowSetPoint = _data.mH4FlowSetPoint .value; + data.mMeasuredFlow = _data.mH4MeasuredFlow .value; + data.mRotorSpeed = _data.mH4RotorSpeed .value; + data.mMotorSpeed = _data.mH4MotorSpeed .value; + data.mMotorCtlCurrent = _data.mH4MotorCtlCurrent .value; + data.mRPM = _data.mH4RPM .value; + data.mRotorCount = _data.mH4RotorCount .value; + data.mPresFlow = _data.mH4PresFlow .value; + data.mRotorHall = _data.mH4RotorHall .value; return data; } Index: sources/model/td/data/treatment/MTreatmentBloodFlowData.h =================================================================== diff -u -rf9abb75101e8cbe4c3a388361cfd3bbf592605f8 -r1439734e9dc8384eff68c061b2930a737f4cfb5e --- sources/model/td/data/treatment/MTreatmentBloodFlowData.h (.../MTreatmentBloodFlowData.h) (revision f9abb75101e8cbe4c3a388361cfd3bbf592605f8) +++ sources/model/td/data/treatment/MTreatmentBloodFlowData.h (.../MTreatmentBloodFlowData.h) (revision 1439734e9dc8384eff68c061b2930a737f4cfb5e) @@ -61,15 +61,15 @@ friend class ::tst_models; struct { - Types::S32 mFlowSetPoint ; ///< Flow Set Point - Types::F32 mMeasuredFlow ; ///< Measured Flow - Types::F32 mRotorSpeed ; ///< Rotor Speed - Types::F32 mMotorSpeed ; ///< Motor Speed - Types::F32 mMotorCtlCurrent ; ///< Motor Controller Current - Types::F32 mRPM ; ///< RPM - Types::U32 mRotorCount ; ///< Rotor Count - Types::U32 mPresFlow ; ///< Prescribed flow rate - Types::U32 mRotorHall ; ///< Rotor Hall Sensor Value + Types::S32 mH4FlowSetPoint ; ///< Flow Set Point + Types::F32 mH4MeasuredFlow ; ///< Measured Flow + Types::F32 mH4RotorSpeed ; ///< Rotor Speed + Types::F32 mH4MotorSpeed ; ///< Motor Speed + Types::F32 mH4MotorCtlCurrent ; ///< Motor Controller Current + Types::F32 mH4RPM ; ///< RPM + Types::U32 mH4RotorCount ; ///< Rotor Count + Types::U32 mH4PresFlow ; ///< Prescribed flow rate + Types::U32 mH4RotorHall ; ///< Rotor Hall Sensor Value } _data; QVariantList parameters() const override; Index: sources/model/td/data/treatment/MTreatmentPressureOcclusionData.cpp =================================================================== diff -u -rf9abb75101e8cbe4c3a388361cfd3bbf592605f8 -r1439734e9dc8384eff68c061b2930a737f4cfb5e --- sources/model/td/data/treatment/MTreatmentPressureOcclusionData.cpp (.../MTreatmentPressureOcclusionData.cpp) (revision f9abb75101e8cbe4c3a388361cfd3bbf592605f8) +++ sources/model/td/data/treatment/MTreatmentPressureOcclusionData.cpp (.../MTreatmentPressureOcclusionData.cpp) (revision 1439734e9dc8384eff68c061b2930a737f4cfb5e) @@ -18,35 +18,35 @@ QVariantList MPressureOcclusion::parameters() const { return { - _data.mArterialPressure .value, - _data.mVenousPressure .value, - _data.mLimitState .value, - _data.mArterialMin .value, - _data.mArterialMax .value, - _data.mVenousMin .value, - _data.mVenousMax .value, - _data.mArterialLongFilter .value, - _data.mVenousLongFilter .value, - _data.mTmpPressure .value, - _data.mTmpMin .value, - _data.mTmpMax .value, + _data. mH2Pressure .value, + _data. mH14Pressure .value, + _data. mLimitState .value, + _data. mH2Min .value, + _data. mH2Max .value, + _data. mH14Min .value, + _data. mH14Max .value, + _data. mH2LongFilter .value, + _data. mH14LongFilter .value, + _data. mTmpPressure .value, + _data. mTmpMin .value, + _data. mTmpMax .value, }; } bool MPressureOcclusion::fromByteArray(const QByteArray &vByteArray, int *vIndex) { int index = 0; // message data start position - if ( ! GetValue(vByteArray, index, _data.mArterialPressure )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mVenousPressure )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mLimitState )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mArterialMin )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mArterialMax )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mVenousMin )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mVenousMax )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mArterialLongFilter )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mVenousLongFilter )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mTmpPressure )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mTmpMin )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mTmpMax )) goto lError; + if ( ! GetValue(vByteArray, index, _data. mH2Pressure )) goto lError; + if ( ! GetValue(vByteArray, index, _data. mH14Pressure )) goto lError; + if ( ! GetValue(vByteArray, index, _data. mLimitState )) goto lError; + if ( ! GetValue(vByteArray, index, _data. mH2Min )) goto lError; + if ( ! GetValue(vByteArray, index, _data. mH2Max )) goto lError; + if ( ! GetValue(vByteArray, index, _data. mH14Min )) goto lError; + if ( ! GetValue(vByteArray, index, _data. mH14Max )) goto lError; + if ( ! GetValue(vByteArray, index, _data. mH2LongFilter )) goto lError; + if ( ! GetValue(vByteArray, index, _data. mH14LongFilter )) goto lError; + if ( ! GetValue(vByteArray, index, _data. mTmpPressure )) goto lError; + if ( ! GetValue(vByteArray, index, _data. mTmpMin )) goto lError; + if ( ! GetValue(vByteArray, index, _data. mTmpMax )) goto lError; return true ; @@ -63,17 +63,17 @@ */ MPressureOcclusion::Data MPressureOcclusion::data() const { Data data; - data.mArterialPressure = _data.mArterialPressure .value; - data.mVenousPressure = _data.mVenousPressure .value; - data.mLimitState = _data.mLimitState .value; - data.mArterialMin = _data.mArterialMin .value; - data.mArterialMax = _data.mArterialMax .value; - data.mVenousMin = _data.mVenousMin .value; - data.mVenousMax = _data.mVenousMax .value; - data.mArterialLongFilter = _data.mArterialLongFilter .value; - data.mVenousLongFilter = _data.mVenousLongFilter .value; - data.mTmpPressure = _data.mTmpPressure .value; - data.mTmpMin = _data.mTmpMin .value; - data.mTmpMax = _data.mTmpMax .value; + data.mArterialPressure = _data. mH2Pressure .value; + data.mVenousPressure = _data. mH14Pressure .value; + data.mLimitState = _data. mLimitState .value; + data.mArterialMin = _data. mH2Min .value; + data.mArterialMax = _data. mH2Max .value; + data.mVenousMin = _data. mH14Min .value; + data.mVenousMax = _data. mH14Max .value; + data.mArterialLongFilter = _data. mH2LongFilter .value; + data.mVenousLongFilter = _data. mH14LongFilter .value; + data.mTmpPressure = _data. mTmpPressure .value; + data.mTmpMin = _data. mTmpMin .value; + data.mTmpMax = _data. mTmpMax .value; return data; } Index: sources/model/td/data/treatment/MTreatmentPressureOcclusionData.h =================================================================== diff -u -rf9abb75101e8cbe4c3a388361cfd3bbf592605f8 -r1439734e9dc8384eff68c061b2930a737f4cfb5e --- sources/model/td/data/treatment/MTreatmentPressureOcclusionData.h (.../MTreatmentPressureOcclusionData.h) (revision f9abb75101e8cbe4c3a388361cfd3bbf592605f8) +++ sources/model/td/data/treatment/MTreatmentPressureOcclusionData.h (.../MTreatmentPressureOcclusionData.h) (revision 1439734e9dc8384eff68c061b2930a737f4cfb5e) @@ -67,18 +67,19 @@ QVariantList parameters() const override; struct { - Types::F32 mArterialPressure ; ///< Latest arterial pressure (mmHg) - Types::F32 mVenousPressure ; ///< Latest venous pressure (mmHg) - Types::U32 mLimitState ; ///< Latest BP occlusion (no units) - Types::S32 mArterialMin ; ///< Current pressure limits state (enum-stabilization or stable) - Types::S32 mArterialMax ; ///< Current arterial minimum pressure limit (mmHg) - Types::S32 mVenousMin ; ///< Current arterial maximum pressure limit (mmHg) - Types::S32 mVenousMax ; ///< Current venous minimum pressure limit (mmHg) - Types::F32 mArterialLongFilter ; ///< Current venous maximum pressure limit (mmHg) - Types::F32 mVenousLongFilter ; ///< Arterial long filter (mmHg) - Types::F32 mTmpPressure ; ///< Venous long filter (mmHg) - Types::F32 mTmpMin ; ///< Blood pump occlusion long filter - Types::F32 mTmpMax ; ///< Partial Occlusion base line + Types::F32 mH2Pressure ; ///< Latest arterial pressure (mmHg) + Types::F32 mH14Pressure ; ///< Latest venous pressure (mmHg) + Types::U32 mLimitState ; ///< mH2Pressure + Types::S32 mH2Min ; ///< Current pressure limits state (enum-stabilization or stable) + Types::S32 mH2Max ; ///< Current arterial minimum pressure limit (mmHg) + Types::S32 mH14Min ; ///< Current arterial maximum pressure limit (mmHg) + Types::S32 mH14Max ; ///< Current venous minimum pressure limit (mmHg) + Types::F32 mH2LongFilter ; ///< Current venous maximum pressure limit (mmHg) + Types::F32 mH14LongFilter ; ///< Arterial long filter (mmHg) + Types::F32 mTmpPressure ; ///< Venous long filter (mmHg) + Types::F32 mTmpMin ; ///< Blood pump occlusion long filter + Types::F32 mTmpMax ; ///< Partial Occlusion base line + } _data; public: Index: sources/view/dd/data/VDDConductivityData.cpp =================================================================== diff -u -r3428dfd1fb3372d8de9a7c1afc55e4860b70ec89 -r1439734e9dc8384eff68c061b2930a737f4cfb5e --- sources/view/dd/data/VDDConductivityData.cpp (.../VDDConductivityData.cpp) (revision 3428dfd1fb3372d8de9a7c1afc55e4860b70ec89) +++ sources/view/dd/data/VDDConductivityData.cpp (.../VDDConductivityData.cpp) (revision 1439734e9dc8384eff68c061b2930a737f4cfb5e) @@ -21,9 +21,9 @@ void VDDConductivity::onActionReceive(const DDConductivityData &vData) { - CD1 ( vData. mCD1 ); - CD2 ( vData. mCD2 ); - CD3 ( vData. mCD3 ); - CD4 ( vData. mCD4 ); - CD5 ( vData. mCD5 ); + bicarbCondutivity1 ( vData.mBicarbCondutivity1 ); + acidBicarbCondutivity1 ( vData.mAcidBicarbCondutivity1 ); + acidBicarbCondutivity2 ( vData.mAcidBicarbCondutivity2 ); + spentCondutivity1 ( vData.mSpentCondutivity1 ); + bicarbCondutivity2 ( vData.mBicarbCondutivity2 ); } Index: sources/view/dd/data/VDDConductivityData.h =================================================================== diff -u -rf9abb75101e8cbe4c3a388361cfd3bbf592605f8 -r1439734e9dc8384eff68c061b2930a737f4cfb5e --- sources/view/dd/data/VDDConductivityData.h (.../VDDConductivityData.h) (revision f9abb75101e8cbe4c3a388361cfd3bbf592605f8) +++ sources/view/dd/data/VDDConductivityData.h (.../VDDConductivityData.h) (revision 1439734e9dc8384eff68c061b2930a737f4cfb5e) @@ -36,11 +36,11 @@ { Q_OBJECT - PROPERTY( float , CD1 , 0) - PROPERTY( float , CD2 , 0) - PROPERTY( float , CD3 , 0) - PROPERTY( float , CD4 , 0) - PROPERTY( float , CD5 , 0) + PROPERTY( float , bicarbCondutivity1 , 0) + PROPERTY( float , acidBicarbCondutivity1 , 0) + PROPERTY( float , acidBicarbCondutivity2 , 0) + PROPERTY( float , spentCondutivity1 , 0) + PROPERTY( float , bicarbCondutivity2 , 0) VIEW_DEC(VDDConductivity, DDConductivityData) }; Index: sources/view/td/data/VTDAirTrapData.cpp =================================================================== diff -u -rf9abb75101e8cbe4c3a388361cfd3bbf592605f8 -r1439734e9dc8384eff68c061b2930a737f4cfb5e --- sources/view/td/data/VTDAirTrapData.cpp (.../VTDAirTrapData.cpp) (revision f9abb75101e8cbe4c3a388361cfd3bbf592605f8) +++ sources/view/td/data/VTDAirTrapData.cpp (.../VTDAirTrapData.cpp) (revision 1439734e9dc8384eff68c061b2930a737f4cfb5e) @@ -20,11 +20,11 @@ VIEW_DEF(VTDAirTrap, TDAirTrapData) void VTDAirTrap::onActionReceive(const TDAirTrapData &vData) { - lowLevel (vData.mLowLevel ); - upLevel (vData.mUpLevel ); - lowLevelRaw (vData.mLowLevelRaw ); - upLevelRaw (vData.mUpLevelRaw ); - valveStateH13 (vData.mValveStateH13 ); - valveStateH20 (vData.mValveStateH20 ); - controlling (vData.mControlling ); + lowLevel (vData.mLowLevel ); + upLevel (vData.mUpLevel ); + lowLevelRaw (vData.mLowLevelRaw ); + upLevelRaw (vData.mUpLevelRaw ); + valveIntakeState (vData.mValveIntakeState ); + valveOutletState (vData.mValveOutletState ); + controlling (vData.mControlling ); } Index: sources/view/td/data/VTDAirTrapData.h =================================================================== diff -u -rf9abb75101e8cbe4c3a388361cfd3bbf592605f8 -r1439734e9dc8384eff68c061b2930a737f4cfb5e --- sources/view/td/data/VTDAirTrapData.h (.../VTDAirTrapData.h) (revision f9abb75101e8cbe4c3a388361cfd3bbf592605f8) +++ sources/view/td/data/VTDAirTrapData.h (.../VTDAirTrapData.h) (revision 1439734e9dc8384eff68c061b2930a737f4cfb5e) @@ -35,13 +35,13 @@ class VTDAirTrap : public QObject { Q_OBJECT - PROPERTY( quint32 , lowLevel , 0) - PROPERTY( quint32 , upLevel , 0) - PROPERTY( quint32 , lowLevelRaw , 0) - PROPERTY( quint32 , upLevelRaw , 0) - PROPERTY( quint32 , valveStateH20 , 0) - PROPERTY( quint32 , valveStateH13 , 0) - PROPERTY( quint32 , controlling , 0) + PROPERTY( quint32 , lowLevel , 0) + PROPERTY( quint32 , upLevel , 0) + PROPERTY( quint32 , lowLevelRaw , 0) + PROPERTY( quint32 , upLevelRaw , 0) + PROPERTY( quint32 , valveIntakeState , 0) + PROPERTY( quint32 , valveOutletState , 0) + PROPERTY( quint32 , controlling , 0) VIEW_DEC(VTDAirTrap, TDAirTrapData) }; Index: sources/view/td/data/VTDSwitchesData.h =================================================================== diff -u -rf9abb75101e8cbe4c3a388361cfd3bbf592605f8 -r1439734e9dc8384eff68c061b2930a737f4cfb5e --- sources/view/td/data/VTDSwitchesData.h (.../VTDSwitchesData.h) (revision f9abb75101e8cbe4c3a388361cfd3bbf592605f8) +++ sources/view/td/data/VTDSwitchesData.h (.../VTDSwitchesData.h) (revision 1439734e9dc8384eff68c061b2930a737f4cfb5e) @@ -36,7 +36,6 @@ Q_OBJECT PROPERTY( quint32 , door , 0) - PROPERTY( quint32 , capacity , 0) VIEW_DEC(VTDSwitches, TDSwitchesData) };