Skip to content

Timed transition start time update #5

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Timed transition start time update #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0248127
Remove debug Serial.println(now)
corna Feb 28, 2016
b5b4a46
Update the timed transitions start time on every state change
corna Feb 28, 2016
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
31 changes: 18 additions & 13 deletions Fsm.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ void Fsm::add_timed_transition(State* state_from, State* state_to,

TimedTransition timed_transition;
timed_transition.transition = transition;
timed_transition.start = 0;
timed_transition.start = millis();
timed_transition.interval = interval;

m_timed_transitions = (TimedTransition*) realloc(
Expand Down Expand Up @@ -97,6 +97,7 @@ void Fsm::trigger(int event)
m_transitions[i].event == event)
{
m_current_state = m_transitions[i].make_transition();
update_timed_transitions_starts();
return;
}
}
Expand All @@ -110,19 +111,10 @@ void Fsm::check_timer()
TimedTransition* transition = &m_timed_transitions[i];
if (transition->transition.state_from == m_current_state)
{
if (transition->start == 0)
if (millis() - transition->start >= transition->interval)
{
transition->start = millis();
}
else
{
unsigned long now = millis();
Serial.println(now);
if (now - transition->start >= transition->interval)
{
m_current_state = transition->transition.make_transition();
transition->start = 0;
}
m_current_state = transition->transition.make_transition();
update_timed_transitions_starts();
}
}
}
Expand All @@ -143,3 +135,16 @@ State* Fsm::Transition::make_transition()

return state_to;
}

void Fsm::update_timed_transitions_starts()
{
const unsigned long millis_value = millis();

for (int i = 0; i < m_num_timed_transitions; ++i)
{
TimedTransition* transition = &m_timed_transitions[i];

if (transition->transition.state_from == m_current_state)
transition->start = millis_value;
}
}
1 change: 1 addition & 0 deletions Fsm.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ class Fsm

static Transition create_transition(State* state_from, State* state_to,
int event, void (*on_transition)());
void update_timed_transitions_starts();

private:
State* m_current_state;
Expand Down
1 change: 1 addition & 0 deletions LICENSE
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
The MIT License (MIT)

Copyright (c) 2016 Nicola Corna <nicola@corna.info>
Copyright (c) 2015 Jon Black

Permission is hereby granted, free of charge, to any person obtaining a copy
Expand Down