FHEM/mod-AMAD
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Bugfix: ab Version 1.29 neuer Aufbau des HTTP Request Headers von Automagic, Spracheingabe komplett implementiert

Browse Source
This commit is contained in:
Marko Oldenburg
2015-11-04 09:59:05 +01:00
parent 82ba0bf86c
commit 833669833f
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
74_AMAD.pm
View File

@@ -35,7 +35,7 @@ use Time::HiRes qw(gettimeofday);
use HttpUtils; use HttpUtils;
use TcpServerUtils; use TcpServerUtils;
my $version = "0.8.1"; my $version = "0.9.0";
@@ -459,7 +459,7 @@ sub AMAD_Set($$@) {
$list .= "notifySndFile "; $list .= "notifySndFile ";
$list .= "clearNotificationBar:All,Automagic "; $list .= "clearNotificationBar:All,Automagic ";
$list .= "changetoBTDevice:$btdev " if( AttrVal( $name, "setBluetoothDevice", "none" ) ne "none" ); $list .= "changetoBTDevice:$btdev " if( AttrVal( $name, "setBluetoothDevice", "none" ) ne "none" );
#$list .= "activateVoiceInput:noArg "; # erste Codeteile für Spracheingabe $list .= "activateVoiceInput:noArg ";
if( lc $cmd eq 'screenmsg' if( lc $cmd eq 'screenmsg'
|| lc $cmd eq 'ttsmsg' || lc $cmd eq 'ttsmsg'
@@ -899,8 +899,8 @@ sub AMAD_CommBridge_Read($) {
my $tv = $data[1]; my $tv = $data[1];
@data = split( '\R', $data[0] ); @data = split( '\R', $data[0] );
$data[2] =~ s/FHEMDEVICE: //; $data[3] =~ s/FHEMDEVICE: //;
my $chash = $defs{$data[2]}; my $chash = $defs{$data[3]};
### Begin Response Processing ### Begin Response Processing
my @valuestring = split( '@@@@', $tv ); my @valuestring = split( '@@@@', $tv );
@@ -936,7 +936,7 @@ sub AMAD_CommBridge_Read($) {
return; return;
} }
elsif ( $data[0] =~ /FHEMCMD: voicecmd\b/ ) { elsif ( $data[0] =~ /FHEMCMD: voiceinputvalue\b/ ) {
my $fhemCmd = $data[1]; my $fhemCmd = $data[1];
readingsSingleUpdate( $brihash, "receiveVoiceCommand", $fhemCmd, 1 ); readingsSingleUpdate( $brihash, "receiveVoiceCommand", $fhemCmd, 1 );
@@ -945,10 +945,10 @@ sub AMAD_CommBridge_Read($) {
} }
elsif ( $data[0] =~ /FHEMCMD: statusrequest\b/ ) { elsif ( $data[0] =~ /FHEMCMD: statusrequest\b/ ) {
@data = split( '\R', $data[0] ); @data = split( '\R', $data[0] );
$data[2] =~ s/FHEMDEVICE: //; $data[3] =~ s/FHEMDEVICE: //;
my $chash = $defs{$data[2]}; my $chash = $defs{$data[3]};
return AMAD_GetUpdateLocal( $chash ); return AMAD_GetUpdateLocal( $chash );
} }