Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Feature/hierarchical state machine with test #162

Merged
merged 13 commits into from
Oct 31, 2019
Merged

Feature/hierarchical state machine with test #162

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
18f8c11
Added new profiles to project files
jwellbelove Oct 7, 2019
5a8c653
Fixed strict aliasing bug for -O3 optimisation in etl::pool
jwellbelove Oct 9, 2019
034f5d1
Merge remote-tracking branch 'origin/hotfix/pool_strict_aliasing_bug'…
jwellbelove Oct 9, 2019
e47eef4
Fixed strict aliasing bug for -O3 optimisation in etl::pool
jwellbelove Oct 9, 2019
512ab63
Changed STL alternate namespace to always be 'etlstd'.
jwellbelove Oct 10, 2019
02f7326
Changed STL alternate namespace to always be 'etlstd'.
jwellbelove Oct 10, 2019
480b60b
Merge remote-tracking branch 'origin/feature/change_stl_alternate_nam…
jwellbelove Oct 10, 2019
71efdd5
Changed STL alternate namespace to always be 'etlstd'.
jwellbelove Oct 10, 2019
e5325aa
Fixed incorrect result for negative float to string
jwellbelove Oct 11, 2019
1784561
Merge remote-tracking branch 'origin/hotfix/incorrect_negative_float_…
jwellbelove Oct 11, 2019
054be6b
Added unit test for hsm
delfigon Oct 28, 2019
5750a87
Merge branch 'master' into feature/hierarchical_state_machine
delfigon Oct 28, 2019
ff5009d
Beautifying and removing unneccessary code
Oct 28, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions examples/HierarchicalStateMachine/testhsm.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ typedef etl::state::Composite<State_machine, 0> Top;
typedef etl::state::Composite<State_machine, 1, Top, message::E> S0;
typedef etl::state::Composite<State_machine, 2, S0, message::A, message::B,
message::C, message::D, message::F> S1;
typedef etl::state::Leaf <State_machine, 3, S1, message::G> S11;
typedef etl::state::Leaf <State_machine, 3, S1, message::G, message::H> S11;
typedef etl::state::Composite<State_machine, 4, S0, message::C, message::F> S2;
typedef etl::state::Composite<State_machine, 5, S2, message::B, message::H> S21;
typedef etl::state::Leaf <State_machine, 6, S21, message::D, message::G> S211;
Expand Down Expand Up @@ -286,6 +286,18 @@ on_event(etl::imessage_router &, test::message::G const &, test::State_machine &
std::cout << "Tran(S11, S211, G) - ";
}

template<>
template<typename LEAF>
inline void test::state::S11::
on_event(etl::imessage_router &, test::message::H const &, test::State_machine & h, LEAF const & l) const
{
if (h.foo())
{
h.foo(0);
std::cout << "h[foo]/foo=0 - ";
}
}

/******************************************************************************
* S2
******************************************************************************/
Expand Down Expand Up @@ -364,7 +376,7 @@ on_event(etl::imessage_router &, test::message::H const &, test::State_machine &
{
if (!h.foo()) {
etl::state::Transition<LEAF, Self, test::state::S21> t(h);
std::cout << "!foo/Tran(S21, S21, H) - ";
std::cout << "h[!foo]/foo=1 - ";
h.foo(1);
}
}
Expand Down
Loading