Index: sources/canbus/FrameInterface.cpp =================================================================== diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -ra58f91b077c8131bea3dbde0fc338adb113fc9f3 --- sources/canbus/FrameInterface.cpp (.../FrameInterface.cpp) (revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1) +++ sources/canbus/FrameInterface.cpp (.../FrameInterface.cpp) (revision a58f91b077c8131bea3dbde0fc338adb113fc9f3) @@ -74,11 +74,8 @@ */ void FrameInterface::quit() { - // disabled coco begin validated: Application termination is not correctly done in coco!!! - // it has been tested and works perfectly fine in normal run. quitThread(); // validated } -// disabled coco end /*! * \brief FrameInterface connections definition @@ -123,15 +120,11 @@ */ void FrameInterface::quitThread() { - // disabled coco begin validated: Application termination is not correctly done in coco!!! - // it has been tested and works perfectly fine in normal run. - if ( ! _thread ) return; // runs in thread moveToThread(qApp->thread()); // validated } -// disabled coco end /*! * \brief FrameInterface::transmitFrame @@ -172,12 +165,12 @@ FrameInterface::ChannelGroup channelGroup = ChannelGroup::eChannel_Unknown; switch (vFrameId) { - case eDialin_HD: - case eHD_Dialin: - case eDialin_DG: - case eDG_Dialin: - case eDialin_UI: - case eUI_Dialin: + case eDialin_TD : + case eTD_Dialin : + case eDialin_DD : + case eDD_Dialin : + case eDialin_UI : + case eUI_Dialin : if ( gDisableDialinUnhandled ) { channelGroup = ChannelGroup::eChannel_Ignores; } else { @@ -187,45 +180,41 @@ ok = ! gDisableDialinUnhandled; // if ok is true then it will be interpreted as unhandled messages. break; - case eChlid_HD_DG : - channelGroup = ChannelGroup::eChannel_Ignores; - break; - // disabled coco begin validated: The HD/DG communication has not been defined and implemented yet. - case eChlid_DG_HD : - // disabled coco end - // this channel is used for DG CheckIn for HW support and testing for now. + // these channels will be used for testing for now. + case eChlid_TD_DD : + case eChlid_DD_TD : + case eChlid_DD_FP : + case eChlid_FP_DD : //channelGroup = ChannelGroup::eChannel_Ignores; //break; - case eChlid_HD_UI : - case eChlid_HD_Alarm : - case eChlid_HD_Sync : - // disabled coco begin validated: The UI/DG communication has not been defined and implemented yet. - case eChlid_DG_Alarm : - case eChlid_DG_UI : - case eChlid_DG_Sync : - // disabled coco end - //case eChlid_DG_UI : // has duplicate value as eChlid_DG_Alarm + case eChlid_TD_UI : + case eChlid_TD_Alarm : + case eChlid_TD_Sync : + //case eChlid_DD_UI : // has duplicate value as eChlid_DD_Sync + case eChlid_DD_Alarm : + case eChlid_DD_Sync : + //case eChlid_FP_UI : // Only in α, will be removed in ꞵ + case eChlid_FP_Alarm : // Only in α, will be removed in ꞵ + case eChlid_FP_Sync : // Only in α, will be removed in ꞵ channelGroup = ChannelGroup::eChannel_Listens; break; - // disabled coco begin validated: The UI Alarm and Sync messages has not been defined and implemented yet. - case eChlid_UI_Alarm : - case eChlid_UI_Sync : - //case eChlid_UI_DG : + case eChlid_UI_Alarm : + case eChlid_UI_Sync : + case eChlid_UI_TD : + //case eChlid_UI_DD : // has duplicate value as eChlid_UI_Sync channelGroup = ChannelGroup::eChannel_Outputs; break; - // disabled coco end + default: ok = false; break; } - // disabled coco begin validated: manually tested if (vOK) *vOK = ok; if (vDebugChanngel) *vDebugChanngel = debugChannel; - // disabled coco end return channelGroup; } @@ -317,15 +306,11 @@ void FrameInterface::trnsmtHead() { if ( _txFrameList.isEmpty() ) { - // disabled coco begin validated: This is a fake data generator for CANBus missing/swapped frames Testing - // will never be executed on the product and shall be removed after the CANBus issues has been resolved. - // has been tested manually if ( gSendEmptyKeepAwake ) { transmitFrame(eChlid_LOWEST,QByteArray()); // Keep the CANBus awake. return; } } - // disabled coco end else { Frame frame = _txFrameList.first(); transmitFrame(frame.can_Id, frame.data); @@ -356,7 +341,6 @@ */ void FrameInterface::appendHead(Can_Id vCan_Id, const QByteArray &vData) { - // disabled coco begin validated: has been manually tested by sending over 4000 frames and not received by any other node. //DEBUG qDebug() << "F " << _txFrameList.count(); if (_txFrameList.count() >= _txFrameList_Max) { static quint32 i = 0; @@ -366,7 +350,6 @@ if ( i < UINT32_MAX - 1 ) i++ ; else i = 0; return; - // disabled coco end } Frame frame = Frame(vCan_Id, vData);