Public/fhem-mirror
1
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-04 22:19:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

74_AMADDevice: add ttsMsgVol, sets automatically a preset volume

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@15022 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
LeonGaultier 2017-09-06 19:56:28 +00:00
parent 5b596679aa
commit 613c70e1c9
4 changed files with 609 additions and 558 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fhem/CHANGED
View File

@ -1,5 +1,6 @@
# Add changes at the top of the list. Keep it in ASCII, and 80-char wide. # Add changes at the top of the list. Keep it in ASCII, and 80-char wide.
# Do not insert empty lines here, update check depends on it. # Do not insert empty lines here, update check depends on it.
- feature: 74_AMADDevice: add ttsMsgVol, sets automatically a preset volume
- feature: proxy global attribute for HttpUtils (Forum #60471) - feature: proxy global attribute for HttpUtils (Forum #60471)
- bugfix: 93_DbLog: V2.22.5, several fixes Forum:#75894 - bugfix: 93_DbLog: V2.22.5, several fixes Forum:#75894
- feature: 74_GardenaSmartDevice: check character for create devicenames - feature: 74_GardenaSmartDevice: check character for create devicenames

2
fhem/FHEM/73_AMADCommBridge.pm
View File

@ -75,7 +75,7 @@ eval "use JSON;1" or $missingModul .= "JSON ";
my $modulversion = "4.0.5"; my $modulversion = "4.0.5";
my $flowsetversion = "4.0.6"; my $flowsetversion = "4.0.7";

12
fhem/FHEM/74_AMADDevice.pm
View File

@ -58,8 +58,8 @@ eval "use Encode qw(encode encode_utf8);1" or $missingModul .= "Encode ";
eval "use JSON;1" or $missingModul .= "JSON "; eval "use JSON;1" or $missingModul .= "JSON ";
my $modulversion = "4.0.7"; my $modulversion = "4.0.8";
my $flowsetversion = "4.0.6"; my $flowsetversion = "4.0.7";
@ -105,8 +105,9 @@ sub AMADDevice_Initialize($) {
"setOpenUrlBrowser ". "setOpenUrlBrowser ".
"setNotifySndFilePath ". "setNotifySndFilePath ".
"setTtsMsgSpeed ". "setTtsMsgSpeed ".
"setUserFlowState ".
"setTtsMsgLang:de,en ". "setTtsMsgLang:de,en ".
"setTtsMsgVol ".
"setUserFlowState ".
"setVolUpDownStep:1,2,4,5 ". "setVolUpDownStep:1,2,4,5 ".
"setVolMax ". "setVolMax ".
"setVolFactor:2,3,4,5 ". "setVolFactor:2,3,4,5 ".
@ -448,8 +449,9 @@ sub AMADDevice_Set($$@) {
my $msg = join( " ", @args ); my $msg = join( " ", @args );
my $speed = AttrVal( $name, "setTtsMsgSpeed", "1.0" ); my $speed = AttrVal( $name, "setTtsMsgSpeed", "1.0" );
my $lang = AttrVal( $name, "setTtsMsgLang","de" ); my $lang = AttrVal( $name, "setTtsMsgLang","de" );
my $ttsmsgvol = AttrVal( $name, "setTtsMsgVol","none");
$uri = $host . ":" . $port . "/fhem-amad/setCommands/ttsMsg?message=".urlEncode($msg)."&msgspeed=".$speed."&msglang=".$lang; $uri = $host . ":" . $port . "/fhem-amad/setCommands/ttsMsg?message=".urlEncode($msg)."&msgspeed=".$speed."&msglang=".$lang."&msgvol=".$ttsmsgvol;
$method = "POST"; $method = "POST";
} }
@ -1040,6 +1042,7 @@ sub AMADDevice_decrypt($) {
<li>setNotifySndFilePath - set systempath to notifyfile (default /storage/emulated/0/Notifications/</li> <li>setNotifySndFilePath - set systempath to notifyfile (default /storage/emulated/0/Notifications/</li>
<li>setTtsMsgSpeed - set speaking speed for TTS (Value between 0.5 - 4.0, 0.5 Step) default is 1.0</li> <li>setTtsMsgSpeed - set speaking speed for TTS (Value between 0.5 - 4.0, 0.5 Step) default is 1.0</li>
<li>setTtsMsgLang - set speaking language for TTS, de or en (default is de)</li> <li>setTtsMsgLang - set speaking language for TTS, de or en (default is de)</li>
<li>setTtsMsgVol - is set, change automatically the media audio end set it back</li>
<br> <br>
To be able to use "openApp" the corresponding attribute "setOpenApp" needs to contain the app package name. To be able to use "openApp" the corresponding attribute "setOpenApp" needs to contain the app package name.
<br><br> <br><br>
@ -1211,6 +1214,7 @@ sub AMADDevice_decrypt($) {
<li>setNotifySndFilePath - setzt den korrekten Systempfad zur Notifydatei (default ist /storage/emulated/0/Notifications/</li> <li>setNotifySndFilePath - setzt den korrekten Systempfad zur Notifydatei (default ist /storage/emulated/0/Notifications/</li>
<li>setTtsMsgSpeed - setzt die Sprachgeschwindigkeit bei der Sprachausgabe(Werte zwischen 0.5 bis 4.0 in 0.5er Schritten) default ist 1.0</li> <li>setTtsMsgSpeed - setzt die Sprachgeschwindigkeit bei der Sprachausgabe(Werte zwischen 0.5 bis 4.0 in 0.5er Schritten) default ist 1.0</li>
<li>setTtsMsgLang - setzt die Sprache bei der Sprachausgabe, de oder en (default ist de)</li> <li>setTtsMsgLang - setzt die Sprache bei der Sprachausgabe, de oder en (default ist de)</li>
<li>setTtsMsgVol - wenn gesetzt wird der Wert als neues Media Volume f&uuml; die Sprachansage verwendet und danach wieder der alte Wert eingestellt</li>
<li>setVolUpDownStep - setzt den Step f&uuml;r volumeUp und volumeDown</li> <li>setVolUpDownStep - setzt den Step f&uuml;r volumeUp und volumeDown</li>
<li>setVolMax - setzt die maximale Volume Gr&uoml;e f&uuml;r den Slider</li> <li>setVolMax - setzt die maximale Volume Gr&uoml;e f&uuml;r den Slider</li>
<li>setNotifyVolMax - setzt den maximalen Lautst&auml;rkewert für Benachrichtigungslautst&auml;rke f&uuml;r den Slider</li> <li>setNotifyVolMax - setzt den maximalen Lautst&auml;rkewert für Benachrichtigungslautst&auml;rke f&uuml;r den Slider</li>

1146
fhem/FHEM/lib/74_AMADautomagicFlowset_4.0.6.xml → fhem/FHEM/lib/74_AMADautomagicFlowset_4.0.7.xml
View File

File diff suppressed because it is too large Load Diff