FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-01-31 06:39:11 +00:00
Code Issues Releases Wiki Activity

49_SSCam: attr customSVSversion option 9.2.0

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@29359 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
nasseeder1 2024-11-25 19:52:40 +00:00
parent f3d7e546b7
commit fa4e2fc855
2 changed files with 29 additions and 6 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
- feature: 49_SSCam: attr customSVSversion option 9.2.0
- feature: 57_Calendar: add terse human-readable format for datetimes - feature: 57_Calendar: add terse human-readable format for datetimes
- change: 57_Calendar: replace deprectated smartmatch by function - change: 57_Calendar: replace deprectated smartmatch by function
- featur: 36_Shelly: reading 'temperature' for ShellyPlusUni - featur: 36_Shelly: reading 'temperature' for ShellyPlusUni

30
fhem/FHEM/49_SSCam.pm
View File

@ -192,6 +192,7 @@ BEGIN {
# Versions History intern # Versions History intern
my %vNotesIntern = ( my %vNotesIntern = (
"9.12.1" => "25.11.2024 set COMPATIBILITY to 9.2.1, attr customSVSversion new option 9.2.0 ",
"9.12.0" => "27.10.2024 internal code changes, implement new Take camera snapshot API if SVS >= 9.2.1 ". "9.12.0" => "27.10.2024 internal code changes, implement new Take camera snapshot API if SVS >= 9.2.1 ".
"set COMPATIBILITY to 9.2.0, rename attr simu_SVSversion to customSVSversion ". "set COMPATIBILITY to 9.2.0, rename attr simu_SVSversion to customSVSversion ".
"(https://surveillance-api.synology.com/#get-/webapi/SurveillanceStation/ThirdParty/SnapShot/Take/v1) ", "(https://surveillance-api.synology.com/#get-/webapi/SurveillanceStation/ThirdParty/SnapShot/Take/v1) ",
@ -689,6 +690,25 @@ my %hsimu = ( # Fun
VIDEOSTMS => { VER => '1', PATH => 'webapi/entry.cgi' }, VIDEOSTMS => { VER => '1', PATH => 'webapi/entry.cgi' },
REC => { VER => '6', PATH => 'webapi/entry.cgi' }, REC => { VER => '6', PATH => 'webapi/entry.cgi' },
}, },
'920' => {INFO => { VER => '1', PATH => 'webapi/entry.cgi' },
AUTH => { VER => '6', PATH => 'webapi/entry.cgi' },
EXTREC => { VER => '3', PATH => 'webapi/entry.cgi' },
CAM => { VER => '9', PATH => 'webapi/entry.cgi' },
SNAPSHOT => { VER => '1', PATH => 'webapi/entry.cgi' },
PTZ => { VER => '6', PATH => 'webapi/entry.cgi' },
PRESET => { VER => '1', PATH => 'webapi/entry.cgi' },
SVSINFO => { VER => '8', PATH => 'webapi/entry.cgi' },
CAMEVENT => { VER => '1', PATH => 'webapi/entry.cgi' },
EVENT => { VER => '5', PATH => 'webapi/entry.cgi' },
VIDEOSTM => { VER => '1', PATH => 'webapi/entry.cgi' },
EXTEVT => { VER => '1', PATH => 'webapi/entry.cgi' },
STM => { VER => '1', PATH => 'webapi/entry.cgi' },
HMODE => { VER => '1', PATH => 'webapi/entry.cgi' },
LOG => { VER => '3', PATH => 'webapi/entry.cgi' },
AUDIOSTM => { VER => '2', PATH => 'webapi/entry.cgi' },
VIDEOSTMS => { VER => '1', PATH => 'webapi/entry.cgi' },
REC => { VER => '6', PATH => 'webapi/entry.cgi' },
},
); );
# Standardvariablen und Forward-Deklaration # Standardvariablen und Forward-Deklaration
@ -696,7 +716,7 @@ my $defSlim = 3; # default Anzahl der
my $defColumns = 3; # default Anzahl der Spalten einer snapGallery my $defColumns = 3; # default Anzahl der Spalten einer snapGallery
my $sgnum = '1,2,3,4,5,6,7,8,9,10'; # mögliche Anzahl der abzurufenden Schnappschüsse mit snapGallery my $sgnum = '1,2,3,4,5,6,7,8,9,10'; # mögliche Anzahl der abzurufenden Schnappschüsse mit snapGallery
my $sgbdef = 0; # default value Attr snapGalleryBoost my $sgbdef = 0; # default value Attr snapGalleryBoost
my $compstat = '9.2.0'; # getestete SVS-Version my $compstat = '9.2.1'; # getestete SVS-Version
my $valZoom = '.++,+,stop,-,--.'; # Inhalt des Setters "setZoom" my $valZoom = '.++,+,stop,-,--.'; # Inhalt des Setters "setZoom"
my $shutdownInProcess = 0; # Statusbit shutdown my $shutdownInProcess = 0; # Statusbit shutdown
my $todef = 20; # httptimeout default Wert my $todef = 20; # httptimeout default Wert
@ -708,6 +728,7 @@ my $todef = 20; # httptimeout default
8.1.5 8.1.5
8.2.0 8.2.0
8.2.8 8.2.8
9.2.0
); );
# use vars qw($FW_ME); # webname (default is fhem), used by 97_GROUP/weblink # use vars qw($FW_ME); # webname (default is fhem), used by 97_GROUP/weblink
@ -875,7 +896,8 @@ sub Initialize {
my $simver = join ",", @simus; my $simver = join ",", @simus;
$hash->{AttrList} = "disable:1,0 ". $hash->{AttrList} = "customSVSversion:$simver ".
"disable:1,0 ".
"debugactivetoken:1,0 ". "debugactivetoken:1,0 ".
"debugCachetime:1,0 ". "debugCachetime:1,0 ".
"genericStrmHtmlTag ". "genericStrmHtmlTag ".
@ -916,7 +938,6 @@ sub Initialize {
"session:SurveillanceStation,DSM ". "session:SurveillanceStation,DSM ".
"showPassInLog:1,0 ". "showPassInLog:1,0 ".
"showStmInfoFull:1,0 ". "showStmInfoFull:1,0 ".
"customSVSversion:$simver ".
"videofolderMap ". "videofolderMap ".
"webCmd ". "webCmd ".
$readingFnAttributes; $readingFnAttributes;
@ -11529,7 +11550,8 @@ sub __sendEmailblocking { ##
} }
my $ret = "Email transaction \"$tac\" successfully sent ".( $sslver ? "encoded by $sslver" : ""); my $ret = "Email transaction \"$tac\" successfully sent ".( $sslver ? "encoded by $sslver" : "");
Log3 ($name, 3, "$name - $ret To: $to".(($cc)?", CC: $cc":"") ); Log3 ($name, 4, "$name - used SMTP-Credentials: $username / $password");
Log3 ($name, 3, "$name - $ret To: $to".($cc ? ", CC: $cc" :"") );
# Daten müssen als Einzeiler zurückgegeben werden # Daten müssen als Einzeiler zurückgegeben werden
$ret = encode_base64 ($ret, ""); $ret = encode_base64 ($ret, "");