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

add nfc support

Browse Source
This commit is contained in:
Marko Oldenburg 2017-08-08 07:53:34 +02:00
parent 4be91c25cf
commit a9919f3a60
3 changed files with 620 additions and 523 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
73_AMADCommBridge.pm
View File

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

24
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 ";
my $modulversion = "4.0.4";
my $flowsetversion = "4.0.1";
my $modulversion = "4.0.5";
my $flowsetversion = "4.0.2";
@ -383,15 +383,18 @@ sub AMADDevice_WriteReadings($$) {
$v =~ s/\bnull\b//g;
$v = encode_utf8($v);
readingsBulkUpdateIfChanged($hash, $t, $v, 1) if( defined( $v ) and ($t ne 'deviceState'
readingsBulkUpdateIfChanged($hash, $t, $v, 1) if( defined( $v ) and ($t ne 'deviceState'
or $t ne 'incomingCallerName'
or $t ne 'incomingCallerNumber')
or $t ne 'incomingCallerNumber'
or $t ne 'nfcLastTagID')
);
readingsBulkUpdateIfChanged( $hash, $t, ($v / AttrVal($name,'setVolFactor',1)) ) if( $t eq 'volume' and AttrVal($name,'setVolFactor',1) > 1 );
readingsBulkUpdate( $hash, '.'.$t, $v ) if( $t eq 'deviceState' );
readingsBulkUpdate( $hash, $t, $v ) if( $t eq 'incomingCallerName' );
readingsBulkUpdate( $hash, $t, $v ) if( $t eq 'incomingCallerNumber' );
readingsBulkUpdate( $hash, $t, $v ) if( $t eq 'incomingCallerName'
or $t eq 'incomingCallerNumber'
or $t eq 'nfcLastTagID'
);
}
readingsBulkUpdateIfChanged( $hash, "deviceState", "offline", 1 ) if( $decode_json->{payload}{airplanemode} && $decode_json->{payload}{airplanemode} eq "on" );
@ -630,6 +633,14 @@ sub AMADDevice_Set($$@) {
$method = "POST";
}
elsif( lc $cmd eq 'nfc' ) {
my $mod = join( " ", @args );
$uri = $host . ":" . $port . "/fhem-amad/setCommands/setnfc?nfc=".$mod;
$method = "POST";
}
elsif( lc $cmd eq 'system' ) {
my $systemcmd = join( " ", @args );
@ -770,6 +781,7 @@ sub AMADDevice_Set($$@) {
$list .= " openApp:$apps" if( AttrVal( $name, "setOpenApp", "none" ) ne "none" );
$list .= " system:reboot,shutdown,airplanemodeON" if( AttrVal( $name, "root", "0" ) eq "1" );
$list .= " changetoBTDevice:$btdev" if( AttrVal( $name, "setBluetoothDevice", "none" ) ne "none" );
$list .= " nfc:on,off" if( AttrVal( $name, "root", "0" ) eq "1" );
$list .= " volume:slider,0,1,$volMax";
$list .= " volumeNotification:slider,0,1,$notifyVolMax";
$list .= " volumeRingSound:slider,0,1,$ringSoundVolMax";

1117
74_AMADautomagicFlowset_4.0.1.xml → 74_AMADautomagicFlowset_4.0.2.xml
View File

File diff suppressed because it is too large Load Diff