FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-30 05:57:08 +00:00
Code Issues Releases Wiki Activity

Unit.pm: add data type information

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@12572 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
jpawlowski 2016-11-14 05:00:27 +00:00
parent b720f9efaa
commit 12b5f0c83f
1 changed files with 205 additions and 135 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

170
fhem/FHEM/Unit.pm
View File

@ -178,7 +178,7 @@ my $rtype_base = {
dimension => 'L', dimension => 'L',
formula_symbol => 'l', formula_symbol => 'l',
rtype_base => 'm', rtype_base => 'm',
txt_base => { base_description => {
de => 'Länge', de => 'Länge',
en => 'length', en => 'length',
fr => 'length', fr => 'length',
@ -193,7 +193,7 @@ my $rtype_base = {
dimension => 'M', dimension => 'M',
formula_symbol => 'm', formula_symbol => 'm',
rtype_base => 'kg', rtype_base => 'kg',
txt_base => { base_description => {
de => 'Masse', de => 'Masse',
en => 'mass', en => 'mass',
fr => 'mass', fr => 'mass',
@ -208,7 +208,7 @@ my $rtype_base = {
dimension => 'T', dimension => 'T',
formula_symbol => 't', formula_symbol => 't',
rtype_base => 's', rtype_base => 's',
txt_base => { base_description => {
de => 'Zeit', de => 'Zeit',
en => 'time', en => 'time',
fr => 'time', fr => 'time',
@ -223,7 +223,7 @@ my $rtype_base = {
dimension => 'I', dimension => 'I',
formula_symbol => 'i', formula_symbol => 'i',
rtype_base => 'a', rtype_base => 'a',
txt_base => { base_description => {
de => 'elektrische Stromstärke', de => 'elektrische Stromstärke',
en => 'electric current', en => 'electric current',
fr => 'electric current', fr => 'electric current',
@ -238,7 +238,7 @@ my $rtype_base = {
dimension => 'θ', dimension => 'θ',
formula_symbol => 'T', formula_symbol => 'T',
rtype_base => 'k', rtype_base => 'k',
txt_base => { base_description => {
de => 'absolute Temperatur', de => 'absolute Temperatur',
en => 'absolute temperature', en => 'absolute temperature',
fr => 'absolute temperature', fr => 'absolute temperature',
@ -253,7 +253,7 @@ my $rtype_base = {
dimension => 'N', dimension => 'N',
formula_symbol => 'n', formula_symbol => 'n',
rtype_base => 'mol', rtype_base => 'mol',
txt_base => { base_description => {
de => 'Stoffmenge', de => 'Stoffmenge',
en => 'amount of substance', en => 'amount of substance',
fr => 'amount of substance', fr => 'amount of substance',
@ -268,7 +268,7 @@ my $rtype_base = {
dimension => 'J', dimension => 'J',
formula_symbol => 'Iv', formula_symbol => 'Iv',
rtype_base => 'cd', rtype_base => 'cd',
txt_base => { base_description => {
de => 'Lichtstärke', de => 'Lichtstärke',
en => 'luminous intensity', en => 'luminous intensity',
fr => 'luminous intensity', fr => 'luminous intensity',
@ -283,7 +283,7 @@ my $rtype_base = {
dimension => 'M L^2 T^−2', dimension => 'M L^2 T^−2',
formula_symbol => 'E', formula_symbol => 'E',
rtype_base => 'j', rtype_base => 'j',
txt_base => { base_description => {
de => 'Energie', de => 'Energie',
en => 'energy', en => 'energy',
fr => 'energy', fr => 'energy',
@ -298,7 +298,7 @@ my $rtype_base = {
dimension => 'T^−1', dimension => 'T^−1',
formula_symbol => 'f', formula_symbol => 'f',
rtype_base => 'hz', rtype_base => 'hz',
txt_base => { base_description => {
de => 'Frequenz', de => 'Frequenz',
en => 'frequency', en => 'frequency',
fr => 'frequency', fr => 'frequency',
@ -313,7 +313,7 @@ my $rtype_base = {
dimension => 'M L^2 T^−3', dimension => 'M L^2 T^−3',
formula_symbol => 'P', formula_symbol => 'P',
rtype_base => 'w', rtype_base => 'w',
txt_base => { base_description => {
de => 'Leistung', de => 'Leistung',
en => 'power', en => 'power',
fr => 'power', fr => 'power',
@ -328,7 +328,7 @@ my $rtype_base = {
dimension => 'M L^−1 T^−2', dimension => 'M L^−1 T^−2',
formula_symbol => 'p', formula_symbol => 'p',
rtype_base => 'pa', rtype_base => 'pa',
txt_base => { base_description => {
de => 'Druck', de => 'Druck',
en => 'pressure', en => 'pressure',
fr => 'pressure', fr => 'pressure',
@ -343,7 +343,7 @@ my $rtype_base = {
dimension => 'M L^−1 T^−2', dimension => 'M L^−1 T^−2',
formula_symbol => 'pabs', formula_symbol => 'pabs',
rtype_base => 'pabs', rtype_base => 'pabs',
txt_base => { base_description => {
de => 'absoluter Druck', de => 'absoluter Druck',
en => 'absolute pressure', en => 'absolute pressure',
fr => 'absolute pressure', fr => 'absolute pressure',
@ -358,7 +358,7 @@ my $rtype_base = {
dimension => 'M L^−1 T^−2', dimension => 'M L^−1 T^−2',
formula_symbol => 'pamb', formula_symbol => 'pamb',
rtype_base => 'pamb', rtype_base => 'pamb',
txt_base => { base_description => {
de => 'Luftdruck', de => 'Luftdruck',
en => 'air pressure', en => 'air pressure',
fr => 'air pressure', fr => 'air pressure',
@ -373,7 +373,7 @@ my $rtype_base = {
dimension => 'M L^2 T^−3 I^−1', dimension => 'M L^2 T^−3 I^−1',
formula_symbol => 'U', formula_symbol => 'U',
rtype_base => 'v', rtype_base => 'v',
txt_base => { base_description => {
de => 'elektrische Spannung', de => 'elektrische Spannung',
en => 'electric voltage', en => 'electric voltage',
fr => 'electric voltage', fr => 'electric voltage',
@ -388,7 +388,7 @@ my $rtype_base = {
dimension => '1', dimension => '1',
formula_symbol => '', formula_symbol => '',
rtype_base => 'rad', rtype_base => 'rad',
txt_base => { base_description => {
de => 'ebener Winkel', de => 'ebener Winkel',
en => 'plane angular', en => 'plane angular',
fr => 'plane angular', fr => 'plane angular',
@ -403,7 +403,7 @@ my $rtype_base = {
dimension => 'L T^−1', dimension => 'L T^−1',
formula_symbol => 'v', formula_symbol => 'v',
rtype_base => 'kmh', rtype_base => 'kmh',
txt_base => { base_description => {
de => 'Geschwindigkeit', de => 'Geschwindigkeit',
en => 'speed', en => 'speed',
fr => 'speed', fr => 'speed',
@ -418,7 +418,7 @@ my $rtype_base = {
dimension => 'L^−2 J', dimension => 'L^−2 J',
formula_symbol => 'Ev', formula_symbol => 'Ev',
rtype_base => 'lx', rtype_base => 'lx',
txt_base => { base_description => {
de => 'Beleuchtungsstärke', de => 'Beleuchtungsstärke',
en => 'illumination intensity', en => 'illumination intensity',
fr => 'illumination intensity', fr => 'illumination intensity',
@ -433,7 +433,7 @@ my $rtype_base = {
dimension => 'J', dimension => 'J',
formula_symbol => 'F', formula_symbol => 'F',
rtype_base => 'lm', rtype_base => 'lm',
txt_base => { base_description => {
de => 'Lichtstrom', de => 'Lichtstrom',
en => 'luminous flux', en => 'luminous flux',
fr => 'luminous flux', fr => 'luminous flux',
@ -448,7 +448,7 @@ my $rtype_base = {
dimension => 'L^3', dimension => 'L^3',
formula_symbol => 'V', formula_symbol => 'V',
rtype_base => 'm3', rtype_base => 'm3',
txt_base => { base_description => {
de => 'Volumen', de => 'Volumen',
en => 'volume', en => 'volume',
fr => 'volume', fr => 'volume',
@ -463,7 +463,7 @@ my $rtype_base = {
dimension => '1', dimension => '1',
formula_symbol => 'B', formula_symbol => 'B',
rtype_base => 'b', rtype_base => 'b',
txt_base => { base_description => {
de => 'Logarithmische Größe', de => 'Logarithmische Größe',
en => 'logarithmic level', en => 'logarithmic level',
fr => 'logarithmic level', fr => 'logarithmic level',
@ -478,7 +478,7 @@ my $rtype_base = {
dimension => 'I T', dimension => 'I T',
formula_symbol => 'C', formula_symbol => 'C',
rtype_base => 'coul', rtype_base => 'coul',
txt_base => { base_description => {
de => 'elektrische Ladung', de => 'elektrische Ladung',
en => 'electric charge', en => 'electric charge',
fr => 'electric charge', fr => 'electric charge',
@ -493,7 +493,7 @@ my $rtype_base = {
dimension => '', dimension => '',
formula_symbol => 'F', formula_symbol => 'F',
rtype_base => 'far', rtype_base => 'far',
txt_base => { base_description => {
de => 'elektrische Kapazität', de => 'elektrische Kapazität',
en => 'electric capacity', en => 'electric capacity',
fr => 'electric capacity', fr => 'electric capacity',
@ -508,7 +508,7 @@ my $rtype_base = {
dimension => '', dimension => '',
formula_symbol => 'F', formula_symbol => 'F',
rtype_base => 'far', rtype_base => 'far',
txt_base => { base_description => {
de => 'elektrische Widerstand', de => 'elektrische Widerstand',
en => 'electric resistance', en => 'electric resistance',
fr => 'electric resistance', fr => 'electric resistance',
@ -523,7 +523,7 @@ my $rtype_base = {
dimension => 'L^2', dimension => 'L^2',
formula_symbol => 'A', formula_symbol => 'A',
rtype_base => 'm2', rtype_base => 'm2',
txt_base => { base_description => {
de => 'Flächeninhalt', de => 'Flächeninhalt',
en => 'surface area', en => 'surface area',
fr => 'surface area', fr => 'surface area',
@ -535,13 +535,13 @@ my $rtype_base = {
}, },
900 => { 900 => {
txt_base => 'FHEM Builtin Readings Type', base_description => 'FHEM Builtin Readings Type',
tmpl => '%value%', tmpl => '%value%',
tmpl_long => '%value%', tmpl_long => '%value%',
}, },
999 => { 999 => {
txt_base => 'FHEM User Defined Readings Type', base_description => 'FHEM User Defined Readings Type',
tmpl => '%value%', tmpl => '%value%',
tmpl_long => '%value%', tmpl_long => '%value%',
}, },
@ -560,6 +560,13 @@ my $rtypes = {
pl => [ 'error', 'on' ], pl => [ 'error', 'on' ],
}, },
scope => [ '^(nok|error|0)$', '^(ok|1)$' ], scope => [ '^(nok|error|0)$', '^(ok|1)$' ],
rtype_description => {
de => 'Zweiwertiger Fehlerstatus',
en => 'two-way error state',
fr => 'two-way error state',
nl => 'two-way error state',
pl => 'two-way error state',
},
}, },
onoff => { onoff => {
@ -572,6 +579,13 @@ my $rtypes = {
pl => [ 'off', 'on' ], pl => [ 'off', 'on' ],
}, },
scope => [ '^(off|0)$', '^(on|1)$' ], scope => [ '^(off|0)$', '^(on|1)$' ],
rtype_description => {
de => 'Schaltstatus',
en => 'Switch state',
fr => 'Switch state',
nl => 'Switch state',
pl => 'Switch state',
},
}, },
bool => { bool => {
@ -583,57 +597,76 @@ my $rtypes = {
nl => [ 'false', 'true' ], nl => [ 'false', 'true' ],
pl => [ 'false', 'true' ], pl => [ 'false', 'true' ],
}, },
scope => [ '^(0|false)$', '^(1|true)$' ], scope => [ '^(false|0)$', '^(true|1)$' ],
rtype_description => {
de => 'Boolesch',
en => 'Boolean',
fr => 'Boolean',
nl => 'Boolean',
pl => 'Boolean',
},
}, },
epoch => { epoch => {
ref_base => 900, ref_base => 900,
txt => { scope => { min => 0 },
rtype_description => {
de => 'Unix Epoche in s seit 1970-01-01T00:00:00Z', de => 'Unix Epoche in s seit 1970-01-01T00:00:00Z',
en => 'Unix epoch in s since 1970-01-01T00:00:00Z', en => 'Unix epoch in s since 1970-01-01T00:00:00Z',
fr => 'Unix epoch in s since 1970-01-01T00:00:00Z', fr => 'Unix epoch in s since 1970-01-01T00:00:00Z',
nl => 'Unix epoch in s since 1970-01-01T00:00:00Z', nl => 'Unix epoch in s since 1970-01-01T00:00:00Z',
pl => 'Unix epoch in s since 1970-01-01T00:00:00Z', pl => 'Unix epoch in s since 1970-01-01T00:00:00Z',
}, },
scope => { min => 0 },
}, },
time => { time => {
ref_base => 900, ref_base => 900,
txt => { scope => '^(([0-1]?[0-9]|[0-2]?[0-3]):([0-5]?[0-9]))$',
rtype_description => {
de => 'Uhrzeit hh:mm', de => 'Uhrzeit hh:mm',
en => 'time hh:mm', en => 'time hh:mm',
fr => 'time hh:mm', fr => 'time hh:mm',
nl => 'time hh:mm', nl => 'time hh:mm',
pl => 'time hh:mm', pl => 'time hh:mm',
}, },
scope => '^(([0-1]?[0-9]|[0-2]?[0-3]):([0-5]?[0-9]))$',
}, },
datetime => { datetime => {
ref_base => 900, ref_base => 900,
txt => 'YYYY-mm-dd hh:mm',
scope => scope =>
'^(([1-2][0-9]{3})-(0?[1-9]|1[0-2])-(0?[1-9]|[1-2][0-9]|30|31) (0?[1-9]|1[0-9]|2[0-3]):(0?[1-9]|[1-5][0-9]))$', '^(([1-2][0-9]{3})-(0?[1-9]|1[0-2])-(0?[1-9]|[1-2][0-9]|30|31) (0?[1-9]|1[0-9]|2[0-3]):(0?[1-9]|[1-5][0-9]))$',
rtype_description => {
de => 'Datum+Uhrzeit YYYY-mm-dd hh:mm',
en => 'date+time YYYY-mm-dd hh:mm',
fr => 'date+time YYYY-mm-dd hh:mm',
nl => 'date+time YYYY-mm-dd hh:mm',
pl => 'date+time YYYY-mm-dd hh:mm',
},
}, },
timesec => { timesec => {
ref_base => 900, ref_base => 900,
txt => { scope => '^(([0-1]?[0-9]|[0-2]?[0-3]):([0-5]?[0-9]):([0-5]?[0-9]))$',
rtype_description => {
de => 'Uhrzeit hh:mm:ss', de => 'Uhrzeit hh:mm:ss',
en => 'time hh:mm:ss', en => 'time hh:mm:ss',
fr => 'time hh:mm:ss', fr => 'time hh:mm:ss',
nl => 'time hh:mm:ss', nl => 'time hh:mm:ss',
pl => 'time hh:mm:ss', pl => 'time hh:mm:ss',
}, },
scope => '(([0-1]?[0-9]|[0-2]?[0-3]):([0-5]?[0-9]):([0-5]?[0-9]))',
}, },
datetimesec => { datetimesec => {
ref_base => 900, ref_base => 900,
txt => 'YYYY-mm-dd hh:mm:ss',
scope => scope =>
'^(([1-2][0-9]{3})-(0?[1-9]|1[0-2])-(0?[1-9]|[1-2][0-9]|30|31) (0?[1-9]|1[0-9]|2[0-3]):(0?[1-9]|[1-5][0-9]):(0?[1-9]|[1-5][0-9]))$', '^(([1-2][0-9]{3})-(0?[1-9]|1[0-2])-(0?[1-9]|[1-2][0-9]|30|31) (0?[1-9]|1[0-9]|2[0-3]):(0?[1-9]|[1-5][0-9]):(0?[1-9]|[1-5][0-9]))$',
rtype_description => {
de => 'Datum+Uhrzeit YYYY-mm-dd hh:mm:ss',
en => 'date+time YYYY-mm-dd hh:mm:ss',
fr => 'date+time YYYY-mm-dd hh:mm:ss',
nl => 'date+time YYYY-mm-dd hh:mm:ss',
pl => 'date+time YYYY-mm-dd hh:mm:ss',
},
}, },
direction => { direction => {
@ -641,6 +674,13 @@ my $rtypes = {
formula_symbol => 'Dir', formula_symbol => 'Dir',
ref => 'gon', ref => 'gon',
scope => { min => 0, max => 360 }, scope => { min => 0, max => 360 },
rtype_description => {
de => 'Richtungsangabe',
en => 'direction',
fr => 'direction',
nl => 'direction',
pl => 'direction',
},
}, },
compasspoint => { compasspoint => {
@ -698,49 +738,77 @@ my $rtypes = {
'^(S|8)$', '^(SSW|9)$', '^(SW|10)$', '^(WSW|11)$', '^(S|8)$', '^(SSW|9)$', '^(SW|10)$', '^(WSW|11)$',
'^(W|12)$', '^(WNW|13)$', '^(NW|14)$', '^(NNW|15)$' '^(W|12)$', '^(WNW|13)$', '^(NW|14)$', '^(NNW|15)$'
], ],
rtype_description => {
de => 'Himmelsrichtung',
en => 'point of the compass',
fr => 'point of the compass',
nl => 'point of the compass',
pl => 'point of the compass',
},
}, },
closure => { closure => {
ref_base => 900, ref_base => 900,
txt => { txt => {
de => 'offen/geschlossen/gekippt', de => [ 'geschlossen', 'offen', 'gekippt' ],
en => 'open/closed/tilted', en => [ 'closed', 'open', 'tilted' ],
fr => 'open/closed/tilted', fr => [ 'closed', 'open', 'tilted' ],
nl => 'open/closed/tilted', nl => [ 'closed', 'open', 'tilted' ],
pl => 'open/closed/tilted', pl => [ 'closed', 'open', 'tilted' ],
}, },
scope => [ '^(closed|0)$', '^(open|1)$', '^(tilted|2)$' ], scope => [ '^(closed|0)$', '^(open|1)$', '^(tilted|2)$' ],
rtype_description => {
de => 'Status für Fenster und Türen',
en => 'state for windows and doors',
fr => 'state for windows and doors',
nl => 'state for windows and doors',
pl => 'state for windows and doors',
},
}, },
condition_hum => { condition_hum => {
ref_base => 900, ref_base => 900,
txt => { txt => {
de => [ 'trocken', 'niedrig', 'optimal', 'hoch', 'feucht' ],
en => [ 'dry', 'low', 'optimal', 'high', 'wet' ],
fr => [ 'dry', 'low', 'optimal', 'high', 'wet' ],
nl => [ 'dry', 'low', 'optimal', 'high', 'wet' ],
pl => [ 'dry', 'low', 'optimal', 'high', 'wet' ],
},
scope => [
'^(dry|0)$', '^(low|1)$', '^(optimal|2)$', '^(high|3)$',
'^(wet|4)$'
],
rtype_description => {
de => 'Feuchtigkeitsbedingung', de => 'Feuchtigkeitsbedingung',
en => 'humidity condition', en => 'humidity condition',
fr => 'humidity condition', fr => 'humidity condition',
nl => 'humidity condition', nl => 'humidity condition',
pl => 'humidity condition', pl => 'humidity condition',
}, },
scope => [
'^(dry|0)$', '^(low|1)$', '^(optimal|2)$', '^(high|3)$',
'^(wet|4)$'
],
}, },
condition_uvi => { condition_uvi => {
ref_base => 900, ref_base => 900,
txt => { txt => {
de => 'UV Bedingung', de => [ 'niedrig', 'moderat', 'high', 'sehr hoch', 'extrem' ],
en => 'UV condition', en => [ 'low', 'moderate', 'high', 'veryhigh', 'extreme' ],
fr => 'UV condition', fr => [ 'low', 'moderate', 'high', 'veryhigh', 'extreme' ],
nl => 'UV condition', nl => [ 'low', 'moderate', 'high', 'veryhigh', 'extreme' ],
pl => 'UV condition', pl => [ 'low', 'moderate', 'high', 'veryhigh', 'extreme' ],
}, },
scope => [ scope => [
'^(low|0)$', '^(moderate|1)$', '^(low|0)$', '^(moderate|1)$',
'^(high|2)$', '^(veryhigh|3)$', '^(high|2)$', '^(veryhigh|3)$',
'^(extreme|4)$' '^(extreme|4)$'
], ],
rtype_description => {
de => 'UV Bedingung',
en => 'UV condition',
fr => 'UV condition',
nl => 'UV condition',
pl => 'UV condition',
},
}, },
pct => { pct => {
@ -2561,7 +2629,9 @@ sub formatValue($$$;$$$$) {
elsif ( ref($format) eq 'HASH' && looks_like_number($value) ) { elsif ( ref($format) eq 'HASH' && looks_like_number($value) ) {
my $v = abs($value); my $v = abs($value);
foreach my $l ( sort { $b <=> $a } keys( %{$format} ) ) { foreach my $l ( sort { $b <=> $a } keys( %{$format} ) ) {
next if ( ref( $format->{$l} ) ne 'HASH' || !$format->{$l}{scale} ); next
if ( ref( $format->{$l} ) ne 'HASH'
|| !$format->{$l}{scale} );
if ( $v >= $l ) { if ( $v >= $l ) {
my $scale = $format->{$l}{scale}; my $scale = $format->{$l}{scale};