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

10_FBDECT.pm: add DECT440 buttons (Forum #118303)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@23646 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2021-01-30 17:56:52 +00:00
parent 0507c3f2db
commit 1e049d47ab
1 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
fhem/FHEM/10_FBDECT.pm
View File

@ -416,8 +416,12 @@ my %fbhttp_readings = (
summeractive => '"summeractive:".($val ? "yes":"no")', summeractive => '"summeractive:".($val ? "yes":"no")',
holidayactive => '"holidayactive:".($val ? "yes":"no")', holidayactive => '"holidayactive:".($val ? "yes":"no")',
lastpressedtimestamp => '"lastpressedtimestamp:".($val=~m/^\d{10}$/ ? FmtDateTime($val) : "N/A")', lastpressedtimestamp => '"lastpressedtimestamp:".($val=~m/^\d{10}$/ ? FmtDateTime($val) : "N/A")',
lastpressedtimestamp_kurz => '"lastpressedtimestamp_kurz:".($val=~m/^\d{10}$/ ? FmtDateTime($val) : "N/A")', lastpressedtimestamp_kurz => '"lastpressedtimestamp_kurz:$val"',
lastpressedtimestamp_lang => '"lastpressedtimestamp_lang:".($val=~m/^\d{10}$/ ? FmtDateTime($val) : "N/A")', lastpressedtimestamp_lang => '"lastpressedtimestamp_lang:$val"',
lastpressedtimestamp_Oben_rechts =>'"lastpressedtimestamp_oben_rechts:$val"',
lastpressedtimestamp_Unten_rechts=>'"lastpressedtimestamp_unten_rechts:$val"',
lastpressedtimestamp_Oben_links =>'"lastpressedtimestamp_oben_links:$val"',
lastpressedtimestamp_Unten_links=>'"lastpressedtimestamp_unten_links:$val"',
hue => '"hue:$val"', hue => '"hue:$val"',
current_mode => '"current_mode:$val"', current_mode => '"current_mode:$val"',
saturation => '"saturation:$val"', saturation => '"saturation:$val"',
@ -438,24 +442,23 @@ FBDECT_ParseHttp($$$)
my $omsg; my $omsg;
$omsg = $msg; $omsg = $msg;
$omsg =~ s,<([^/>]+?)>([^<]+?)<,$h{$1}=$2,ge; # Quick & Dirty: Tags $omsg =~ s,<([^/>]+?)>([^<]+?)<,$h{$1}=$2 if(!$h{$1}),ge; # Quick & Dirty:Tags
$omsg = $msg; $omsg = $msg;
$omsg =~ s, ([a-z_]+?)="([^"]*)",$h{$1}=$2,ge; # Quick & Dirty: Attributes $omsg =~ s, ([a-z_]+?)="([^"]*)",$h{$1}=$2 if(!$h{$1}),ge; # Attributes
if($h{lastpressedtimestamp}) { # Dect400/#94700 if($h{lastpressedtimestamp}) { # Dect400/#94700, 440/#118303
sub dp($$$); sub dp {
sub my ($txt,$h,$ln) = (@_);
dp($$$)
{
my ($ln, $txt,$hptr) = (@_);
$txt =~ s#<([^/\s>]+?)[^/]*?>(.*?)</\g1># $txt =~ s#<([^/\s>]+?)[^/]*?>(.*?)</\g1>#
my ($n,$c) = ($1,$2); my ($n,$c) = ($1,$2);
$ln = $1 if($n eq "name" && $c =~ m/.*(kurz|lang)$/); $ln = makeReadingName($1) if($n eq "name" && $c =~ m/: (.*)$/);
$hptr->{"${n}_$ln"} = $c if($n eq "lastpressedtimestamp" && $ln); if($n eq "lastpressedtimestamp" && $ln) {
dp($ln, $c, $hptr) if($c && $c =~ m/^<.*>$/); $h->{"${n}_$ln"} = ($c =~ m/^\d{10}$/ ? FmtDateTime($c) : "N/A");
}
dp($c, $h) if($c && $c =~ m/^<.*>$/);
#gex; #gex;
} }
dp("", $msg, \%h); dp($msg, \%h);
} }
my $ain = $h{identifier}; my $ain = $h{identifier};