Index: sources/canbus/MessageGlobals.h =================================================================== diff -u -r94c3fb6bbcf932b1f50a2d616dc600e3c449afe4 -r148e4803af29502875b08875f171e284398db34e --- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 94c3fb6bbcf932b1f50a2d616dc600e3c449afe4) +++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 148e4803af29502875b08875f171e284398db34e) @@ -103,8 +103,8 @@ {Gui::GuiActionType::ID_DGLoadCellReadingsData , 4 * 4 }, // 4 parameters each 4bytes {Gui::GuiActionType::ID_DGTemperaturesData , 23 * 4 }, // 23 parameters each 4bytes {Gui::GuiActionType::ID_DGAccelerometerData , 9 * 4 }, // 9 parameters each 4bytes - {Gui::GuiActionType::ID_DDConductivityData , 8 * 4 }, // 8 parameters each 4bytes - {Gui::GuiActionType::ID_DDGenDialysateData , 10 * 4 }, // 10 parameters each 4bytes + {Gui::GuiActionType::ID_DDConductivityData , 5 * 4 }, // 5 parameters each 4bytes + {Gui::GuiActionType::ID_DDGenDialysateData , 9 * 4 }, // 9 parameters each 4bytes // HD Data Messages {Gui::GuiActionType::ID_HDAccelerometerData , 9 * 4 }, // 9 parameters each 4bytes {Gui::GuiActionType::ID_HDSyringePumpData , 9 * 4 }, // 9 parameters each 4bytes Index: sources/model/dg/data/MDDConductivityData.cpp =================================================================== diff -u -r94c3fb6bbcf932b1f50a2d616dc600e3c449afe4 -r148e4803af29502875b08875f171e284398db34e --- sources/model/dg/data/MDDConductivityData.cpp (.../MDDConductivityData.cpp) (revision 94c3fb6bbcf932b1f50a2d616dc600e3c449afe4) +++ sources/model/dg/data/MDDConductivityData.cpp (.../MDDConductivityData.cpp) (revision 148e4803af29502875b08875f171e284398db34e) @@ -22,10 +22,7 @@ _data.mCD2 .value, _data.mCD3 .value, _data.mCD4 .value, - _data.mTD1 .value, - _data.mTD2 .value, - _data.mTD3 .value, - _data.mTD4 .value, + _data.mCD5 .value, }; } @@ -35,10 +32,7 @@ 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.mTD1 )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mTD2 )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mTD3 )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mTD4 )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mCD5 )) goto lError; return true ; @@ -59,9 +53,6 @@ data.mCD2 = _data.mCD2 .value; data.mCD3 = _data.mCD3 .value; data.mCD4 = _data.mCD4 .value; - data.mTD1 = _data.mTD1 .value; - data.mTD2 = _data.mTD2 .value; - data.mTD3 = _data.mTD3 .value; - data.mTD4 = _data.mTD4 .value; + data.mCD5 = _data.mCD5 .value; return data; } Index: sources/model/dg/data/MDDConductivityData.h =================================================================== diff -u -r94c3fb6bbcf932b1f50a2d616dc600e3c449afe4 -r148e4803af29502875b08875f171e284398db34e --- sources/model/dg/data/MDDConductivityData.h (.../MDDConductivityData.h) (revision 94c3fb6bbcf932b1f50a2d616dc600e3c449afe4) +++ sources/model/dg/data/MDDConductivityData.h (.../MDDConductivityData.h) (revision 148e4803af29502875b08875f171e284398db34e) @@ -39,10 +39,7 @@ * | #02:(F32) | \ref Data::mCD2 | * | #03:(F32) | \ref Data::mCD3 | * | #04:(F32) | \ref Data::mCD4 | - * | #05:(F32) | \ref Data::mTD1 | - * | #06:(F32) | \ref Data::mTD2 | - * | #07:(F32) | \ref Data::mTD3 | - * | #08:(F32) | \ref Data::mTD4 | + * | #05:(F32) | \ref Data::mCD5 | * * * \sa Data @@ -67,10 +64,7 @@ Types::F32 mCD2 ; Types::F32 mCD3 ; Types::F32 mCD4 ; - Types::F32 mTD1 ; - Types::F32 mTD2 ; - Types::F32 mTD3 ; - Types::F32 mTD4 ; + Types::F32 mCD5 ; } _data; @@ -80,14 +74,11 @@ QString infoText () const override { return QString("Conductivity"); } struct Data{ - float mCD1 = 0; ///< - float mCD2 = 0; ///< - float mCD3 = 0; ///< - float mCD4 = 0; ///< - float mTD1 = 0; ///< - float mTD2 = 0; ///< - float mTD3 = 0; ///< - float mTD4 = 0; ///< + 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 }; MDDConductivityData () { } Index: sources/model/dg/data/MDDGenDialysateData.cpp =================================================================== diff -u -r94c3fb6bbcf932b1f50a2d616dc600e3c449afe4 -r148e4803af29502875b08875f171e284398db34e --- sources/model/dg/data/MDDGenDialysateData.cpp (.../MDDGenDialysateData.cpp) (revision 94c3fb6bbcf932b1f50a2d616dc600e3c449afe4) +++ sources/model/dg/data/MDDGenDialysateData.cpp (.../MDDGenDialysateData.cpp) (revision 148e4803af29502875b08875f171e284398db34e) @@ -20,7 +20,6 @@ _data.mGenDialysateExec .value, _data.mDDInProgress .value, _data.mFltLevel1 .value, - _data.mFltLevel2 .value, _data.mBicarbLevel .value, _data.mSpentLevel .value, _data.mHydNegativePressure .value, @@ -35,7 +34,6 @@ 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.mFltLevel2 )) 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; @@ -61,7 +59,6 @@ data.mGenDialysateExec = _data.mGenDialysateExec .value; data.mDDInProgress = _data.mDDInProgress .value; data.mFltLevel1 = _data.mFltLevel1 .value; - data.mFltLevel2 = _data.mFltLevel2 .value; data.mBicarbLevel = _data.mBicarbLevel .value; data.mSpentLevel = _data.mSpentLevel .value; data.mHydNegativePressure = _data.mHydNegativePressure .value; Index: sources/model/dg/data/MDDGenDialysateData.h =================================================================== diff -u -r94c3fb6bbcf932b1f50a2d616dc600e3c449afe4 -r148e4803af29502875b08875f171e284398db34e --- sources/model/dg/data/MDDGenDialysateData.h (.../MDDGenDialysateData.h) (revision 94c3fb6bbcf932b1f50a2d616dc600e3c449afe4) +++ sources/model/dg/data/MDDGenDialysateData.h (.../MDDGenDialysateData.h) (revision 148e4803af29502875b08875f171e284398db34e) @@ -38,13 +38,12 @@ * | #01:(U32) | \ref Data::mGenDialysateExec | * | #02:(U32) | \ref Data::mDDInProgress | * | #03:(U32) | \ref Data::mFltLevel1 | - * | #04:(U32) | \ref Data::mFltLevel2 | - * | #05:(U32) | \ref Data::mBicarbLevel | - * | #06:(U32) | \ref Data::mSpentLevel | - * | #07:(F32) | \ref Data::mHydNegativePressure | - * | #08:(F32) | \ref Data::mHydPositivePressure | - * | #09:(F32) | \ref Data::mSpendPressure | - * | #10:(U32) | \ref Data::mDialGood | + * | #04:(U32) | \ref Data::mBicarbLevel | + * | #05:(U32) | \ref Data::mSpentLevel | + * | #06:(F32) | \ref Data::mHydNegativePressure | + * | #07:(F32) | \ref Data::mHydPositivePressure | + * | #08:(F32) | \ref Data::mSpendPressure | + * | #09:(U32) | \ref Data::mDialGood | * * * \sa Data @@ -68,7 +67,6 @@ Types::U32 mGenDialysateExec ; Types::U32 mDDInProgress ; Types::U32 mFltLevel1 ; - Types::U32 mFltLevel2 ; Types::U32 mBicarbLevel ; Types::U32 mSpentLevel ; Types::F32 mHydNegativePressure ; @@ -84,16 +82,15 @@ QString infoText () const override { return QString("Conductivity"); } struct Data{ - quint32 mGenDialysateExec = 0; ///< - quint32 mDDInProgress = 0; ///< - quint32 mFltLevel1 = 0; ///< - quint32 mFltLevel2 = 0; ///< - quint32 mBicarbLevel = 0; ///< - quint32 mSpentLevel = 0; ///< - float mHydNegativePressure = 0; ///< - float mHydPositivePressure = 0; ///< - float mSpendPressure = 0; ///< - quint32 mDialGood = 0; ///< + quint32 mGenDialysateExec = 0; ///< Generate dialysate execution state + quint32 mDDInProgress = 0; ///< Dialysate Delivery in Progress Bool + quint32 mFltLevel1 = 0; ///< Floater level (low, medium and high) + quint32 mBicarbLevel = 0; ///< BiCarb Chamber level + quint32 mSpentLevel = 0; ///< Spent dialysate chamber level + float mHydNegativePressure = 0; ///< Hydraulics chamber negative pressure + float mHydPositivePressure = 0; ///< Hydraulics chamber positive pressure + float mSpendPressure = 0; ///< Spent Dialysate positive pressure + quint32 mDialGood = 0; ///< Ready to deliver dialysate or not }; MDDGenDialysateData () { } Index: sources/view/dg/data/VDDConductivityData.cpp =================================================================== diff -u -r94c3fb6bbcf932b1f50a2d616dc600e3c449afe4 -r148e4803af29502875b08875f171e284398db34e --- sources/view/dg/data/VDDConductivityData.cpp (.../VDDConductivityData.cpp) (revision 94c3fb6bbcf932b1f50a2d616dc600e3c449afe4) +++ sources/view/dg/data/VDDConductivityData.cpp (.../VDDConductivityData.cpp) (revision 148e4803af29502875b08875f171e284398db34e) @@ -25,8 +25,5 @@ CD2 ( vData. mCD2 ); CD3 ( vData. mCD3 ); CD4 ( vData. mCD4 ); - TD1 ( vData. mTD1 ); - TD2 ( vData. mTD2 ); - TD3 ( vData. mTD3 ); - TD4 ( vData. mTD4 ); + CD5 ( vData. mCD5 ); } Index: sources/view/dg/data/VDDConductivityData.h =================================================================== diff -u -r94c3fb6bbcf932b1f50a2d616dc600e3c449afe4 -r148e4803af29502875b08875f171e284398db34e --- sources/view/dg/data/VDDConductivityData.h (.../VDDConductivityData.h) (revision 94c3fb6bbcf932b1f50a2d616dc600e3c449afe4) +++ sources/view/dg/data/VDDConductivityData.h (.../VDDConductivityData.h) (revision 148e4803af29502875b08875f171e284398db34e) @@ -40,10 +40,7 @@ PROPERTY( float , CD2 , 0) PROPERTY( float , CD3 , 0) PROPERTY( float , CD4 , 0) - PROPERTY( float , TD1 , 0) - PROPERTY( float , TD2 , 0) - PROPERTY( float , TD3 , 0) - PROPERTY( float , TD4 , 0) + PROPERTY( float , CD5 , 0) VIEW_DEC(VDDConductivity, DDConductivityData) }; Index: sources/view/dg/data/VDDGenDialysateData.cpp =================================================================== diff -u -r94c3fb6bbcf932b1f50a2d616dc600e3c449afe4 -r148e4803af29502875b08875f171e284398db34e --- sources/view/dg/data/VDDGenDialysateData.cpp (.../VDDGenDialysateData.cpp) (revision 94c3fb6bbcf932b1f50a2d616dc600e3c449afe4) +++ sources/view/dg/data/VDDGenDialysateData.cpp (.../VDDGenDialysateData.cpp) (revision 148e4803af29502875b08875f171e284398db34e) @@ -24,7 +24,6 @@ genDialysateExec ( vData. mGenDialysateExec ); ddInProgress ( vData. mDDInProgress ); fltLevel1 ( vData. mFltLevel1 ); - fltLevel2 ( vData. mFltLevel2 ); bicarbLevel ( vData. mBicarbLevel ); spentLevel ( vData. mSpentLevel ); hydNegativePressure ( vData. mHydNegativePressure );