Index: sources/model/hd/data/MTDAirTrapData.cpp =================================================================== diff -u -ra245272e6d8eee5c3658245570b6d31bd039af74 -r86274f18e9356126c41d848bc78bfba318638aee --- sources/model/hd/data/MTDAirTrapData.cpp (.../MTDAirTrapData.cpp) (revision a245272e6d8eee5c3658245570b6d31bd039af74) +++ sources/model/hd/data/MTDAirTrapData.cpp (.../MTDAirTrapData.cpp) (revision 86274f18e9356126c41d848bc78bfba318638aee) @@ -22,7 +22,8 @@ _data.mUpLevel .value, _data.mLowLevelRaw .value, _data.mUpLevelRaw .value, - _data.mValveState .value, + _data.mValveStateH13.value, + _data.mValveStateH20.value, _data.mControlling .value, }; } @@ -33,7 +34,8 @@ 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.mValveState )) 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; return true ; @@ -51,11 +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.mValveState = _data.mValveState .value; - data.mControlling = _data.mControlling .value; + 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; return data; }