Index: sources/canbus/MessageGlobals.h =================================================================== diff -u -rc1031c7f6901733253a1196afec347c197edb9d2 -r419e283b49ae32d48abcba1912757d7e00c120c4 --- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision c1031c7f6901733253a1196afec347c197edb9d2) +++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 419e283b49ae32d48abcba1912757d7e00c120c4) @@ -106,6 +106,8 @@ // HD Data Messages {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 // ---- 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/main.qml =================================================================== diff -u -r364cf0959b78d4e86c7220fb878c5246c9d7d6bd -r419e283b49ae32d48abcba1912757d7e00c120c4 --- sources/gui/qml/main.qml (.../main.qml) (revision 364cf0959b78d4e86c7220fb878c5246c9d7d6bd) +++ sources/gui/qml/main.qml (.../main.qml) (revision 419e283b49ae32d48abcba1912757d7e00c120c4) @@ -46,7 +46,7 @@ import VBluetooth 0.1 import VDuetRoWaterDG 0.1 import VCloudSync 0.1 - +import VHDUsageInfo 0.1 // States views import VHDOperationMode 0.1 import VPreTreatmentStates 0.1 @@ -147,7 +147,7 @@ VBluetooth { id: vBluetooth } VDuetRoWaterDG { id: vDuetRoWaterDG } VCloudSync { id: vCloudSync } - + VHDUsageInfo { id: vHDUsageInfo } // ---- States VHDOperationMode { id: vHDOperationMode onStandbyChanged: { Index: sources/gui/qml/pages/settings/SettingsInformation.qml =================================================================== diff -u -r36d49ba38a1e56929f1ce3c6fe8b7a0933d5f46a -r419e283b49ae32d48abcba1912757d7e00c120c4 --- sources/gui/qml/pages/settings/SettingsInformation.qml (.../SettingsInformation.qml) (revision 36d49ba38a1e56929f1ce3c6fe8b7a0933d5f46a) +++ sources/gui/qml/pages/settings/SettingsInformation.qml (.../SettingsInformation.qml) (revision 419e283b49ae32d48abcba1912757d7e00c120c4) @@ -45,7 +45,7 @@ rowCount : 11 rowSpacing : 0 itemHeight : 45 - itemWidth : 550 + itemWidth : 575 touchable : false itemsHasLine: [ 0, // title C1 @@ -67,6 +67,7 @@ itemsUnitLeftMargin : itemWidth / 4 + 50 itemsValue : [ "" , + vDevice .osVersion , Qt .application.version, vAdjustmentVersions .hdVerDevice , vAdjustmentVersions .hdVerFPGA , @@ -87,6 +88,7 @@ ] itemsText : [ qsTr("Versions" ), // col1 title + qsTr("OS Version" ), qsTr("UI Version" ), qsTr("HD Version" ), qsTr("HD FPGA Version" ), Index: sources/model/hd/adjustment/settings/MAdjustHDRequests.h =================================================================== diff -u -r6be40239ce52d641692de158a044af0a54cde1e8 -r419e283b49ae32d48abcba1912757d7e00c120c4 --- sources/model/hd/adjustment/settings/MAdjustHDRequests.h (.../MAdjustHDRequests.h) (revision 6be40239ce52d641692de158a044af0a54cde1e8) +++ sources/model/hd/adjustment/settings/MAdjustHDRequests.h (.../MAdjustHDRequests.h) (revision 419e283b49ae32d48abcba1912757d7e00c120c4) @@ -122,9 +122,9 @@ class MAdjustVersionsReq : public MModel { public: - quint8 ver_major = QString("%1").arg(VER_MAJOR ).toUInt(); - quint8 ver_minor = QString("%1").arg(VER_MINOR ).toUInt(); - quint8 ver_micro = QString("%1").arg(VER_MICRO ).toUInt(); + quint8 ver_major = QString("%1").arg(UI_VERSION_MAJAR ).toUInt(); + quint8 ver_minor = QString("%1").arg(UI_VERSION_MINOR ).toUInt(); + quint8 ver_micro = QString("%1").arg(UI_VERSION_MICRO ).toUInt(); quint16 ver_revis = QString("%1").arg(VER_REVIS ).toUInt(); quint32 ver_comp = QString("%1").arg(SW_COMPATIBILITY_REV).toUInt();