Index: sources/model/dg/data/MDGTemperaturesData.cpp =================================================================== diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -r2b8b5f01a15397b7a32a312f2f3d14f05ac99355 --- sources/model/dg/data/MDGTemperaturesData.cpp (.../MDGTemperaturesData.cpp) (revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263) +++ sources/model/dg/data/MDGTemperaturesData.cpp (.../MDGTemperaturesData.cpp) (revision 2b8b5f01a15397b7a32a312f2f3d14f05ac99355) @@ -19,19 +19,27 @@ QVariantList MDGTemperatures::parameters() const { return { - _data.mInletPrimaryHeater .value, - _data.mHeatDisinfect .value, - _data.mOutletPrimaryHeater .value, - _data.mConductivitySensor1 .value, - _data.mConductivitySensor2 .value, - _data.mOutletRedundancy .value, - _data.mInletDialysate .value, - _data.mPrimaryHeaterThermoCouple .value, - _data.mTrimmerHeaterThermoCouple .value, - _data.mPrimaryHeaterColdJunction .value, - _data.mTrimmerHeaterColdJunction .value, - _data.mPrimaryHeaterInternal .value, - _data.mTrimmerHeaterInternal .value + _data.mInletPrimaryHeater .value, + _data.mHeatDisinfect .value, + _data.mOutletPrimaryHeater .value, + _data.mConductivitySensor1 .value, + _data.mConductivitySensor2 .value, + _data.mOutletRedundancy .value, + _data.mInletDialysate .value, + _data.mPrimaryHeaterThermoCouple .value, + _data.mTrimmerHeaterThermoCouple .value, + _data.mPrimaryHeaterColdJunction .value, + _data.mTrimmerHeaterColdJunction .value, + _data.mPrimaryHeaterInternal .value, + _data.mTrimmerHeaterInternal .value, + _data.mFpgaBoard .value, + _data.mLoadCellA1B1 .value, + _data.mLoadCellA2B2 .value, + _data.mInternalTHDORTD .value, + _data.mInternalTDIRTD .value, + _data.mInteralTHDRTD .value, + _data.mInternalCondSnsrTemp .value, + _data.mBaroTempSensor .value, }; } @@ -50,6 +58,14 @@ if (GetValue(vByteArray, index, _data.mTrimmerHeaterColdJunction )) if (GetValue(vByteArray, index, _data.mPrimaryHeaterInternal )) if (GetValue(vByteArray, index, _data.mTrimmerHeaterInternal )) + if (GetValue(vByteArray, index, _data.mFpgaBoard )) + if (GetValue(vByteArray, index, _data.mLoadCellA1B1 )) + if (GetValue(vByteArray, index, _data.mLoadCellA2B2 )) + if (GetValue(vByteArray, index, _data.mInternalTHDORTD )) + if (GetValue(vByteArray, index, _data.mInternalTDIRTD )) + if (GetValue(vByteArray, index, _data.mInteralTHDRTD )) + if (GetValue(vByteArray, index, _data.mInternalCondSnsrTemp )) + if (GetValue(vByteArray, index, _data.mBaroTempSensor )) return true ; else { if(vIndex) *vIndex = index; return false; } else { if(vIndex) *vIndex = index; return false; } @@ -64,6 +80,14 @@ 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; } + 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; } + else { if(vIndex) *vIndex = index; return false; } } /*! @@ -86,5 +110,13 @@ data.mTrimmerHeaterColdJunction = _data.mTrimmerHeaterColdJunction .value; data.mPrimaryHeaterInternal = _data.mPrimaryHeaterInternal .value; data.mTrimmerHeaterInternal = _data.mTrimmerHeaterInternal .value; + data.mFpgaBoard = _data.mFpgaBoard .value; + data.mLoadCellA1B1 = _data.mLoadCellA1B1 .value; + data.mLoadCellA2B2 = _data.mLoadCellA2B2 .value; + data.mInternalTHDORTD = _data.mInternalTHDORTD .value; + data.mInternalTDIRTD = _data.mInternalTDIRTD .value; + data.mInteralTHDRTD = _data.mInteralTHDRTD .value; + data.mInternalCondSnsrTemp = _data.mInternalCondSnsrTemp .value; + data.mBaroTempSensor = _data.mBaroTempSensor .value; return data; }