Index: AlarmMapping.csv =================================================================== diff -u -rf571021c16fd304c37e027c5ffc38eb21f5382ba -r10f946b2ecf6eed25d07d6a22216393dca34ffcc --- AlarmMapping.csv (.../AlarmMapping.csv) (revision f571021c16fd304c37e027c5ffc38eb21f5382ba) +++ AlarmMapping.csv (.../AlarmMapping.csv) (revision 10f946b2ecf6eed25d07d6a22216393dca34ffcc) @@ -272,7 +272,7 @@ 271,"DG POST Safety Shutdown failure." 272,"HD Fan RPM out of range." 273,"Available for use." - 274,"Available for use." + 274,"DG inactive reservoir weight out of range." 275,"HD arterial pressure sensor is reading out of range." 276,"HD venous pressure sensor is reading out of range." 277,"HD BP occlusion sensor is reading out of range." Index: sources/canbus/MessageGlobals.h =================================================================== diff -u -rf724589acaa51725f5e5f8a746404d01804efbcf -r10f946b2ecf6eed25d07d6a22216393dca34ffcc --- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision f724589acaa51725f5e5f8a746404d01804efbcf) +++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 10f946b2ecf6eed25d07d6a22216393dca34ffcc) @@ -83,7 +83,7 @@ {Gui::GuiActionType::ID_BloodPrime , 2 * 4 }, // 2 parameters each 4bytes {Gui::GuiActionType::ID_TreatmentStop , 2 * 4 }, // 2 parameters each 4bytes {Gui::GuiActionType::ID_HDAirBubbleData , 2 * 4 }, // 2 parameters each 4bytes - {Gui::GuiActionType::ID_HDAirTrapData , 2 * 4 }, // 2 parameters each 4bytes + {Gui::GuiActionType::ID_HDAirTrapData , 4 * 4 }, // 4 parameters each 4bytes {Gui::GuiActionType::ID_HDBloodLeakData , 2 * 4 }, // 2 parameters each 4bytes // ---- {Gui::GuiActionType::ID_HDOperationModeData , 2 * 4 }, // 2 parameter each 4bytes Index: sources/gui/qml/dialogs/DiagnosticsDialog.qml =================================================================== diff -u -rf724589acaa51725f5e5f8a746404d01804efbcf -r10f946b2ecf6eed25d07d6a22216393dca34ffcc --- sources/gui/qml/dialogs/DiagnosticsDialog.qml (.../DiagnosticsDialog.qml) (revision f724589acaa51725f5e5f8a746404d01804efbcf) +++ sources/gui/qml/dialogs/DiagnosticsDialog.qml (.../DiagnosticsDialog.qml) (revision 10f946b2ecf6eed25d07d6a22216393dca34ffcc) @@ -308,11 +308,15 @@ vHDAirBubble .venousAirBubbleStatus , vHDAirTrap .airTrapLowerLevel , vHDAirTrap .airTrapUpperLevel , + vHDAirTrap .airTrapRawLowerLevel , + vHDAirTrap .airTrapRawUpperLevel , ] label: [ "ADV" , "ATll" , "ATul" , + "ATRll" , + "ATRul" , ] } Index: sources/model/hd/alarm/MAlarmMapping.cpp =================================================================== diff -u -rb0b2f6f711301a93d1b50004c17fa64385fc8500 -r10f946b2ecf6eed25d07d6a22216393dca34ffcc --- sources/model/hd/alarm/MAlarmMapping.cpp (.../MAlarmMapping.cpp) (revision b0b2f6f711301a93d1b50004c17fa64385fc8500) +++ sources/model/hd/alarm/MAlarmMapping.cpp (.../MAlarmMapping.cpp) (revision 10f946b2ecf6eed25d07d6a22216393dca34ffcc) @@ -7,7 +7,7 @@ * * \file MAlarmMapping.cpp * \author (last) Behrouz NematiPour - * \date (last) 21-Feb-2024 + * \date (last) 27-Feb-2024 * \author (original) Behrouz NematiPour * \date (original) 03-May-2021 * Index: sources/model/hd/data/MHDAirBubbleData.cpp =================================================================== diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -r10f946b2ecf6eed25d07d6a22216393dca34ffcc --- sources/model/hd/data/MHDAirBubbleData.cpp (.../MHDAirBubbleData.cpp) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) +++ sources/model/hd/data/MHDAirBubbleData.cpp (.../MHDAirBubbleData.cpp) (revision 10f946b2ecf6eed25d07d6a22216393dca34ffcc) @@ -33,7 +33,7 @@ } /*! - * \brief MHDAirTrapData::data + * \brief MHDAirBubbleData::data * \details Provides model's Data from the received messages data values * \return Data */ Index: sources/model/hd/data/MHDAirTrapData.cpp =================================================================== diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -r10f946b2ecf6eed25d07d6a22216393dca34ffcc --- sources/model/hd/data/MHDAirTrapData.cpp (.../MHDAirTrapData.cpp) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) +++ sources/model/hd/data/MHDAirTrapData.cpp (.../MHDAirTrapData.cpp) (revision 10f946b2ecf6eed25d07d6a22216393dca34ffcc) @@ -20,16 +20,22 @@ return { _data.mAirTrapLowerLevel.value, _data.mAirTrapUpperLevel.value, + _data.mAirTrapRawLowerLevel.value, + _data.mAirTrapRawUpperLevel.value, }; } bool MHDAirTrapData::fromByteArray(const QByteArray &vByteArray, int *vIndex) { int index = 0; if (GetValue(vByteArray, index, _data.mAirTrapLowerLevel )) if (GetValue(vByteArray, index, _data.mAirTrapUpperLevel )) + if (GetValue(vByteArray, index, _data.mAirTrapRawLowerLevel )) + if (GetValue(vByteArray, index, _data.mAirTrapRawUpperLevel )) return true ; 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; } } /*! @@ -39,7 +45,9 @@ */ MHDAirTrapData::Data MHDAirTrapData::data() const{ Data data; - data.mAirTrapLowerLevel = _data.mAirTrapLowerLevel.value; - data.mAirTrapUpperLevel = _data.mAirTrapUpperLevel.value; + data.mAirTrapLowerLevel = _data.mAirTrapLowerLevel.value; + data.mAirTrapUpperLevel = _data.mAirTrapUpperLevel.value; + data.mAirTrapRawLowerLevel = _data.mAirTrapRawLowerLevel.value; + data.mAirTrapRawUpperLevel = _data.mAirTrapRawUpperLevel.value; return data; } Index: sources/model/hd/data/MHDAirTrapData.h =================================================================== diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -r10f946b2ecf6eed25d07d6a22216393dca34ffcc --- sources/model/hd/data/MHDAirTrapData.h (.../MHDAirTrapData.h) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) +++ sources/model/hd/data/MHDAirTrapData.h (.../MHDAirTrapData.h) (revision 10f946b2ecf6eed25d07d6a22216393dca34ffcc) @@ -39,6 +39,8 @@ * | || * | #1:(U32) | \ref Data::mAirTrapLowerLevel | * | #2:(U32) | \ref Data::mAirTrapUpperLevel | + * | #2:(U32) | \ref Data::mAirTrapRawLowerLevel | + * | #2:(U32) | \ref Data::mAirTrapRawUpperLevel | * * \sa Data * @@ -60,6 +62,8 @@ struct { Types::U32 mAirTrapLowerLevel; Types::U32 mAirTrapUpperLevel; + Types::U32 mAirTrapRawLowerLevel; + Types::U32 mAirTrapRawUpperLevel; } _data; public: @@ -70,8 +74,10 @@ struct Data { - quint32 mAirTrapLowerLevel = 0; ///< Lower Level - quint32 mAirTrapUpperLevel = 0; ///< Upper Level + quint32 mAirTrapLowerLevel = 0; ///< Lower Level + quint32 mAirTrapUpperLevel = 0; ///< Upper Level + quint32 mAirTrapRawLowerLevel = 0; ///< Raw Lower Level + quint32 mAirTrapRawUpperLevel = 0; ///< Raw Upper Level }; MHDAirTrapData () { } Index: sources/view/hd/data/VHDAirTrapData.cpp =================================================================== diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -r10f946b2ecf6eed25d07d6a22216393dca34ffcc --- sources/view/hd/data/VHDAirTrapData.cpp (.../VHDAirTrapData.cpp) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) +++ sources/view/hd/data/VHDAirTrapData.cpp (.../VHDAirTrapData.cpp) (revision 10f946b2ecf6eed25d07d6a22216393dca34ffcc) @@ -20,6 +20,8 @@ VIEW_DEF(VHDAirTrap, HDAirTrapData) void VHDAirTrap::onActionReceive(const HDAirTrapData &vData) { - airTrapLowerLevel (vData.mAirTrapLowerLevel ); - airTrapUpperLevel (vData.mAirTrapUpperLevel ); + airTrapLowerLevel (vData.mAirTrapLowerLevel ); + airTrapUpperLevel (vData.mAirTrapUpperLevel ); + airTrapRawLowerLevel (vData.mAirTrapRawLowerLevel ); + airTrapRawUpperLevel (vData.mAirTrapRawUpperLevel ); } Index: sources/view/hd/data/VHDAirTrapData.h =================================================================== diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -r10f946b2ecf6eed25d07d6a22216393dca34ffcc --- sources/view/hd/data/VHDAirTrapData.h (.../VHDAirTrapData.h) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) +++ sources/view/hd/data/VHDAirTrapData.h (.../VHDAirTrapData.h) (revision 10f946b2ecf6eed25d07d6a22216393dca34ffcc) @@ -37,6 +37,8 @@ PROPERTY( quint32 , airTrapLowerLevel , 0) PROPERTY( quint32 , airTrapUpperLevel , 0) + PROPERTY( quint32 , airTrapRawLowerLevel , 0) + PROPERTY( quint32 , airTrapRawUpperLevel , 0) VIEW_DEC(VHDAirTrap, HDAirTrapData) };