FHEM/modul-XiaomiSmartHome
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

add: gateway now play sound

Browse Source 
add:
ringtone 0-29, 10001 is custom a ringtone uploaded with mi app
10000 is ringtone off
This commit is contained in:
Torte
2017-05-03 20:00:02 +02:00
parent b7f00619cd
commit 47dcf95f09
2 changed files with 32 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
FHEM/71_XiaomiSmartHome.pm
View File

@@ -50,7 +50,7 @@ sub XiaomiSmartHome_Notify($$);
sub XiaomiSmartHome_updateSingleReading($$); sub XiaomiSmartHome_updateSingleReading($$);
sub XiaomiSmartHome_updateAllReadings($); sub XiaomiSmartHome_updateAllReadings($);
my $iv="\x17\x99\x6d\x09\x3d\x28\xdd\xb3\xba\x69\x5a\x2e\x6f\x58\x56\x2e"; my $iv="\x17\x99\x6d\x09\x3d\x28\xdd\xb3\xba\x69\x5a\x2e\x6f\x58\x56\x2e";
my $version = "0.21"; my $version = "0.22";
my %XiaomiSmartHome_gets = ( my %XiaomiSmartHome_gets = (
"getDevices" => ["get_id_list", '^.+get_id_list_ack' ], "getDevices" => ["get_id_list", '^.+get_id_list_ack' ],
@@ -60,8 +60,10 @@ my %sets = (
"password" => 1, "password" => 1,
"rgb:colorpicker,RGB" => 1, "rgb:colorpicker,RGB" => 1,
"pct:colorpicker,BRI,0,1,100" => 1, "pct:colorpicker,BRI,0,1,100" => 1,
"volume:slider,0,1,100" => 1,
"off" => 0, "off" => 0,
"on" => 0, "on" => 0,
"ringtone:0,1,2,3,4,5,6,7,8,13,21,22,23,24,25,26,27,28,29,10000,10001" => 1,
); );
@@ -300,7 +302,7 @@ sub XiaomiSmartHome_Write($@)
{ {
Log3 $name, 5, "$name: Write> Get all Sensors"; Log3 $name, 5, "$name: Write> Get all Sensors";
$msg = '{"cmd" : "get_id_list"}'; $msg = '{"cmd" : "get_id_list"}';
} }
if ( $hash->{READINGS}{password}{VAL} !~ /^[a-zA-Z0-9]{16}$/ ) if ( $hash->{READINGS}{password}{VAL} !~ /^[a-zA-Z0-9]{16}$/ )
{ {
Log3 $name, 1, "$name: Write> Password not SET!"; Log3 $name, 1, "$name: Write> Password not SET!";
@@ -320,6 +322,16 @@ sub XiaomiSmartHome_Write($@)
{ {
$msg = '{"cmd":"write","model":"plug","sid":"' . $iohash->{SID} . '","data":"{\"status\":\"' . $val . '\",\"key\":\"'. XiaomiSmartHome_EncryptKey($hash) .'\"}" }'; $msg = '{"cmd":"write","model":"plug","sid":"' . $iohash->{SID} . '","data":"{\"status\":\"' . $val . '\",\"key\":\"'. XiaomiSmartHome_EncryptKey($hash) .'\"}" }';
} }
if ($cmd eq 'ringtone')
{
my $vol = $hash->{READINGS}{volume}{VAL};
$msg = '{"cmd":"write","model":"gateway","sid":"' . $hash->{SID} . '","short_id":0,"key":"8","data":"{\"mid\":' . $val . ',\"vol\":' . $vol . ',\"key\":\"'. XiaomiSmartHome_EncryptKey($hash) .'\"}" }';
}
if ($cmd eq 'volume')
{
my $rt = $hash->{READINGS}{ringtone}{VAL};
$msg = '{"cmd":"write","model":"gateway","sid":"' . $hash->{SID} . '","short_id":0,"key":"8","data":"{\"mid\":' . $rt . ',\"vol\":' .$val . ',\"key\":\"'. XiaomiSmartHome_EncryptKey($hash) .'\"}" }';
}
} }
return Log3 $name, 4, "$name: Write> - socket not connected" unless($hash->{CD}); return Log3 $name, 4, "$name: Write> - socket not connected" unless($hash->{CD});
Log3 $name, 4, "$name: Write> $msg " . $GATEWAY; Log3 $name, 4, "$name: Write> $msg " . $GATEWAY;
@@ -379,6 +391,8 @@ sub XiaomiSmartHome_Notify($$)
return "" if(IsDisabled($ownName)); # Return without any further action if the module is disabled return "" if(IsDisabled($ownName)); # Return without any further action if the module is disabled
$attr{$own_hash->{NAME}}{webCmd} = "pct:rgb:rgb ff0000:rgb 00ff00:rgb 0000ff:on:off" if ( ! $attr{$own_hash->{NAME}}{webCmd} || $attr{$own_hash->{NAME}}{webCmd} eq "rgb:rgb ff0000:rgb 00ff00:rgb 0000ff:on:off" ); $attr{$own_hash->{NAME}}{webCmd} = "pct:rgb:rgb ff0000:rgb 00ff00:rgb 0000ff:on:off" if ( ! $attr{$own_hash->{NAME}}{webCmd} || $attr{$own_hash->{NAME}}{webCmd} eq "rgb:rgb ff0000:rgb 00ff00:rgb 0000ff:on:off" );
readingsSingleUpdate($own_hash, "pct", 100, 1) if ( ! $own_hash->{READINGS}{pct}{VAL}); readingsSingleUpdate($own_hash, "pct", 100, 1) if ( ! $own_hash->{READINGS}{pct}{VAL});
readingsSingleUpdate($own_hash, "ringtone", 21, 1) if ( ! $own_hash->{READINGS}{ringtone}{VAL});
readingsSingleUpdate($own_hash, "volume", 10, 1) if ( ! $own_hash->{READINGS}{volume}{VAL});
my $devName = $dev_hash->{NAME}; # Device that created the events my $devName = $dev_hash->{NAME}; # Device that created the events
my $events = deviceEvents($dev_hash, 1); my $events = deviceEvents($dev_hash, 1);
if($devName eq "global" && grep(m/^INITIALIZED|REREADCFG$/, @{$events})) if($devName eq "global" && grep(m/^INITIALIZED|REREADCFG$/, @{$events}))
@@ -474,10 +488,23 @@ sub XiaomiSmartHome_Set($@)
my $rgb = sprintf("%d", hex($MIpct . $hash->{helper}{prevrgbvalue})); my $rgb = sprintf("%d", hex($MIpct . $hash->{helper}{prevrgbvalue}));
XiaomiSmartHome_Write($hash,'pct',$rgb); XiaomiSmartHome_Write($hash,'pct',$rgb);
} }
elsif($cmd eq "ringtone")
{
my $ownName = $hash->{NAME};
Log3 $ownName, 4, "$ownName: Set> $cmd, $args[0]";
readingsSingleUpdate( $hash, 'ringtone', $args[0], 1 );
XiaomiSmartHome_Write($hash,'ringtone',$args[0]);
}
elsif($cmd eq "volume")
{
my $ownName = $hash->{NAME};
Log3 $ownName, 4, "$ownName: Set> $cmd, $args[0]";
readingsSingleUpdate( $hash, 'volume', $args[0], 1 );
XiaomiSmartHome_Write($hash,'volume',$args[0]);
}
else else
{ {
return "Unknown argument! $cmd, $args[0], choose one of password rgb"; return "Unknown argument! $cmd, $args[0], choose one of password rgb volume";
} }
} }
##################################### #####################################

2
controls_mish.txt
View File

@@ -1,2 +1,2 @@
UPD 2017-05-01_13:14:55 21662 FHEM/71_XiaomiSmartHome.pm UPD 2017-05-03_19:53:18 23715 FHEM/71_XiaomiSmartHome.pm
UPD 2017-05-01_13:14:43 11699 FHEM/71_XiaomiSmartHome_Device.pm UPD 2017-05-01_13:14:43 11699 FHEM/71_XiaomiSmartHome_Device.pm