From 1f5a6c74e122df4e699072e710057954ec6bfb42 Mon Sep 17 00:00:00 2001
From: Beta-User <>
Date: Wed, 29 Jan 2020 04:45:17 +0000
Subject: [PATCH] mqtt2.template: shelly2.5: devStateIcon;
 httpmod.template:hm-firmware-check requestData

git-svn-id: https://svn.fhem.de/fhem/trunk@21068 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 fhem/FHEM/lib/AttrTemplate/httpmod.template | 2 +-
 fhem/FHEM/lib/AttrTemplate/mqtt2.template   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/fhem/FHEM/lib/AttrTemplate/httpmod.template b/fhem/FHEM/lib/AttrTemplate/httpmod.template
index b2ec9505b..4ad1fdf32 100644
--- a/fhem/FHEM/lib/AttrTemplate/httpmod.template
+++ b/fhem/FHEM/lib/AttrTemplate/httpmod.template
@@ -492,7 +492,7 @@ attr DEVICE reading02RegOpt g
 attr DEVICE reading02Regex (?si)(.{300})<a.href="\/downloads\/software\/firmware\/hm[^"]+
 attr DEVICE readingMaxAge 10
 attr DEVICE readingMaxAgeReplacementMode delete
-attr DEVICE requestData.* suchbegriff=&quelle=29&suchkategorie=3&themenbereich=1
+attr DEVICE requestData suchbegriff=&quelle=29&suchkategorie=3&themenbereich=1
 attr DEVICE room WHICHROOM
 attr DEVICE showError 1
 attr DEVICE showMatched 1
diff --git a/fhem/FHEM/lib/AttrTemplate/mqtt2.template b/fhem/FHEM/lib/AttrTemplate/mqtt2.template
index 20ffb5642..5ea25e2c2 100644
--- a/fhem/FHEM/lib/AttrTemplate/mqtt2.template
+++ b/fhem/FHEM/lib/AttrTemplate/mqtt2.template
@@ -1415,7 +1415,7 @@ setreading DEVICE_CH2 associatedWith DEVICE
 attr DEVICE_CH2 setList \
   off:noArg shellies/DEVNAME/relay/1/command off\
   on:noArg shellies/DEVNAME/relay/1/command on
-attr DEVICE devStateIcon {my $onl = ReadingsVal($name,"online","false") eq "true"?"10px-kreis-gruen":"10px-kreis-rot";; my $light = ReadingsVal($name,"state","off");; my $cons = ReadingsVal($name,"relay_1_power","unknown");; my $temp = ReadingsVal($name,"temperature","-100");;"<div><a href=\"http://".ReadingsVal($name,"ip","none")." \"target=\"_blank\">".FW_makeImage($onl)."</a> <a href=\"/fhem?cmd.dummy=set $name toggle&XHR=1\">".FW_makeImage($light)."</a> Aktuell: $cons W / Temp.: $temp °C</div>"}
+attr DEVICE_CH2 devStateIcon {my $onl = ReadingsVal($name,"online","false") eq "true"?"10px-kreis-gruen":"10px-kreis-rot";; my $light = ReadingsVal($name,"state","off");; my $cons = ReadingsVal($name,"relay_1_power","unknown");; my $temp = ReadingsVal($name,"temperature","-100");;"<div><a href=\"http://".ReadingsVal($name,"ip","none")." \"target=\"_blank\">".FW_makeImage($onl)."</a> <a href=\"/fhem?cmd.dummy=set $name toggle&XHR=1\">".FW_makeImage($light)."</a> Aktuell: $cons W / Temp.: $temp °C</div>"}
 attr DEVICE model shelly25_split
 
 # shelly4pro using original firmware