fix roommate homecoming
This commit is contained in:
parent
f3cf0ee70a
commit
3945163b28
@ -38,7 +38,7 @@ package main;
|
|||||||
use strict;
|
use strict;
|
||||||
use warnings;
|
use warnings;
|
||||||
|
|
||||||
my $version = "0.1.90";
|
my $version = "0.1.91";
|
||||||
|
|
||||||
sub AutoShuttersControl_Initialize($) {
|
sub AutoShuttersControl_Initialize($) {
|
||||||
my ($hash) = @_;
|
my ($hash) = @_;
|
||||||
@ -896,7 +896,10 @@ sub RoommateEventProcessing($@) {
|
|||||||
or $shutters->getRoommatesLastStatus eq 'gone'
|
or $shutters->getRoommatesLastStatus eq 'gone'
|
||||||
or $shutters->getRoommatesLastStatus eq 'home'
|
or $shutters->getRoommatesLastStatus eq 'home'
|
||||||
)
|
)
|
||||||
and $shutters->getModeUp eq 'home'
|
and ($shutters->getModeUp eq 'home'
|
||||||
|
or $shutters->getModeUp eq 'always'
|
||||||
|
or $shutters->getModeDown eq 'home'
|
||||||
|
or $shutters->getModeDown eq 'always')
|
||||||
and $shutters->getRoommatesStatus eq 'home'
|
and $shutters->getRoommatesStatus eq 'home'
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
@ -1231,7 +1234,7 @@ sub ShuttersEventProcessing($@) {
|
|||||||
|
|
||||||
if ( $events =~ m#.*:\s(\d+)# ) {
|
if ( $events =~ m#.*:\s(\d+)# ) {
|
||||||
$shutters->setShuttersDev($shuttersDev);
|
$shutters->setShuttersDev($shuttersDev);
|
||||||
|
$ascDev->setPosReading;
|
||||||
if ( ( int( gettimeofday() ) - $shutters->getLastPosTimestamp ) > 60
|
if ( ( int( gettimeofday() ) - $shutters->getLastPosTimestamp ) > 60
|
||||||
and $shutters->getLastPos != $shutters->getStatus )
|
and $shutters->getLastPos != $shutters->getStatus )
|
||||||
{
|
{
|
||||||
@ -2713,6 +2716,16 @@ sub setDelayCmdReading {
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
sub setPosReading {
|
||||||
|
my $self = shift;
|
||||||
|
my $name = $self->{name};
|
||||||
|
my $hash = $defs{$name};
|
||||||
|
|
||||||
|
readingsSingleUpdate( $hash, $shutters->getShuttersDev . '_PosValue',
|
||||||
|
$shutters->getStatus, 1 );
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
sub setLastPosReading {
|
sub setLastPosReading {
|
||||||
my $self = shift;
|
my $self = shift;
|
||||||
my $name = $self->{name};
|
my $name = $self->{name};
|
||||||
|
Loading…
x
Reference in New Issue
Block a user