Merge branch '1.0-local' into 1.0

This commit is contained in:
xdrm-brackets 2017-02-23 17:10:59 +01:00
commit 5ef44b0e47
1 changed files with 2 additions and 2 deletions

View File

@ -165,6 +165,7 @@
/* (4) Check if the state allows the action to be performed */ /* (4) Check if the state allows the action to be performed */
for( $c = 0 ; $c < strlen($state) && $c < strlen($action['prev']) ; $c++ ){ for( $c = 0 ; $c < strlen($state) && $c < strlen($action['prev']) ; $c++ ){
//
// {1} 'X' = any state -> so ignore // // {1} 'X' = any state -> so ignore //
if( $action['prev'][$c] == 'X' ) if( $action['prev'][$c] == 'X' )
continue; continue;
@ -194,13 +195,12 @@
$action = $grantedFor[$toPerform]; $action = $grantedFor[$toPerform];
var_dump($action);
/* [5] Process the action on the STATE /* [5] Process the action on the STATE
=========================================================*/ =========================================================*/
/* (1) Update the state with the found action */ /* (1) Update the state with the found action */
for( $c = 0 ; $c < strlen($state) && $c < strlen($action['next']) ; $c++ ){ for( $c = 0 ; $c < strlen($state) && $c < strlen($action['next']) ; $c++ ){
slog($c.' - '.$action['next'][$c], 'mfrc522:loop');
// {1} If 'x' -> let the current state // // {1} If 'x' -> let the current state //
if( $action['next'][$c] == 'X' ) if( $action['next'][$c] == 'X' )
continue; continue;