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

22_HOMEMODE: add reading lastInfo, add userattr to sensors with same devspec

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@14482 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
deespe 2017-06-08 19:30:49 +00:00
parent fa79793234
commit c1832018e3
1 changed files with 25 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
fhem/FHEM/22_HOMEMODE.pm
View File

@ -16,7 +16,7 @@ use Time::HiRes qw(gettimeofday);
use HttpUtils; use HttpUtils;
use vars qw{%attr %defs %modules}; use vars qw{%attr %defs %modules};
my $HOMEMODE_version = "1.1.2"; my $HOMEMODE_version = "1.1.3";
my $HOMEMODE_Daytimes = "05:00|morning 10:00|day 14:00|afternoon 18:00|evening 23:00|night"; my $HOMEMODE_Daytimes = "05:00|morning 10:00|day 14:00|afternoon 18:00|evening 23:00|night";
my $HOMEMODE_Seasons = "03.01|spring 06.01|summer 09.01|autumn 12.01|winter"; my $HOMEMODE_Seasons = "03.01|spring 06.01|summer 09.01|autumn 12.01|winter";
my $HOMEMODE_UserModes = "gotosleep,awoken,asleep"; my $HOMEMODE_UserModes = "gotosleep,awoken,asleep";
@ -1507,30 +1507,17 @@ sub HOMEMODE_Attr(@)
"Invalid value $attr_value for attribute $attr_name. Must be a number from 1 to 99999 for interval in minutes!"; "Invalid value $attr_value for attribute $attr_name. Must be a number from 1 to 99999 for interval in minutes!";
return $trans if ($attr_value !~ /^\d{1,5}$/); return $trans if ($attr_value !~ /^\d{1,5}$/);
} }
elsif ($attr_name eq "HomeSensorsContact" && $init_done) elsif ($attr_name =~ /^(HomeSensorsContact|HomeSensorsMotion)$/ && $init_done)
{ {
$trans = $HOMEMODE_de? $trans = $HOMEMODE_de?
"$attr_value muss ein gültiger Devspec sein!": "$attr_value muss ein gültiger Devspec sein!":
"$attr_value must be a valid devspec!"; "$attr_value must be a valid devspec!";
return $trans if (!HOMEMODE_CheckIfIsValidDevspec($attr_value)); return $trans if (!HOMEMODE_CheckIfIsValidDevspec($attr_value));
if ($attr_value_old ne $attr_value) my $od = "";
{ $od = $hash->{SENSORSCONTACT} if ($hash->{SENSORSCONTACT} && $attr_name eq "HomeSensorsContact");
CommandDeleteReading(undef,"$name lastContact|prevContact|contacts.*"); $od = $hash->{SENSORSMOTION} if ($hash->{SENSORSMOTION} && $attr_name eq "HomeSensorsMotion");
HOMEMODE_updateInternals($hash); HOMEMODE_updateInternals($hash);
HOMEMODE_addSensorsuserattr($hash,$attr_value,$attr_value_old); HOMEMODE_addSensorsuserattr($hash,$attr_value,$od);
}
}
elsif ($attr_name eq "HomeSensorsMotion" && $init_done)
{
$trans = $HOMEMODE_de?
"$attr_value muss ein gültiger Devspec sein!":
"$attr_value must be a valid devspec!";
return $trans if (!HOMEMODE_CheckIfIsValidDevspec($attr_value));
if ($attr_value_old ne $attr_value)
{
HOMEMODE_updateInternals($hash);
HOMEMODE_addSensorsuserattr($hash,$attr_value,$attr_value_old);
}
} }
elsif ($attr_name eq "HomeSensorsPowerEnergy" && $init_done) elsif ($attr_name eq "HomeSensorsPowerEnergy" && $init_done)
{ {
@ -1539,11 +1526,8 @@ sub HOMEMODE_Attr(@)
"$attr_value muss ein gültiger Devspec mit $p und $e Readings sein!": "$attr_value muss ein gültiger Devspec mit $p und $e Readings sein!":
"$attr_value must be a valid devspec with $p and $e readings!"; "$attr_value must be a valid devspec with $p and $e readings!";
return $trans if (!HOMEMODE_CheckIfIsValidDevspec($attr_value,$p) || !HOMEMODE_CheckIfIsValidDevspec($attr_value,$e)); return $trans if (!HOMEMODE_CheckIfIsValidDevspec($attr_value,$p) || !HOMEMODE_CheckIfIsValidDevspec($attr_value,$e));
if ($attr_value_old ne $attr_value)
{
HOMEMODE_updateInternals($hash); HOMEMODE_updateInternals($hash);
} }
}
elsif ($attr_name eq "HomeTwilightDevice" && $init_done) elsif ($attr_name eq "HomeTwilightDevice" && $init_done)
{ {
$trans = $HOMEMODE_de? $trans = $HOMEMODE_de?
@ -1695,7 +1679,7 @@ sub HOMEMODE_Attr(@)
"$attr_value muss ein gültiges Gerät mit $read Reading sein!": "$attr_value muss ein gültiges Gerät mit $read Reading sein!":
"$attr_name must be a valid device with $read reading!"; "$attr_name must be a valid device with $read reading!";
return $trans if (!HOMEMODE_CheckIfIsValidDevspec($attr_value,$read)); return $trans if (!HOMEMODE_CheckIfIsValidDevspec($attr_value,$read));
HOMEMODE_updateInternals($hash) if ($attr_value_old ne $attr_value); HOMEMODE_updateInternals($hash);
} }
elsif ($attr_name eq "HomeSensorsPowerEnergyReadings" && $init_done) elsif ($attr_name eq "HomeSensorsPowerEnergyReadings" && $init_done)
{ {
@ -1728,7 +1712,7 @@ sub HOMEMODE_Attr(@)
"$attr_value muss ein gültiges Gerät mit $read Reading sein!": "$attr_value muss ein gültiges Gerät mit $read Reading sein!":
"$attr_name must be a valid device with $read reading!"; "$attr_name must be a valid device with $read reading!";
return $trans if (!HOMEMODE_CheckIfIsValidDevspec($attr_value,$read)); return $trans if (!HOMEMODE_CheckIfIsValidDevspec($attr_value,$read));
HOMEMODE_updateInternals($hash) if ($attr_value_old ne $attr_value); HOMEMODE_updateInternals($hash);
} }
elsif ($attr_name eq "HomeSensorsBatteryLowPercentage") elsif ($attr_name eq "HomeSensorsBatteryLowPercentage")
{ {
@ -2941,9 +2925,11 @@ sub HOMEMODE_Details($$$)
my ($FW_name,$name,$room) = @_; my ($FW_name,$name,$room) = @_;
return if (AttrVal($name,"HomeAdvancedDetails","none") eq "none" || (AttrVal($name,"HomeAdvancedDetails","") eq "room" && $FW_detail eq $name)); return if (AttrVal($name,"HomeAdvancedDetails","none") eq "none" || (AttrVal($name,"HomeAdvancedDetails","") eq "room" && $FW_detail eq $name));
my $hash = $defs{$name}; my $hash = $defs{$name};
my $iid = ReadingsVal($name,"lastInfo","") ? ReadingsVal($name,"lastInfo","") : "";
my $info = ReadingsVal($name,$iid,"");
my $html = "<div>"; my $html = "<div>";
$html .= "<style>.homehover{cursor:pointer}.homeinfo{display:none}.tar{text-align:right}.homeinfopanel{min-height:30px;max-width:480px;padding:3px 10px}</style>"; $html .= "<style>.homehover{cursor:pointer}.homeinfo{display:none}.tar{text-align:right}.homeinfopanel{min-height:30px;max-width:480px;padding:3px 10px}</style>";
$html .= "<div class=\"homeinfopanel\" informid=\"\"></div>"; $html .= "<div class=\"homeinfopanel\" informid=\"$iid\">$info</div>";
$html .= "<table class=\"wide\">"; $html .= "<table class=\"wide\">";
if (AttrVal($name,"HomeYahooWeatherDevice","")) if (AttrVal($name,"HomeYahooWeatherDevice",""))
{ {
@ -2989,7 +2975,14 @@ sub HOMEMODE_Details($$$)
} }
$html .= "</table>"; $html .= "</table>";
$html .= "</div>"; $html .= "</div>";
$html .= "<script>\$(\".homehover\").unbind().click(function(){var t=\$(this).find(\".homeinfo\").text();var id=\$(this).find(\".homeinfo\").attr(\"informid\");\$(\".homeinfopanel\").text(t).attr(\"informid\",id);});</script>"; $html .= "<script>";
$html .= "\$(\".homehover\").unbind().click(function(){";
$html .= "var t=\$(this).find(\".homeinfo\").text();";
$html .= "var id=\$(this).find(\".homeinfo\").attr(\"informid\");";
$html .= "var r=id.split(\"-\")[1];";
$html .= "\$(\".homeinfopanel\").text(t).attr(\"informid\",id);";
$html .= "if(r){\$.post(window.location.pathname+\"?cmd=setreading%20$name%20lastInfo%20\"+r+\"$FW_CSRF\")};";
$html .= "});</script>";
return $html; return $html;
} }
@ -3906,6 +3899,10 @@ sub HOMEMODE_Details($$$)
<b><i>lastGotosleepByResident</i></b><br> <b><i>lastGotosleepByResident</i></b><br>
last resident who went gotosleep last resident who went gotosleep
</li> </li>
<li>
<b><i>lastInfo</i></b><br>
last shown item on infopanel (HomeAdvancedDetails)
</li>
<li> <li>
<b><i>lastMotion</i></b><br> <b><i>lastMotion</i></b><br>
last sensor which triggered motion last sensor which triggered motion