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

10_ZWave.pm: less strict ControlColor parsing (reported by goap)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@21025 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2020-01-20 19:15:42 +00:00
parent ac57bc6bcd
commit 9efc0469f1
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
fhem/FHEM/10_ZWave.pm
View File

@ -151,7 +151,8 @@ my %zwave_class = (
rgb => '05050000010002%02x03%02x04%02x', # Forum #44014 rgb => '05050000010002%02x03%02x04%02x', # Forum #44014
wcrgb => '050500%02x01%02x02%02x03%02x04%02x' }, wcrgb => '050500%02x01%02x02%02x03%02x04%02x' },
parse => { "043302(..)(..)"=> 'ZWave_ccCapability($1,$2)', parse => { "043302(..)(..)"=> 'ZWave_ccCapability($1,$2)',
"043304(..)(.*)"=> '"ccStatus_".hex($1).":".hex($2)' } }, "0.3304(..)(..)(.*)"=> '"ccStatus_".hex($1).":".hex($2)',
"..3304(..)(..)(.*)"=> 'ZWave_ccParse(hex($1),hex($2))' } },
ZIP_ADV_CLIENT => { id => '34' }, ZIP_ADV_CLIENT => { id => '34' },
METER_PULSE => { id => '35' }, METER_PULSE => { id => '35' },
BASIC_TARIFF_INFO => { id => '36' }, BASIC_TARIFF_INFO => { id => '36' },
@ -2545,6 +2546,15 @@ ZWave_doorLLRParse($$)
} }
} }
sub
ZWave_ccParse($$)
{
my ($ch,$val) = @_;
my @ccLabel = ("WarmWhite","ColdWhite","Red","Green","Blue",
"Amber","Cyan","Purple","Indexed");
my $l = ($ch > @ccLabel-1 ? "unknown":$ccLabel[$ch]);
return "cc$l:$val";
}
sub sub
ZWave_ccColorSet($) ZWave_ccColorSet($)
@ -7111,6 +7121,9 @@ ZWave_firmwareUpdateParse($$$)
<br><br><b>Class COLOR_CONTROL</b> <br><br><b>Class COLOR_CONTROL</b>
<li>ccCapability:XY</li> <li>ccCapability:XY</li>
<li>ccStatus_X:Y</li> <li>ccStatus_X:Y</li>
<li>cc&lt;Col&gt;:Y<br>
where &lt;col&gt; is one of WarmWhite, ColdWhite, Red, Green, Blue, Amber,
Cyan, Purple, Indexed</li>
<br><br><b>Class CONFIGURATION</b> <br><br><b>Class CONFIGURATION</b>
<li>config_X:Y<br> <li>config_X:Y<br>