Bugfix in Control and added new Camera (#2171)

* fixed control typos

missing word "s" for "Controls" Table for database queries

* added Dericam P2 camera Control

* fixed missing CanReset column

* Update DericamP2.pm

* added some more missing controls

CanSleep, CanWake

* Update DericamP2.pm

* Update DericamP2.pm

* Update DericamP2.pm

* Update DericamP2.pm

* Update DericamP2.pm

* Update DericamP2.pm

* Update DericamP2.pm

* Update zm_create.sql.in

db/zm_create.sql.in

@@ -778,6 +778,7 @@ INSERT INTO `Controls` VALUES (NULL,'Reolink RLC-411','Ffmpeg','Reolink',0,0,1,1
 INSERT INTO `Controls` VALUES (NULL,'Reolink RLC-420','Ffmpeg','Reolink',0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
 INSERT INTO `Controls` VALUES (NULL,'D-LINK DCS-3415','Remote','DCS3415',0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0);
 INSERT INTO `Controls` VALUES (NULL,'IOS Camera','Ffmpeg','IPCAMIOS',0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,1,0,0,0,0,0,0,0,0,0,1,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,1,0,0,0,0,0,0,0,0,0,1,0,1,0,1,0,0,0,0,1,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0);
+INSERT INTO `Controls` VALUES (NULL,'Dericam P2','Ffmpeg','DericamP2',0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,10,0,1,1,1,0,0,0,1,1,0,0,0,0,1,1,45,0,0,1,0,0,0,0,1,1,45,0,0,0,0);
 --
 -- Add some monitor preset values
 --

scripts/ZoneMinder/lib/ZoneMinder/Control/DericamP2.pm

@@ -0,0 +1,475 @@
+# ==========================================================================
+#
+# ZoneMinder Dericam P2 Control Protocol Module
+# Copyright (C) Roman Dissertori
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# ==========================================================================
+#
+# This module contains the implementation of the Dericam P2 device control protocol
+#
+package ZoneMinder::Control::DericamP2;
+
+use 5.006;
+use strict;
+use warnings;
+
+require ZoneMinder::Control;
+
+our @ISA = qw(ZoneMinder::Control);
+
+our %CamParams = ();
+
+# ==========================================================================
+#
+# Dericam P2 Control Protocol
+#
+# On ControlAddress use the format :
+#   USERNAME:PASSWORD@ADDRESS:PORT
+#   eg : admin:@10.1.2.1:80
+#        zoneminder:zonepass@10.0.100.1:40000
+#
+# ==========================================================================
+
+use ZoneMinder::Logger qw(:all);
+use ZoneMinder::Config qw(:all);
+
+use Time::HiRes qw( usleep );
+
+sub open
+{
+    my $self = shift;
+
+    $self->loadMonitor();
+
+    use LWP::UserAgent;
+    $self->{ua} = LWP::UserAgent->new;
+    $self->{ua}->agent( "ZoneMinder Control Agent/".ZoneMinder::Base::ZM_VERSION );
+
+    $self->{state} = 'open';
+}
+
+sub printMsg
+{
+    my $self = shift;
+    my $msg = shift;
+    my $msg_len = length($msg);
+
+    Debug( $msg."[".$msg_len."]" );
+}
+
+sub sendCmd
+{
+    my $self = shift;
+    my $cmd = shift;
+    my $result = undef;
+    printMsg( $cmd, "Tx" );
+
+    my $req = HTTP::Request->new( GET=>"http://".$self->{Monitor}->{ControlAddress}."/$cmd" );
+    Info( "http://".$self->{Monitor}->{ControlAddress}."/$cmd".$self->{Monitor}->{ControlDevice} );
+    my $res = $self->{ua}->request($req);
+
+    if ( $res->is_success )
+    {
+        $result = !undef;
+    }
+    else
+    {
+        Error( "Error check failed:'".$res->status_line()."'" );
+    }
+
+    return( $result );
+}
+
+sub getCamParams
+{
+    my $self = shift;
+    my $cmd = "cgi-bin/hi3510/param.cgi?cmd=getimageattr";
+    
+    my $req = $self->sendCmd( $cmd );
+    my $res = $self->{ua}->request($req);
+
+    if ( $res->is_success )
+    {
+        # Parse results setting values in %FCParams
+        my $content = $res->decoded_content;
+
+        while ($content =~ s/var\s+([^=]+)=([^;]+);//ms) {
+            $CamParams{$1} = $2;
+        }
+    }
+    else
+    {
+        Error( "Error check failed:'".$res->status_line()."'" );
+    }
+}
+
+#autoStop
+#This makes use of the ZoneMinder Auto Stop Timeout on the Control Tab
+sub autoStop
+{
+    my $self = shift;
+    my $stop_command = shift;
+    my $autostop = shift;
+    if( $stop_command && $autostop)
+    {
+        Debug( "Auto Stop" );
+        usleep( $autostop );
+        my $cmd = "decoder_control.cgi?command=".$stop_command;
+        $self->sendCmd( $cmd );
+    }
+
+}
+
+# Reset the Camera
+sub reset
+{
+    my $self = shift;
+    Debug( "Camera Reset" );
+    # Move to default position
+    my $cmd = "cgi-bin/hi3510/param.cgi?cmd=ptzctrl&-act=home";
+    $self->sendCmd( $cmd );
+    
+    # Reset all other values to default
+    $cmd = "cgi-bin/hi3510/param.cgi?cmd=setimageattr&-image_type=1&-default=on";
+    $self->sendCmd( $cmd );
+}
+
+# Reboot Camera (on Sleep button)
+sub sleep
+{
+    my $self = shift;
+    Debug( "Camera Reboot" );
+    my $cmd = "cgi-bin/hi3510/param.cgi?cmd=ptzctrl&-act=sysreboot";
+    $self->sendCmd( $cmd );
+}
+
+# Stop the Camera
+sub moveStop
+{
+    my $self = shift;
+    Debug( "Camera Stop" );
+    my $cmd = "cgi-bin/hi3510/param.cgi?cmd=ptzctrl&-act=stop";
+    $self->sendCmd( $cmd );
+}
+
+#Up Arrow
+sub moveConUp
+{
+    my $self = shift;
+    my $stop_command = "1";
+    Debug( "Move Up" );
+    my $cmd = "cgi-bin/hi3510/param.cgi?cmd=ptzctrl&-step=0&-act=up&-speed=45";
+    $self->sendCmd( $cmd );
+    #$self->autoStop( $stop_command, $self->{Monitor}->{AutoStopTimeout} );
+}
+
+#Down Arrow
+sub moveConDown
+{
+    my $self = shift;
+    my $stop_command = "3";
+    Debug( "Move Down" );
+    my $cmd = "cgi-bin/hi3510/param.cgi?cmd=ptzctrl&-step=0&-act=down&-speed=45";
+    $self->sendCmd( $cmd );
+    #$self->autoStop( $stop_command, $self->{Monitor}->{AutoStopTimeout} );
+}
+
+#Left Arrow
+sub moveConLeft
+{
+    my $self = shift;
+    my $stop_command = "5";
+    Debug( "Move Left" );
+    my $cmd = "cgi-bin/hi3510/param.cgi?cmd=ptzctrl&-step=0&-act=left&-speed=45";
+    $self->sendCmd( $cmd );
+    #$self->autoStop( $stop_command, $self->{Monitor}->{AutoStopTimeout} );
+}
+
+#Right Arrow
+sub moveConRight
+{
+    my $self = shift;
+    my $stop_command = "7";
+    Debug( "Move Right" );
+    my $cmd = "cgi-bin/hi3510/param.cgi?cmd=ptzctrl&-step=0&-act=right&-speed=45";
+    $self->sendCmd( $cmd );
+    #$self->autoStop( $stop_command, $self->{Monitor}->{AutoStopTimeout} );
+}
+
+#Zoom In
+sub zoomConTele
+{
+    my $self = shift;
+    Debug( "Zoom Tele" );
+    my $cmd = "decoder_control.cgi?command=18";
+    $self->sendCmd( $cmd );
+}
+
+#Zoom Out
+sub zoomConWide
+{
+    my $self = shift;
+    Debug( "Zoom Wide" );
+    my $cmd = "decoder_control.cgi?command=16";
+    $self->sendCmd( $cmd );
+}
+
+#Diagonally Up Right Arrow
+#This camera does not have builtin diagonal commands so we emulate them
+sub moveConUpRight
+{
+    my $self = shift;
+    Debug( "Move Diagonally Up Right" );
+    my $cmd = "cgi-bin/hi3510/param.cgi?cmd=ptzctrl&-step=0&-act=upright&-speed=45";
+    $self->sendCmd( $cmd );
+}
+
+#Diagonally Down Right Arrow
+#This camera does not have builtin diagonal commands so we emulate them
+sub moveConDownRight
+{
+    my $self = shift;
+    Debug( "Move Diagonally Down Right" );
+    my $cmd = "cgi-bin/hi3510/param.cgi?cmd=ptzctrl&-step=0&-act=downright&-speed=45";
+    $self->sendCmd( $cmd );
+}
+
+#Diagonally Up Left Arrow
+#This camera does not have builtin diagonal commands so we emulate them
+sub moveConUpLeft
+{
+    my $self = shift;
+    Debug( "Move Diagonally Up Left" );
+    my $cmd = "cgi-bin/hi3510/param.cgi?cmd=ptzctrl&-step=0&-act=upleft&-speed=45";
+    $self->sendCmd( $cmd );
+}
+
+#Diagonally Down Left Arrow
+#This camera does not have builtin diagonal commands so we emulate them
+sub moveConDownLeft
+{
+    my $self = shift;
+    Debug( "Move Diagonally Down Left" );
+    my $cmd = "cgi-bin/hi3510/param.cgi?cmd=ptzctrl&-step=0&-act=downnleft&-speed=45";
+    $self->sendCmd( $cmd );
+}
+
+#Set Camera Preset
+#Presets must be translated into values internal to the camera
+#Those values are: 30,32,34,36,38,40,42,44 for presets 1-8 respectively
+sub presetSet
+{
+    my $self = shift;
+    my $params = shift;
+    my $preset = $self->getParam( $params, 'preset' );
+    Debug( "Set Preset $preset" );
+
+    if (( $preset >= 1 ) && ( $preset <= 8 )) {
+        my $cmd = "cgi-bin/hi3510/param.cgi?cmd=preset&-act=set&-number=".(($preset*2) + 28);
+        $self->sendCmd( $cmd );
+    }
+}
+
+#Recall Camera Preset
+#Presets must be translated into values internal to the camera
+#Those values are: 31,33,35,37,39,41,43,45 for presets 1-8 respectively
+sub presetGoto
+{
+    my $self = shift;
+    my $params = shift;
+    my $preset = $self->getParam( $params, 'preset' );
+    Debug( "Goto Preset $preset" );
+
+    if (( $preset >= 1 ) && ( $preset <= 8 )) {
+        my $cmd = "cgi-bin/hi3510/param.cgi?cmd=preset&-act=goto&-number=".(($preset*2) + 29);
+        $self->sendCmd( $cmd );
+    }
+
+    if ( $preset == 9 ) {
+        $self->horizontalPatrol();
+    }
+
+    if ( $preset == 10 ) {
+        $self->verticalPatrol();
+    }
+}
+
+#Horizontal Patrol
+sub horizontalPatrol
+{
+    my $self = shift;
+    Debug( "Horizontal Patrol" );
+    my $cmd = "cgi-bin/hi3510/param.cgi?cmd=ptzctrl&-step=0&-act=hscan";
+    $self->sendCmd( $cmd );
+}
+
+#Vertical Patrol
+sub verticalPatrol
+{
+    my $self = shift;
+    Debug( "Vertical Patrol" );
+    my $cmd = "cgi-bin/hi3510/param.cgi?cmd=ptzctrl&-step=0&-act=vscan";
+    $self->sendCmd( $cmd );
+}
+
+# Increase Brightness
+sub irisAbsOpen
+{
+    my $self = shift;
+    my $params = shift;
+    $self->getCamParams() unless($CamParams{'brightness'});
+    my $step = $self->getParam( $params, 'step' );
+
+    $CamParams{'brightness'} += $step;
+    $CamParams{'brightness'} = 100 if ($CamParams{'brightness'} > 100);
+    Debug( "Increase Brightness" );
+    my $cmd = "cgi-bin/hi3510/param.cgi?cmd=setimageattr&-brightness=".$CamParams{'brightness'};
+    $self->sendCmd( $cmd );
+}
+
+# Decrease Brightness
+sub irisAbsClose
+{
+    my $self = shift;
+    my $params = shift;
+    $self->getCamParams() unless($CamParams{'brightness'});
+    my $step = $self->getParam( $params, 'step' );
+
+    $CamParams{'brightness'} -= $step;
+    $CamParams{'brightness'} = 0 if ($CamParams{'brightness'} < 0);
+    Debug( "Decrease Brightness" );
+    my $cmd = "cgi-bin/hi3510/param.cgi?cmd=setimageattr&-brightness=".$CamParams{'brightness'};
+    $self->sendCmd( $cmd );
+}
+
+# Increase Contrast
+sub whiteAbsIn
+{
+    my $self = shift;
+    my $params = shift;
+    $self->getCamParams() unless($CamParams{'contrast'});
+    my $step = $self->getParam( $params, 'step' );
+
+    $CamParams{'contrast'} += $step;
+    $CamParams{'contrast'} = 100 if ($CamParams{'contrast'} > 100);
+    Debug( "Increase Contrast" );
+    my $cmd = "cgi-bin/hi3510/param.cgi?cmd=setimageattr&-contrast=".$CamParams{'contrast'};
+    $self->sendCmd( $cmd );
+}
+
+# Decrease Contrast
+sub whiteAbsOut
+{
+    my $self = shift;
+    my $params = shift;
+    $self->getCamParams() unless($CamParams{'contrast'});
+    my $step = $self->getParam( $params, 'step' );
+
+    $CamParams{'contrast'} -= $step;
+    $CamParams{'contrast'} = 0 if ($CamParams{'contrast'} < 0);
+    Debug( "Decrease Contrast" );
+    my $cmd = "cgi-bin/hi3510/param.cgi?cmd=setimageattr&-contrast=".$CamParams{'contrast'};
+    $self->sendCmd( $cmd );
+}
+
+#TODO Saturation cgi-bin/hi3510/param.cgi?cmd=setimageattr&-saturation=44 [0-255]
+sub satIncrease
+{
+    my $self = shift;
+    my $params = shift;
+    $self->getCamParams() unless($CamParams{'saturation'});
+    my $step = $self->getParam( $params, 'step' );
+
+    $CamParams{'saturation'} += $step;
+    $CamParams{'saturation'} = 255 if ($CamParams{'saturation'} > 255);
+    Debug( "Increase Saturation" );
+    my $cmd = "cgi-bin/hi3510/param.cgi?cmd=setimageattr&-saturation=".$CamParams{'saturation'};
+    $self->sendCmd( $cmd );
+}
+
+sub satDecrease
+{
+    my $self = shift;
+    my $params = shift;
+    $self->getCamParams() unless($CamParams{'saturation'});
+    my $step = $self->getParam( $params, 'step' );
+
+    $CamParams{'saturation'} -= $step;
+    $CamParams{'saturation'} = 0 if ($CamParams{'saturation'} < 0);
+    Debug( "Decrease Saturation" );
+    my $cmd = "cgi-bin/hi3510/param.cgi?cmd=setimageattr&-saturation=".$CamParams{'saturation'};
+    $self->sendCmd( $cmd );
+}
+#TODO Sharpness cgi-bin/hi3510/param.cgi?cmd=setimageattr&-sharpness=37 [0-100]
+sub sharpIncrease
+{
+    my $self = shift;
+    my $params = shift;
+    $self->getCamParams() unless($CamParams{'sharpness'});
+    my $step = $self->getParam( $params, 'step' );
+
+    $CamParams{'sharpness'} += $step;
+    $CamParams{'sharpness'} = 100 if ($CamParams{'sharpness'} > 100);
+    Debug( "Increase Sharpness" );
+    my $cmd = "cgi-bin/hi3510/param.cgi?cmd=setimageattr&-sharpness=".$CamParams{'sharpness'};
+    $self->sendCmd( $cmd );
+}
+
+sub sharpDecrease
+{
+    my $self = shift;
+    my $params = shift;
+    $self->getCamParams() unless($CamParams{'sharpness'});
+    my $step = $self->getParam( $params, 'step' );
+
+    $CamParams{'sharpness'} -= $step;
+    $CamParams{'sharpness'} = 0 if ($CamParams{'sharpness'} < 0);
+    Debug( "Decrease Sharpness" );
+    my $cmd = "cgi-bin/hi3510/param.cgi?cmd=setimageattr&-sharpness=".$CamParams{'sharpness'};
+    $self->sendCmd( $cmd );
+}
+
+#TODO Hue cgi-bin/hi3510/param.cgi?cmd=setimageattr&-hue=37 [0-100]
+sub hueIncrease
+{
+    my $self = shift;
+    my $params = shift;
+    $self->getCamParams() unless($CamParams{'hue'});
+    my $step = $self->getParam( $params, 'step' );
+
+    $CamParams{'hue'} += $step;
+    $CamParams{'hue'} = 100 if ($CamParams{'hue'} > 100);
+    Debug( "Increase Hue" );
+    my $cmd = "cgi-bin/hi3510/param.cgi?cmd=setimageattr&-hue=".$CamParams{'hue'};
+    $self->sendCmd( $cmd );
+}
+
+sub hueDecrease
+{
+    my $self = shift;
+    my $params = shift;
+    $self->getCamParams() unless($CamParams{'hue'});
+    my $step = $self->getParam( $params, 'step' );
+
+    $CamParams{'hue'} -= $step;
+    $CamParams{'hue'} = 0 if ($CamParams{'hue'} < 0);
+    Debug( "Decrease Hue" );
+    my $cmd = "cgi-bin/hi3510/param.cgi?cmd=setimageattr&-hue=".$CamParams{'hue'};
+    $self->sendCmd( $cmd );
+}
+
+1;

web/includes/Control.php

@@ -12,6 +12,9 @@ private $defaults = array(
     'CanMoveRel' => 0,
     'CanMoveCon' => 0,
     'CanPan' => 0,
+    'CanReset' => 0,
+    'CanSleep' => 0,
+    'CanWake' => 0,
     'MinPanRange' => NULL,
     'MaxPanRange' => NULL,
     'MinPanStep' => NULL,
@@ -103,7 +106,7 @@ private $defaults = array(
     if ( $IdOrRow ) {
       $row = NULL;
       if ( is_integer( $IdOrRow ) or is_numeric( $IdOrRow ) ) {
-        $row = dbFetchOne( 'SELECT * FROM Control WHERE Id=?', NULL, array( $IdOrRow ) );
+        $row = dbFetchOne( 'SELECT * FROM Controls WHERE Id=?', NULL, array( $IdOrRow ) );
         if ( ! $row ) {
           Error("Unable to load Control record for Id=" . $IdOrRow );
         }