fix: messages
Alejandro Criado-Pérez
parent
fd39c57038
commit
871bf1772f
|
|
@ -382,7 +382,7 @@ our @options = (
|
|||
requesting address can change for each request which will cause
|
||||
most requests to fail. This option allows you to control
|
||||
whether IP addresses are included in the authentication hash on
|
||||
your system. If you experience intermitent problems with
|
||||
your system. If you experience intermittent problems with
|
||||
authentication, switching this option off may help.
|
||||
`,
|
||||
requires => [
|
||||
|
|
|
|||
|
|
@ -604,7 +604,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
|||
|
||||
=head2 focusRel<range>
|
||||
|
||||
This set of methods invoke realtive focus in the range direction indicated by
|
||||
This set of methods invoke relative focus in the range direction indicated by
|
||||
the <range> portion of their name. They accept no arguments.
|
||||
|
||||
NOTE:
|
||||
|
|
@ -615,7 +615,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
|||
|
||||
=head2 irisRel<Large/Small>
|
||||
|
||||
This set of methods invoke realtive iris size in the direction indicated by
|
||||
This set of methods invoke relative iris size in the direction indicated by
|
||||
the <Large/Small> portion of their name. They accept no arguments.
|
||||
|
||||
NOTE:
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@
|
|||
# This module FI8608W_Y2k.pm contains the implementation of API camera control
|
||||
# For FOSCAM FI8608W PT Camera (This cam support only H264 streaming)
|
||||
# V1.0 Le 13 AOUT 2013
|
||||
# If you wan't to contact me i understand French and English, precise ZoneMinder in subject
|
||||
# If you want to contact me i understand French and English, precise ZoneMinder in subject
|
||||
# but i prefer via the ZoneMinder Forum
|
||||
# My name is Christophe DAPREMONT my email is christophe_y2k@yahoo.fr
|
||||
#
|
||||
|
|
@ -60,9 +60,9 @@ our @ISA = qw(ZoneMinder::Control);
|
|||
# -Zoom Wide switch OFF InfraRed LED and stay to manual IR MODE
|
||||
# -Button WAKE switch to AUTO ON/OFF IR LED
|
||||
# -Button RESET to setup image at initial value
|
||||
# -8 Preset PTZ are implemented and functionnal
|
||||
# -8 Preset PTZ are implemented and functional
|
||||
# -This Script use for login "admin" this hardcoded and your password must setup in "Control Device" section
|
||||
# -This script is compatible with the basic authentification method used by mostly new camera based with hi3510 chipset
|
||||
# -This script is compatible with the basic authentication method used by mostly new camera based with hi3510 chipset
|
||||
# -AutoStop function is active and you must set up value (in sec example 0.7) under AutoStop section
|
||||
# or you can set up to 0 for disable it (in this case you need to click to the circle center for stop)
|
||||
# -"White In" to control Brightness, "auto" for restore the original value of Brightness
|
||||
|
|
@ -75,7 +75,7 @@ use ZoneMinder::Logger qw(:all);
|
|||
use ZoneMinder::Config qw(:all);
|
||||
use Time::HiRes qw( usleep );
|
||||
|
||||
# Set $osd to "off" if you wan't disabled OSD i need to place this variable in another script because
|
||||
# Set $osd to "off" if you want disabled OSD i need to place this variable in another script because
|
||||
# this script is reload at every command ,if i want the button on/off (Focus MAN) for OSD works...
|
||||
my $osd = "on";
|
||||
|
||||
|
|
@ -103,8 +103,8 @@ sub sendCmd
|
|||
my $cmd = shift;
|
||||
my $result = undef;
|
||||
printMsg( $cmd, "Tx" );
|
||||
# I solve the authentification problem with recent Foscam
|
||||
# I use perl Basic Authentification method
|
||||
# I solve the authentication problem with recent Foscam
|
||||
# I use perl Basic Authentication method
|
||||
my $ua = LWP::UserAgent->new();
|
||||
my $req = HTTP::Request->new( GET =>"http://".$self->{Monitor}->{ControlAddress}."/web/cgi-bin/hi3510/".$cmd );
|
||||
$req->authorization_basic('admin', $self->{Monitor}->{ControlDevice} );
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@
|
|||
# V0.6b Le 01 AOUT 2013 -
|
||||
# V1.0 Le 04 AOUT 2013 - production usable if you do not use preset ptz
|
||||
# V1.1 Le 11 AOUT 2013 - put a cosmetic update source code
|
||||
# If you wan't to contact me i understand French and English, precise ZoneMinder in subject
|
||||
# If you want to contact me i understand French and English, precise ZoneMinder in subject
|
||||
# My name is Christophe DAPREMONT my email is christophe_y2k@yahoo.fr
|
||||
#
|
||||
# V1.1 ====================================================================================
|
||||
|
|
@ -66,7 +66,7 @@ our @ISA = qw(ZoneMinder::Control);
|
|||
# -8 Preset PTZ are implemented but the firmware is buggy and that do not work
|
||||
# You Need to configure ZoneMinder PANSPEED & TILTSEPPED & ZOOMSPEED 1 to 63 by 1 step
|
||||
# -This Script use for login "admin" this hardcoded and your password must setup in "Control Device" section
|
||||
# -This script is compatible with the basic authentification method used by mostly new camera
|
||||
# -This script is compatible with the basic authentication method used by mostly new camera
|
||||
# -AutoStop function is active and you must set up value (in sec example 0.5) under AutoStop section
|
||||
# or you can set up to 0 for disable it but the camera never stop to move and trust me, she can move all the night...
|
||||
# (you need to click to the center arrow for stop)
|
||||
|
|
@ -81,7 +81,7 @@ use ZoneMinder::Logger qw(:all);
|
|||
use ZoneMinder::Config qw(:all);
|
||||
use Time::HiRes qw( usleep );
|
||||
|
||||
# Set $osd to "off" if you wan't disabled OSD i need to place this variable in another script because
|
||||
# Set $osd to "off" if you want disabled OSD i need to place this variable in another script because
|
||||
# this script is reload at every command ,if i want the button on/off (Focus MAN) for OSD works...
|
||||
my $osd = "on";
|
||||
|
||||
|
|
@ -109,8 +109,8 @@ sub sendCmd
|
|||
my $cmd = shift;
|
||||
my $result = undef;
|
||||
printMsg( $cmd, "Tx" );
|
||||
# I solve the authentification problem with recent Foscam
|
||||
# I use perl Basic Authentification method
|
||||
# I solve the authentication problem with recent Foscam
|
||||
# I use perl Basic Authentication method
|
||||
my $ua = LWP::UserAgent->new();
|
||||
my $req = HTTP::Request->new( GET =>"http://".$self->{Monitor}->{ControlAddress}."/web/cgi-bin/hi3510/".$cmd );
|
||||
$req->authorization_basic('admin', $self->{Monitor}->{ControlDevice} );
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@
|
|||
# This module FI8620_Y2k.pm contains the implementation of API camera control
|
||||
# For FOSCAM FI8620 Dome PTZ Camera (This cam support only H264 streaming)
|
||||
# V1.0 Le 09 AOUT 2013 - production usable for the script but not for the camera "reboot itself"
|
||||
# If you wan't to contact me i understand French and English, precise ZoneMinder in subject
|
||||
# If you want to contact me i understand French and English, precise ZoneMinder in subject
|
||||
# My name is Christophe DAPREMONT my email is christophe_y2k@yahoo.fr
|
||||
#
|
||||
# =========================================================================================
|
||||
|
|
@ -55,7 +55,7 @@ use ZoneMinder::Logger qw(:all);
|
|||
use ZoneMinder::Config qw(:all);
|
||||
use Time::HiRes qw( usleep );
|
||||
|
||||
# Set $osd to "off" if you wan't disabled OSD i need to place this variable in another script because
|
||||
# Set $osd to "off" if you want disabled OSD i need to place this variable in another script because
|
||||
# this script is reload at every command ,if i want the button on/off (Focus MAN) for OSD works...
|
||||
my $osd = "on";
|
||||
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@
|
|||
# This module FI8620_Y2k.pm contains the implementation of API camera control
|
||||
# For FOSCAM FI8620 Dome PTZ Camera (This cam support only H264 streaming)
|
||||
# V1.0 Le 09 AOUT 2013 - production usable for the script but not for the camera "reboot itself"
|
||||
# If you wan't to contact me i understand French and English, precise ZoneMinder in subject
|
||||
# If you want to contact me i understand French and English, precise ZoneMinder in subject
|
||||
# My name is Christophe DAPREMONT my email is christophe_y2k@yahoo.fr
|
||||
#
|
||||
# =========================================================================================
|
||||
|
|
@ -64,7 +64,7 @@ use ZoneMinder::Logger qw(:all);
|
|||
use ZoneMinder::Config qw(:all);
|
||||
use Time::HiRes qw( usleep );
|
||||
|
||||
# Set $osd to "off" if you wan't disabled OSD i need to place this variable in another script because
|
||||
# Set $osd to "off" if you want disabled OSD i need to place this variable in another script because
|
||||
# this script is reload at every command ,if i want the button on/off (Focus MAN) for OSD works...
|
||||
# PP - changed this to off - it achieves OSD by renaming the Device and what happens is at times
|
||||
# it does not reset the name if a command fails. Net result: Your camera gets a name like "Move Left" which
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
# in the camera and modifies the ZM db entries.The camera has 16 presets with 1-4
|
||||
# occupied with TopMost, Bottomost, LeftMost, RightMost so configure for 12.
|
||||
# the camera stores presets in available spot until full. the script first deletes
|
||||
# a preset then sets one using the now avialable spot.
|
||||
# a preset then sets one using the now available spot.
|
||||
#
|
||||
# ==========================================================================
|
||||
#
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@
|
|||
#
|
||||
# Create a new Control Capabilities:
|
||||
# Main: Name Keekoon, Type = Remote, Protocol = Keekoon
|
||||
# Move: Can Move, Can Move Diagonally, Can Move Continous
|
||||
# Move: Can Move, Can Move Diagonally, Can Move Continuous
|
||||
# Pan: Can Pan
|
||||
# Tilt: Can Tilt
|
||||
# Presets: Has Presets, Num Presets = 6, Can Set Presets
|
||||
|
|
|
|||
|
|
@ -50,7 +50,7 @@ my ( $controlUri, $scheme );
|
|||
# - Control Type: ONVIF
|
||||
# - Control Device: prof0 - this is dependant on camera. It maybe required to sniff the traffic using Wireshark to find this out. If left empty value of "000" will be used.
|
||||
# - Control Address: <scheme>://[<user>:<password>@]<ip_or_host_of_onvif_enabled_camera>[:port][control_uri]
|
||||
# - Auto Stop Timeout: 1.00 - how long shold the camera move for when move command is issued. Value of 1.00 means 1s.
|
||||
# - Auto Stop Timeout: 1.00 - how long should the camera move for when move command is issued. Value of 1.00 means 1s.
|
||||
# - Track Motion: NOT IMPLEMENTED - this suppose to be a feature for automatic camera scrolling (moving).
|
||||
# - Track Delay: NOT IMPLEMENTED
|
||||
# - Return Location: Home|Preset 1 - NOT IMPLEMENTED
|
||||
|
|
|
|||
|
|
@ -748,7 +748,7 @@ state since the last call to this method.
|
|||
|
||||
=item ( $x, $y ) = zmGetAlarmLocation ( $monitor );
|
||||
|
||||
Return an x,y pair indicating the image co-ordinates of the centre of the
|
||||
Return an x,y pair indicating the image coordinates of the centre of the
|
||||
last motion event generated by the given monitor. If no event has been
|
||||
generated by the current monitor process, or the alarm was not motion
|
||||
related, returns -1,-1.
|
||||
|
|
@ -833,8 +833,8 @@ brightness Read/write location for the current monitor brightness
|
|||
hue Read/write location for the current monitor hue
|
||||
colour Read/write location for the current monitor colour
|
||||
contrast Read/write location for the current monitor contrast
|
||||
alarm_x Image x co-ordinate (from left) of the centre of the last motion event, -1 if none
|
||||
alarm_y Image y co-ordinate (from top) of the centre of the last motion event, -1 if none
|
||||
alarm_x Image x coordinate (from left) of the centre of the last motion event, -1 if none
|
||||
alarm_y Image y coordinate (from top) of the centre of the last motion event, -1 if none
|
||||
alarm_cause The current alarm event cause string along with zone names(s) alarmed
|
||||
|
||||
trigger_data The triggered event mapped memory section
|
||||
|
|
|
|||
|
|
@ -466,7 +466,7 @@ sub ImportanceNumber {
|
|||
} elsif ($$self{Importance} eq 'Normal') {
|
||||
return 0;
|
||||
}
|
||||
Warning("Wierd value for Importance $$self{Importance}");
|
||||
Warning("Weird value for Importance $$self{Importance}");
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -86,7 +86,7 @@ sub new {
|
|||
|
||||
if ( $id and (!$no_cache) and $$sub_cache{$id} ) {
|
||||
if ( $data ) {
|
||||
# The reason to use load is if we have overriden it in the object,
|
||||
# The reason to use load is if we have overridden it in the object,
|
||||
$$sub_cache{$id}->load( $data );
|
||||
}
|
||||
return $$sub_cache{$id};
|
||||
|
|
@ -239,7 +239,7 @@ $log->debug("No serial") if $debug;
|
|||
ZoneMinder::Database::end_transaction( $local_dbh, $ac ) if $ac;
|
||||
return $local_dbh->errstr;
|
||||
} elsif ( $debug ) {
|
||||
$log->debug("SQL succesful DELETE FROM $table WHERE $where");
|
||||
$log->debug("SQL successful DELETE FROM $table WHERE $where");
|
||||
} # end if
|
||||
} # end if
|
||||
$insert = 1;
|
||||
|
|
@ -818,7 +818,7 @@ sub find_sql {
|
|||
|
||||
my @param_keys = keys %$params;
|
||||
|
||||
# no operators, just which fields are being searched on. Mostly just useful for detetion of the deleted field.
|
||||
# no operators, just which fields are being searched on. Mostly just useful for detection of the deleted field.
|
||||
my %used_fields;
|
||||
|
||||
# We use this search hash so that we can mash it up and leave the params hash alone
|
||||
|
|
|
|||
|
|
@ -152,7 +152,7 @@ while True:
|
|||
head, version, session, sequence_number, msgid, len_data = struct.unpack(
|
||||
'BB2xII2xHI', conn.recv(20)
|
||||
)
|
||||
sleep(0.1) # Just for recive whole packet
|
||||
sleep(0.1) # Just for receive whole packet
|
||||
data = conn.recv(len_data)
|
||||
conn.close()
|
||||
# make the json a Dictionary
|
||||
|
|
|
|||
|
|
@ -317,7 +317,7 @@ MAIN: while( $loop ) {
|
|||
if ( $Event->Path() ne $full_path ) {
|
||||
if ( ! (-e $Event->Path()) ) {
|
||||
if ( $Event->StorageId() != $Storage->Id() ) {
|
||||
Info("Correcting Storge Id for event $$Event{Id} from $$Event{StorageId} $$Event{Path} to $$Storage{Id} $full_path");
|
||||
Info("Correcting Storage Id for event $$Event{Id} from $$Event{StorageId} $$Event{Path} to $$Storage{Id} $full_path");
|
||||
$Event->save({ StorageId=>$Storage->Id() });
|
||||
$Event->Path(undef);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -166,7 +166,7 @@ sub selectQuery {
|
|||
return @data;
|
||||
}
|
||||
|
||||
# Exectute a pre-built sql query
|
||||
# Execute a pre-built sql query
|
||||
sub runQuery {
|
||||
my $dbh = shift;
|
||||
my $sql = shift;
|
||||
|
|
|
|||
|
|
@ -151,10 +151,10 @@ if (!EVENT_PATH) {
|
|||
die;
|
||||
}
|
||||
|
||||
# In future, should not be neccessary wrt StorageAreas
|
||||
# In future, should not be necessary wrt StorageAreas
|
||||
chdir(EVENT_PATH);
|
||||
|
||||
# Should not be neccessary... but nice to get a local var. What if it fails?
|
||||
# Should not be necessary... but nice to get a local var. What if it fails?
|
||||
my $dbh = zmDbConnect();
|
||||
$dbh->do('SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED');
|
||||
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@ $ENV{PATH} = '/bin:/usr/bin:/usr/local/bin';
|
|||
$ENV{SHELL} = '/bin/sh' if exists $ENV{SHELL};
|
||||
delete @ENV{qw(IFS CDPATH ENV BASH_ENV)};
|
||||
|
||||
# Setting these as contants for now.
|
||||
# Setting these as constants for now.
|
||||
|
||||
my $help = 0;
|
||||
my $force = 0;
|
||||
|
|
|
|||
|
|
@ -278,7 +278,7 @@ while (!$zm_terminate) {
|
|||
@needsReload = ();
|
||||
}
|
||||
|
||||
# zmDbConnect will ping and reconnect if neccessary
|
||||
# zmDbConnect will ping and reconnect if necessary
|
||||
$dbh = zmDbConnect();
|
||||
} # end while (!$zm_terminate)
|
||||
Info('Trigger daemon exiting');
|
||||
|
|
|
|||
|
|
@ -1065,7 +1065,7 @@ sub migratePaths {
|
|||
|
||||
my %customConfig;
|
||||
|
||||
# Check the traditional default values for the variables previsouly found under Options -> Paths
|
||||
# Check the traditional default values for the variables previously found under Options -> Paths
|
||||
if ( $Config{ZM_DIR_EVENTS} ne 'events' ) {
|
||||
$customConfig{ZM_DIR_EVENTS} = $Config{ZM_DIR_EVENTS};
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue