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

FULLY: Fixed speak and overlayMessage

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@25516 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
zap 2022-01-20 16:00:19 +00:00
parent a541759b3c
commit 454fe2d41f
2 changed files with 8 additions and 5 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.
- bugfix: 89_FULLY: Fixed speak and overlayMessage commands.
- bugfix: 74_XiaomiBTLESens: fix incurrect temperatur then value is negativ - bugfix: 74_XiaomiBTLESens: fix incurrect temperatur then value is negativ
- feature: 30_HUEBridge: support eventstream api (push events) - feature: 30_HUEBridge: support eventstream api (push events)
- change: 70_DENON_AVR: added soundformat strings. patch by All-Ex - change: 70_DENON_AVR: added soundformat strings. patch by All-Ex

12
fhem/FHEM/89_FULLY.pm
View File

@ -447,14 +447,16 @@ sub FULLY_Set ($@)
push (@p, { "key" => "motionDetection", "value" => "$value" }); push (@p, { "key" => "motionDetection", "value" => "$value" });
} }
elsif ($opt eq 'speak') { elsif ($opt eq 'speak') {
my $text = shift @a // return 'Usage: set $name speak "{Text}"'; my $text = join(' ',@a);
return 'Usage: set $name speak {Text}' if (!defined($text) || $text eq '');
my $enctext = FULLY_SubstDeviceReading ($text); my $enctext = FULLY_SubstDeviceReading ($text);
push (@c, "textToSpeech"); push (@c, "textToSpeech");
push (@p, { "text" => "$enctext" }); push (@p, { "text" => "$enctext" });
} }
elsif ($opt eq 'overlayMessage') { elsif ($opt eq 'overlayMessage') {
my $text = shift @a // return 'Usage: set $name overlayMessage "{Text}"'; my $text = join(' ',@a);
my $enctext = FULLY_SubstDeviceReading ($text); return 'Usage: set $name overlayMessage [{Text}]' if (!defined($text));;
my $enctext = $text ne '' ? FULLY_SubstDeviceReading ($text) : '';
push (@c, "setOverlayMessage"); push (@c, "setOverlayMessage");
push (@p, { "text" => "$enctext" }); push (@p, { "text" => "$enctext" });
} }
@ -497,8 +499,8 @@ sub FULLY_Set ($@)
elsif ($opt eq 'setStringSetting' || $opt eq 'setBooleanSetting') { elsif ($opt eq 'setStringSetting' || $opt eq 'setBooleanSetting') {
return "FULLY: Command $opt only available in expert mode" if ($expert == 0); return "FULLY: Command $opt only available in expert mode" if ($expert == 0);
my $key = shift @a; my $key = shift @a;
my $value = shift @a; my $value = join(' ',@a);
return "Usage: set $name $opt {key} {value}" if (!defined ($value)); return "Usage: set $name $opt {key} {value}" if (!defined($value) || $value eq '');
push (@c, $opt); push (@c, $opt);
push (@p, { "key" => "$key", "value" => "$value" }); push (@p, { "key" => "$key", "value" => "$value" });
} }