Fisheye: Tag f91ee3bac4f77fc7a0fe8d122c8c49b34b6984ec refers to a dead (removed) revision in file `dry-demo-states.scxml'. Fisheye: No comparison available. Pass `N' to diff? Index: drydemo.pro =================================================================== diff -u -r581c95962cdb9ce7728e8def1e51556548d02244 -rf91ee3bac4f77fc7a0fe8d122c8c49b34b6984ec --- drydemo.pro (.../drydemo.pro) (revision 581c95962cdb9ce7728e8def1e51556548d02244) +++ drydemo.pro (.../drydemo.pro) (revision f91ee3bac4f77fc7a0fe8d122c8c49b34b6984ec) @@ -1,4 +1,4 @@ -QT += qml quick serialbus concurrent charts bluetooth +QT += qml quick serialbus concurrent charts bluetooth scxml # TODO clean up CONFIG += c++17 warn_on # CONFIG += disable-desktop # QMAKE_CXX = clazy @@ -395,4 +395,4 @@ ui_build_history.log STATECHARTS += \ - dry-demo-states.scxml + drydemostates.scxml Index: drydemo.pro.user =================================================================== diff -u -rfe9459548d7b0f6c1d8cb77c0e23d7a385b48fa2 -rf91ee3bac4f77fc7a0fe8d122c8c49b34b6984ec --- drydemo.pro.user (.../drydemo.pro.user) (revision fe9459548d7b0f6c1d8cb77c0e23d7a385b48fa2) +++ drydemo.pro.user (.../drydemo.pro.user) (revision f91ee3bac4f77fc7a0fe8d122c8c49b34b6984ec) @@ -1,6 +1,6 @@ - + EnvironmentId Index: drydemostates.scxml =================================================================== diff -u --- drydemostates.scxml (revision 0) +++ drydemostates.scxml (revision f91ee3bac4f77fc7a0fe8d122c8c49b34b6984ec) @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + Index: main.cpp =================================================================== diff -u -r581c95962cdb9ce7728e8def1e51556548d02244 -rf91ee3bac4f77fc7a0fe8d122c8c49b34b6984ec --- main.cpp (.../main.cpp) (revision 581c95962cdb9ce7728e8def1e51556548d02244) +++ main.cpp (.../main.cpp) (revision f91ee3bac4f77fc7a0fe8d122c8c49b34b6984ec) @@ -48,6 +48,8 @@ #include "Threads.h" +#include "drydemostates.h" + // kernel #include @@ -506,6 +508,23 @@ signal(SIGTERM, signalhandler); #endif + drydemostates dryStates; + + qDebug() << "Here"; + + //dryStates.start(); + + dryStates.connectToState("Idle", QScxmlStateMachine::onEntry([&]() { + qDebug() << "In onEntry"; + QThread::sleep(4); + dryStates.submitEvent("Tx_Start_Rqst");})); + + dryStates.connectToState("Idle", QScxmlStateMachine::onExit([&] { + qDebug() << "Exiting";})); + + dryStates.connectToState("Treatment", QScxmlStateMachine::onEntry([&]() { + qDebug() << "In Treatment";})); + // setting the environment for the keyboard. qputenv("QT_IM_MODULE" , QByteArray("qtvirtualkeyboard" )); qputenv("QT_VIRTUALKEYBOARD_STYLE" , QByteArray("denali" )); Index: sources/canbus/CanInterface.cpp =================================================================== diff -u -r80b8371f1a93481e05302cef6e474db802fda153 -rf91ee3bac4f77fc7a0fe8d122c8c49b34b6984ec --- sources/canbus/CanInterface.cpp (.../CanInterface.cpp) (revision 80b8371f1a93481e05302cef6e474db802fda153) +++ sources/canbus/CanInterface.cpp (.../CanInterface.cpp) (revision f91ee3bac4f77fc7a0fe8d122c8c49b34b6984ec) @@ -58,7 +58,7 @@ .arg(tr("%1 Initialized").arg(metaObject()->className())) .arg(status()); //OG_DEBUG(logMessage); // TODO is this needed? - + qDebug() << logMessage; return true; } Index: sources/canbus/FrameInterface.cpp =================================================================== diff -u -r80b8371f1a93481e05302cef6e474db802fda153 -rf91ee3bac4f77fc7a0fe8d122c8c49b34b6984ec --- sources/canbus/FrameInterface.cpp (.../FrameInterface.cpp) (revision 80b8371f1a93481e05302cef6e474db802fda153) +++ sources/canbus/FrameInterface.cpp (.../FrameInterface.cpp) (revision f91ee3bac4f77fc7a0fe8d122c8c49b34b6984ec) @@ -264,7 +264,7 @@ Can_Id mCan_Id = static_cast(mFrameId); emit didFrameReceive(mCan_Id, vFrame.payload()); -} + } /*! * \brief FrameInterface::onFrameTransmit Index: sources/canbus/MessageBuilder.cpp =================================================================== diff -u -r80b8371f1a93481e05302cef6e474db802fda153 -rf91ee3bac4f77fc7a0fe8d122c8c49b34b6984ec --- sources/canbus/MessageBuilder.cpp (.../MessageBuilder.cpp) (revision 80b8371f1a93481e05302cef6e474db802fda153) +++ sources/canbus/MessageBuilder.cpp (.../MessageBuilder.cpp) (revision f91ee3bac4f77fc7a0fe8d122c8c49b34b6984ec) @@ -260,6 +260,7 @@ vMessage.can_id = vCan_Id; vMessage.head = getHeader (mPayload); // keep header before taking it out of the payload. does not affect payload vMessage.sequence = getSequence (mPayload); + vMessage.actionId = getActionId (mPayload); vMessage.length = getLength (mPayload); vMessage.data = getData (mPayload, vMessage.length); vMessage.initialized = true; Index: sources/canbus/MessageDispatcher.cpp =================================================================== diff -u -r80b8371f1a93481e05302cef6e474db802fda153 -rf91ee3bac4f77fc7a0fe8d122c8c49b34b6984ec --- sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision 80b8371f1a93481e05302cef6e474db802fda153) +++ sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision f91ee3bac4f77fc7a0fe8d122c8c49b34b6984ec) @@ -162,6 +162,7 @@ // TODO : must be moved to a MessageModel class if (mMessage.isComplete()) { rxCount(); + qDebug() << " On dispatch"; #ifdef DEBUG_OUT_OF_SYNC if (_rxSequence != mMessage.sequence) { qDebug() << tr("Out of Sync : %1 , %2").arg(_rxSequence).arg(mMessage.sequence); Index: sources/canbus/MessageGlobals.h =================================================================== diff -u -r80b8371f1a93481e05302cef6e474db802fda153 -rf91ee3bac4f77fc7a0fe8d122c8c49b34b6984ec --- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 80b8371f1a93481e05302cef6e474db802fda153) +++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision f91ee3bac4f77fc7a0fe8d122c8c49b34b6984ec) @@ -126,6 +126,7 @@ Can_Id can_id = eChlid_NONE; Sequence sequence = 0; // seq 0 is invalid int length = 0; + int actionId = 0; QByteArray head; QByteArray data; bool initialized = false; @@ -143,6 +144,7 @@ // Since the crc is part of the data and there is no message without crc // then a message would never be empty. // It is preferred to keep it as is so that the initialization is independent of data. + //qDebug() << data.length() << length; return !isEmpty() && data.length() == length; // disabled coco end } Index: sources/canbus/MessageInterpreter.cpp =================================================================== diff -u -r80b8371f1a93481e05302cef6e474db802fda153 -rf91ee3bac4f77fc7a0fe8d122c8c49b34b6984ec --- sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision 80b8371f1a93481e05302cef6e474db802fda153) +++ sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision f91ee3bac4f77fc7a0fe8d122c8c49b34b6984ec) @@ -121,6 +121,7 @@ QString mActionIdHexString = Format::toHexString(0); Q_UNUSED(mActionIdHexString); Q_UNUSED(len); + qDebug() << "In paylod valid"; /*if ( ! payloadLen.contains(vType) ) { LOG_DEBUG(QString("Undefined data length for received Message with ID '%1'").arg(mActionIdHexString)); // TODO is this needed? return false; @@ -144,6 +145,7 @@ */ void MessageInterpreter::logInvalidLength() { + qDebug() << "Paylod invalid"; //LOG_DEBUG(QString("Incorrect data length for transmit message with ID '%1'") // .arg(mActionIdHexString)); // TODO is this needed? } @@ -157,6 +159,7 @@ */ bool MessageInterpreter::isValidMessage(const Message &vMessage) const { + qDebug() << "Is valid message"; Q_UNUSED(vMessage); //if ( ! isType (vMessage, vType) ) return false; //if ( ! isPayloadLenValid(vMessage, vType) ) return false; @@ -197,6 +200,7 @@ */ bool MessageInterpreter::interpretMessage(const QVariantList &vData, QByteArray &vPayload, Can_Id &vCanId) { + qDebug() << "Interpret"; Q_UNUSED(vData); bool ok = true; if (vCanId == Can::Can_Id::eChlid_NONE ) @@ -302,12 +306,14 @@ bool MessageInterpreter::interpretMessage(const Message &vMessage, QVariantList &vData) { bool ok = false; - - switch (identifySource(vMessage.can_id)) { - case Can_Source::eCan_HD: ok = interpretMessage_HD(vMessage, vData); break; - case Can_Source::eCan_DG: ok = interpretMessage_DG(vMessage, vData); break; - default : printUnhandled (vMessage ); break; // ok is false, the individual interpreters for ?HD/DG should not be called, and it should be done here. - } + Q_UNUSED(vData); + qDebug() << "I am called"; + printUnhandled (vMessage ); + //switch (identifySource(vMessage.can_id)) { + //case Can_Source::eCan_HD: ok = interpretMessage_HD(vMessage, vData); break; + //case Can_Source::eCan_DG: ok = interpretMessage_DG(vMessage, vData); break; + //default : printUnhandled (vMessage ); break; // ok is false, the individual interpreters for ?HD/DG should not be called, and it should be done here. + //} return ok; } @@ -398,6 +404,7 @@ void MessageInterpreter::updateUnhandledMessages() { // TODO is this needed? + qDebug() << "Update"; } /*! @@ -469,6 +476,7 @@ } } //LOG_APPED(logString); // TODO is this needed? + qDebug() << "H" + logString; } else { //if ( gDisableUnhandledReport ) { // if the unhandled message error has been disabled, return.