Index: sources/canbus/MessageGlobals.h =================================================================== diff -u -r2124420a19819f672e9180979ff3762dc083eb7f -r4884b4cb65e55661249c78901b5e0b724cb21b36 --- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 2124420a19819f672e9180979ff3762dc083eb7f) +++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 4884b4cb65e55661249c78901b5e0b724cb21b36) @@ -158,6 +158,7 @@ {Gui::GuiActionType::ID_SelfTestNoCartridgeData , 2 * 4 }, // 2 parameters each 4bytes // Pre-Treatment Disposables Installation Confirm {Gui::GuiActionType::ID_AdjustDisposablesConfirmReq , 0 * 4 }, // 0 parameter + {Gui::GuiActionType::ID_AdjustDisposablesConfirmRsp , 2 * 4 }, // 2 parameter // Pre-Treatment SelfTest Dry Progress Data {Gui::GuiActionType::ID_SelfTestDryData , 2 * 4 }, // 2 parameters each 4bytes // Pre-Treatment Disposable Priming @@ -341,7 +342,7 @@ * \details The message structure after it's been converted form hex bytes to meaningful struct for UI. */ struct Message { // TODO : Should be converted to MessageModel class // no time left for now !!! - Can_Id can_id; + Can_Id can_id = eChlid_NONE; Sequence sequence = 0; // seq 0 is invalid Gui::GuiActionType actionId = Gui::GuiActionType::ID_Unknown; int length = 0; Index: sources/gui/GuiGlobals.h =================================================================== diff -u -r2124420a19819f672e9180979ff3762dc083eb7f -r4884b4cb65e55661249c78901b5e0b724cb21b36 --- sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 2124420a19819f672e9180979ff3762dc083eb7f) +++ sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 4884b4cb65e55661249c78901b5e0b724cb21b36) @@ -162,6 +162,7 @@ ID_SelfTestNoCartridgeData = 0x6100, // 97 // there is no specific response message for this request and changing of the state in Pre_Treatment_States is used as the response // Pre-Treatment Disposables Installation Confirm ID_AdjustDisposablesConfirmReq = 0x6200, // 98 // there is no specific response message for this request and changing of the state in Pre_Treatment_States is used as the response + ID_AdjustDisposablesConfirmRsp = 0xAD00, // 173 // there is no specific response message for this request and changing of the state in Pre_Treatment_States is used as the response // Pre-Treatment SelfTest Dry Progress Data ID_SelfTestDryData = 0x6300, // 99 // Pre-Treatment Disposable Priming Index: sources/gui/qml/main.qml =================================================================== diff -u -r2124420a19819f672e9180979ff3762dc083eb7f -r4884b4cb65e55661249c78901b5e0b724cb21b36 --- sources/gui/qml/main.qml (.../main.qml) (revision 2124420a19819f672e9180979ff3762dc083eb7f) +++ sources/gui/qml/main.qml (.../main.qml) (revision 4884b4cb65e55661249c78901b5e0b724cb21b36) @@ -325,7 +325,7 @@ } // keyboard should always be before AlarmItem to not to covet it. - VirtualKeyboard { id: _keyboard } + KeyboardItem { id: _keyboard } // AlarmItem should always be at the end so nothing covers it AlarmItem { id: _alarmItem ; z: 997 }