Index: sources/canbus/MessageGlobals.h =================================================================== diff -u -r38ae7b93679d05a54fc460dac68891562d7da72d -r4c975736fbcc57e7e401001440b67b1317849c7e --- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 38ae7b93679d05a54fc460dac68891562d7da72d) +++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 4c975736fbcc57e7e401001440b67b1317849c7e) @@ -107,7 +107,7 @@ {Gui::GuiActionType::ID_HDAccelerometerData , 9 * 4 }, // 9 parameters each 4bytes {Gui::GuiActionType::ID_HDSyringePumpData , 9 * 4 }, // 9 parameters each 4bytes {Gui::GuiActionType::ID_HDUsageInfoReq , 0 * 4 }, // 0 parameters each 4bytes - {Gui::GuiActionType::ID_HDUsageInfoRsp , 4 * 4 + 2 }, // 4 parameters each 4bytes + 1 parameter 2 bytes + {Gui::GuiActionType::ID_HDUsageInfoRsp , 4 * 3 }, // 3 parameters each 4bytes // ---- TODO : AFTER GIVING IT SOME THOUGHT, IT SEEMS WE CAN GET THESE LEN FROM THE MODEL AND DO NOT NEED TO HAVE THIS BUT NEED TO INVESTIGATE MORE. {Gui::GuiActionType::ID_AlarmStatus , 4 * 4 + 2 }, // 4 parameters each 4bytes + 1 parameter 2bytes Index: sources/gui/qml/pages/settings/SettingsInformation.qml =================================================================== diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -r4c975736fbcc57e7e401001440b67b1317849c7e --- sources/gui/qml/pages/settings/SettingsInformation.qml (.../SettingsInformation.qml) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) +++ sources/gui/qml/pages/settings/SettingsInformation.qml (.../SettingsInformation.qml) (revision 4c975736fbcc57e7e401001440b67b1317849c7e) @@ -82,7 +82,6 @@ vHDUsageInfo .totalTxHours , vHDUsageInfo .totalTxHoursSinceLastService , vHDUsageInfo .epochOfStartOfLastTx , - vHDUsageInfo .epochOfLastRecordReset , ] itemsText : [ qsTr("Versions" ), // col1 title @@ -102,11 +101,10 @@ qsTr("DG Last Service Date" ), qsTr("DG Next Service Date" ), - qsTr("Treatment" ), + qsTr("Treatment" ), qsTr("Total Hours" ), qsTr("Hours Since Last Service" ), - qsTr("Last Start" ), - qsTr("Last Reset" ), + qsTr("Last Treatment Start Date" ), ] } } Index: sources/model/hd/data/MHDUsageInfoResponse.cpp =================================================================== diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -r4c975736fbcc57e7e401001440b67b1317849c7e --- sources/model/hd/data/MHDUsageInfoResponse.cpp (.../MHDUsageInfoResponse.cpp) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) +++ sources/model/hd/data/MHDUsageInfoResponse.cpp (.../MHDUsageInfoResponse.cpp) (revision 4c975736fbcc57e7e401001440b67b1317849c7e) @@ -21,8 +21,6 @@ _data.mTotalTxHours .value, _data.mTotalTxHoursSinceLastService .value, _data.mEpochOfStartOfLastTx .value, - _data.mEpochOfLastRecordReset .value, - _data.mCrc .value, }; } @@ -31,14 +29,10 @@ if (GetValue(vByteArray, index, _data.mTotalTxHours )) if (GetValue(vByteArray, index, _data.mTotalTxHoursSinceLastService )) if (GetValue(vByteArray, index, _data.mEpochOfStartOfLastTx )) - if (GetValue(vByteArray, index, _data.mEpochOfLastRecordReset )) - if (GetValue(vByteArray, index, _data.mCrc )) 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; } - else { if(vIndex) *vIndex = index; return false; } } /*! @@ -51,7 +45,5 @@ data.mTotalTxHours = _data.mTotalTxHours .value; data.mTotalTxHoursSinceLastService = _data.mTotalTxHoursSinceLastService.value; data.mEpochOfStartOfLastTx = _data.mEpochOfStartOfLastTx .value; - data.mEpochOfLastRecordReset = _data.mEpochOfLastRecordReset .value; - data.mCrc = _data.mCrc .value; return data; } Index: sources/model/hd/data/MHDUsageInfoResponse.h =================================================================== diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -r4c975736fbcc57e7e401001440b67b1317849c7e --- sources/model/hd/data/MHDUsageInfoResponse.h (.../MHDUsageInfoResponse.h) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) +++ sources/model/hd/data/MHDUsageInfoResponse.h (.../MHDUsageInfoResponse.h) (revision 4c975736fbcc57e7e401001440b67b1317849c7e) @@ -39,8 +39,6 @@ * | #1:(F32) | \ref Data::mTotalTxHours | * | #2:(F32) | \ref Data::mTotalTxHoursSinceLastService | * | #3:(U32) | \ref Data::mEpochOfStartOfLastTx | - * | #4:(U32) | \ref Data::mEpochOfLastRecordReset | - * | #5:(U16) | \ref Data::mCrc | * * \sa Data * @@ -63,8 +61,6 @@ Types::F32 mTotalTxHours ; Types::F32 mTotalTxHoursSinceLastService ; Types::U32 mEpochOfStartOfLastTx ; - Types::U32 mEpochOfLastRecordReset ; - Types::U16 mCrc ; } _data; public: @@ -77,8 +73,6 @@ float mTotalTxHours ; float mTotalTxHoursSinceLastService ; quint32 mEpochOfStartOfLastTx ; - quint32 mEpochOfLastRecordReset ; - quint16 mCrc ; }; MHDUsageInfoResponse () {} Index: sources/view/settings/VHDUsageInfo.cpp =================================================================== diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -r4c975736fbcc57e7e401001440b67b1317849c7e --- sources/view/settings/VHDUsageInfo.cpp (.../VHDUsageInfo.cpp) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) +++ sources/view/settings/VHDUsageInfo.cpp (.../VHDUsageInfo.cpp) (revision 4c975736fbcc57e7e401001440b67b1317849c7e) @@ -33,20 +33,13 @@ */ void View::VHDUsageInfo::onActionReceive(const HDUsageInfoResponseData &vData) { - - int hours = vData.mTotalTxHours; - int minutes = (vData.mTotalTxHours - hours) * 60; - QString timeFormatted = QString("%1:%2").arg(hours).arg(minutes); + QString timeFormatted = QString("%1").arg(vData.mTotalTxHours); totalTxHours(timeFormatted); - hours = vData.mTotalTxHoursSinceLastService; - minutes = (vData.mTotalTxHoursSinceLastService - hours) * 60; - timeFormatted = QString("%1:%2").arg(hours).arg(minutes); + timeFormatted = QString("%1").arg(vData.mTotalTxHoursSinceLastService); totalTxHoursSinceLastService(timeFormatted); + epochOfStartOfLastTx (Format::fromEpoch(vData.mEpochOfStartOfLastTx, _LastTreatmentDateFormat)); - epochOfStartOfLastTx (vData.mEpochOfStartOfLastTx ? QString("%1").arg(vData.mEpochOfStartOfLastTx ) : "" ); - epochOfLastRecordReset (vData.mEpochOfLastRecordReset ? QString("%1").arg(vData.mEpochOfLastRecordReset) : "" ); - // *** has to be the last to let the information to be set and then emit the signal *** // *** otherwise will use the Previous values before being set. *** adjustment ( true ); Index: sources/view/settings/VHDUsageInfo.h =================================================================== diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -r4c975736fbcc57e7e401001440b67b1317849c7e --- sources/view/settings/VHDUsageInfo.h (.../VHDUsageInfo.h) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) +++ sources/view/settings/VHDUsageInfo.h (.../VHDUsageInfo.h) (revision 4c975736fbcc57e7e401001440b67b1317849c7e) @@ -39,6 +39,8 @@ HDUsageInfoRequestData _data; + const QString _LastTreatmentDateFormat = "yyyy/MM/dd"; + // disabled coco begin validated: // The property adjustment_Triggered has to be always true // and to always trigger the change event to work as a notifier for GUI