Index: .gitignore =================================================================== diff -u -r561055268da68e24fe91a1148b76bf1785dae14d -rd07ec81c7002ed2ac60c1dfc3101fb820e88211c --- .gitignore (.../.gitignore) (revision 561055268da68e24fe91a1148b76bf1785dae14d) +++ .gitignore (.../.gitignore) (revision d07ec81c7002ed2ac60c1dfc3101fb820e88211c) @@ -1,2 +1,2 @@ *.autosave - +common Index: cppcheck.err =================================================================== diff -u -r805119c460b4a266d6401c8705f4427e7fbe270f -rd07ec81c7002ed2ac60c1dfc3101fb820e88211c --- cppcheck.err (.../cppcheck.err) (revision 805119c460b4a266d6401c8705f4427e7fbe270f) +++ cppcheck.err (.../cppcheck.err) (revision d07ec81c7002ed2ac60c1dfc3101fb820e88211c) @@ -1,6 +1,6 @@ -[sources/gui/guiview.cpp:186]: (style) The function 'alarmIDName' is never used. -[sources/gui/guiview.cpp:168]: (style) The function 'alarmPriorityName' is never used. +[sources/view/valarmstatus.cpp:52]: (style) The function 'alarmPriorityText' is never used. [sources/utility/types.cpp:20]: (style) The function 'floatCompare' is never used. -[sources/storage/filehandler.cpp:61]: (style) The function 'read' is never used. -[sources/maintimer.cpp:54]: (style) The function 'timerEvent' is never used. +[sources/storage/filehandler.cpp:68]: (style) The function 'read' is never used. +[sources/view/valarmstatus.cpp:89]: (style) The function 'text' is never used. +[sources/canbus/frameinterface.cpp:266]: (style) The function 'timerEvent' is never used. (information) Cppcheck cannot find all the include files. Cppcheck can check the code without the include files found. But the results will probably be more accurate if all the include files are found. Please check your project's include directories and add all of them as include directories for Cppcheck. To see what files Cppcheck cannot find use --check-config. Index: cppcheck.log =================================================================== diff -u -r805119c460b4a266d6401c8705f4427e7fbe270f -rd07ec81c7002ed2ac60c1dfc3101fb820e88211c --- cppcheck.log (.../cppcheck.log) (revision 805119c460b4a266d6401c8705f4427e7fbe270f) +++ cppcheck.log (.../cppcheck.log) (revision d07ec81c7002ed2ac60c1dfc3101fb820e88211c) @@ -3,122 +3,208 @@ Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/configuration/ -I.//sources/canbus/ Platform:Native Checking main.cpp: UNIT_TEST... -1/24 files checked 4% done +1/41 files checked 2% done Checking sources/applicationcontroller.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/configuration/ -I.//sources/canbus/ Platform:Native -2/24 files checked 8% done +2/41 files checked 4% done Checking sources/applicationpost.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/configuration/ -I.//sources/canbus/ Platform:Native -3/24 files checked 12% done +3/41 files checked 7% done Checking sources/canbus/caninterface.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/configuration/ -I.//sources/canbus/ Platform:Native -4/24 files checked 16% done +4/41 files checked 9% done Checking sources/canbus/frameinterface.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/configuration/ -I.//sources/canbus/ Platform:Native -5/24 files checked 20% done +5/41 files checked 12% done Checking sources/canbus/messageacknowmodel.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/configuration/ -I.//sources/canbus/ Platform:Native -6/24 files checked 25% done +6/41 files checked 14% done Checking sources/canbus/messagebuilder.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/configuration/ -I.//sources/canbus/ Platform:Native Checking sources/canbus/messagebuilder.cpp: DISABLE_CRC... -7/24 files checked 29% done +7/41 files checked 17% done Checking sources/canbus/messagedispatcher.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/configuration/ -I.//sources/canbus/ Platform:Native Checking sources/canbus/messagedispatcher.cpp: DEBUG_ACKBACK_HD_TO_UI... -8/24 files checked 33% done +Checking sources/canbus/messagedispatcher.cpp: DEBUG_OUT_OF_SYNC... +8/41 files checked 19% done Checking sources/canbus/messageinterpreter.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/configuration/ -I.//sources/canbus/ Platform:Native -9/24 files checked 37% done +9/41 files checked 21% done Checking sources/configuration/display.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/configuration/ -I.//sources/canbus/ Platform:Native -10/24 files checked 41% done +10/41 files checked 24% done Checking sources/configuration/sound.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/configuration/ -I.//sources/canbus/ Platform:Native -11/24 files checked 45% done +11/41 files checked 26% done Checking sources/gui/guicontroller.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/configuration/ -I.//sources/canbus/ Platform:Native -12/24 files checked 50% done +12/41 files checked 29% done Checking sources/gui/guiglobals.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/configuration/ -I.//sources/canbus/ Platform:Native -13/24 files checked 54% done +13/41 files checked 31% done Checking sources/gui/guiview.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/configuration/ -I.//sources/canbus/ Platform:Native -14/24 files checked 58% done +14/41 files checked 34% done Checking sources/maintimer.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/configuration/ -I.//sources/canbus/ Platform:Native -15/24 files checked 62% done +15/41 files checked 36% done +Checking sources/model/malarmstatus.cpp ... +Defines: +Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/configuration/ -I.//sources/canbus/ +Platform:Native +16/41 files checked 39% done +Checking sources/model/mpoweroff.cpp ... +Defines: +Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/configuration/ -I.//sources/canbus/ +Platform:Native +17/41 files checked 41% done +Checking sources/model/mtreatmentadjustblooddialysateresponse.cpp ... +Defines: +Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/configuration/ -I.//sources/canbus/ +Platform:Native +18/41 files checked 43% done +Checking sources/model/mtreatmentflows.cpp ... +Defines: +Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/configuration/ -I.//sources/canbus/ +Platform:Native +19/41 files checked 46% done +Checking sources/model/mtreatmentoutletflow.cpp ... +Defines: +Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/configuration/ -I.//sources/canbus/ +Platform:Native +20/41 files checked 48% done +Checking sources/model/mtreatmentpressureocclusion.cpp ... +Defines: +Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/configuration/ -I.//sources/canbus/ +Platform:Native +21/41 files checked 51% done +Checking sources/model/mtreatmentranges.cpp ... +Defines: +Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/configuration/ -I.//sources/canbus/ +Platform:Native +22/41 files checked 53% done +Checking sources/model/mtreatmenttime.cpp ... +Defines: +Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/configuration/ -I.//sources/canbus/ +Platform:Native +23/41 files checked 56% done Checking sources/storage/filehandler.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/configuration/ -I.//sources/canbus/ Platform:Native -16/24 files checked 66% done +24/41 files checked 58% done Checking sources/storage/logger.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/configuration/ -I.//sources/canbus/ Platform:Native Checking sources/storage/logger.cpp: QT_DEBUG... -17/24 files checked 70% done +25/41 files checked 60% done Checking sources/storage/settings.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/configuration/ -I.//sources/canbus/ Platform:Native -18/24 files checked 75% done +26/41 files checked 63% done Checking sources/storage/storageglobals.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/configuration/ -I.//sources/canbus/ Platform:Native -19/24 files checked 79% done +27/41 files checked 65% done Checking sources/storage/usbwatcher.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/configuration/ -I.//sources/canbus/ Platform:Native -20/24 files checked 83% done +28/41 files checked 68% done Checking sources/threads.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/configuration/ -I.//sources/canbus/ Platform:Native -21/24 files checked 87% done +29/41 files checked 70% done Checking sources/utility/crc.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/configuration/ -I.//sources/canbus/ Platform:Native -22/24 files checked 91% done +30/41 files checked 73% done Checking sources/utility/format.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/configuration/ -I.//sources/canbus/ Platform:Native -23/24 files checked 95% done +31/41 files checked 75% done Checking sources/utility/types.cpp ... Defines: Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/configuration/ -I.//sources/canbus/ Platform:Native -24/24 files checked 100% done +32/41 files checked 78% done +Checking sources/view/valarmstatus.cpp ... +Defines: +Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/configuration/ -I.//sources/canbus/ +Platform:Native +33/41 files checked 80% done +Checking sources/view/vpoweroff.cpp ... +Defines: +Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/configuration/ -I.//sources/canbus/ +Platform:Native +34/41 files checked 82% done +Checking sources/view/vtreatmentadjustmentsresponse.cpp ... +Defines: +Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/configuration/ -I.//sources/canbus/ +Platform:Native +35/41 files checked 85% done +Checking sources/view/vtreatmentbloodflow.cpp ... +Defines: +Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/configuration/ -I.//sources/canbus/ +Platform:Native +36/41 files checked 87% done +Checking sources/view/vtreatmentdialysateflow.cpp ... +Defines: +Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/configuration/ -I.//sources/canbus/ +Platform:Native +37/41 files checked 90% done +Checking sources/view/vtreatmentpressureocclusion.cpp ... +Defines: +Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/configuration/ -I.//sources/canbus/ +Platform:Native +38/41 files checked 92% done +Checking sources/view/vtreatmentranges.cpp ... +Defines: +Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/configuration/ -I.//sources/canbus/ +Platform:Native +39/41 files checked 95% done +Checking sources/view/vtreatmenttime.cpp ... +Defines: +Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/configuration/ -I.//sources/canbus/ +Platform:Native +40/41 files checked 97% done +Checking sources/view/vtreatmentultrafiltration.cpp ... +Defines: +Includes: -I.//sources/ -I.//sources/gui/ -I.//sources/storage/ -I.//sources/configuration/ -I.//sources/canbus/ +Platform:Native +41/41 files checked 100% done Index: denali.pro =================================================================== diff -u -rd3f916066c2d10c10fffa91fd8a7e5ac6dd86c7d -rd07ec81c7002ed2ac60c1dfc3101fb820e88211c --- denali.pro (.../denali.pro) (revision d3f916066c2d10c10fffa91fd8a7e5ac6dd86c7d) +++ denali.pro (.../denali.pro) (revision d07ec81c7002ed2ac60c1dfc3101fb820e88211c) @@ -26,6 +26,7 @@ #DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0 INCLUDEPATH += \ + common \ sources \ sources/model \ sources/view \ @@ -36,6 +37,8 @@ sources/abstract HEADERS += \ + common/AlarmDefs.h \ + common/MsgDefs.h \ sources/main.h \ sources/maintimer.h \ sources/model/mtreatmentadjustblooddialysateresponse.h \ Index: sources/canbus/messageinterpreter.cpp =================================================================== diff -u -r9d2940c9f09ace35e4e0501a61d46b6bdf789dab -rd07ec81c7002ed2ac60c1dfc3101fb820e88211c --- sources/canbus/messageinterpreter.cpp (.../messageinterpreter.cpp) (revision 9d2940c9f09ace35e4e0501a61d46b6bdf789dab) +++ sources/canbus/messageinterpreter.cpp (.../messageinterpreter.cpp) (revision d07ec81c7002ed2ac60c1dfc3101fb820e88211c) @@ -66,13 +66,10 @@ bool ok = true; vPayload.clear(); int l = vData.length(); - quint8 ix = 0; switch (vActionId) { // notice we are in transmit mode case Gui::GuiActionType::PowerOff: - ix = static_cast(Gui::GuiActionIndx::PowerOff_Response); - if (l >= ix + 1) { - quint8 tmp = vData[ix].toUInt(); - vPayload += tmp; + if (l >= 1) { + vPayload += vData[0].toUInt(); } else { QString mActionIdHexString = Format::toHexString(vActionId); LOG_ERROR(tr("Incorrect data for Message ID (UI) '%1'").arg(mActionIdHexString)); Index: sources/gui/guiglobals.cpp =================================================================== diff -u -rd3f916066c2d10c10fffa91fd8a7e5ac6dd86c7d -rd07ec81c7002ed2ac60c1dfc3101fb820e88211c --- sources/gui/guiglobals.cpp (.../guiglobals.cpp) (revision d3f916066c2d10c10fffa91fd8a7e5ac6dd86c7d) +++ sources/gui/guiglobals.cpp (.../guiglobals.cpp) (revision d07ec81c7002ed2ac60c1dfc3101fb820e88211c) @@ -36,7 +36,6 @@ { qRegisterMetaType ("GuiActionType" ); qRegisterMetaType ("GuiActionData" ); - qRegisterMetaType ("GuiActionIndx" ); qRegisterMetaType ("GuiAlarmID" ); qRegisterMetaType ("GuiAlarmPriority"); Index: sources/gui/guiglobals.h =================================================================== diff -u -rd3f916066c2d10c10fffa91fd8a7e5ac6dd86c7d -rd07ec81c7002ed2ac60c1dfc3101fb820e88211c --- sources/gui/guiglobals.h (.../guiglobals.h) (revision d3f916066c2d10c10fffa91fd8a7e5ac6dd86c7d) +++ sources/gui/guiglobals.h (.../guiglobals.h) (revision d07ec81c7002ed2ac60c1dfc3101fb820e88211c) @@ -20,6 +20,8 @@ // Qt #include +// Project + namespace Gui { extern QQuickView *_viewer; class GuiActions @@ -28,8 +30,21 @@ explicit GuiActions(); public: - enum /*class*/ GuiActionsType_Enum /*: quint16 QML doesn't support enum types */ { + /*! + * \brief The GuiActionsType_Enum enum + * \details + * *** This enum could use the Msg_IDs enum in MsgDefs.h, ***\n + * *** But that enum has values in BigEndian ***\n + * *** So it has to be converted each time it is refferenced. ***\n + * *** Since an enum is a constant value, ***\n + * *** I don't see any point in calculating it on each reference. ***\n + * *** Therefore I preffered to keep them as constant values ***\n + * *** Exactly as it is goint to be shown in denali messages ***\n + * *** then it can be compared exactly the way it is with no conversion.***\n + */ + enum GuiActionsType_Enum /*: quint16 QML doesn't support enum types */ { Unknown = 0x0000, + PowerOff = 0x0100, KeepAlive = 0x0700, BloodFlow = 0x0500, @@ -42,7 +57,7 @@ AlarmTriggered = 0x0300, AlarmCleared = 0x0400, - PressureOcclusion = 0x0900, // message 9 + PressureOcclusion = 0x0900, AdjustBloodDialysateReq = 0x1700, // 23 AdjustBloodDialysateRsp = 0x1800, // 24 @@ -54,12 +69,6 @@ Acknow = 0xFFFF, }; - enum class GuiActionsIndx_Enum { - // ---- PowerOff - PowerOff_ShowHide = 0 , - PowerOff_Response = 0 , - }; - enum class GuiActionsData_Enum /*: quint8 QML doesn't support*/ { NoData = 0x00, @@ -74,91 +83,25 @@ Timeout = 0x01, }; - enum GuiAlarmPriority_Enum { // TODO : this code has to be in common repository soon. - ALARM_PRIORITY_NONE = 0, - ALARM_PRIORITY_LOW, - ALARM_PRIORITY_MEDIUM, - ALARM_PRIORITY_HIGH, - NUM_OF_ALARM_PRIORITIES - }; - - enum GuiAlarmID_Enum { // TODO : this code has to be in common repository soon. - ALARM_ID_NO_ALARM = 0, - ALARM_ID_SOFTWARE_FAULT, - ALARM_ID_STUCK_BUTTON_TEST_FAILED, - ALARM_ID_FPGA_POST_TEST_FAILED, - ALARM_ID_WATCHDOG_POST_TEST_FAILED, - ALARM_ID_UI_COMM_POST_FAILED, // 5 - ALARM_ID_BLOOD_PUMP_MC_CURRENT_CHECK, - ALARM_ID_BLOOD_PUMP_MC_SPEED_CHECK, - ALARM_ID_BLOOD_PUMP_MC_DIRECTION_CHECK, - ALARM_ID_BLOOD_PUMP_ROTOR_SPEED_CHECK, - ALARM_ID_DIAL_IN_PUMP_MC_CURRENT_CHECK, // 10 - ALARM_ID_DIAL_IN_PUMP_MC_SPEED_CHECK, - ALARM_ID_DIAL_IN_PUMP_MC_DIRECTION_CHECK, - ALARM_ID_DIAL_IN_PUMP_ROTOR_SPEED_CHECK, - ALARM_ID_DIAL_OUT_PUMP_MC_CURRENT_CHECK, - ALARM_ID_DIAL_OUT_PUMP_MC_SPEED_CHECK, // 15 - ALARM_ID_DIAL_OUT_PUMP_MC_DIRECTION_CHECK, - ALARM_ID_DIAL_OUT_PUMP_ROTOR_SPEED_CHECK, - ALARM_ID_WATCHDOG_EXPIRED, - ALARM_ID_RTC_COMM_ERROR, - ALARM_ID_RTC_CONFIG_ERROR, // 20 - ALARM_ID_DG_COMM_TIMEOUT, - ALARM_ID_UI_COMM_TIMEOUT, - ALARM_ID_COMM_TOO_MANY_BAD_CRCS, - ALARM_ID_TREATMENT_STOPPED_BY_USER, - ALARM_ID_BLOOD_SITTING_WARNING, // 25 - ALARM_ID_BLOOD_SITTING_TOO_LONG_NO_RESUME, - ALARM_ID_BLOOD_SITTING_TOO_LONG_NO_RINSEBACK, - ALARM_ID_CAN_MESSAGE_NOT_ACKED, - ALARM_ID_OCCLUSION_BLOOD_PUMP, - ALARM_ID_OCCLUSION_DIAL_IN_PUMP, // 30 - ALARM_ID_OCCLUSION_DIAL_OUT_PUMP, - ALARM_ID_ARTERIAL_PRESSURE_LOW, - ALARM_ID_ARTERIAL_PRESSURE_HIGH, - ALARM_ID_VENOUS_PRESSURE_LOW, - ALARM_ID_VENOUS_PRESSURE_HIGH, // 35 - NUM_OF_ALARM_IDS - }; - - enum GuiRequestReasons_Enum - { - REASON_NONE = 0, ///< No reason. - REASON_NOT_ALLOWED_IN_CURRENT_MODE, ///< Request is not allowed in the current operating mode. - REASON_TIMEOUT_WAITING_FOR_USER_CONFIRM, ///< Validated request was not confirmed by user in reasonable time. - REASON_NOT_IN_TREATMENT_MODE, ///< Request is not allowed if not in treatment mode. - REASON_INVALID_TREATMENT_STATE, ///< Request is not allowed in current treatment state. - REASON_TREATMENT_TOO_CLOSE_TO_FINISHED, ///< Request is not allowed so near end of treatment. - REASON_TREATMENT_TIME_OUT_OF_RANGE, ///< Treatment duration is out of range. - REASON_TREATMENT_TIME_LESS_THAN_CURRENT, ///< Treatment time change is less than currently elapsed treatment time. - REASON_BLOOD_FLOW_OUT_OF_RANGE, ///< Blood flow is out of range. - REASON_DIAL_FLOW_OUT_OF_RANGE, ///< Dialysate flow is out of range. - REASON_DIAL_VOLUME_OUT_OF_RANGE, ///< Dialysate flow rate or treatment duration causes dialysate volume to exceed limit. - REASON_UF_VOLUME_OUT_OF_RANGE, ///< Ultrafiltration volume is out of range. - REASON_UF_RATE_OUT_OF_RANGE, ///< Ultrafiltration rate is out of range. - NUM_OF_REQUEST_REJECT_REASONS ///< Number of settings change reject codes. - }; - Q_ENUM(GuiActionsType_Enum) Q_ENUM(GuiActionsData_Enum) - Q_ENUM(GuiActionsIndx_Enum) - Q_ENUM(GuiAlarmPriority_Enum) - Q_ENUM(GuiAlarmID_Enum) + #include "AlarmDefs.h" + Q_ENUM(Alarm_Priorities) + Q_ENUM(Alarm_List ) - Q_ENUM(GuiRequestReasons_Enum) + #include "MsgDefs.h" + Q_ENUM(Request_Reject_Reasons) }; // to be able to use the enum as signal/slot parameter typedef GuiActions::GuiActionsType_Enum GuiActionType; typedef GuiActions::GuiActionsData_Enum GuiActionData; - typedef GuiActions::GuiActionsIndx_Enum GuiActionIndx; - typedef GuiActions::GuiAlarmPriority_Enum GuiAlarmPriority; - typedef GuiActions::GuiAlarmID_Enum GuiAlarmID; + typedef GuiActions::Alarm_Priorities GuiAlarmPriority; + typedef GuiActions::Alarm_List GuiAlarmID; - typedef GuiActions::GuiRequestReasons_Enum GuiRequestReasons; + typedef GuiActions::Request_Reject_Reasons GuiRequestReasons; void registerTypes(); void registerQmlTypes(); Index: sources/view/vtreatmentadjustmentsresponse.cpp =================================================================== diff -u -r31b9ae63410e7ca23f0f849e38368880e4c402b4 -rd07ec81c7002ed2ac60c1dfc3101fb820e88211c --- sources/view/vtreatmentadjustmentsresponse.cpp (.../vtreatmentadjustmentsresponse.cpp) (revision 31b9ae63410e7ca23f0f849e38368880e4c402b4) +++ sources/view/vtreatmentadjustmentsresponse.cpp (.../vtreatmentadjustmentsresponse.cpp) (revision d07ec81c7002ed2ac60c1dfc3101fb820e88211c) @@ -54,7 +54,7 @@ QString View::VTreatmentAdjustmentsResponse::text() { QString text; - if (_adjustment_Reason != GuiRequestReasons::REASON_NONE) + if (_adjustment_Reason != GuiRequestReasons::REQUEST_REJECT_REASON_NONE) text = reasonText(static_cast(_adjustment_Reason)); return text; } Index: unittests/tst_messaging.cpp =================================================================== diff -u -r5626bf604947efe5a80c9ca51802aab1a70a6939 -rd07ec81c7002ed2ac60c1dfc3101fb820e88211c --- unittests/tst_messaging.cpp (.../tst_messaging.cpp) (revision 5626bf604947efe5a80c9ca51802aab1a70a6939) +++ unittests/tst_messaging.cpp (.../tst_messaging.cpp) (revision d07ec81c7002ed2ac60c1dfc3101fb820e88211c) @@ -404,7 +404,6 @@ data += 0x08; data += 0x09; - qDebug() << data.length(); Can::FrameList framelist; Can::Sequence seq = 1; QVERIFY( bMsg.buildFrames(Gui::GuiActionType::String, data, framelist, seq));