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

10_ZWave.pm: use the pepper pictures, if alliance do not have them (Forum #72935)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@14480 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2017-06-08 17:17:28 +00:00
parent 85540aa9a2
commit c6cb0b5256
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
fhem/FHEM/10_ZWave.pm
View File

@ -657,7 +657,8 @@ our %zwave_deviceSpecial;
my $zwave_cryptRijndael = 0;
my $zwave_lastHashSent;
my (%zwave_link, %zwave_img);
my $zwave_helpSites = "alliance"; # was "alliance,pepper";
my $zwave_activeHelpSites = "alliance"; # "pepper is dead";
my $zwave_allHelpSites = "alliance,pepper";
# standard definitions for regular expression
# naming scheme: p<number of returned groups>_name
@ -718,7 +719,7 @@ ZWave_Initialize($)
################
# Read in the pepper/alliance translation table
for my $n (split(",", $zwave_helpSites)) {
for my $n (split(",", $zwave_allHelpSites)) {
my $fn = $attr{global}{modpath}."/FHEM/lib/zwave_${n}links.csv.gz";
my $gz = gzopen($fn, "rb");
if($gz) {
@ -4962,7 +4963,7 @@ ZWave_getPic($$)
{
my ($iodev, $model) = @_;
my $hs = AttrVal($iodev, "helpSites", $zwave_helpSites);
my $hs = AttrVal($iodev, "helpSites", $zwave_allHelpSites);
for my $n (split(",", $hs)) {
my $img = $zwave_img{$n}{$model};
next if(!$img);
@ -4993,7 +4994,7 @@ ZWave_fhemwebFn($$$$)
return '' if (!$model);
my $iodev = $defs{$d}{IODev}{NAME};
my $hs = AttrVal($iodev, "helpSites", $zwave_helpSites);
my $hs = AttrVal($iodev, "helpSites", $zwave_activeHelpSites);
for my $n (split(",", $hs)) {
my $link = $zwave_link{$n}{$model};
next if(!$link);