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

49_SSCam: contrib 8.4.0

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@18174 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
nasseeder1 2019-01-07 18:40:45 +00:00
parent 43adfe59d3
commit 2cd384f489
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
fhem/contrib/DS_Starter/49_SSCam.pm
View File

@ -4911,9 +4911,6 @@ sub SSCam_camop_parse ($) {
Log3($name, 3, "$name - Snapshot of Camera $camname has been done successfully"); Log3($name, 3, "$name - Snapshot of Camera $camname has been done successfully");
# Token freigeben vor nächstem Kommando
SSCam_delActiveToken($hash);
my $num = $hash->{HELPER}{SNAPNUM}; # Gesamtzahl der auszulösenden Schnappschüsse my $num = $hash->{HELPER}{SNAPNUM}; # Gesamtzahl der auszulösenden Schnappschüsse
my $ncount = $hash->{HELPER}{SNAPNUMCOUNT}; # Restzahl der auszulösenden Schnappschüsse my $ncount = $hash->{HELPER}{SNAPNUMCOUNT}; # Restzahl der auszulösenden Schnappschüsse
$ncount--; # wird vermindert je Snap $ncount--; # wird vermindert je Snap
@ -4921,11 +4918,17 @@ sub SSCam_camop_parse ($) {
my $emtxt = $hash->{HELPER}{SMTPMSG}; # alternativer Text für Email-Versand my $emtxt = $hash->{HELPER}{SMTPMSG}; # alternativer Text für Email-Versand
if($ncount > 0) { if($ncount > 0) {
InternalTimer(gettimeofday()+$lag, "SSCam_camsnap", "$name:$num:$lag:$ncount:$emtxt", 0); InternalTimer(gettimeofday()+$lag, "SSCam_camsnap", "$name:$num:$lag:$ncount:$emtxt", 0);
# Token freigeben für nächstes Kommando
SSCam_delActiveToken($hash);
return; return;
} }
# Schnappschußgalerie abrufen (snapGalleryBoost) oder nur Info des letzten Snaps # Schnappschußgalerie abrufen (snapGalleryBoost) oder nur Info des letzten Snaps
my ($slim,$ssize) = SSCam_snaplimsize($hash); my ($slim,$ssize) = SSCam_snaplimsize($hash);
# Token freigeben vor nächstem Kommando
SSCam_delActiveToken($hash);
RemoveInternalTimer("SSCam_getsnapinfo"); RemoveInternalTimer("SSCam_getsnapinfo");
InternalTimer(gettimeofday()+0.6, "SSCam_getsnapinfo", "$name:$slim:$ssize", 0); InternalTimer(gettimeofday()+0.6, "SSCam_getsnapinfo", "$name:$slim:$ssize", 0);
@ -7175,7 +7178,7 @@ sub SSCam_prepareSendEmail ($$;$) {
# Extraktion EMail-Texte # Extraktion EMail-Texte
# Attribut snapEmailTxt kann übersteuert werden mit: $hash->{HELPER}{SMTPMSG} # Attribut snapEmailTxt kann übersteuert werden mit: $hash->{HELPER}{SMTPMSG}
# Format in $hash->{HELPER}{SMTPMSG} muss sein: subject => <Betreff-Text>, body => <Mitteilung-Text> # Format in $hash->{HELPER}{SMTPMSG} muss sein: subject => <Betreff-Text>, body => <Mitteilung-Text>
my $mth = delete $hash->{HELPER}{SMTPMSG}; my $mth = $hash->{HELPER}{SMTPMSG};
my $mt = $mth?$mth:AttrVal($name, "snapEmailTxt", ""); my $mt = $mth?$mth:AttrVal($name, "snapEmailTxt", "");
$mt =~ s/['"]//g; $mt =~ s/['"]//g;
@ -7205,6 +7208,7 @@ sub SSCam_prepareSendEmail ($$;$) {
$lsnaptime = ReadingsVal($name,"LastSnapTime",""); $lsnaptime = ReadingsVal($name,"LastSnapTime","");
$sdat = $data; $sdat = $data;
delete $hash->{HELPER}{CANSENDSNAP}; delete $hash->{HELPER}{CANSENDSNAP};
delete $hash->{HELPER}{SMTPMSG};
$ret = SSCam_sendEmail($hash, {'subject' => $smtpmsg{subject}, $ret = SSCam_sendEmail($hash, {'subject' => $smtpmsg{subject},
'part1txt' => $smtpmsg{body}, 'part1txt' => $smtpmsg{body},