Commit Graph

149 Commits

Author SHA1 Message Date
Jim Perkins
9a37c393cc Update HikVision.pm
ERR [Can't access name:zoomStop AUTOLOAD:ZoneMinder::Control::HikVision::zoomStop member of object of class ZoneMinder::Control::HikVision from main:186]

https://forums.zoneminder.com/viewtopic.php?f=9&t=25442&p=119856#p119856
2021-02-17 19:02:01 -06:00
gmanic
037f197f54 corrected $this to $self 2021-02-03 12:53:33 +01:00
Isaac Connor
1e59c5bbde Merge branch 'release-1.34' 2021-01-15 18:46:07 -05:00
Isaac Connor
7183a47a3a split Netcat security header into multiple lines for legibility 2021-01-15 18:45:13 -05:00
Isaac Connor
c9ac5dff62 Use parent printMsg 2020-12-21 12:17:02 -05:00
Isaac Connor
ac9432edf4 Older cameras don't have that file. It's ok for it to return a 404. 2020-08-11 15:17:27 -04:00
Isaac Connor
89007227b6 Add reboot method to SkyIPCam7xx control script 2020-07-23 11:54:19 -04:00
Isaac Connor
cd707571e7 Merge branch 'master' of github.com:zoneminder/ZoneMinder 2020-07-08 17:22:32 -04:00
Isaac Connor
e5afc1a2db Cleanup code that sets digest credentials. Fixes #2972 2020-07-08 17:20:52 -04:00
Isaac Connor
2db65d3821 Merge branch 'release-1.34' 2020-07-04 09:09:24 -04:00
Isaac Connor
db5370024a implement moveMap and moveRel. Please note that many cameras do not implement these functions and may even report that they do implement them and then silently do nothing when you use them. So YMMV 2020-07-04 09:02:01 -04:00
Isaac Connor
73ec5f10a5 sendCmd failures should not be fatal 2020-06-26 16:52:34 -04:00
Isaac Connor
58a015e20a fix use of printMsg 2020-05-29 12:20:39 -04:00
Isaac Connor
8bebb2b890 fix use of printMsg 2020-05-09 11:49:02 -04:00
Isaac Connor
a7b553cdbe code style and correct license. Author was contacted and ok'd the change. Fies #2883 2020-04-23 10:37:42 -04:00
Isaac Connor
3117f29f71 code style and correct license. Author was contacted and ok'd the change. Fies #2883 2020-03-30 10:32:26 -04:00
zlodag
0c97bff645 monitor presets and controls for D-Link DCS-5020L 2020-02-19 22:50:09 +13:00
Isaac Connor
cac7ddd89d Discover that authority also contains port. Remove redundant stuff. 2020-02-18 16:48:08 -05:00
Isaac Connor
9a21ebf696 Remove unneeded test for :80 2020-02-18 15:10:44 -05:00
Isaac Connor
568c42cfa9 Use URI to better handle ControlAddress parsing. 2020-02-18 13:05:45 -05:00
Isaac Connor
223b618f74 quotes 2020-02-18 11:08:05 -05:00
Isaac Connor
9c65a8b293 handle Amcrest cameras giving a 401 Unauthorized on the first attempt to send a command. Just send another. 2020-02-12 12:34:43 -05:00
Isaac Connor
cc9add9310 fall back to ControlAddress if first ptz get fails 2020-02-11 17:40:33 -05:00
Isaac Connor
f6d10e84f2 Fix basic auth. TUrn ControlAddress into a URI if it isn't one 2020-01-12 18:07:20 -05:00
Isaac Connor
80c95d5afe Merge branch 'master' into wip_axisv2 2020-01-10 17:20:32 -05:00
Isaac Connor
f8e54ba6e3 spacing, quotes 2020-01-10 16:41:22 -05:00
Isaac Connor
1d24e022bb Add realm detection 2020-01-02 16:45:27 -05:00
Isaac Connor
9d57be4c9e google code style, remove redundant code matching parent. Don't re-instantiate UA. 2020-01-02 16:24:43 -05:00
Isaac Connor
c6813fecd5 handle new values for Orientation enum. Spacing, quotes. Handle uppercase HTTP in ControlAddress. 2019-12-10 10:14:32 -05:00
Isaac Connor
22b61cd5b2 wip cleanup of AxisV2 2019-12-02 15:51:40 -05:00
Isaac Connor
1c51c695d9 Remove printMsg, it will be inherited 2019-11-21 10:49:04 -05:00
Isaac Connor
5c715ec96b fix use of printMsg in Netcat 2019-10-21 13:18:50 -04:00
Isaac Connor
2619e90e96 add missing sendCmd's, spacing 2019-10-18 14:12:26 -04:00
Simpler1
436c46207f Remove dash from IPCC7210W.pm 2019-10-04 22:52:51 -04:00
Isaac Connor
5aa639ff76 use common printMsg 2019-10-03 18:11:54 -04:00
Isaac Connor
5799815c2e Better debugging 2019-10-03 18:09:15 -04:00
Isaac Connor
0515fe51fd debug 2019-10-03 17:59:34 -04:00
Isaac Connor
12f75c32de Fix version 2019-10-03 17:54:41 -04:00
Isaac Connor
783358c932 Import Sony PTZ driver 2019-10-03 17:31:54 -04:00
Isaac Connor
6f5c297265 google code style 2019-10-03 17:28:57 -04:00
Isaac Connor
a7f27dddde quotes and more useful sendCmd debugging. 2019-10-03 17:27:46 -04:00
Isaac Connor
ad1df8f80a log the response if command fails, and add missing uthentication sections 2019-06-21 11:40:46 -04:00
Isaac Connor
d9f7e93df3 Fix typo gegress to degrees. Fixes #2601 2019-05-10 14:27:51 -04:00
Rémi Da Costa
16697565bf Netcat ONVIF: adding ONVIF authentication 2019-04-30 07:48:47 +02:00
cnighswonger
dfa997a989 Add camera relative iris control methods
This set of methods invoke realtive iris size in the direction indicated by
    the <Large/Small> portion of their name. They accept no arguments.

    NOTE:

    This only just does work. The Dahua API specifies "multiples" as the input.
    We pass in a 1 for that as it does not seem to matter what number (0-8) is
    provided, the camera iris behaves the same.
2019-04-29 16:05:44 -04:00
redaco
76dd411341 Netcat ONVIF: Added support for "profile token" (#2589) 2019-04-29 15:56:55 -04:00
Isaac Connor
e1873b1693 debug response content 2019-04-05 15:17:13 -04:00
Isaac Connor
aaef151815 ZM_VERSION is a constant not a scalar variable 2019-04-05 13:18:06 -04:00
Chris
ad5f6a8729 Camera reboot function (#2554)
* Adding a button for camera reboot function

This series of commits will add a camera reboot function to the
control interface if supported by the camera configuration.

* Adding reboot function option to contorl configuration

This patch adds a reboot option to the camera control configuration
view.

* Adding Reboot field to Controls table

This patch adds a Reboot field to the Controls table to support
a camera reboot control option.

* Correcting button value to match reset

* Updating language files

I'm not sure of the proper procedure to trigger updating of
non-english language files so I'm updating them all with English
hoping that that will draw attention to the changes and others
will translate accordingly.

* Add missing forward slash
2019-03-18 14:49:05 -04:00
Chris
6ee689f4bf Dahua control improvements (#2552)
* Adding a presetHome method

The Dahua protocol does not appear to support a preset Home feature. We could
allow the user to assign a preset slot as the "home" slot. Dahua does appear
to support naming presets which may lend itself to this sort of thing. At
this point, we'll just send the camera back to center and zoom wide. (0°,0°,0)

* Adjusting naming of private methods and adding POD

* Adding relative focus methods

This patch also adds the return value of the get request used to
send the command to the camera.

Furthermore, it fixes a small bug in the authentication of requests
sent to the camera after the connection is opened. I really have no
idea why the problem occurred and it appeared to have no practical
effect on the execution of the command. It showed up when I enabled
debug, so this attempts to fix it or at least quiet it.

* Adding POD for the new relative focus methods

Also doing a bit of cleanup on POD in general.

* Adding some documentation to demystify control motion types

This was not clear to me at the outset, and I could not locate existing
documentation which explained the prioritization and exclusion aspects.

Maybe it will help someone else.

* Renaming private methods and adding more POD

This patch renames private methods by prefixing an underscore to
them. This at least helps visually distinguish them as private
when reading through the code.

It also adds more documentation on public methods.

* Grouping all relative motion methods together

This makes for easier reading.

* Adding in a reset method from Issue #2414

This method was supplied by kobold81 who got it from
bobylapointe69300 who posted it in the following forum post:

https://forums.zoneminder.com/viewtopic.php?f=9&t=27000&p=104601&hilit=dahua#p104601

This patch also includes some POD cleanup.

* Adding continuous movement methods and fixing reset

This patch adds the continuous movement methods provided in the patch
for Issue #2414. Note that these are not truly continuous as they
result in movement for less than a ms. Adapting the code to support
truly continuous movement would invovle some considerable work.

This patch also correct the reset method and adds a reboot method.
The two are different creatures with different effects.

POD added as well.

* Removing redundant get request code

Two slightly different versions of code are currently used to post
the get request to the camera in order to execute commands. This
patch modifies the open method in order to allow its re-use and
removes redundant code.

Note: This is the first installment on changes towards improving
the way the HTTP transactions are handled.

* Making authenication failures fatal

Authentication failures result in camera commands not being executed.
They may as well be fatal and return the general reason to the user
directly.

* Work on persistent sessions

I think this will have to wait since it appears that the camera expects
some sort of keepalive/heartbeat signal to keep the session open.

* Restoring accidentally deleted code
2019-03-12 11:09:57 -04:00