Loop new implementation test@6

This commit is contained in:
xdrm-brackets 2017-09-28 11:01:40 +02:00
parent 5bd826c752
commit c7e046374a
1 changed files with 11 additions and 8 deletions

View File

@ -127,15 +127,11 @@
/* [2] Manage timeout /* [2] Manage timeout
=========================================================*/ =========================================================*/
/* (1) If already acted for this timeout -> abort */ /* (1) If no action for this @cur_timeout -> reset to 0 */
if( $last_to == $cur_timeout )
return false;
/* (2) If no action for this @cur_timeout -> reset to 0 */
if( !isset($actions[$cur_timeout]) || !is_array($actions[$cur_timeout]) ) if( !isset($actions[$cur_timeout]) || !is_array($actions[$cur_timeout]) )
return false; return false;
/* (3) fetch actions for the current @cur_timeout */ /* (2) fetch actions for the current @cur_timeout */
$actionlist = $actions[floor($cur_timeout)]; $actionlist = $actions[floor($cur_timeout)];
@ -153,7 +149,7 @@
} }
/* (4) If no action found -> abort */ /* (3) If no action found -> abort */
if( count($grantedFor) == 0 ){ if( count($grantedFor) == 0 ){
slog('user not granted to any action', 'rfid-read:loop'); slog('user not granted to any action', 'rfid-read:loop');
return false; return false;
@ -408,10 +404,17 @@
/* [4] Manage action /* [4] Manage action
=========================================================*/ =========================================================*/
/* (1) Try to process action */ /* (1) Calc real timeout (diff in sec. between now and first time card passed) */
$cur_timeout = floor(microtime(true) - $timeout); $cur_timeout = floor(microtime(true) - $timeout);
/* (2) If already acted for this timeout -> abort */
if( $last_to == $cur_timeout )
return false;
/* (3) Try to process action */
$performed = act($user, $cur_timeout); $performed = act($user, $cur_timeout);
/* (2) If performed -> update chip according to new state */ /* (2) If performed -> update chip according to new state */
if( $performed ){ if( $performed ){