Commite502e9f

committed

modified: library.properties

modified: src/finitestate.cppmodified: src/finitestate.h

1 parent68221ef commite502e9fCopy full SHA for e502e9f

File tree

-6

lines changed

-6

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`name=Finite-State`
`2`		`-version=1.5.0`
	`2`	`+version=1.6.0`
`3`	`3`	`author=Montree Hamarn, Natvalun Tavepontakul`
`4`	`4`	`maintainer=Montree Hamarn<montree.hamarn@gmail.com>`
`5`	`5`	`sentence=Finite-State Machine (FSM) for Arduino.`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -134,7 +134,7 @@ void FiniteState::InternalNextStateAction(const id_t id) {`
`134`	`134`	`}`
`135`	`135`
`136`	`136`	`voidFiniteState::InternalEntryAction(constid_t id) {`
`137`		`- _startTime =micros();`
	`137`	`+ _startTime =millis();`
`138`	`138`	`_timeout =false;`
`139`	`139`	`_eventArgs.id = id;`
`140`	`140`	`this->InternalEventHandler(ENTRY);`
`@@ -161,8 +161,8 @@ const TriState FiniteState::InternalTimer() {`
`161`	`161`
`162`	`162`	`constboolFiniteState::InternalTimeout() {`
`163`	`163`	`if (_timeout)returntrue;`
`164`		`-time_t elapsedTime =micros() - _startTime;`
`165`		`-if (elapsedTime <MS2US(_transitions[_eventArgs.id].delayTime))returnfalse;`
	`164`	`+time_t elapsedTime =millis() - _startTime;`
	`165`	`+if (elapsedTime < _transitions[_eventArgs.id].delayTime)returnfalse;`
`166`	`166`	`_timeout =true;`
`167`	`167`	`returntrue;`
`168`	`168`	`}`

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`
`13`	`13`	`#include"Arduino.h"`
`14`	`14`
`15`		`-#defineFINITE_STATE_VERSION"1.4.3"`
	`15`	`+#defineFINITE_STATE_VERSION"1.6.0"`
`16`	`16`	`#defineFINITE_STATE_AUTHOR"MicroBeaut"`
`17`	`17`
`18`	`18`	`#defineSTATE_TRANSITION_MIN1`
`@@ -62,7 +62,6 @@ typedef struct {`
`62`	`62`
`63`	`63`	`classFiniteState {`
`64`	`64`	`private:`
`65`		`-#defineMS2US(ms) (ms *1000UL)`
`66`	`65`	`Transition *_transitions;// Tranistion Pointer`
`67`	`66`	`uint8_t _size;// Number of Transitions`
`68`	`67`	`EventArgs _eventArgs;// Event Argument`

Comments

(0)