mhop/fhem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Unit: add rtype for RGB Decimal

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@13962 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
loredo
2017-04-10 12:35:20 +00:00
parent 6e7808ef63
commit 7b4c5d4b5d
2 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
fhem/FHEM/50_HP1000.pm
View File

@@ -88,7 +88,7 @@ sub HP1000_Initialize($) {
'UV' => { rtype => 'uvi', },
'UVR' => { rtype => 'uwpscm', },
'UVcondition' => { rtype => 'condition_uvi', },
'UVcondition_rgb' => { rtype => 'rgb', },
'UVcondition_rgb' => { rtype => 'rgbhex', },
'condition' => { rtype => 'condition_weather', },
'daylight' => { rtype => 'yesno', },
'dewpoint' => { rtype => 'c', formula_symbol => 'Td', },

16
fhem/FHEM/Unit.pm
View File

@@ -1328,13 +1328,23 @@ my $rtypes = {
},
# color
rgbhex => {
ref_base => 900,
rtype_description => {
de => 'RGB Farbwert in Hex Notation',
en => 'RGB color value in Hex notation',
},
scope => '^#?(([0-9a-fA-F]{2})([0-9a-fA-F]{2})([0-9a-fA-F]{2}))$',
},
rgb => {
ref_base => 900,
rtype_description => {
de => 'RGB Farbwert',
en => 'RGB color value',
de => 'RGB Farbwert in Dezimal Notation',
en => 'RGB color value in decimal notation',
},
scope => '^#?(([0-9a-fA-F]{2})([0-9a-fA-F]{2})([0-9a-fA-F]{2}))$',
scope =>
'^[\s\t\n ]*(?:rgb|RGB)?[\s\t\n ]*\(?[\s\t\n ]*((?:([0-9]{1,2}|1[0-9]{1,2}|2[0-4][0-9]|25[0-5])[\s\t\n ]*,?[\s\t\n ]*)(?:([0-9]{1,2}|1[0-9]{1,2}|2[0-4][0-9]|25[0-5])[\s\t\n ]*,?[\s\t\n ]*)(?:([0-9]{1,2}|1[0-9]{1,2}|2[0-4][0-9]|25[0-5])))[\s\t\n ]*\)?[\s\t\n ]*$',
},
# logical operators