Index: denali.pro.user =================================================================== diff -u -r2b00ad4142892e8d9e768ef58f139611e9d670c0 -rc12aef133e2c349ba1559a75135a55dd12b977c8 --- denali.pro.user (.../denali.pro.user) (revision 2b00ad4142892e8d9e768ef58f139611e9d670c0) +++ denali.pro.user (.../denali.pro.user) (revision c12aef133e2c349ba1559a75135a55dd12b977c8) @@ -1,14 +1,14 @@ - + EnvironmentId {67370740-e20f-4fc6-be45-6652e866a8bf} ProjectExplorer.Project.ActiveTarget - 1 + 0 ProjectExplorer.Project.EditorSettings Index: main.cpp =================================================================== diff -u -r2b00ad4142892e8d9e768ef58f139611e9d670c0 -rc12aef133e2c349ba1559a75135a55dd12b977c8 --- main.cpp (.../main.cpp) (revision 2b00ad4142892e8d9e768ef58f139611e9d670c0) +++ main.cpp (.../main.cpp) (revision c12aef133e2c349ba1559a75135a55dd12b977c8) @@ -61,10 +61,10 @@ } } -int gFakeInterval; -QString gFakeData; -bool gConsoleoutFrameInterface = false; -bool gConsoleoutCanInterface = false; +int gFakeInterval; +QByteArray gFakeData; +bool gConsoleoutFrameInterface = false; +bool gConsoleoutCanInterface = false; /*! * \brief enableFakeTestData @@ -84,8 +84,8 @@ if (ok) { gFakeInterval = interval; } - gFakeData = mLines[1]; - gFakeData = QByteArray::fromHex(gFakeData.toLatin1()); + gFakeData = mLines[1].toLatin1(); + gFakeData = QByteArray::fromHex(gFakeData); qDebug() << " ~~ !!!!! APPLICATION RUNNING IN THE TEST MODE !!!!! ~~ " ; LOG_EVENT(" \n ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ " " \n ~~ !!!!! APPLICATION RUNNING IN THE TEST MODE !!!!! ~~ " Index: sources/applicationcontroller.cpp =================================================================== diff -u -r2b00ad4142892e8d9e768ef58f139611e9d670c0 -rc12aef133e2c349ba1559a75135a55dd12b977c8 --- sources/applicationcontroller.cpp (.../applicationcontroller.cpp) (revision 2b00ad4142892e8d9e768ef58f139611e9d670c0) +++ sources/applicationcontroller.cpp (.../applicationcontroller.cpp) (revision c12aef133e2c349ba1559a75135a55dd12b977c8) @@ -236,8 +236,41 @@ { #ifndef DISABLE_KEEP_ALIVE QVariantList mData; + Types::U16 u16; + int fakeDataLen = gFakeData.length(); if (gFakeData.length()) { - mData += gFakeData; + QByteArray data; + if (fakeDataLen == 1 && gFakeData == QByteArray::fromHex("00")) { + static quint64 txCount = 0; + for (int i = 0; i < 13; i++) { + switch (i) { + case 0: + u16.value = txCount++; + data += u16.bytes[0]; + data += u16.bytes[1]; + break; + case 12: + for (int i = 0; i < 4; i++) { + data += (char)(0); + } + u16.value = txCount++; + data += u16.bytes[0]; + data += u16.bytes[1]; + break; + default: + for (int i = 0; i < 6; i++) { + data += (char)(0); + } + u16.value = txCount++; + data += u16.bytes[0]; + data += u16.bytes[1]; + break; + } + } + mData += QByteArray::fromHex(data.toHex()); + } else { + mData += gFakeData; + } } else { mData += static_cast(GuiActionData::NoData); } Index: sources/main.h =================================================================== diff -u -r2b00ad4142892e8d9e768ef58f139611e9d670c0 -rc12aef133e2c349ba1559a75135a55dd12b977c8 --- sources/main.h (.../main.h) (revision 2b00ad4142892e8d9e768ef58f139611e9d670c0) +++ sources/main.h (.../main.h) (revision c12aef133e2c349ba1559a75135a55dd12b977c8) @@ -41,5 +41,5 @@ return _instance; \ } -extern int gFakeInterval; -extern QString gFakeData; +extern int gFakeInterval; +extern QByteArray gFakeData; Index: sources/utility/format.cpp =================================================================== diff -u -rc6a09899d2e46dc0bda5a6b994aa257953626f97 -rc12aef133e2c349ba1559a75135a55dd12b977c8 --- sources/utility/format.cpp (.../format.cpp) (revision c6a09899d2e46dc0bda5a6b994aa257953626f97) +++ sources/utility/format.cpp (.../format.cpp) (revision c12aef133e2c349ba1559a75135a55dd12b977c8) @@ -43,9 +43,14 @@ QByteArray mData; if(vData.type() == QVariant::String) { mData += vData.toByteArray(); - } else { - mData += vData.toUInt(); + return mData; } + + if(vData.type() == QVariant::ByteArray) { + mData += vData.toByteArray(); + return mData; + } + + mData += vData.toUInt(); return mData; } -