From 0ee6e571e248741f47bd8f7223c60ba21a776f5b Mon Sep 17 00:00:00 2001 From: KernSani Date: Wed, 26 Dec 2018 16:17:37 +0000 Subject: [PATCH] 46_TRX_LIGHT: Support for CUVEO git-svn-id: https://svn.fhem.de/fhem/trunk@18059 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/46_TRX_LIGHT.pm | 93 +++++++++++++++++++++++++++------------ 1 file changed, 66 insertions(+), 27 deletions(-) diff --git a/fhem/FHEM/46_TRX_LIGHT.pm b/fhem/FHEM/46_TRX_LIGHT.pm index ab5dc02bd..11f9096ae 100755 --- a/fhem/FHEM/46_TRX_LIGHT.pm +++ b/fhem/FHEM/46_TRX_LIGHT.pm @@ -34,7 +34,10 @@ ############################################################################## # # CHANGELOG -# +# 26.12.2018 Support for CUVEO devices +# 09.12.2018 Additional commands for RFY (forum #36451) +# Support for Cuevo (not tested) +# Fix for Selectplus (forum #71568) # 25.03.2018 Summary for Commandref # Use SetExtensions # Fix to trigger events (userreadings) - topic #65899 @@ -54,7 +57,7 @@ my $TRX_LIGHT_X10_type_default = "x10"; my $DOT = q{_}; my %light_device_codes = ( # HEXSTRING => "NAME", "name of reading", - # 0x10: Lighting1 + # 0x10: Lighting1 0x1000 => [ "X10", "light" ], 0x1001 => [ "ARC", "light" ], 0x1002 => [ "AB400D", "light" ], @@ -66,16 +69,15 @@ my %light_device_codes = ( # HEXSTRING => "NAME", "name of reading", 0x1008 => [ "ENER010", "light" ], # Energenie ENER010: untested 0x1009 => [ "ENER5", "light" ], # Energenie 5-gang: untested 0x100A => [ "COCO_GDR2", "light" ], # COCO GDR2-2000R: untestedCOCO - # 0x11: Lighting2 + # 0x11: Lighting2 0x1100 => [ "AC", "light" ], 0x1101 => [ "HOMEEASY", "light" ], 0x1102 => [ "ANSLUT", "light" ], - # 0x12: Lighting3 0x1200 => [ "KOPPLA", "light" ], # IKEA Koppla - # 0x13: Lighting4 + # 0x13: Lighting4 0x1300 => [ "PT2262", "light" ], # PT2262 raw messages - # 0x14: Lighting5 + # 0x14: Lighting5 0x1400 => [ "LIGHTWAVERF", "light" ], # LightwaveRF 0x1401 => [ "EMW100", "light" ], # EMW100 0x1402 => [ "BBSB", "light" ], # BBSB @@ -83,19 +85,20 @@ my %light_device_codes = ( # HEXSTRING => "NAME", "name of reading", 0x1404 => [ "RSL2", "light" ], # Conrad RSL2 0x1405 => [ "LIVOLO", "light" ], # Livolo 0x1406 => [ "TRC02", "light" ], # RGB TRC02 - # 0x15: Lighting6 + # 0x15: Lighting6 0x1500 => [ "BLYSS", "light" ], # Blyss - # 0x16: Chime + 0x1501 => [ "CUVEO", "light" ], # Cuveo + # 0x16: Chime 0x1600 => [ "BYRONSX", "light" ], # Byron SX 0x1601 => [ "BYRONMP", "chime" ], # Byron MP001 0x1602 => [ "SELECTPLUS", "chime" ], # SelectPlus 0x1603 => [ "RFU", "chime" ], # RFU 0x1604 => [ "ENVIVO", "chime" ], # Envivo - # 0x17: Fan + # 0x17: Fan 0x1700 => [ "SIEMENS_SF01", "light" ], # Siemens SF01 - # 0x18: Curtain1 + # 0x18: Curtain1 0x1800 => [ "HARRISON", "light" ], # Harrison Curtain - # 0x19: Blinds1 + # 0x19: Blinds1 0x1900 => [ "ROLLER_TROL", "light" ], # Roller Trol 0x1901 => [ "HASTA_OLD", "light" ], # Hasta old 0x1902 => [ "AOK_RF01", "light" ], # A-OK RF01 @@ -109,7 +112,7 @@ my %light_device_codes = ( # HEXSTRING => "NAME", "name of reading", ); my %light_device_commands = ( # HEXSTRING => commands - # 0x10: Lighting1 + # 0x10: Lighting1 0x1000 => [ "off", "on", "dim", "bright", "", "all_off", "all_on" ], # X10 0x1001 => [ "off", "on", "", "", "", "all_off", "all_on", "chime" ], # ARC 0x1002 => [ "off", "on" ], # AB400D @@ -121,19 +124,19 @@ my %light_device_commands = ( # HEXSTRING => commands 0x1008 => [ "off", "on", "", "", "", "all_off", "all_on" ], # Energenie ENER010 0x1009 => [ "off", "on" ], # Energenie 5-gang 0x100A => [ "off", "on" ], # COCO GDR2-2000R - # 0x11: Lighting2 + # 0x11: Lighting2 0x1100 => [ "off", "on", "level", "all_off", "all_on", "all_level" ], # AC 0x1101 => [ "off", "on", "level", "all_off", "all_on", "all_level" ], # HOMEEASY 0x1102 => [ "off", "on", "level", "all_off", "all_on", "all_level" ], # ANSLUT - # 0x12: Lighting3 + # 0x12: Lighting3 0x1200 => [ "bright", "", "", "", "", "", "", "", "dim", "", "", "", "", "", "", "", "on", "level1", "level2", "level3", "level4", "level5", "level6", "level7", "level8", "level9", "off", "", "program", "", "", "", "", ], # Koppla - # 0x13: Lighting4 + # 0x13: Lighting4 0x1300 => ["Lighting4"], # Lighting4: PT2262 - # 0x14: Lighting5 + # 0x14: Lighting5 0x1400 => [ "off", "on", "all_off", "mood1", "mood2", "mood3", "mood4", "mood5", "reserved1", "reserved2", "unlock", "lock", @@ -145,9 +148,10 @@ my %light_device_commands = ( # HEXSTRING => commands 0x1404 => [ "off", "on", "all_off", "all_on" ], # Conrad RSL 0x1405 => [ "all_off", "on_off", "dim+", "dim-" ], # Livolo 0x1406 => [ "off", "on", "bright", "dim", "vivid", "pale", "color" ], # TRC02 - # 0x15: Lighting6 + # 0x15: Lighting6 0x1500 => [ "on", "off", "all_on", "all_off" ], # Blyss - # 0x16: Chime + 0x1501 => [ "on", "off", "all_on", "all_off" ], # Cuveo + # 0x16: Chime 0x1600 => [ "", "tubular3_1", "solo1", "bigben1", "", "tubular2_1", "tubular2_2", "", "dingdong", "solo2", " ", "", @@ -174,7 +178,7 @@ my %light_device_commands = ( # HEXSTRING => commands 0x1905 => [ "down", "up", "stop" ], # Media Mount 0x1906 => [ "open", "close", "stop", "confirm" ], # DC/RMF/Yooda 0x1907 => [ "open", "close", "stop", "confirm_pair" ], # Forest - 0x1A00 => [ "stop", "up", "", "down", "", "", "", "program" ], # RTS RFY + 0x1A00 => [ "stop", "up", "", "down", "", "", "", "program", "", "", "", "", "", "", "", "up<0.5s", "down<0.5s", "up>2s", "down>2s", "enable_sun+wind", "disable_sun"], #RFY, forum #36451 0x1A01 => [ "stop", "up", "", "down", "", "", "", "program" ], # RTS RFY ext ); @@ -286,9 +290,10 @@ sub TRX_LIGHT_Set($@) { else { Log3 $name, 5, "TRX_LIGHT_Set() PT2262: else arg=$command l='$l'"; - my $error = "Unknown command $command, choose one of $l "; - Log3 $name, 1, "TRX_LIGHT_Set() PT2262" . $error if ( $command ne "?" ); - return $error; + #my $error = "Unknown command $command, choose one of $l "; + return SetExtensions( $hash, $l, $name, @a ); + #Log3 $name, 1, "TRX_LIGHT_Set() PT2262" . $error if ( $command ne "?" ); + #return $error; } } } @@ -301,7 +306,7 @@ sub TRX_LIGHT_Set($@) { $l =~ s/ color / color:slider,14,2,128 /; } - #my $error = "Unknown command $command, choose one of $l"; + #my $error = "Unknown command $command, choose one of $l"; return SetExtensions( $hash, $l, $name, @a ); @@ -449,6 +454,32 @@ sub TRX_LIGHT_Set($@) { "TRX_LIGHT_Set() lighting5 name=$name device_type=$device_type, deviceid=$deviceid command=$command"; Log3 $name, 5, "TRX_LIGHT_Set() lighting5 hexline=$hex_prefix$hex_command"; } + # Lighting6 + elsif ( $protocol_type == 0x15 ) { + my $id1; + my $id2; + my $unit; + my $group; + if ( $deviceid =~ /(..)(..)(.)(.)/ ) { + $id1 = $1; + $id2 = $2; + $group = $3; + $unit = $4; + } + else { + Log3 $name, 1, + "TRX_LIGHT_Set() lighting6 wrong deviceid: name=$name device_type=$device_type, deviceid=$deviceid"; + return "error set name=$name deviceid=$deviceid"; + } + $hex_prefix = sprintf "0B15"; + $hex_command = sprintf "%02x%02x%s%s%02x%02x%02x%02x0070", $device_type_num & 0xff, $seqnr, $id1, $id2, $group, $unit, $cmnd,$cmnd; + + + Log3 $name, 5, + "TRX_LIGHT_Set() lighting6 name=$name device_type=$device_type, deviceid=$deviceid command=$command $id1$id2"; + Log3 $name, 5, "TRX_LIGHT_Set() lighting2 hexline=$hex_prefix$hex_command"; + + } elsif ( $protocol_type == 0x16 ) { # Chime @@ -623,6 +654,7 @@ sub TRX_LIGHT_Define($$) { && $type ne "RSL2" && $type ne "LIVOLO" && $type ne "BLYSS" + && $type ne "CUVEO" && $type ne "BYRONSX" && $type ne "SIEMENS_SF01" && $type ne "HARRISON" @@ -764,7 +796,12 @@ sub TRX_LIGHT_parse_X10 ($$) { $data = $bytes->[7]; } elsif ( $type == 0x15 ) { - $device = sprintf '%02x%02x%c%d', $bytes->[3], $bytes->[4], $bytes->[5], $bytes->[6]; + if ($subtype == 0x00 ) { #Blyss + $device = sprintf '%02x%02x%c%d', $bytes->[3], $bytes->[4], $bytes->[5], $bytes->[6]; + } + else { #Cuveo + $device = sprintf '%02x%02x%d%d', $bytes->[3], $bytes->[4], $bytes->[5], $bytes->[6]; + } $data = $bytes->[7]; } elsif ( $type == 0x16 ) { #Chime @@ -773,7 +810,7 @@ sub TRX_LIGHT_parse_X10 ($$) { $data = $bytes->[5]; } else { - $device = sprintf '%02x', $bytes->[3], $bytes->[4]; + $device = sprintf '%04x', $bytes->[4], $bytes->[5]; #forum #71568 $data = 0; } } @@ -799,7 +836,7 @@ sub TRX_LIGHT_parse_X10 ($$) { my $command = ""; if ( exists $light_device_commands{$type_subtype} ) { my $code = $light_device_commands{$type_subtype}; - if ( exists $code->[$data] ) { + if ( exists $code->[$data] ) { $command = $code->[$data]; } else { @@ -823,6 +860,7 @@ sub TRX_LIGHT_parse_X10 ($$) { my $firstdevice = 1; my $def = $modules{TRX_LIGHT}{defptr}{$device_name}; + #Log3 $hash, 1, "TRX_LIGHT_parse_X10() device $device_name"; if ( !$def ) { $firstdevice = 0; $def = $modules{TRX_LIGHT}{defptr2}{$device_name}; @@ -872,7 +910,7 @@ sub TRX_LIGHT_parse_X10 ($$) { readingsBeginUpdate($def); - if ( $type == 0x10 || $type == 0x11 || $type == 0x14 || $type == 0x16 ) { + if ( $type == 0x10 || $type == 0x11 || $type == 0x14 || $type == 0x16 || $type==0x15) { # try to use it for all types: $current = $command; @@ -1159,6 +1197,7 @@ KlikAanKlikUit, NEXA, CHACON, HomeEasy UK.
You need to define an RFXtrx433
  • LIVOLO (Livolo devices. Commands ["all_off", "on_off", "dim+", "dim-"].)
  • TRC02 (RGB TRC02 devices. Commands ["off", "on", "bright", "dim", "vivid", "pale", "color"].)
  • BLYSS (Blyss devices. deviceid: [A-P][1-5]. Commands ["off", "on", "all_off", "all_on"].)
    • +
  • CUVEO (Blyss devices. deviceid: [A-P][1-5]. Commands ["off", "on", "all_off", "all_on"].)
  • BYRONSX (Byron SX chime devices. deviceid: 00-FF. Commands [ "tubular3_1", "solo1", "bigben1", "tubular2_1", "tubular2_2", "solo2", "tubular3_2"].)
  • SELECTPLUS (SELECTPLUS] chime devices. deviceid: 0000-FFFF. Commands [ "ring"].)
  • SIEMENS_SF01 (Siemens SF01 devices. deviceid: 000000-007FFF. Commands [ "timer", "-", "learn", "+", "confirm", "light", "on", "off" ].)