From 429340664d87f70a14f993aa97e6b630fa34907a Mon Sep 17 00:00:00 2001
From: Beta-User <>
Date: Tue, 5 Dec 2023 15:49:52 +0000
Subject: [PATCH] mqtt2.template: updates to z2m and other

git-svn-id: https://svn.fhem.de/fhem/trunk@28255 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 fhem/FHEM/lib/AttrTemplate/mqtt2.template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/fhem/FHEM/lib/AttrTemplate/mqtt2.template b/fhem/FHEM/lib/AttrTemplate/mqtt2.template
index 9616f0f78..9d61773c4 100644
--- a/fhem/FHEM/lib/AttrTemplate/mqtt2.template
+++ b/fhem/FHEM/lib/AttrTemplate/mqtt2.template
@@ -152,7 +152,8 @@ attr DEVICE readingList\
   $\DEVICETOPIC/bridge/info:.* info\
   $\DEVICETOPIC/bridge/groups:.* groups\
   $\DEVICETOPIC/bridge/event:.* { json2nameValue($EVENT) }\
-  $\DEVICETOPIC/bridge/extensions:.* extensions
+  $\DEVICETOPIC/bridge/extensions:.* extensions\
+  $\DEVICETOPIC/bridge/response/permit_join:.* { json2nameValue($EVENT) }
 attr DEVICE setList\
   log_level:debug,info,warn,error $\DEVICETOPIC/bridge/config/log_level $EVTPART1\
   permit_join:true,false $\DEVICETOPIC/bridge/request/permit_join $EVTPART1\
@@ -178,7 +179,7 @@ attr DEVICE comment To check for new updates of the deamon software, you might w
 #set DEVICE attrTemplate do_general_mqtt_cleanup ADD_TO_IO_IGNOREREGEXP=BASE_TOPIC/[A-Za-z0-9._]+/set
 set DEVICE attrTemplate do_general_mqtt_cleanup
 attr DEVICE model zigbee2mqtt_bridge
-setreading DEVICE attrTemplateVersion 20220328
+setreading DEVICE attrTemplateVersion 20231205
 # Based on https://forum.fhem.de/index.php/topic,94060.msg872371.html#msg872371
 
 
@@ -3368,7 +3369,7 @@ par:DEVNAME;name of this shelly;{ AttrVal('DEVICE','readingList','') =~ m,shelli
 par:ICON;ICON as set, defaults to motion_detector;{ AttrVal('DEVICE','icon','motion_detector') }
 attr DEVICE icon ICON
 attr DEVICE devStateIcon {my $onl = ReadingsVal($name,'online','false') eq 'true'?'10px-kreis-gruen':'10px-kreis-rot'; \
-my $moti = ReadingsVal($name,"motion","false") eq "true"?"people_sensor":"message_presence"; \
+my $moti = ReadingsVal($name,"status_motion","false") eq "true"?"people_sensor":"message_presence"; \
 "<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($moti)."</a>"}
 attr DEVICE readingList shellies/DEVNAME/online:.* online\
   shellies/DEVNAME/sensor/status:.* { json2nameValue($EVENT) }\
@@ -3377,7 +3378,7 @@ attr DEVICE readingList shellies/DEVNAME/online:.* online\
 attr DEVICE setList x_update:noArg shellies/DEVNAME/command update_fw\
   x_mqttcom shellies/DEVNAME/command $EVTPART1
 attr DEVICE model shellymotion
-setreading DEVICE attrTemplateVersion 20210324
+setreading DEVICE attrTemplateVersion 20231205
 
 
 # shellyht using original firmware