Skip to content

Commit 97f0ed8

Browse files
committed
8.0.4
1 parent 3cce8da commit 97f0ed8

File tree

2 files changed

+26
-7
lines changed

2 files changed

+26
-7
lines changed

qutest/qep_msm/src/tstsm.qm

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -890,7 +890,7 @@ QS_OBJ_DICTIONARY(&amp;TstSM2_inst);</action>
890890
<entry>//</entry>
891891
<exit>//</exit>
892892
<!--${SFs::TstSM5::SM::s1::s2::s3::s4::s5::s6::s7::s8::B}-->
893-
<tran trig="B" target="../../../../../../../../../2/1/0/0/1/1/0/0/0">
893+
<tran trig="B" target="../../../../../../../../../2/1/0/0/1/1/0/0/1">
894894
<tran_glyph conn="30,84,1,3,36">
895895
<action box="0,-2,10,2"/>
896896
</tran_glyph>
@@ -940,7 +940,7 @@ QS_OBJ_DICTIONARY(&amp;TstSM2_inst);</action>
940940
<entry>//</entry>
941941
<exit>//</exit>
942942
<!--${SFs::TstSM5::SM::t1::history}-->
943-
<history type="shallow" target="../1/0/0/1/1/0/0/0">
943+
<history type="shallow" target="../1/0/0/1/1/0/0/1">
944944
<history_glyph conn="50,73,3,3,16"/>
945945
</history>
946946
<!--${SFs::TstSM5::SM::t1::t2}-->
@@ -956,8 +956,8 @@ QS_OBJ_DICTIONARY(&amp;TstSM2_inst);</action>
956956
<entry>//</entry>
957957
<exit>//</exit>
958958
<!--${SFs::TstSM5::SM::t1::t2::t3::t4::D}-->
959-
<tran trig="D" target="../1/1/0/0/0">
960-
<tran_glyph conn="86,36,1,0,-12,34">
959+
<tran trig="D" target="../1/1/0/0">
960+
<tran_glyph conn="86,36,1,0,-12,26">
961961
<action box="-3,-2,10,2"/>
962962
</tran_glyph>
963963
</tran>
@@ -983,6 +983,12 @@ QS_OBJ_DICTIONARY(&amp;TstSM2_inst);</action>
983983
<state name="t8">
984984
<entry>//</entry>
985985
<exit>//</exit>
986+
<!--${SFs::TstSM5::SM::t1::t2::t3::t4::t5::t6::t7::t8::initial}-->
987+
<initial target="../1">
988+
<initial_glyph conn="75,67,5,0,-4,3">
989+
<action box="0,-2,10,2"/>
990+
</initial_glyph>
991+
</initial>
986992
<!--${SFs::TstSM5::SM::t1::t2::t3::t4::t5::t6::t7::t8::t9}-->
987993
<state name="t9">
988994
<exit>//</exit>

qutest/qep_msm/src/tstsm_sf.c

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -371,12 +371,13 @@ static QMState const TstSM5_t7_s = {
371371
static QState TstSM5_t8 (TstSM5 * const me, QEvt const * const e);
372372
static QState TstSM5_t8_e(TstSM5 * const me);
373373
static QState TstSM5_t8_x(TstSM5 * const me);
374+
static QState TstSM5_t8_i(TstSM5 * const me);
374375
static QMState const TstSM5_t8_s = {
375376
&TstSM5_t7_s, // superstate
376377
Q_STATE_CAST(&TstSM5_t8),
377378
Q_ACTION_CAST(&TstSM5_t8_e),
378379
Q_ACTION_CAST(&TstSM5_t8_x),
379-
Q_ACTION_NULL // no initial tran.
380+
Q_ACTION_CAST(&TstSM5_t8_i)
380381
};
381382
static QState TstSM5_t9 (TstSM5 * const me, QEvt const * const e);
382383
static QState TstSM5_t9_x(TstSM5 * const me);
@@ -1472,14 +1473,15 @@ static QState TstSM5_t4(TstSM5 * const me, QEvt const * const e) {
14721473
case D_SIG: {
14731474
static struct {
14741475
QMState const *target;
1475-
QActionHandler act[5];
1476+
QActionHandler act[6];
14761477
} const tatbl_ = { // tran-action table
1477-
&TstSM5_t9_s, // target state
1478+
&TstSM5_t8_s, // target state
14781479
{
14791480
Q_ACTION_CAST(&TstSM5_t5_e), // entry
14801481
Q_ACTION_CAST(&TstSM5_t6_e), // entry
14811482
Q_ACTION_CAST(&TstSM5_t7_e), // entry
14821483
Q_ACTION_CAST(&TstSM5_t8_e), // entry
1484+
Q_ACTION_CAST(&TstSM5_t8_i), // initial tran.
14831485
Q_ACTION_NULL // zero terminator
14841486
}
14851487
};
@@ -1604,6 +1606,17 @@ static QState TstSM5_t8_x(TstSM5 * const me) {
16041606
(void)me; // unused parameter
16051607
return QM_EXIT(&TstSM5_t8_s);
16061608
}
1609+
//${SFs::TstSM5::SM::t1::t2::t3::t4::t5::t6::t7::t8::initial}
1610+
static QState TstSM5_t8_i(TstSM5 * const me) {
1611+
//${SFs::TstSM5::SM::t1::t2::t3::t4::t5::t6::t7::t8::initial}
1612+
static QMTranActTable const tatbl_ = { // tran-action table
1613+
&TstSM5_t9_s, // target state
1614+
{
1615+
Q_ACTION_NULL // zero terminator
1616+
}
1617+
};
1618+
return QM_TRAN_INIT(&tatbl_);
1619+
}
16071620
//${SFs::TstSM5::SM::t1::t2::t3::t4::t5::t6::t7::t8}
16081621
static QState TstSM5_t8(TstSM5 * const me, QEvt const * const e) {
16091622
QState status_;

0 commit comments

Comments
 (0)