FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-02-01 19:30:31 +00:00
Code Issues Releases Wiki Activity

UConv: allow custom thesholds for climate condition

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@19399 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
jpawlowski 2019-05-18 11:22:58 +00:00
parent 1175931a69
commit 5401afd830
1 changed files with 54 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
fhem/FHEM/UConv.pm
View File

@ -1053,26 +1053,39 @@ sub c2condition($;$$) {
my $rgb = "FFFFFF";
$lang = "en" if ( !$lang );
my $thresholds;
if ($roomType) {
$roomType = "living"
if ( looks_like_number($roomType) );
if ( ref($roomType)
&& ref($roomType) eq 'ARRAY'
&& scalar @{$roomType} == 6 )
{
$thresholds = $roomType;
}
elsif (ref($roomType)
|| looks_like_number($roomType)
|| !defined( $ideal_clima{$roomType} ) )
{
$thresholds = $ideal_clima{living}{c};
}
else {
$thresholds = $ideal_clima{$roomType}{c};
}
}
else {
$roomType = "outdoor";
$thresholds = $ideal_clima{outdoor}{c};
}
if ( defined( $ideal_clima{$roomType} ) ) {
my $i = 0;
foreach my $th ( @{ $ideal_clima{$roomType}{c} } ) {
if ( $data > $th ) {
$val = $clima_names{c}{$lang}[$i];
$rgb = $clima_names{c}{rgb}[$i];
}
else {
last;
}
$i++;
my $i = 0;
foreach my $th ( @{$thresholds} ) {
if ( $data > $th ) {
$val = $clima_names{c}{ lc($lang) }[$i];
$rgb = $clima_names{c}{rgb}[$i];
}
else {
last;
}
$i++;
}
return ( $val, $rgb ) if (wantarray);
@ -1086,26 +1099,39 @@ sub humidity2condition($;$$) {
my $rgb = "FFFFFF";
$lang = "en" if ( !$lang );
my $thresholds;
if ($roomType) {
$roomType = "living"
if ( looks_like_number($roomType) );
if ( ref($roomType)
&& ref($roomType) eq 'ARRAY'
&& scalar @{$roomType} == 5 )
{
$thresholds = $roomType;
}
elsif (ref($roomType)
|| looks_like_number($roomType)
|| !defined( $ideal_clima{$roomType} ) )
{
$thresholds = $ideal_clima{living}{h};
}
else {
$thresholds = $ideal_clima{$roomType}{h};
}
}
else {
$roomType = "outdoor";
$thresholds = $ideal_clima{outdoor}{h};
}
if ( defined( $ideal_clima{$roomType} ) ) {
my $i = 0;
foreach my $th ( @{ $ideal_clima{$roomType}{h} } ) {
if ( $data > $th ) {
$val = $clima_names{h}{$lang}[$i];
$rgb = $clima_names{h}{rgb}[$i];
}
else {
last;
}
$i++;
my $i = 0;
foreach my $th ( @{$thresholds} ) {
if ( $data > $th ) {
$val = $clima_names{h}{ lc($lang) }[$i];
$rgb = $clima_names{h}{rgb}[$i];
}
else {
last;
}
$i++;
}
return ( $val, $rgb ) if (wantarray);