Index: denali.pro.user =================================================================== diff -u -rb50431293b0690d6071f0fd58044880909cef01d -ra1fdb6d955a07f87e0352c41cee61106eb97e59f --- denali.pro.user (.../denali.pro.user) (revision b50431293b0690d6071f0fd58044880909cef01d) +++ denali.pro.user (.../denali.pro.user) (revision a1fdb6d955a07f87e0352c41cee61106eb97e59f) @@ -1,6 +1,6 @@ - + EnvironmentId Index: sources/gui/qml/main.qml =================================================================== diff -u -rb50431293b0690d6071f0fd58044880909cef01d -ra1fdb6d955a07f87e0352c41cee61106eb97e59f --- sources/gui/qml/main.qml (.../main.qml) (revision b50431293b0690d6071f0fd58044880909cef01d) +++ sources/gui/qml/main.qml (.../main.qml) (revision a1fdb6d955a07f87e0352c41cee61106eb97e59f) @@ -218,6 +218,7 @@ // 3 - Footer MainMenu { id: _mainMenu + hidden: true // it should be hidden by default since the landing screen changed to init and it does not have the main menu untill the POST passes. titles: [ qsTr("Treatment") , qsTr("Manager") , qsTr("Settings") ] Component.onCompleted: { _settingsStack.visible = false Index: sources/gui/qml/pages/MainStack.qml =================================================================== diff -u -r1dead6ecc09639538da51e5fac5e4d0e21d9eeee -ra1fdb6d955a07f87e0352c41cee61106eb97e59f --- sources/gui/qml/pages/MainStack.qml (.../MainStack.qml) (revision 1dead6ecc09639538da51e5fac5e4d0e21d9eeee) +++ sources/gui/qml/pages/MainStack.qml (.../MainStack.qml) (revision a1fdb6d955a07f87e0352c41cee61106eb97e59f) @@ -73,9 +73,6 @@ onVisibleChanged: if (visible) { _mainMenu.hidden = true - - vAdjustmentVersions.doAdjustment() - vAdjustmentVersions.doUIPOSTFinal() } Image { id: _dialityLogo Behavior on opacity { OpacityAnimator { duration: 1000 } } @@ -123,7 +120,14 @@ Connections { target: vHDOperationMode // onFaultChanged : { page( _faultModeScreen , vfault )} // may needed later. onServiceChanged : { page( _serviceModeScreen , vservice )} - onInitChanged : { page( _initialModeScreen , vinit )} + onInitChanged : { page( _initialModeScreen , vinit ) + if (vinit) { + // FIXMW : This is a temporary code for now to make the FW work. + // later needs to be moved to the correct place. + vAdjustmentVersions.doAdjustment() + vAdjustmentVersions.doUIPOSTFinal() + } + } onHomeChanged : { page( _mainHome , vhome )} onStandbyChanged : { /* It depends on the subModes of the standBy. Handled by onHome. */ } Index: sources/model/dg/adjustment/settings/MAdjustDGVersionsResponse.h =================================================================== diff -u -r13d6a4fae2f910ab6e289ac9280258a94f734405 -ra1fdb6d955a07f87e0352c41cee61106eb97e59f --- sources/model/dg/adjustment/settings/MAdjustDGVersionsResponse.h (.../MAdjustDGVersionsResponse.h) (revision 13d6a4fae2f910ab6e289ac9280258a94f734405) +++ sources/model/dg/adjustment/settings/MAdjustDGVersionsResponse.h (.../MAdjustDGVersionsResponse.h) (revision a1fdb6d955a07f87e0352c41cee61106eb97e59f) @@ -32,7 +32,7 @@ * * | MSG | CAN ID | Type | Ack | Src | Dest | Description | * |:------:|:------:|:----:|:---:|:---:|:----:|:-----------:| - * | 0x1E00 | 0x070 | Rsp | Y | DG | UI | DG Versions Data | + * | 0x1E00 | 0x070 | Rsp | Y | DG | All | DG Versions Data | * * | Payload || * | || Index: sources/model/hd/adjustment/settings/MAdjustHDVersionsResponse.h =================================================================== diff -u -r13d6a4fae2f910ab6e289ac9280258a94f734405 -ra1fdb6d955a07f87e0352c41cee61106eb97e59f --- sources/model/hd/adjustment/settings/MAdjustHDVersionsResponse.h (.../MAdjustHDVersionsResponse.h) (revision 13d6a4fae2f910ab6e289ac9280258a94f734405) +++ sources/model/hd/adjustment/settings/MAdjustHDVersionsResponse.h (.../MAdjustHDVersionsResponse.h) (revision a1fdb6d955a07f87e0352c41cee61106eb97e59f) @@ -32,7 +32,7 @@ * * | MSG | CAN ID | Type | Ack | Src | Dest | Description | * |:------:|:------:|:----:|:---:|:---:|:----:|:---------------------:| - * | 0x1D00 | 0x020 | Rsp | Y | HD | UI | HD Versions Data | + * | 0x1D00 | 0x020 | Rsp | Y | HD | All | HD Versions Data | * * | Payload || * | || Index: sources/model/hd/alarm/MAlarmMapping.cpp =================================================================== diff -u -rb22dd46db3def5d3c36d36c319f0bea89bf018d9 -ra1fdb6d955a07f87e0352c41cee61106eb97e59f --- sources/model/hd/alarm/MAlarmMapping.cpp (.../MAlarmMapping.cpp) (revision b22dd46db3def5d3c36d36c319f0bea89bf018d9) +++ sources/model/hd/alarm/MAlarmMapping.cpp (.../MAlarmMapping.cpp) (revision a1fdb6d955a07f87e0352c41cee61106eb97e59f) @@ -7,7 +7,7 @@ * * \file MAlarmMapping.cpp * \author (last) Behrouz NematiPour - * \date (last) 27-Jul-2021 + * \date (last) 28-Jul-2021 * \author (original) Behrouz NematiPour * \date (original) 03-May-2021 * @@ -280,7 +280,7 @@ /*0250*/case GuiAlarmID::ALARM_ID_DG_CHEM_DISINFECT_INLET_COND_AND_TEMP_OUT : { result = QObject::tr("DG chemical disinfect inlet conductivity and temperature out of range." ); break; } /* 250*/ /*0251*/case GuiAlarmID::ALARM_ID_HD_INVALID_SYSTEM_RECORD : { result = QObject::tr("HD invalid system record." ); break; } /* 251*/ /*0252*/case GuiAlarmID::ALARM_ID_HD_INVALID_SERVICE_RECORD : { result = QObject::tr("HD invalid service record." ); break; } /* 252*/ -/*0253*/case GuiAlarmID::ALARM_ID_DG_INVALID_SYSTEM_RECORD : { result = QObject::tr("DG invalid sytem record." ); break; } /* 253*/ +/*0253*/case GuiAlarmID::ALARM_ID_DG_INVALID_SYSTEM_RECORD : { result = QObject::tr("DG invalid system record." ); break; } /* 253*/ /*0254*/case GuiAlarmID::ALARM_ID_DG_INVALID_SERVICE_RECORD : { result = QObject::tr("DG invalid service record." ); break; } /* 254*/ /*0255*/case GuiAlarmID::ALARM_ID_HD_UI_COMPATIBILITY_ERROR : { result = QObject::tr("HD and UI software builds are not compatible." ); break; } /* 255*/ /*0256*/case GuiAlarmID::ALARM_ID_HD_DG_COMPATIBILITY_ERROR : { result = QObject::tr("HD and DG software builds are not compatible." ); break; } /* 256*/