From a5b7be7cbf892db61e41c4749fa34073109c3d27 Mon Sep 17 00:00:00 2001
From: Beta-User <>
Date: Sun, 22 Mar 2020 17:46:07 +0000
Subject: [PATCH] speechrecogn.template: extend radio option functionality;
 httpmod.template: update tasmotaupdate

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

diff --git a/fhem/FHEM/lib/AttrTemplate/httpmod.template b/fhem/FHEM/lib/AttrTemplate/httpmod.template
index e0da1ba2e..0f488adf8 100644
--- a/fhem/FHEM/lib/AttrTemplate/httpmod.template
+++ b/fhem/FHEM/lib/AttrTemplate/httpmod.template
@@ -621,7 +621,7 @@ attr DEVICE showMatched 1
 attr DEVICE stateFormat { my $ret ="";;\
     my $lastCheck = ReadingsTimestamp($name,"MATCHED_READINGS","???");;\
     $ret .= '<div style="text-align:left">';;\
-    $ret .= 'last <a title="versions" href="'.InternalVal($name,"MainURL","unknown").'">tasmota</a>-check => '.$lastCheck;;\
+    $ret .= 'last <a title="versions" href="https://github.com/arendst/Tasmota/releases" target="_blank">tasmota</a>-check => '.$lastCheck;;\
     $ret .= '<br><br><pre>';;\
     $ret .= "| device                           | current |   new   |  released  |<br>";;\
     $ret .= "---------------------------------------------------------------------<br>";;\
@@ -639,12 +639,12 @@ attr DEVICE stateFormat { my $ret ="";;\
       foreach my $devStr (@devices) {\
         my ($dev,$old,$new,$date) = $devStr =~ m/^([^\s]+)\s\(([^\s]+)\s\|\s([^\s]+)\s\|\s([^\)]+)\)$/;;\
         $ret .= '| <a href="/fhem?detail='.$dev.'"><b>';;\
-        $ret .= sprintf("%-32s",$dev);;\
+        $ret .= sprintf("%-32s",AttrVal($dev,"alias",$dev));;\
         $ret .= '</b></a> | ';;\
         $ret .= '<b style="color:lightgray">';;\
-		$ret .= '<a href="http://'.ReadingsVal($dev,"IPAddress",ReadingsVal($dev,"INFO1_IPAddress","0.0.0.0")).'" target="_blank">';;\
-		$ret .= sprintf("%7s",$old);;\
-        $ret .= '</b></a> | ';;\
+        $ret .= '<a href="http://'.ReadingsVal($dev,"IPAddress",ReadingsVal($dev,"INFO1_IPAddress","0.0.0.0")).'/up" target="_blank">';;\
+        $ret .= sprintf("%7s",$old);;\
+        $ret .= '</a></b> | ';;\
         $ret .= '<a href="https://github.com/arendst/Tasmota/releases/tag/v'.$new.'">';;\
         $ret .= '<b style="color:red">';;\
         $ret .= sprintf("%7s",$new);;\
diff --git a/fhem/FHEM/lib/AttrTemplate/speechrecogn.template b/fhem/FHEM/lib/AttrTemplate/speechrecogn.template
index 03c76c156..5ccdbbce7 100644
--- a/fhem/FHEM/lib/AttrTemplate/speechrecogn.template
+++ b/fhem/FHEM/lib/AttrTemplate/speechrecogn.template
@@ -99,9 +99,12 @@ desc:generic template to set speech recognition attribute alexaName, call e.g. w
 option:{my @devices=devspec2array("TYPE=(alexa)");; $devices[0] ? return 1 : return 0}
 #par:ALEXANAME;Please enter alexaName. Pls. enter something, even if you do not want any name to be set, use the offered radio option to skip naming instead!;{ AttrVal("DEVICE","alexaName",undef) }
 par:ALEXAISNAME;Current attribute value alexaName;{ AttrVal("DEVICE","alexaName","(not set)") }
+par:RADIO_KEEPalexaNAME;Keep current attribute value;{ defined AttrVal("DEVICE","alexaName",undef) ? undef :0 }
 par:RADIO_SETalexaNAME;Set a new alexaName;{ undef }
-par:RADIO_DoNotSetalexaName;Leave alexaName attribute empty;{ undef }
+par:RADIO_DoNotSetalexaName;Leave alexaName attribute empty;{ defined AttrVal("DEVICE","alexaName",undef) ? 0 : undef }
 par:RADIO_Delete_gDT;Discard genericDeviceType attribute;{ undef }
+option:{ RADIO_KEEPalexaNAME }
+set DEVICE attrTemplate speech_recognition_siri_specials CHECKGDTDONE=1
 option:{ RADIO_Delete_gDT }
 deleteAttr DEVICE genericDeviceType
 option:{ RADIO_DoNotSetalexaName }
@@ -114,7 +117,6 @@ name:speech_recognition_request_alexaName
 filter:NAME=speechrecognTesting
 order:1000020b
 desc:generic template to ask for alexaName attribute setting. Only intented for internal use by speech_recognition_request_alexaName
-#par:ALEXAISNAME;Current attribute value alexaName;{ AttrVal("DEVICE","alexaName","(not set)") } 
 par:ALEXANAME;Please enter alexaName;{ undef } 
 option:{my @devices=devspec2array("TYPE=(alexa)");; $devices[0] ? return 1 : return 0}
 attr DEVICE alexaName ALEXANAME
@@ -130,10 +132,12 @@ order:1000021a
 desc:generic template to set speech recognition attribute alexaName, call e.g. with set xy attrTemplate speech_recognition_siri_specials ALEXANAME=myAlexaName
 option:{my @devices=devspec2array("TYPE=(siri)");; $devices[0] ? return 1 : return 0}
 par:CHECKGDTDONE;Set this to  to 1 if answer was no in previous template;{ 0 } 
+par:RADIO_KEEPsiriNAME;Keep current attribute value;{ defined AttrVal("DEVICE","siriName",undef) ? undef :0 }
 par:RADIO_SETsiriNAME;Set a new siriName;{ undef }
 par:RADIO_DoNotSetsiriName;Leave siriName attribute empty;{ undef }
-par:RADIO_Delete_gDT;Discard genericDeviceType attribute;{ CHECKGDTDONE ? 0 : undef }
-option:{ RADIO_Delete_gDT && }
+par:RADIO_Delete_gDT;Discard genericDeviceType attribute;{ CHECKGDTDONE ? undef : 0 }
+option:{ RADIO_KEEPsiriNAME }
+option:{ RADIO_Delete_gDT }
 deleteAttr DEVICE genericDeviceType
 option:{ RADIO_DoNotSetsiriName }
 deleteAttr DEVICE siriName