aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFredrik Gustafsson <[email protected]>2013-03-08 11:27:27 +0100
committerFredrik Gustafsson <[email protected]>2013-03-08 11:27:27 +0100
commit13a85e903600714ad4dcd0ce9828dee17ea19bf8 (patch)
tree3b08caa39fafd78c75b462bf36e65e3c0f766c5a
parent6586f8c192b44d12e7ed83e7ca3d10cbf836404f (diff)
parent02ee25e3cde4e1bec0b3724e28c2831508c98e6f (diff)
downloadotp-13a85e903600714ad4dcd0ce9828dee17ea19bf8.tar.gz
otp-13a85e903600714ad4dcd0ce9828dee17ea19bf8.tar.bz2
otp-13a85e903600714ad4dcd0ce9828dee17ea19bf8.zip
Merge branch 'maint'
-rw-r--r--system/doc/design_principles/fsm.xml13
1 files changed, 7 insertions, 6 deletions
diff --git a/system/doc/design_principles/fsm.xml b/system/doc/design_principles/fsm.xml
index edb2e20605..7decbb48cd 100644
--- a/system/doc/design_principles/fsm.xml
+++ b/system/doc/design_principles/fsm.xml
@@ -75,7 +75,7 @@ StateName(Event, StateData) ->
-export([init/1, locked/2, open/2]).
start_link(Code) ->
- gen_fsm:start_link({local, code_lock}, code_lock, Code, []).
+ gen_fsm:start_link({local, code_lock}, code_lock, lists:reverse(Code, []).
button(Digit) ->
gen_fsm:send_event(code_lock, {button, Digit}).
@@ -87,7 +87,7 @@ locked({button, Digit}, {SoFar, Code}) ->
case [Digit|SoFar] of
Code ->
do_unlock(),
- {next_state, open, {[], Code}, 3000};
+ {next_state, open, {[], Code}, 30000};
Incomplete when length(Incomplete)<length(Code) ->
{next_state, locked, {Incomplete, Code}};
_Wrong ->
@@ -106,7 +106,8 @@ open(timeout, State) ->
calling <c>code_lock:start_link(Code)</c>:</p>
<code type="none">
start_link(Code) ->
- gen_fsm:start_link({local, code_lock}, code_lock, Code, []).</code>
+ gen_fsm:start_link({local, code_lock}, code_lock, lists:reverse(Code), []).
+ </code>
<p><c>start_link</c> calls the function <c>gen_fsm:start_link/4</c>.
This function spawns and links to a new process, a gen_fsm.</p>
<list type="bulleted">
@@ -130,8 +131,8 @@ start_link(Code) ->
corresponding to one process contained in one module.</p>
</item>
<item>
- <p>The third argument, <c>Code</c>, is a term which is passed
- as-is to the callback function <c>init</c>. Here, <c>init</c>
+ <p>The third argument, <c>Code</c>, is a list of digits which is passed
+ reversed to the callback function <c>init</c>. Here, <c>init</c>
gets the correct code for the lock as indata.</p>
</item>
<item>
@@ -203,7 +204,7 @@ open(timeout, State) ->
<section>
<title>Timeouts</title>
- <p>When a correct code has been givened, the door is unlocked and
+ <p>When a correct code has been given, the door is unlocked and
the following tuple is returned from <c>locked/2</c>:</p>
<code type="none">
{next_state, open, {[], Code}, 30000};</code>