Index: denali.pro.user =================================================================== diff -u -r6816b783f50e08267aa016d64350bc020080d901 -rdd6c876521e397ff990f81e7363b4f007fe3e2d9 --- denali.pro.user (.../denali.pro.user) (revision 6816b783f50e08267aa016d64350bc020080d901) +++ denali.pro.user (.../denali.pro.user) (revision dd6c876521e397ff990f81e7363b4f007fe3e2d9) @@ -1,6 +1,6 @@ - + EnvironmentId Index: sources/canbus/MessageGlobals.h =================================================================== diff -u -r6816b783f50e08267aa016d64350bc020080d901 -rdd6c876521e397ff990f81e7363b4f007fe3e2d9 --- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 6816b783f50e08267aa016d64350bc020080d901) +++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision dd6c876521e397ff990f81e7363b4f007fe3e2d9) @@ -190,9 +190,9 @@ // ---- Treatment Log {Gui::GuiActionType::ID_AdjustTreatmentLogReq , 0 * 4 }, // 1 parameter each 4bytes {Gui::GuiActionType::ID_AdjustTreatmentLogRsp , 35 * 4 }, //35 parameter each 4bytes - {Gui::GuiActionType::ID_TreatmentLogAvrgeData , 6 * 4 }, // 6 parameter each 4bytes - {Gui::GuiActionType::ID_TreatmentLogAlarmData , 4 * 4 }, // 4 parameter each 4bytes - {Gui::GuiActionType::ID_TreatmentLogEventData , 4 * 4 }, // 4 parameter each 4bytes + {Gui::GuiActionType::ID_TreatmentLogAvrgeData , 5 * 4 }, // 5 parameter each 4bytes + {Gui::GuiActionType::ID_TreatmentLogAlarmData , 3 * 4 }, // 3 parameter each 4bytes + {Gui::GuiActionType::ID_TreatmentLogEventData , 3 * 4 }, // 3 parameter each 4bytes // ---- Versions {Gui::GuiActionType::ID_AdjustVersionsReq , 0 * 4 }, // 0 parameters each 4bytes Index: sources/model/hd/data/treatmentlog/MTreatmentLogAlarmData.cpp =================================================================== diff -u -r6816b783f50e08267aa016d64350bc020080d901 -rdd6c876521e397ff990f81e7363b4f007fe3e2d9 --- sources/model/hd/data/treatmentlog/MTreatmentLogAlarmData.cpp (.../MTreatmentLogAlarmData.cpp) (revision 6816b783f50e08267aa016d64350bc020080d901) +++ sources/model/hd/data/treatmentlog/MTreatmentLogAlarmData.cpp (.../MTreatmentLogAlarmData.cpp) (revision dd6c876521e397ff990f81e7363b4f007fe3e2d9) @@ -14,11 +14,13 @@ */ #include "MTreatmentLogAlarmData.h" +// Qt +#include + using namespace Model; QVariantList MTreatmentLogAlarmData::parameters() const { return { - _data.mTimeStamp.value, _data.mAlarmID .value, _data.mParam1 .value, _data.mParam2 .value, @@ -27,15 +29,13 @@ bool MTreatmentLogAlarmData::fromByteArray(const QByteArray &vByteArray, int *vIndex) { int index = 0; // message data start position - if (GetValue(vByteArray, index, _data.mTimeStamp)) if (GetValue(vByteArray, index, _data.mAlarmID )) if (GetValue(vByteArray, index, _data.mParam1 )) if (GetValue(vByteArray, index, _data.mParam2 )) 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; } } /*! @@ -45,7 +45,7 @@ */ TreatmentLogAlarmData MTreatmentLogAlarmData::data() const { Data data; - data.mTimeStamp = _data.mTimeStamp .value; + data.mTimeStamp = QDateTime::currentDateTime().toSecsSinceEpoch(); data.mAlarmID = _data.mAlarmID .value; data.mParam1 = _data.mParam1 .value; data.mParam2 = _data.mParam2 .value; Index: sources/model/hd/data/treatmentlog/MTreatmentLogAlarmData.h =================================================================== diff -u -r6816b783f50e08267aa016d64350bc020080d901 -rdd6c876521e397ff990f81e7363b4f007fe3e2d9 --- sources/model/hd/data/treatmentlog/MTreatmentLogAlarmData.h (.../MTreatmentLogAlarmData.h) (revision 6816b783f50e08267aa016d64350bc020080d901) +++ sources/model/hd/data/treatmentlog/MTreatmentLogAlarmData.h (.../MTreatmentLogAlarmData.h) (revision dd6c876521e397ff990f81e7363b4f007fe3e2d9) @@ -37,9 +37,9 @@ * * | Payload || * | || - * | #1:(U32) | \ref Data::mTimeStamp | - * | #2:(U32) | \ref Data::mAlarmID | - * | #3:(U32) | \ref Data::mParam1 | + * | #1:(U32) | \ref Data::mAlarmID | + * | #2:(U32) | \ref Data::mParam1 | + * | #3:(U32) | \ref Data::mParam2 | * * \sa Data * \sa HD_Post_Treatment_Mode_States @@ -60,7 +60,6 @@ QVariantList parameters() const override; struct { - Types::U32 mTimeStamp ; ///< TimeStamp in epoch Types::U32 mAlarmID ; ///< Alarm ID Types::U32 mParam1 ; ///< Alarm Parameter 1 // may need more than 1 parameter but defined one so it would be easier to add more later. Types::U32 mParam2 ; ///< Alarm Parameter 2 // may need more than 1 parameter but defined one so it would be easier to add more later. @@ -73,7 +72,7 @@ QString infoText () const override { return QString("TreatmentLogAlarm") ; } struct Data { - quint32 mTimeStamp ; ///< TimeStamp in epoch + quint64 mTimeStamp ; ///< Timestamp of the received message in secs since epoch quint32 mAlarmID ; ///< Alarm ID quint32 mParam1 ; ///< Alarm Parameter 1 quint32 mParam2 ; ///< Alarm Parameter 2 Index: sources/model/hd/data/treatmentlog/MTreatmentLogAvrgeData.cpp =================================================================== diff -u -ra5be04172757fa469d85fb83a6998a4404214f19 -rdd6c876521e397ff990f81e7363b4f007fe3e2d9 --- sources/model/hd/data/treatmentlog/MTreatmentLogAvrgeData.cpp (.../MTreatmentLogAvrgeData.cpp) (revision a5be04172757fa469d85fb83a6998a4404214f19) +++ sources/model/hd/data/treatmentlog/MTreatmentLogAvrgeData.cpp (.../MTreatmentLogAvrgeData.cpp) (revision dd6c876521e397ff990f81e7363b4f007fe3e2d9) @@ -14,11 +14,13 @@ */ #include "MTreatmentLogAvrgeData.h" +// Qt +#include + using namespace Model; QVariantList MTreatmentLogAvrgeData::parameters() const { return { - _data.mTimeStamp .value, _data.mBloodFlowRate .value, _data.mDialysateFlowRate .value, _data.mUFRate .value, @@ -29,7 +31,6 @@ bool MTreatmentLogAvrgeData::fromByteArray(const QByteArray &vByteArray, int *vIndex) { int index = 0; // message data start position - if (GetValue(vByteArray, index, _data.mTimeStamp )) if (GetValue(vByteArray, index, _data.mBloodFlowRate )) if (GetValue(vByteArray, index, _data.mDialysateFlowRate)) if (GetValue(vByteArray, index, _data.mUFRate )) @@ -41,7 +42,6 @@ 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; } } /*! @@ -51,7 +51,7 @@ */ TreatmentLogAvrgeData MTreatmentLogAvrgeData::data() const { Data data; - data.mTimeStamp = _data.mTimeStamp .value; + data.mTimeStamp = QDateTime::currentDateTime().toSecsSinceEpoch(); data.mBloodFlowRate = _data.mBloodFlowRate .value; data.mDialysateFlowRate = _data.mDialysateFlowRate .value; data.mUFRate = _data.mUFRate .value; Index: sources/model/hd/data/treatmentlog/MTreatmentLogAvrgeData.h =================================================================== diff -u -r6816b783f50e08267aa016d64350bc020080d901 -rdd6c876521e397ff990f81e7363b4f007fe3e2d9 --- sources/model/hd/data/treatmentlog/MTreatmentLogAvrgeData.h (.../MTreatmentLogAvrgeData.h) (revision 6816b783f50e08267aa016d64350bc020080d901) +++ sources/model/hd/data/treatmentlog/MTreatmentLogAvrgeData.h (.../MTreatmentLogAvrgeData.h) (revision dd6c876521e397ff990f81e7363b4f007fe3e2d9) @@ -37,12 +37,11 @@ * * | Payload || * | || - * | #1:(U32) | \ref Data::mTimeStamp | - * | #2:(U32) | \ref Data::mBloodFlowRate | - * | #3:(U32) | \ref Data::mDialysateFlowRate | - * | #4:(F32) | \ref Data::mUFRate | - * | #5:(F32) | \ref Data::mArterialPressure | - * | #6:(F32) | \ref Data::mVenousPressure | + * | #1:(U32) | \ref Data::mBloodFlowRate | + * | #2:(U32) | \ref Data::mDialysateFlowRate | + * | #3:(F32) | \ref Data::mUFRate | + * | #4:(F32) | \ref Data::mArterialPressure | + * | #5:(F32) | \ref Data::mVenousPressure | * * \sa Data * \sa HD_Post_Treatment_Mode_States @@ -63,12 +62,11 @@ QVariantList parameters() const override; struct { - Types::U32 mTimeStamp ; ///< TimeStamp in epoch - Types::U32 mBloodFlowRate ; ///< 2 - (U32) Blood Flow Rate (mL/min) - Types::U32 mDialysateFlowRate ; ///< 3 - (U32) Dialysate Flow Rate (mL/min) - Types::F32 mUFRate ; ///< 4 - (F32) Ultrafiltration Rate (mmHg) - Types::F32 mArterialPressure ; ///< 5 - (F32) Arterial Pressure (mmHg) - Types::F32 mVenousPressure ; ///< 6 - (F32) Venous Pressure (mmHg) + Types::U32 mBloodFlowRate ; ///< (U32) Blood Flow Rate (mL/min) + Types::U32 mDialysateFlowRate ; ///< (U32) Dialysate Flow Rate (mL/min) + Types::F32 mUFRate ; ///< (F32) Ultrafiltration Rate (mmHg) + Types::F32 mArterialPressure ; ///< (F32) Arterial Pressure (mmHg) + Types::F32 mVenousPressure ; ///< (F32) Venous Pressure (mmHg) } _data; public: @@ -78,12 +76,12 @@ QString infoText () const override { return QString("TreatmentLogAvrge") ; } struct Data { - quint32 mTimeStamp ; ///< TimeStamp in epoch - quint32 mBloodFlowRate ; ///< 2 - (U32) Blood Flow Rate (mL/min) - quint32 mDialysateFlowRate ; ///< 3 - (U32) Dialysate Flow Rate (mL/min) - float mUFRate ; ///< 4 - (F32) Ultrafiltration Rate (mmHg) - float mArterialPressure ; ///< 5 - (F32) Arterial Pressure (mmHg) - float mVenousPressure ; ///< 6 - (F32) Venous Pressure (mmHg) + quint64 mTimeStamp ; ///< Timestamp of the received message in secs since epoch + quint32 mBloodFlowRate ; ///< Blood Flow Rate (mL/min) + quint32 mDialysateFlowRate ; ///< Dialysate Flow Rate (mL/min) + float mUFRate ; ///< Ultrafiltration Rate (mmHg) + float mArterialPressure ; ///< Arterial Pressure (mmHg) + float mVenousPressure ; ///< Venous Pressure (mmHg) quint32 mSystolic = 0; ///< Systolic Blood Pressure - This value is not coming from FW and will be get from UI and User. quint32 mDiastolic = 0; ///< Diastolic Blood Pressure - This value is not coming from FW and will be get from UI and User. quint32 mHeartRate = 0; ///< Heart Rate - This value is not coming from FW and will be get from UI and User. Index: sources/model/hd/data/treatmentlog/MTreatmentLogEventData.cpp =================================================================== diff -u -ra5be04172757fa469d85fb83a6998a4404214f19 -rdd6c876521e397ff990f81e7363b4f007fe3e2d9 --- sources/model/hd/data/treatmentlog/MTreatmentLogEventData.cpp (.../MTreatmentLogEventData.cpp) (revision a5be04172757fa469d85fb83a6998a4404214f19) +++ sources/model/hd/data/treatmentlog/MTreatmentLogEventData.cpp (.../MTreatmentLogEventData.cpp) (revision dd6c876521e397ff990f81e7363b4f007fe3e2d9) @@ -14,11 +14,13 @@ */ #include "MTreatmentLogEventData.h" +// Qt +#include + using namespace Model; QVariantList MTreatmentLogEventData::parameters() const { return { - _data.mTimeStamp.value, _data.mEventID .value, _data.mOldValue .value, _data.mNewValue .value, @@ -27,15 +29,13 @@ bool MTreatmentLogEventData::fromByteArray(const QByteArray &vByteArray, int *vIndex) { int index = 0; // message data start position - if (GetValue(vByteArray, index, _data.mTimeStamp)) if (GetValue(vByteArray, index, _data.mEventID )) if (GetValue(vByteArray, index, _data.mOldValue )) if (GetValue(vByteArray, index, _data.mNewValue )) 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; } } /*! @@ -45,7 +45,7 @@ */ TreatmentLogEventData MTreatmentLogEventData::data() const { Data data; - data.mTimeStamp = _data.mTimeStamp .value; + data.mTimeStamp = QDateTime::currentDateTime().toSecsSinceEpoch(); data.mEventID = _data.mEventID .value; data.mOldValue = _data.mOldValue .value; data.mNewValue = _data.mNewValue .value; Index: sources/model/hd/data/treatmentlog/MTreatmentLogEventData.h =================================================================== diff -u -rb3eb8bc9696c4db9867ad1cf13b47c455a94e0fe -rdd6c876521e397ff990f81e7363b4f007fe3e2d9 --- sources/model/hd/data/treatmentlog/MTreatmentLogEventData.h (.../MTreatmentLogEventData.h) (revision b3eb8bc9696c4db9867ad1cf13b47c455a94e0fe) +++ sources/model/hd/data/treatmentlog/MTreatmentLogEventData.h (.../MTreatmentLogEventData.h) (revision dd6c876521e397ff990f81e7363b4f007fe3e2d9) @@ -37,10 +37,9 @@ * * | Payload || * | || - * | #1:(U32) | \ref Data::mTimeStamp | - * | #2:(U32) | \ref Data::mEventID | - * | #3:(F32) | \ref Data::mOldValue | - * | #4:(F32) | \ref Data::mNewValue | + * | #1:(U32) | \ref Data::mEventID | + * | #2:(F32) | \ref Data::mOldValue | + * | #3:(F32) | \ref Data::mNewValue | * * \sa Data * \sa HD_Post_Treatment_Mode_States @@ -61,7 +60,6 @@ QVariantList parameters() const override; struct { - Types::U32 mTimeStamp ; ///< TimeStamp in epoch Types::U32 mEventID ; ///< Event ID Types::F32 mOldValue ; ///< Event Old Value Types::F32 mNewValue ; ///< Event New Value @@ -74,7 +72,7 @@ QString infoText () const override { return QString("TreatmentLogEvent") ; } struct Data { - quint32 mTimeStamp ; ///< TimeStamp in epoch + quint64 mTimeStamp ; ///< Timestamp of the received message in secs since epoch quint32 mEventID ; ///< Event ID float mOldValue ; ///< Event Old Value float mNewValue ; ///< Event New Value