FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-04 11:26:55 +00:00
Code Issues Releases Wiki Activity

39_alexa.pm: added fhemIntents attribute

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@12828 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
justme-1968 2016-12-19 13:31:14 +00:00
parent b88ef0ba80
commit fdba6df287
1 changed files with 44 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
fhem/FHEM/39_alexa.pm
View File

@ -22,12 +22,28 @@ alexa_Initialize($)
$hash->{UndefFn} = "alexa_Undefine";
$hash->{SetFn} = "alexa_Set";
$hash->{GetFn} = "alexa_Get";
#$hash->{AttrFn} = "alexa_Attr";
$hash->{AttrList} = "alexaMapping:textField-long alexaTypes articles prepositions $readingFnAttributes";
$hash->{AttrFn} = "alexa_Attr";
$hash->{AttrList} = "alexaMapping:textField-long alexaTypes fhemIntents:textField-long articles prepositions $readingFnAttributes";
}
#####################################
sub
alexa_AttrDefaults($)
{
my ($hash) = @_;
my $name = $hash->{NAME};
if( !AttrVal( $name, 'alexaMapping', undef ) ) {
CommandAttr(undef,"$name alexaMapping #Characteristic:<name>=<value>,...");
}
if( !AttrVal( $name, 'fhemIntents', undef ) ) {
CommandAttr(undef,"$name fhemIntents #IntentName:<sample utterance>" );
}
}
sub
alexa_Define($$)
{
@ -41,12 +57,14 @@ alexa_Define($$)
$hash->{NAME} = $name;
my $d = $modules{$hash->{TYPE}}{defptr};
return "$hash->{TYPE} device already defined as $d->{NAME}." if( defined($d) );
return "$hash->{TYPE} device already defined as $d->{NAME}." if( defined($d) && $name ne $d->{NAME} );
$modules{$hash->{TYPE}}{defptr} = $hash;
addToAttrList("$hash->{TYPE}Name");
addToAttrList("$hash->{TYPE}Room");
alexa_AttrDefaults($hash);
$hash->{STATE} = 'active';
return undef;
@ -331,8 +349,24 @@ Log 1, Dumper $characteristicsOfIntent;
++$i;
}
$samples .= "\n";
}
if( my $entries = AttrVal( $name, 'fhemIntents', undef ) ) {
foreach my $entry ( split( /\n/, $entries ) ) {
next if( !$entry );
next if( $entry =~ /^#/ );
my ($intent, $remainder) = split( /:|=/, $entry, 2 );
my @parts = split( /,/, $remainder );
my $utterance = $parts[$#parts];
push @{$schema->{intents}}, {intent => "FHEM${intent}Intent", };
$samples .= "\nFHEM${intent}Intent $utterance";
}
$samples .= "\n";
}
push @{$schema->{intents}}, {intent => "StatusIntent",
slots => [ { name => 'Device', type => 'FHEM_Device' },
@ -429,10 +463,12 @@ alexa_Attr($$$)
}
if( $cmd eq 'set' ) {
if( $orig ne $attrVal ) {
$attr{$name}{$attrName} = $attrVal;
return $attrName ." set to ". $attrVal;
}
} else {
delete $attr{$name}{$attrName};
RemoveInternalTimer($hash);
InternalTimer(gettimeofday(), "alexa_AttrDefaults", $hash, 0);
}
return;