Index: unittests/tst_canbus.cpp =================================================================== diff -u -r0ec11323cb0a379804d3623893c5823baaaf80a4 -r2df3974863afc21b288e566426600d6738bc9fca --- unittests/tst_canbus.cpp (.../tst_canbus.cpp) (revision 0ec11323cb0a379804d3623893c5823baaaf80a4) +++ unittests/tst_canbus.cpp (.../tst_canbus.cpp) (revision 2df3974863afc21b288e566426600d6738bc9fca) @@ -84,7 +84,7 @@ void tst_canbus::tst_FrameInterface_ActionTransmit_KeepAlive() { - _expected = "A5.01.00.07.00.00.30.00"; + _expected = "A5.FF.FF.07.00.00.A7.00"; _MessageDispatcher.onActionTransmit(Gui::GuiActionType::ID_KeepAlive, {}); QVERIFY(_emited); } @@ -239,16 +239,36 @@ void tst_canbus::tst_FrameInterface_FrameReceived_LongFrame_BloodFlow() { + + /* + * | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description | + * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:-----------: | + * |0x0500| 0x040 | 7 | 1 Hz | N | HD | All | Blood Flow Data | + * + * | Payload || + * | || + * | #1 :(S32) | \ref Data::mFlowSetPoint | + * | #2 :(F32) | \ref Data::mMeasuredFlow | + * | #3 :(F32) | \ref Data::mRotorSpeed | + * | #4 :(F32) | \ref Data::mMotorSpeed | + * | #5 :(F32) | \ref Data::mMotorCtlSpeed | + * | #6 :(F32) | \ref Data::mMotorCtlCurrent | + * | #7 :(F32) | \ref Data::mPWMDutyCycle | + * | #8 :(U32) | \ref Data::mRotorCount | + * | #9 :(U32) | \ref Data::mPresFlow | + * | #10:(U32) | \ref Data::mRotorHall | + */ _action = Gui::GuiActionType::ID_BloodFlow; - _data = { -400, -397.50f, -26.20f, -2000.00f, -2002.50f, 648.75f, 62.50f }; + _data = { -400, -397.50f, -26.20f, -2000.00f, -2002.50f, 648.75f, 62.50f, 201, 202, 203 }; QCanBusFrame mFrame; mFrame.setFrameId(Can_Id::eChlid_HD_Sync); QStringList mPayloadList { - "a5.0a.00.05.00.1c.70.fe" , - "ff.ff.00.c0.c6.c3.9a.99" , - "d1.c1.00.00.fa.c4.00.50" , - "fa.c4.00.30.22.44.00.00" , - "7a.42.fb.00.00.00.00.00" , + "A5.02.00.05.00.28.70.FE" , + "FF.FF.00.C0.C6.C3.9A.99" , + "D1.C1.00.00.FA.C4.00.50" , + "FA.C4.00.30.22.44.00.00" , + "7A.42.C9.00.00.00.CA.00" , + "00.00.CB.00.00.00.6F.00" , }; for ( QString payload : mPayloadList ) { mFrame.setPayload(QByteArray::fromHex(payload.remove(QLatin1Char('.')).toLatin1()));