Public/fhem-mirror
1
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-07 22:29:19 +00:00
Code

49_SSCam: V3.8.4, usage of Internal MODEL changed

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@16576 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
nasseeder1 2018-04-09 17:41:49 +00:00
parent d29dd4f74c
commit 43cb6cf874
2 changed files with 7 additions and 5 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.
- change: 49_SSCam: V3.8.4, usage of Internal MODEL changed
- bugfix: 00_SIGNALduino: fixed ws7000 decoding - bugfix: 00_SIGNALduino: fixed ws7000 decoding
- feature: 72_XiaomiDevice: predefined zones and points, carpet mode - feature: 72_XiaomiDevice: predefined zones and points, carpet mode
- bugfix: 88_xs1Bridge: blacklist PEARL Warning + Code mod - bugfix: 88_xs1Bridge: blacklist PEARL Warning + Code mod

11
fhem/FHEM/49_SSCam.pm
View File

@ -27,6 +27,7 @@
######################################################################################################################### #########################################################################################################################
# Versions History: # Versions History:
# #
# 3.8.4 06.04.2018 Internal MODEL changed to SVS or "CamVendor - CamModel" for Cams
# 3.8.3 05.04.2018 bugfix V3.8.2, $OpMode "Start" changed, composegallery changed # 3.8.3 05.04.2018 bugfix V3.8.2, $OpMode "Start" changed, composegallery changed
# 3.8.2 04.04.2018 $attr replaced by AttrVal, SSCam_wdpollcaminfo redesigned # 3.8.2 04.04.2018 $attr replaced by AttrVal, SSCam_wdpollcaminfo redesigned
# 3.8.1 04.04.2018 some codereview like new sub SSCam_jboolmap # 3.8.1 04.04.2018 some codereview like new sub SSCam_jboolmap
@ -216,7 +217,7 @@ use Time::HiRes;
use HttpUtils; use HttpUtils;
# no if $] >= 5.017011, warnings => 'experimental'; # no if $] >= 5.017011, warnings => 'experimental';
my $SSCamVersion = "3.8.3"; my $SSCamVersion = "3.8.4";
# Aufbau Errorcode-Hashes (siehe Surveillance Station Web API) # Aufbau Errorcode-Hashes (siehe Surveillance Station Web API)
my %SSCam_errauthlist = ( my %SSCam_errauthlist = (
@ -332,7 +333,7 @@ sub SSCam_Define($@) {
$hash->{SERVERPORT} = $serverport; $hash->{SERVERPORT} = $serverport;
$hash->{CAMNAME} = $camname; $hash->{CAMNAME} = $camname;
$hash->{VERSION} = $SSCamVersion; $hash->{VERSION} = $SSCamVersion;
$hash->{MODEL} = ($camname =~ m/^SVS$/i)?"SVS":"CAM"; $hash->{MODEL} = ($camname =~ m/^SVS$/i)?"SVS":"CAM"; # initial, CAM wird später ersetzt durch CamModel
# benötigte API's in $hash einfügen # benötigte API's in $hash einfügen
$hash->{HELPER}{APIINFO} = "SYNO.API.Info"; # Info-Seite für alle API's, einzige statische Seite ! $hash->{HELPER}{APIINFO} = "SYNO.API.Info"; # Info-Seite für alle API's, einzige statische Seite !
@ -4402,8 +4403,8 @@ sub SSCam_camop_parse ($) {
readingsBulkUpdate($hash,"Errorcode","none"); readingsBulkUpdate($hash,"Errorcode","none");
readingsBulkUpdate($hash,"Error","none"); readingsBulkUpdate($hash,"Error","none");
readingsEndUpdate($hash, 1); readingsEndUpdate($hash, 1);
# Logausgabe $hash->{MODEL} = ReadingsVal($name,"CamVendor","")." - ".ReadingsVal($name,"CamModel","CAM") if(SSCam_IsModelCam($hash));
Log3($name, $verbose, "$name - Informations of camera $camname retrieved"); Log3($name, $verbose, "$name - Informations of camera $camname retrieved");
} elsif ($OpMode eq "geteventlist") { } elsif ($OpMode eq "geteventlist") {
@ -4994,7 +4995,7 @@ return($hash,$success);
############################################################################### ###############################################################################
sub SSCam_IsModelCam($){ sub SSCam_IsModelCam($){
my ($hash)= @_; my ($hash)= @_;
my $m = ($hash->{MODEL} eq "CAM")?1:0; my $m = ($hash->{MODEL} ne "SVS")?1:0;
return($m); return($m);
} }