ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 67 - Added auto stop timeout to mapped continuous control. 

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1665 e3e1d417-86f3-4887-817a-d78f3d33393f
This commit is contained in:
stan 2005-12-08 17:11:33 +00:00
parent 448c61efa5
commit d3ca56ab96
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
web/zm_actions.php
View File

@ -435,6 +435,7 @@ if ( isset($action) )
break;
}
$slow = 0.9; // Threshold for slow speed/timeouts
$turbo = 0.9; // Threshold for turbo speed
$blind = 0.1; // Threshold for blind spot
@ -515,11 +516,20 @@ if ( isset($action) )
{
$ctrl_command .= " --tiltspeed=".$tilt_speed;
}
if ( $monitor['AutoStopTimeout'] )
{
$slow_pan_speed = intval(round($monitor['MinPanSpeed']+(($monitor['MaxPanSpeed']-$monitor['MinPanSpeed'])*$slow)));
$slow_tilt_speed = intval(round($monitor['MinTiltSpeed']+(($monitor['MaxTiltSpeed']-$monitor['MinTiltSpeed'])*$slow)));
if ( (!isset($pan_speed) || ($pan_speed < $slow_pan_speed)) && (!isset($tilt_speed) || ($tilt_speed < $slow_tilt_speed)) )
{
$ctrl_command .= " --autostop=".$monitor['AutoStopTimeout'];
}
}
}
}
else
{
$slow = 0.25; // Threshold for slow speed/timeouts
$slow = 0.9; // Threshold for slow speed/timeouts
$turbo = 0.9; // Threshold for turbo speed
$long_y = 48;
$short_x = 32;
@ -861,7 +871,7 @@ if ( isset($action) )
{
$slow_pan_speed = intval(round($monitor['MinPanSpeed']+(($monitor['MaxPanSpeed']-$monitor['MinPanSpeed'])*$slow)));
$slow_tilt_speed = intval(round($monitor['MinTiltSpeed']+(($monitor['MaxTiltSpeed']-$monitor['MinTiltSpeed'])*$slow)));
if ( (isset($pan_speed) && ($pan_speed < $slow_pan_speed)) || (isset($tilt_speed) && ($tilt_speed < $slow_tilt_speed)) )
if ( (!isset($pan_speed) || ($pan_speed < $slow_pan_speed)) && (!isset($tilt_speed) || ($tilt_speed < $slow_tilt_speed)) )
{
$ctrl_command .= " --autostop=".$monitor['AutoStopTimeout'];
}