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

44_ROLLO.pm: Loglevel from 3 to 5 for few messages,Rollo should only drive 10 steps in "force" mode for up/down

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@18350 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
KernSani 2019-01-20 10:13:22 +00:00
parent eed0b1fed6
commit 06c58577ce
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
fhem/FHEM/44_ROLLO.pm
View File

@ -25,13 +25,16 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details. # GNU General Public License for more details.
# #
# CHANGELOG:
# 1.403: Loglevel from 3 to 5 for few messages
# Rollo should only drive 10 steps in "force" mode for up/down
######################################################################################## ########################################################################################
package main; package main;
use strict; use strict;
use warnings; use warnings;
my $version = "1.402"; my $version = "1.403";
my %sets = ( my %sets = (
"open" => "noArg", "open" => "noArg",
@ -391,7 +394,7 @@ sub ROLLO_isAllowed($$$) {
my $pct = ReadingsVal( $name, "pct", undef ); my $pct = ReadingsVal( $name, "pct", undef );
$pct = 100 - $pct if ( AttrVal( $name, "rl_type", "normal" ) eq "HomeKit" ); # KernSani 30.12.2018 $pct = 100 - $pct if ( AttrVal( $name, "rl_type", "normal" ) eq "HomeKit" ); # KernSani 30.12.2018
my $blockmode = AttrVal( $name, "rl_blockMode", "none" ); my $blockmode = AttrVal( $name, "rl_blockMode", "none" );
Log3 $name, 3, "ROLLO ($name) >> Blockmode:$blockmode $pct-->$desired_pct"; Log3 $name, 5, "ROLLO ($name) >> Blockmode:$blockmode $pct-->$desired_pct";
if ( $blockmode eq "blocked" if ( $blockmode eq "blocked"
|| ( $blockmode eq "only-up" && $pct <= $desired_pct ) || ( $blockmode eq "only-up" && $pct <= $desired_pct )
|| ( $blockmode eq "only-down" && $pct >= $desired_pct ) ) || ( $blockmode eq "only-down" && $pct >= $desired_pct ) )
@ -737,7 +740,13 @@ sub ROLLO_calculateDriveTime(@) {
# Wenn force-Drive gesetzt ist fahren wir immer 100% (wenn "open" oder "closed") # Wenn force-Drive gesetzt ist fahren wir immer 100% (wenn "open" oder "closed")
if ( AttrVal( $name, "rl_forceDrive", 0 ) == 1 && ( $oldpos == 0 || $oldpos == 100 ) ) { if ( AttrVal( $name, "rl_forceDrive", 0 ) == 1 && ( $oldpos == 0 || $oldpos == 100 ) ) {
Log3 $name, 4, "ROLLO ($name): forceDrive set, driving $direction"; Log3 $name, 4, "ROLLO ($name): forceDrive set, driving $direction";
$steps = 100; my $cmd = ReadingsVal( $name, "command", "stop" );
if ( $cmd eq "up" or $cmd eq "down" ) {
$steps = 10;
}
else {
$steps = 100;
}
} }
} }
@ -747,6 +756,7 @@ sub ROLLO_calculateDriveTime(@) {
} }
my $drivetime = $time * $steps / 100; my $drivetime = $time * $steps / 100;
Log3 $name, 5, "ROLLO ($name) netto drive time = $drivetime";
# reactionTime etc... sollten nur hinzugefügt werden, wenn auch gefahren wird... # reactionTime etc... sollten nur hinzugefügt werden, wenn auch gefahren wird...
if ( $drivetime > 0 ) { if ( $drivetime > 0 ) {