FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-03 16:56:54 +00:00
Code Issues Releases Wiki Activity

49_SSCAM: "goAbsPTZ" may be unavailable on Windows-systems

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@10783 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
nasseeder1 2016-02-09 21:15:25 +00:00
parent 0b75b4295a
commit 192fcdd651
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fhem/CHANGED
View File

@ -1,5 +1,6 @@
# Add changes at the top of the list. Keep it in ASCII, and 80-char wide. # Add changes at the top of the list. Keep it in ASCII, and 80-char wide.
# Do not insert empty lines here, update check depends on it. # Do not insert empty lines here, update check depends on it.
- bugfix: 49:SSCAM: "goAbsPTZ" may be unavailable on Windows-systems
- feature 49_SSCAM: added function "move" for continuous PTZ action - feature 49_SSCAM: added function "move" for continuous PTZ action
- feature: 02_RSS: continue image update sequence after error (HTML) - feature: 02_RSS: continue image update sequence after error (HTML)
- feature: 98_rssFeed: Possibility to modfy feed data via a custom function. - feature: 98_rssFeed: Possibility to modfy feed data via a custom function.

5
fhem/FHEM/49_SSCam.pm
View File

@ -27,6 +27,7 @@
########################################################################################################## ##########################################################################################################
# Versions History: # Versions History:
# #
# 1.12.1 09.02.2016 bugfix: "goAbsPTZ" may be unavailable on Windows-systems
# 1.12 08.02.2016 added function "move" for continuous PTZ action # 1.12 08.02.2016 added function "move" for continuous PTZ action
# 1.11.1 07.02.2016 entries with loglevel "2" reviewed, changed to loglevel "3" # 1.11.1 07.02.2016 entries with loglevel "2" reviewed, changed to loglevel "3"
# 1.11 05.02.2016 added function "goPreset" and "goAbsPTZ" to control the move of PTZ lense # 1.11 05.02.2016 added function "goPreset" and "goAbsPTZ" to control the move of PTZ lense
@ -227,7 +228,7 @@ sub SSCam_Set {
"enable ". "enable ".
"disable ". "disable ".
((ReadingsVal("$name", "DeviceType", "Camera") eq "PTZ") ? "goPreset:".ReadingsVal("$name", "Presets", "")." " : ""). ((ReadingsVal("$name", "DeviceType", "Camera") eq "PTZ") ? "goPreset:".ReadingsVal("$name", "Presets", "")." " : "").
((ReadingsVal("$name", "CapPTZAbs", "false") eq "true") ? "goAbsPTZ"." " : ""). ((ReadingsVal("$name", "CapPTZAbs", "false")) ? "goAbsPTZ"." " : "").
((ReadingsVal("$name", "CapPTZDirections", "0") > 0) ? "move"." " : ""); ((ReadingsVal("$name", "CapPTZDirections", "0") > 0) ? "move"." " : "");
@ -811,7 +812,7 @@ sub doptzaction ($) {
&printlog($hash,$logstr,"1"); &printlog($hash,$logstr,"1");
return; return;
} }
if ($hash->{HELPER}{PTZACTION} eq "goabsptz" && ReadingsVal("$name", "CapPTZAbs", "false") ne "true") { if ($hash->{HELPER}{PTZACTION} eq "goabsptz" && !ReadingsVal("$name", "CapPTZAbs", "false")) {
$logstr = "ERROR - Operation \"$hash->{HELPER}{PTZACTION}\" is only possible if camera supports absolute PTZ action - please compare with device Reading \"CapPTZAbs\"" ; $logstr = "ERROR - Operation \"$hash->{HELPER}{PTZACTION}\" is only possible if camera supports absolute PTZ action - please compare with device Reading \"CapPTZAbs\"" ;
&printlog($hash,$logstr,"1"); &printlog($hash,$logstr,"1");
return; return;