Index: main.cpp =================================================================== diff -u -r2437559b2d4cd4c2ac6a926b4f55652e55e1f616 -r36740a3ee8e7164e70d8627b057624ec0ef1eb8f --- main.cpp (.../main.cpp) (revision 2437559b2d4cd4c2ac6a926b4f55652e55e1f616) +++ main.cpp (.../main.cpp) (revision 36740a3ee8e7164e70d8627b057624ec0ef1eb8f) @@ -68,7 +68,7 @@ const char *gFakeData_default = "00" ; bool gSendEmptyKeepAwake = false ; bool gFakeSeqAtBegin = false ; -bool gDisableHunhandledReport = false ; +bool gDisableUnhandledReport = false ; bool gConsoleoutFrameInterface = false ; bool gConsoleoutCanInterface = false ; @@ -140,17 +140,17 @@ parser.addOption(optionFakeSeqAtBegin); // --- -u : disable-unhandled-report - QCommandLineOption optionDisableHunhandledReport(QStringList() << "u" << "disable-unhandled-report", + QCommandLineOption optionDisableUnhandledReport(QStringList() << "u" << "disable-unhandled-report", QCoreApplication::translate("main", "Disable unhandled messages report as an error in the log")); - parser.addOption(optionDisableHunhandledReport); + parser.addOption(optionDisableUnhandledReport); // --- parse command lines parser.process(*qApp); gConsoleoutCanInterface = parser.isSet(optionConsoleoutCanInterface ); gConsoleoutFrameInterface = parser.isSet(optionConsoleoutFrameInterface ); - gDisableHunhandledReport = parser.isSet(optionDisableHunhandledReport ); + gDisableUnhandledReport = parser.isSet(optionDisableUnhandledReport ); if (parser.isSet(optionSendEmptyKeepAwake)) gSendEmptyKeepAwake = true; bool ok = false; Index: sources/canbus/messageinterpreter.cpp =================================================================== diff -u -r30f83b2813e68ae3c2806399bf808b642c215b67 -r36740a3ee8e7164e70d8627b057624ec0ef1eb8f --- sources/canbus/messageinterpreter.cpp (.../messageinterpreter.cpp) (revision 30f83b2813e68ae3c2806399bf808b642c215b67) +++ sources/canbus/messageinterpreter.cpp (.../messageinterpreter.cpp) (revision 36740a3ee8e7164e70d8627b057624ec0ef1eb8f) @@ -106,7 +106,7 @@ */ void MessageInterpreter::printUnhandled(const Message &vMessage) const { - if ( gDisableHunhandledReport ) return; + if ( gDisableUnhandledReport ) return; QString mActionIdHexString = Format::toHexString(vMessage.actionId, false, eLenMessageIDDigits); QString logMessage = tr("Unhandled Message ID (HD)") + '\n' + QString("%1 # %2 %3") Index: sources/main.h =================================================================== diff -u -r9cfaddcf21cf36ab5a948b65dd8ef659598a4ed7 -r36740a3ee8e7164e70d8627b057624ec0ef1eb8f --- sources/main.h (.../main.h) (revision 9cfaddcf21cf36ab5a948b65dd8ef659598a4ed7) +++ sources/main.h (.../main.h) (revision 36740a3ee8e7164e70d8627b057624ec0ef1eb8f) @@ -43,7 +43,7 @@ extern const char*gFakeData_default; extern bool gSendEmptyKeepAwake; extern bool gFakeSeqAtBegin; -extern bool gDisableHunhandledReport; +extern bool gDisableUnhandledReport; //--------------------------------------------------------------------------------// //--------------------------------------------------------------------------------// #define DEBUG_PROPERTY_CHANGED(vVARIABLE) //qDebug() << "#" << #vVARIABLE << v##vVARIABLE; Index: unittests/tst_acknow.cpp =================================================================== diff -u -rb798668f16ad0967ab97e96f5f9a2cdd821e899f -r36740a3ee8e7164e70d8627b057624ec0ef1eb8f --- unittests/tst_acknow.cpp (.../tst_acknow.cpp) (revision b798668f16ad0967ab97e96f5f9a2cdd821e899f) +++ unittests/tst_acknow.cpp (.../tst_acknow.cpp) (revision 36740a3ee8e7164e70d8627b057624ec0ef1eb8f) @@ -22,8 +22,8 @@ using namespace Can; -tst_acknow::tst_acknow(QObject *parent) -{ +tst_acknow::tst_acknow(QObject *parent) { + Q_UNUSED(parent) } /*! @@ -69,7 +69,7 @@ */ void tst_acknow::tst_AcknowModel_Receive_Normal() { - _action = Gui::GuiActionType::PowerOff; + _action = Gui::GuiActionType::ID_PowerOff; _data = {0}; QCanBusFrame mFrame; QString mPayload; @@ -88,7 +88,7 @@ void tst_acknow::tst_AcknowModel_Receive_Acknow() { _expected = "A5.01.00.FF.FF.00.19.00"; - _action = Gui::GuiActionType::PowerOff; + _action = Gui::GuiActionType::ID_PowerOff; _data = {0}; QCanBusFrame mFrame; QString mPayload; @@ -106,7 +106,7 @@ void tst_acknow::tst_AcknowModel_Transmit_Normal() { _expected = "A5.02.00.07.00.00.74.00"; - _MessageDispatcher.onActionTransmit(Gui::GuiActionType::KeepAlive, {}); + _MessageDispatcher.onActionTransmit(Gui::GuiActionType::ID_KeepAlive, {}); QVERIFY(_emited); } @@ -117,13 +117,13 @@ void tst_acknow::tst_AcknowModel_Transmit_Acknow() { QCOMPARE( _MessageAcknowModel._acknowList.count(), 0 ); - _MessageDispatcher._needsAcknow.append(Gui::GuiActionType::KeepAlive); + _MessageDispatcher._needsAcknow.append(Gui::GuiActionType::ID_KeepAlive); _expected = "A5.FD.FF.07.00.00.30.00"; Sequence sequence = 3; - _MessageDispatcher.actionTransmit(Gui::GuiActionType::KeepAlive, {}, sequence); + _MessageDispatcher.actionTransmit(Gui::GuiActionType::ID_KeepAlive, {}, sequence); QCOMPARE( _MessageAcknowModel._acknowList.count(), 1 ); QVERIFY(_emited); - _MessageDispatcher._needsAcknow.removeOne(Gui::GuiActionType::KeepAlive); + _MessageDispatcher._needsAcknow.removeOne(Gui::GuiActionType::ID_KeepAlive); } /*! @@ -133,7 +133,7 @@ void tst_acknow::tst_AcknowModel_onAcknowReceive_Correct() { QCOMPARE( _MessageAcknowModel._acknowList.count(), 1 ); - _action = Gui::GuiActionType::KeepAlive; + _action = Gui::GuiActionType::ID_KeepAlive; _data = {0}; QCanBusFrame mFrame; QString mPayload; @@ -191,7 +191,7 @@ void tst_acknow::onFramesTransmit(Can_Id vCan_Id, Sequence vSequence, const FrameList &vFrameList) { - qDebug() << vCan_Id << vSequence << vFrameList; + qDebug() << quint16(vCan_Id) << vSequence << vFrameList; } void tst_acknow::onFailedTransmit(Sequence) Index: unittests/tst_canbus.cpp =================================================================== diff -u -r6ae83fa9a1a3204864fc5b50fe906ac09e9c1ea5 -r36740a3ee8e7164e70d8627b057624ec0ef1eb8f --- unittests/tst_canbus.cpp (.../tst_canbus.cpp) (revision 6ae83fa9a1a3204864fc5b50fe906ac09e9c1ea5) +++ unittests/tst_canbus.cpp (.../tst_canbus.cpp) (revision 36740a3ee8e7164e70d8627b057624ec0ef1eb8f) @@ -84,7 +84,7 @@ void tst_canbus::tst_FrameInterface_ActionTransmit_KeepAlive() { _expected = "A5.01.00.07.00.00.30.00"; - _MessageDispatcher.onActionTransmit(Gui::GuiActionType::idKeepAlive, {}); + _MessageDispatcher.onActionTransmit(Gui::GuiActionType::ID_KeepAlive, {}); QVERIFY(_emited); } @@ -99,23 +99,23 @@ { _expected = "A5.02.00.01.00.01.01.F0"; QVariantList mData {static_cast(Gui::GuiActionData::Accepted)}; - _MessageDispatcher.onActionTransmit(Gui::GuiActionType::idPowerOff, mData); + _MessageDispatcher.onActionTransmit(Gui::GuiActionType::ID_PowerOff, mData); QVERIFY(_emited); } void tst_canbus::tst_FrameInterface_ActionTransmit_PowerOff_Rejected() { _expected = "A5.03.00.01.00.01.02.F4"; QVariantList mData {static_cast(Gui::GuiActionData::Rejected)}; - _MessageDispatcher.onActionTransmit(Gui::GuiActionType::idPowerOff, mData); + _MessageDispatcher.onActionTransmit(Gui::GuiActionType::ID_PowerOff, mData); QVERIFY(_emited); } void tst_canbus::tst_FrameInterface_ActionTransmit_PowerOff() { _expected = "A5.04.00.01.00.01.00.02"; QVariantList mData {static_cast(Gui::GuiActionData::NoData)}; - _MessageDispatcher.onActionTransmit(Gui::GuiActionType::idPowerOff, mData); + _MessageDispatcher.onActionTransmit(Gui::GuiActionType::ID_PowerOff, mData); QVERIFY(_emited); } @@ -126,28 +126,28 @@ _expected = "A5.05.00.FF.FE.01.41.18"; // A QVariantList mData {"A"}; - _MessageDispatcher.onActionTransmit(Gui::GuiActionType::idRawData, mData); + _MessageDispatcher.onActionTransmit(Gui::GuiActionType::ID_RawData, mData); QVERIFY(_emited); } void tst_canbus::tst_FrameInterface_ActionTransmit_ShortPayload() { _expected = "A5.06.00.01.00.00.00.00"; QVariantList mData {}; - _MessageDispatcher.onActionTransmit(Gui::GuiActionType::idPowerOff, mData); + _MessageDispatcher.onActionTransmit(Gui::GuiActionType::ID_PowerOff, mData); QVERIFY(! _emited); // not emitted due to short payload len } void tst_canbus::tst_FrameInterface_ActionTransmit_Unknown() { _expected = ""; - _MessageDispatcher.onActionTransmit(Gui::GuiActionType::idUnknown, {}); + _MessageDispatcher.onActionTransmit(Gui::GuiActionType::ID_Unknown, {}); QVERIFY( ! _emited ); // should not emit the signal due to unknown action } void tst_canbus::tst_FrameInterface_FrameReceived_PowerOff() { - _action = Gui::GuiActionType::idPowerOff; + _action = Gui::GuiActionType::ID_PowerOff; _data = {0}; QCanBusFrame mFrame; QString mPayload; @@ -160,7 +160,7 @@ void tst_canbus::tst_FrameInterface_FrameReceived_PowerOff_Timeout() { - _action = Gui::GuiActionType::idPowerOff; + _action = Gui::GuiActionType::ID_PowerOff; _data = {1}; QCanBusFrame mFrame; QString mPayload; @@ -173,7 +173,7 @@ void tst_canbus::tst_FrameInterface_FrameReceived_Channel_NotListen() { - _action = Gui::GuiActionType::idPowerOff; + _action = Gui::GuiActionType::ID_PowerOff; _data = {1}; QCanBusFrame mFrame; QString mPayload; @@ -186,7 +186,7 @@ void tst_canbus::tst_FrameInterface_FrameReceived_Channel_Incorrect() { - _action = Gui::GuiActionType::idPowerOff; + _action = Gui::GuiActionType::ID_PowerOff; _data = {1}; QCanBusFrame mFrame; QString mPayload; @@ -199,7 +199,7 @@ void tst_canbus::tst_FrameInterface_FrameReceived_CRC_Error() { - _action = Gui::GuiActionType::idPowerOff; + _action = Gui::GuiActionType::ID_PowerOff; _data = {0}; QCanBusFrame mFrame; QString mPayload; @@ -212,7 +212,7 @@ void tst_canbus::tst_FrameInterface_FrameReceived_ShortFrame_Error() { - _action = Gui::GuiActionType::idPowerOff; + _action = Gui::GuiActionType::ID_PowerOff; _data = {0}; QCanBusFrame mFrame; QString mPayload; @@ -225,7 +225,7 @@ void tst_canbus::tst_FrameInterface_FrameReceived_LongFrame_Error() { - _action = Gui::GuiActionType::idPowerOff; + _action = Gui::GuiActionType::ID_PowerOff; _data = {0}; QCanBusFrame mFrame; QString mPayload; @@ -238,7 +238,7 @@ void tst_canbus::tst_FrameInterface_FrameReceived_LongFrame_BloodFlow() { - _action = Gui::GuiActionType::idBloodFlow; + _action = Gui::GuiActionType::ID_BloodFlow; _data = { -400, -397.50f, -26.20f, -2000.00f, -2002.50f, 648.75f, 62.50f }; QCanBusFrame mFrame; mFrame.setFrameId(Can_Id::eChlid_HD_Sync); @@ -258,7 +258,7 @@ void tst_canbus::tst_FrameInterface_FrameReceived_LongFrame_BloodFlow_LessData() { - _action = Gui::GuiActionType::idBloodFlow; + _action = Gui::GuiActionType::ID_BloodFlow; _data = { -400, -397.50f, -26.20f, -2000.00f, -2002.50f, 648.75f, 62.50f }; QCanBusFrame mFrame; mFrame.setFrameId(Can_Id::eChlid_HD_Sync); @@ -277,7 +277,7 @@ void tst_canbus::tst_FrameInterface_FrameReceived_LongFrame_AlarmStatus() { - _action = Gui::GuiActionType::idAlarmStatus; + _action = Gui::GuiActionType::ID_AlarmStatus; _data = { 2, 10, 60, 30, false,true ,false,false, // 0100 true ,false,false,false, // 1000 @@ -301,7 +301,7 @@ void tst_canbus::tst_FrameInterface_FrameReceived_LongFrame_AlarmStatus_LessData() { - _action = Gui::GuiActionType::idAlarmStatus; + _action = Gui::GuiActionType::ID_AlarmStatus; _data = { 2, 10, 60, 30, false,true ,false,false, // 0100 true ,false,false,false, // 1000 Index: unittests/tst_logging.cpp =================================================================== diff -u -r6ae83fa9a1a3204864fc5b50fe906ac09e9c1ea5 -r36740a3ee8e7164e70d8627b057624ec0ef1eb8f --- unittests/tst_logging.cpp (.../tst_logging.cpp) (revision 6ae83fa9a1a3204864fc5b50fe906ac09e9c1ea5) +++ unittests/tst_logging.cpp (.../tst_logging.cpp) (revision 36740a3ee8e7164e70d8627b057624ec0ef1eb8f) @@ -39,7 +39,7 @@ QCOMPARE( _Logger.init(), ! _Logger.init() ); QString mContent; FileHandler::read(_Logger._logFileName, mContent); - QCOMPARE(mContent, "Event: , Storage::Logger Initialized\n"); + QCOMPARE(mContent, ",E,UI,Storage::Logger Initialized\n"); } void tst_logging::cleanup() @@ -59,15 +59,15 @@ LOG_EVENT("1 - Event log has been created"); QString mContent; FileHandler::read(_Logger._logFileName, mContent); - QCOMPARE(mContent, "Event: , 1 - Event log has been created\n"); + QCOMPARE(mContent, ",E,1 - Event log has been created\n"); } void tst_logging::logDatum() { LOG_DATUM("3 - Datum log has been created"); QString mContent; FileHandler::read(_Logger._logFileName, mContent); - QCOMPARE(mContent, "Datum: , 3 - Datum log has been created\n"); + QCOMPARE(mContent, ",D,3 - Datum log has been created\n"); } void tst_logging::logError() @@ -87,12 +87,12 @@ "Error: , 4 - Datum log has been created\n"); } -void tst_logging::logError_gDisableHunhandledReport_False() +void tst_logging::logError_gDisableUnhandledReport_False() { - gDisableHunhandledReport = false; + gDisableUnhandledReport = false; Can::MessageInterpreter iMsg; Can::Message msg; - msg.actionId = Gui::GuiActionType::idAlarmTriggered; + msg.actionId = Gui::GuiActionType::ID_AlarmTriggered; msg.data = {}; iMsg.printUnhandled(msg); QString mContent; @@ -102,12 +102,12 @@ QCOMPARE(lines.first(), "Error: , Unhandled Message ID (HD)"); } -void tst_logging::logError_gDisableHunhandledReport_True() +void tst_logging::logError_gDisableUnhandledReport_True() { - gDisableHunhandledReport = true; + gDisableUnhandledReport = true; Can::MessageInterpreter iMsg; Can::Message msg; - msg.actionId = Gui::GuiActionType::idAlarmTriggered; + msg.actionId = Gui::GuiActionType::ID_AlarmTriggered; msg.data = {}; iMsg.printUnhandled(msg); QString mContent; @@ -117,10 +117,10 @@ void tst_logging::logError_Unhandled_TreatmentState() { - gDisableHunhandledReport = false; + gDisableUnhandledReport = false; Can::MessageInterpreter iMsg; Can::Message msg; - msg.actionId = Gui::GuiActionType::idTreatmentState; + msg.actionId = Gui::GuiActionType::ID_TreatmentState; msg.data = {}; QVariantList vData {}; QVERIFY(iMsg.interpretMessage_HD(msg, vData)); Index: unittests/tst_logging.h =================================================================== diff -u -rb798668f16ad0967ab97e96f5f9a2cdd821e899f -r36740a3ee8e7164e70d8627b057624ec0ef1eb8f --- unittests/tst_logging.h (.../tst_logging.h) (revision b798668f16ad0967ab97e96f5f9a2cdd821e899f) +++ unittests/tst_logging.h (.../tst_logging.h) (revision 36740a3ee8e7164e70d8627b057624ec0ef1eb8f) @@ -44,8 +44,8 @@ void logDatum(); void logUnknown(); - void logError_gDisableHunhandledReport_False(); - void logError_gDisableHunhandledReport_True(); + void logError_gDisableUnhandledReport_False(); + void logError_gDisableUnhandledReport_True (); void logError_Unhandled_TreatmentState(); Index: unittests/tst_messaging.cpp =================================================================== diff -u -r6ae83fa9a1a3204864fc5b50fe906ac09e9c1ea5 -r36740a3ee8e7164e70d8627b057624ec0ef1eb8f --- unittests/tst_messaging.cpp (.../tst_messaging.cpp) (revision 6ae83fa9a1a3204864fc5b50fe906ac09e9c1ea5) +++ unittests/tst_messaging.cpp (.../tst_messaging.cpp) (revision 36740a3ee8e7164e70d8627b057624ec0ef1eb8f) @@ -32,10 +32,10 @@ { Can::MessageInterpreter iMsg; Can::Message msg; - msg.actionId = Gui::GuiActionType::idAdjustBloodDialysateReq; + msg.actionId = Gui::GuiActionType::ID_AdjustBloodDialysateReq; msg.data = {}; - QVERIFY( iMsg.isType(msg, Gui::GuiActionType::AdjustBloodDialysateReq)); - QVERIFY(! iMsg.isType(msg, Gui::GuiActionType::BloodFlow)); + QVERIFY( iMsg.isType(msg, Gui::GuiActionType::ID_AdjustBloodDialysateReq)); + QVERIFY(! iMsg.isType(msg, Gui::GuiActionType::ID_BloodFlow)); } /*! @@ -46,9 +46,9 @@ { Can::MessageInterpreter iMsg; Can::Message msg; - msg.actionId = Gui::GuiActionType::idAdjustBloodDialysateReq; + msg.actionId = Gui::GuiActionType::ID_AdjustBloodDialysateReq; msg.data = {}; - QVERIFY( ! iMsg.isPayloadLenValid(msg, Gui::GuiActionType::AdjustBloodDialysateReq)); + QVERIFY( ! iMsg.isPayloadLenValid(msg, Gui::GuiActionType::ID_AdjustBloodDialysateReq)); } /*! @@ -72,11 +72,11 @@ { Can::MessageInterpreter iMsg; Can::Message msg; - msg.actionId = Gui::GuiActionType::idUnknown; + msg.actionId = Gui::GuiActionType::ID_Unknown; msg.data = {}; Model::MPowerOff data; data.fromByteArray(msg.data); - QVERIFY( ! iMsg.getPowerOffData(msg, data)); + QVERIFY( ! iMsg.powerOff(msg, data)); } /*! @@ -87,7 +87,7 @@ { Can::MessageInterpreter iMsg; Can::Message msg; - msg.actionId = Gui::GuiActionType::idPowerOff; + msg.actionId = Gui::GuiActionType::ID_PowerOff; msg.data = {}; Model::MPowerOff data; data.fromByteArray(msg.data); @@ -102,7 +102,7 @@ { Can::MessageInterpreter iMsg; Can::Message msg; - msg.actionId = Gui::GuiActionType::idPowerOff; + msg.actionId = Gui::GuiActionType::ID_PowerOff; msg.data = {}; QVariantList data; QVERIFY( ! iMsg.powerOffData(msg, data)); @@ -116,7 +116,7 @@ { Can::MessageInterpreter iMsg; Can::Message msg; - msg.actionId = Gui::GuiActionType::idUnknown; + msg.actionId = Gui::GuiActionType::ID_Unknown; msg.data = {}; Model::MBloodFlow data; data.fromByteArray(msg.data); @@ -131,7 +131,7 @@ { Can::MessageInterpreter iMsg; Can::Message msg; - msg.actionId = Gui::GuiActionType::idBloodFlow; + msg.actionId = Gui::GuiActionType::ID_BloodFlow; msg.data = {}; Model::MBloodFlow data; data.fromByteArray(msg.data); @@ -146,7 +146,7 @@ { Can::MessageInterpreter iMsg; Can::Message msg; - msg.actionId = Gui::GuiActionType::idBloodFlow; + msg.actionId = Gui::GuiActionType::ID_BloodFlow; msg.data = {}; QVariantList data; QVERIFY( ! iMsg.bloodFlowData(msg, data)); @@ -161,7 +161,7 @@ { Can::MessageInterpreter iMsg; Can::Message msg; - msg.actionId = Gui::GuiActionType::idUnknown; + msg.actionId = Gui::GuiActionType::ID_Unknown; msg.data = {}; Model::MDialysateFlow data; data.fromByteArray(msg.data); @@ -176,7 +176,7 @@ { Can::MessageInterpreter iMsg; Can::Message msg; - msg.actionId = Gui::GuiActionType::idDialysateInletFlow; + msg.actionId = Gui::GuiActionType::ID_DialysateInletFlow; msg.data = {}; Model::MDialysateFlow data; data.fromByteArray(msg.data); @@ -191,7 +191,7 @@ { Can::MessageInterpreter iMsg; Can::Message msg; - msg.actionId = Gui::GuiActionType::idDialysateInletFlow; + msg.actionId = Gui::GuiActionType::ID_DialysateInletFlow; msg.data = {}; QVariantList data; QVERIFY( ! iMsg.dialysateInletFlowData(msg, data)); @@ -206,7 +206,7 @@ { Can::MessageInterpreter iMsg; Can::Message msg; - msg.actionId = Gui::GuiActionType::idUnknown; + msg.actionId = Gui::GuiActionType::ID_Unknown; msg.data = {}; Model::MOutletFlow data; data.fromByteArray(msg.data); @@ -221,7 +221,7 @@ { Can::MessageInterpreter iMsg; Can::Message msg; - msg.actionId = Gui::GuiActionType::idDialysateOutletFlow; + msg.actionId = Gui::GuiActionType::ID_DialysateOutletFlow; msg.data = {}; Model::MOutletFlow data; data.fromByteArray(msg.data); @@ -236,7 +236,7 @@ { Can::MessageInterpreter iMsg; Can::Message msg; - msg.actionId = Gui::GuiActionType::idDialysateOutletFlow; + msg.actionId = Gui::GuiActionType::ID_DialysateOutletFlow; msg.data = {}; QVariantList data; QVERIFY( ! iMsg.dialysateOutletFlowData(msg, data)); @@ -251,7 +251,7 @@ { Can::MessageInterpreter iMsg; Can::Message msg; - msg.actionId = Gui::GuiActionType::idUnknown; + msg.actionId = Gui::GuiActionType::ID_Unknown; msg.data = {}; Model::MTreatmentTime data; data.fromByteArray(msg.data); @@ -266,7 +266,7 @@ { Can::MessageInterpreter iMsg; Can::Message msg; - msg.actionId = Gui::GuiActionType::idTreatmentTime; + msg.actionId = Gui::GuiActionType::ID_TreatmentTime; msg.data = {}; Model::MTreatmentTime data; data.fromByteArray(msg.data); @@ -281,7 +281,7 @@ { Can::MessageInterpreter iMsg; Can::Message msg; - msg.actionId = Gui::GuiActionType::idTreatmentTime; + msg.actionId = Gui::GuiActionType::ID_TreatmentTime; msg.data = {}; QVariantList data; QVERIFY( ! iMsg.treatmentTime(msg, data)); @@ -296,7 +296,7 @@ { Can::MessageInterpreter iMsg; Can::Message msg; - msg.actionId = Gui::GuiActionType::idUnknown; + msg.actionId = Gui::GuiActionType::ID_Unknown; msg.data = {}; Model::MAlarmStatus data; data.fromByteArray(msg.data); @@ -311,7 +311,7 @@ { Can::MessageInterpreter iMsg; Can::Message msg; - msg.actionId = Gui::GuiActionType::idAlarmStatus; + msg.actionId = Gui::GuiActionType::ID_AlarmStatus; msg.data = {}; Model::MAlarmStatus data; data.fromByteArray(msg.data); @@ -326,7 +326,7 @@ { Can::MessageInterpreter iMsg; Can::Message msg; - msg.actionId = Gui::GuiActionType::idAlarmStatus; + msg.actionId = Gui::GuiActionType::ID_AlarmStatus; msg.data = {}; QVariantList data; QVERIFY( ! iMsg.alarmStatus(msg, data)); @@ -341,7 +341,7 @@ { Can::MessageInterpreter iMsg; Can::Message msg; - msg.actionId = Gui::GuiActionType::idUnknown; + msg.actionId = Gui::GuiActionType::ID_Unknown; msg.data = {}; Model::MPressureOcclusion data; data.fromByteArray(msg.data); @@ -356,7 +356,7 @@ { Can::MessageInterpreter iMsg; Can::Message msg; - msg.actionId = Gui::GuiActionType::idPressureOcclusion; + msg.actionId = Gui::GuiActionType::ID_PressureOcclusion; msg.data = {}; Model::MPressureOcclusion data; data.fromByteArray(msg.data); @@ -371,7 +371,7 @@ { Can::MessageInterpreter iMsg; Can::Message msg; - msg.actionId = Gui::GuiActionType::idPressureOcclusion; + msg.actionId = Gui::GuiActionType::ID_PressureOcclusion; msg.data = {}; QVariantList data; QVERIFY( ! iMsg.pressureOcclusionData(msg, data)); @@ -386,7 +386,7 @@ { Can::MessageInterpreter iMsg; Can::Message msg; - msg.actionId = Gui::GuiActionType::idUnknown; + msg.actionId = Gui::GuiActionType::ID_Unknown; msg.data = {}; QVariantList list; QVERIFY( ! iMsg.adjustBloodDialysateData(msg, list)); @@ -400,7 +400,7 @@ { Can::MessageInterpreter iMsg; Can::Message msg; - msg.actionId = Gui::GuiActionType::idAdjustBloodDialysateRsp; + msg.actionId = Gui::GuiActionType::ID_AdjustBloodDialysateRsp; msg.data = {}; QVariantList list; QVERIFY( ! iMsg.adjustBloodDialysateData(msg, list)); @@ -414,7 +414,7 @@ { Can::MessageInterpreter iMsg; Can::Message msg; - msg.actionId = Gui::GuiActionType::idUnknown; + msg.actionId = Gui::GuiActionType::ID_Unknown; msg.data = {}; QVariantList list; QVERIFY( ! iMsg.adjustDurationData(msg, list)); @@ -428,7 +428,7 @@ { Can::MessageInterpreter iMsg; Can::Message msg; - msg.actionId = Gui::GuiActionType::idAdjustDurationRsp; + msg.actionId = Gui::GuiActionType::ID_AdjustDurationRsp; msg.data = {}; QVariantList list; QVERIFY( ! iMsg.adjustDurationData(msg, list)); @@ -442,7 +442,7 @@ { Can::MessageInterpreter iMsg; Can::Message msg; - msg.actionId = Gui::GuiActionType::idUnknown; + msg.actionId = Gui::GuiActionType::ID_Unknown; msg.data = {}; QVariantList list; QVERIFY( ! iMsg.adjustUltrafiltrationStateData(msg, list)); @@ -456,7 +456,7 @@ { Can::MessageInterpreter iMsg; Can::Message msg; - msg.actionId = Gui::GuiActionType::idAdjustUltrafiltrationStateReq; + msg.actionId = Gui::GuiActionType::ID_AdjustUltrafiltrationStateReq; msg.data = {}; QVariantList list; QVERIFY( ! iMsg.adjustUltrafiltrationStateData(msg, list)); @@ -470,7 +470,7 @@ { Can::MessageInterpreter iMsg; Can::Message msg; - msg.actionId = Gui::GuiActionType::idUnknown; + msg.actionId = Gui::GuiActionType::ID_Unknown; msg.data = {}; QVariantList list; QVERIFY( ! iMsg.adjustUltrafiltrationEditData(msg, list)); @@ -484,7 +484,7 @@ { Can::MessageInterpreter iMsg; Can::Message msg; - msg.actionId = Gui::GuiActionType::idAdjustUltrafiltrationEditRsp; + msg.actionId = Gui::GuiActionType::ID_AdjustUltrafiltrationEditRsp; msg.data = {}; QVariantList list; QVERIFY( ! iMsg.adjustUltrafiltrationEditData(msg, list)); @@ -498,7 +498,7 @@ { Can::MessageInterpreter iMsg; Can::Message msg; - msg.actionId = Gui::GuiActionType::idUnknown; + msg.actionId = Gui::GuiActionType::ID_Unknown; msg.data = {}; QVariantList list; QVERIFY( ! iMsg.adjustUltrafiltrationConfirmData(msg, list)); @@ -512,7 +512,7 @@ { Can::MessageInterpreter iMsg; Can::Message msg; - msg.actionId = Gui::GuiActionType::idAdjustUltrafiltrationConfirmRsp; + msg.actionId = Gui::GuiActionType::ID_AdjustUltrafiltrationConfirmRsp; msg.data = {}; QVariantList list; QVERIFY( ! iMsg.adjustUltrafiltrationConfirmData(msg, list)); @@ -526,7 +526,7 @@ { Can::MessageInterpreter iMsg; Can::Message msg; - msg.actionId = Gui::GuiActionType::idUnknown; + msg.actionId = Gui::GuiActionType::ID_Unknown; msg.data = {}; QVariantList list; QVERIFY( ! iMsg.treatmentRangesData(msg, list)); @@ -540,7 +540,7 @@ { Can::MessageInterpreter iMsg; Can::Message msg; - msg.actionId = Gui::GuiActionType::idTreatmentRanges; + msg.actionId = Gui::GuiActionType::ID_TreatmentRanges; msg.data = {}; QVariantList list; QVERIFY( ! iMsg.treatmentRangesData(msg, list)); @@ -554,7 +554,7 @@ { Can::MessageInterpreter iMsg; Can::Message msg; - msg.actionId = Gui::GuiActionType::idUnknown; + msg.actionId = Gui::GuiActionType::ID_Unknown; msg.data = {}; QVariantList list; QVERIFY( ! iMsg.dgLoadCellReadingsData(msg, list)); @@ -568,7 +568,7 @@ { Can::MessageInterpreter iMsg; Can::Message msg; - msg.actionId = Gui::GuiActionType::DGLoadCellReadingsData; + msg.actionId = Gui::GuiActionType::ID_DGLoadCellReadingsData; msg.data = {}; QVariantList list; QVERIFY( ! iMsg.dgLoadCellReadingsData(msg, list)); @@ -582,7 +582,7 @@ { Can::MessageInterpreter iMsg; Can::Message msg; - msg.actionId = Gui::GuiActionType::idUnknown; + msg.actionId = Gui::GuiActionType::ID_Unknown; msg.data = {}; QVariantList list; QVERIFY( ! iMsg.dgTemperaturesData(msg, list)); @@ -596,7 +596,7 @@ { Can::MessageInterpreter iMsg; Can::Message msg; - msg.actionId = Gui::GuiActionType::DGTemperaturesData; + msg.actionId = Gui::GuiActionType::ID_DGTemperaturesData; msg.data = {}; QVariantList list; QVERIFY( ! iMsg.dgTemperaturesData(msg, list)); @@ -610,7 +610,7 @@ { Can::MessageInterpreter iMsg; Can::Message msg; - msg.actionId = Gui::GuiActionType::idUnknown; + msg.actionId = Gui::GuiActionType::ID_Unknown; msg.data = {}; QVariantList list; QVERIFY( ! iMsg.canbusFaultCountData(msg, list)); @@ -624,7 +624,7 @@ { Can::MessageInterpreter iMsg; Can::Message msg; - msg.actionId = Gui::GuiActionType::idCANBusFaultCount; + msg.actionId = Gui::GuiActionType::ID_CANBusFaultCount; msg.data = {}; QVariantList list; QVERIFY( ! iMsg.canbusFaultCountData(msg, list)); @@ -639,7 +639,7 @@ { Can::MessageInterpreter iMsg; QByteArray payload; - QVERIFY(iMsg.interpretMessage(Gui::GuiActionType::String, {}, payload)); + QVERIFY(iMsg.interpretMessage(Gui::GuiActionType::ID_RawData, {}, payload)); QVERIFY(payload.isEmpty()); } @@ -664,7 +664,7 @@ { Can::MessageInterpreter iMsg; QByteArray payload; - QVERIFY(iMsg.interpretMessage(Gui::GuiActionType::AdjustBloodDialysateReq, {}, payload)); + QVERIFY(iMsg.interpretMessage(Gui::GuiActionType::ID_AdjustBloodDialysateReq, {}, payload)); QVERIFY(payload.isEmpty()); } @@ -677,7 +677,7 @@ { Can::MessageInterpreter iMsg; QByteArray payload; - QVERIFY(iMsg.interpretMessage(Gui::GuiActionType::AdjustDurationReq, {}, payload)); + QVERIFY(iMsg.interpretMessage(Gui::GuiActionType::ID_AdjustDurationReq, {}, payload)); QVERIFY(payload.isEmpty()); } @@ -690,7 +690,7 @@ { Can::MessageInterpreter iMsg; QByteArray payload; - QVERIFY(iMsg.interpretMessage(Gui::GuiActionType::AdjustUltrafiltrationStateReq, {}, payload)); + QVERIFY(iMsg.interpretMessage(Gui::GuiActionType::ID_AdjustUltrafiltrationStateReq, {}, payload)); QVERIFY(payload.isEmpty()); } @@ -703,7 +703,7 @@ { Can::MessageInterpreter iMsg; QByteArray payload; - QVERIFY(iMsg.interpretMessage(Gui::GuiActionType::AdjustUltrafiltrationEditReq, {}, payload)); + QVERIFY(iMsg.interpretMessage(Gui::GuiActionType::ID_AdjustUltrafiltrationEditReq, {}, payload)); QVERIFY(payload.isEmpty()); } @@ -716,7 +716,7 @@ { Can::MessageInterpreter iMsg; QByteArray payload; - QVERIFY(iMsg.interpretMessage(Gui::GuiActionType::AdjustUltrafiltrationConfirmReq, {}, payload)); + QVERIFY(iMsg.interpretMessage(Gui::GuiActionType::ID_AdjustUltrafiltrationConfirmReq, {}, payload)); QVERIFY(payload.isEmpty()); } @@ -729,7 +729,7 @@ { Can::MessageInterpreter iMsg; Can::Message msg; - msg.actionId = Gui::GuiActionType::idCANBusFaultCount; + msg.actionId = Gui::GuiActionType::ID_CANBusFaultCount; msg.data = {}; QVariantList data; QVERIFY( ! iMsg.canbusFaultCountData(msg, data)); @@ -743,7 +743,7 @@ { Can::MessageBuilder bMsg; QByteArray payload; - QVERIFY( ! bMsg.addActionId(payload, Gui::GuiActionType::Unknown)); + QVERIFY( ! bMsg.addActionId(payload, Gui::GuiActionType::ID_Unknown)); QVERIFY( payload.isEmpty()); } @@ -757,7 +757,7 @@ { Can::MessageBuilder bMsg; QByteArray payload; - QVERIFY( ! bMsg.addData(payload, Gui::GuiActionType::PowerOff, {})); + QVERIFY( ! bMsg.addData(payload, Gui::GuiActionType::ID_PowerOff, {})); QVERIFY( payload.isEmpty()); } @@ -774,7 +774,7 @@ for (int i = 0; i<= Can::eLenMaxData + 1; i++ ) { data += i; } - QVERIFY(bMsg.addData(payload, Gui::GuiActionType::String, data)); + QVERIFY(bMsg.addData(payload, Gui::GuiActionType::ID_RawData, data)); QVERIFY( ! payload.isEmpty()); } @@ -811,7 +811,7 @@ QByteArray data; Can::FrameList framelist; Can::Sequence seq = 1; - QVERIFY( ! bMsg.buildFrames(Gui::GuiActionType::Unknown, data, framelist, seq)); + QVERIFY( ! bMsg.buildFrames(Gui::GuiActionType::ID_Unknown, data, framelist, seq)); } /*! @@ -824,7 +824,7 @@ QByteArray data; Can::FrameList framelist; Can::Sequence seq = 1; - QVERIFY( ! bMsg.buildFrames(Gui::GuiActionType::PowerOff, data, framelist, seq)); + QVERIFY( ! bMsg.buildFrames(Gui::GuiActionType::ID_PowerOff, data, framelist, seq)); } /*! @@ -847,7 +847,7 @@ Can::FrameList framelist; Can::Sequence seq = 1; - QVERIFY( bMsg.buildFrames(Gui::GuiActionType::String, data, framelist, seq)); + QVERIFY( bMsg.buildFrames(Gui::GuiActionType::ID_RawData, data, framelist, seq)); } /*! @@ -859,6 +859,6 @@ Can::MessageDispatcher dMsg; QVariantList data; Can::Sequence seq = 1; - dMsg.actionTransmit(Gui::GuiActionType::idAdjustBloodDialysateReq, data, seq); + dMsg.actionTransmit(Gui::GuiActionType::ID_AdjustBloodDialysateReq, data, seq); }