Merge pull request 'devel' (#1) from FHEM/mod-AutoShuttersControl:devel into devel
Reviewed-on: jochenluedering/mod-AutoShuttersControl#1
This commit is contained in:
jochenluedering
commit
0b22ac9e12
@ -416,11 +416,11 @@ __END__
|
||||
after the last manual operation in seconds. Defaults to 1200 (20 minutes).
|
||||
</li>
|
||||
<a id="AutoShuttersControl-attr-ASC_BlockingTime_beforDayOpen"></a>
|
||||
<li><strong>ASC_BlockingTime_beforDayOpen</strong> - Time in which no closing operation is made by
|
||||
<li><strong>ASC_BlockingTime_beforeDayOpen</strong> - Time in which no closing operation is made by
|
||||
<abbr>ASC</abbr> after opening at the morning in seconds. Defaults to 3600 (one hour).
|
||||
</li>
|
||||
<a id="AutoShuttersControl-attr-ASC_BlockingTime_beforNightClose"></a>
|
||||
<li><strong>ASC_BlockingTime_beforNightClose</strong> - Time in which no closing operation is made by
|
||||
<a id="AutoShuttersControl-attr-ASC_BlockingTime_beforeNightClose"></a>
|
||||
<li><strong>ASC_BlockingTime_beforeNightClose</strong> - Time in which no closing operation is made by
|
||||
<abbr>ASC</abbr> before closing at the evening in seconds. Defaults to 3600 (one hour).
|
||||
</li>
|
||||
<a id="AutoShuttersControl-attr-ASC_BrightnessSensor"></a>
|
||||
@ -639,6 +639,19 @@ __END__
|
||||
</li>
|
||||
<a id="AutoShuttersControl-attr-ASC_SlatPosCmd_SlatDevice"></a>
|
||||
<li><strong>ASC_SlatPosCmd_SlatDevice</strong> - If your shutter is "venetian blind" type (with turnable slats, lamellas or similar), this is the place to set additional command and/or device info to control the slat level. Examples: <i>attr ROLLO ASC_SlatPosCmd_SlatDevice slatPct</i> or <i>attr ROLLO ASC_SlatPosCmd_SlatDevice dim:ROLLOSLATDEVICE</i>. Providing a device name for the slat device is only needed in case it's different to the shutter itself. If attribute is set, additional positioning values for the respective slat levels can be set in attributes <i>ASC_Open_Pos</i>, <i>ASC_Closed_Pos</i>, <i>ASC_Ventilate_Pos</i>, <i>ASC_ComfortOpen_Pos</i>, <i>ASC_Shading_Pos</i> and <i>ASC_Sleep_Pos</i>.</li>
|
||||
<a id="AutoShuttersControl-attr-ASC_CommandTemplate"></a>
|
||||
<li><strong>ASC_CommandTemplate</strong> - <strong>FHEM or Perl command</strong> (Perl in braces as usual needs escaping semicolons etc.).<br>
|
||||
This optional attribute will override the internally determined command to drive this shutter. Setting it, is only recommended in <strong>some rare and special cases,</strong>, in most cases there's <strong>no need</strong> to set this attribute!
|
||||
The parameters <i>$name</i> (name of the shutter device), <i>$pos</i> (target position for the respective drive command), <i>$slatPos</i> (target position for the (turnable) lammellas in venetion blinds) and <i>$cause</i> (internal label for the cause of the driving command) will be replaced by the appropirate values. You may have to take care to avoid unneeded driving commands.
|
||||
Examples:
|
||||
<ul>
|
||||
<li><i>attr ROLLO ASC_CommandTemplate set $name $pos</i> - Address the position command directly to the main switch of the device</li>
|
||||
<li><i>attr ROLLO ASC_CommandTemplate set $name pct $pos</i> - Address the setter <i>pct</i> for positioning commands</li>
|
||||
<li><i>attr ROLLO ASC_CommandTemplate set $name datapoint 4.LEVEL_2 $slatPos 4.LEVEL $pos</i> - combined positioning command, e.g. appropriate for HM-IP-venetian blind type actors</li>
|
||||
<li><i>attr ROLLO ASC_CommandTemplate { fhem("set $name ".($pos+1024)).";set $name 0")}</i> - positioning command with Perl calculation and additional "execute" command, e.g. for an SPS type blind</li>
|
||||
<li><i>attr ROLLO ASC_CommandTemplate { myPerlFn("$name",$pos,$slatPos,"$cause")}</i> - call own Perl function (e.g. from 99_myUtils.pm)</li>
|
||||
</ul>
|
||||
</li>
|
||||
<a id="AutoShuttersControl-attr-ASC_WindowRec_PosAfterDayClosed"></a>
|
||||
<li><strong>ASC_WindowRec_PosAfterDayClosed</strong> - open,lastManual / auf welche Position soll das Rollo nach dem schließen am Tag fahren. Open Position oder letzte gespeicherte manuelle Position (default: open)</li>
|
||||
<blockquote>
|
||||
@ -1028,10 +1041,10 @@ __END__
|
||||
<li><strong>ASC_AutoAstroModeMorningHorizon</strong> - Höhe über Horizont,a wenn beim Attribut ASC_autoAstroModeMorning HORIZON ausgewählt (default: none)</li>
|
||||
<a id="AutoShuttersControl-attr-ASC_BlockingTime_afterManual"></a>
|
||||
<li><strong>ASC_BlockingTime_afterManual</strong> - wie viel Sekunden soll die Automatik nach einer manuellen Fahrt aussetzen. (default: 1200)</li>
|
||||
<a id="AutoShuttersControl-attr-ASC_BlockingTime_beforDayOpen"></a>
|
||||
<li><strong>ASC_BlockingTime_beforDayOpen</strong> - wie viel Sekunden vor dem morgendlichen öffnen soll keine schließen Fahrt mehr stattfinden. (default: 3600)</li>
|
||||
<a id="AutoShuttersControl-attr-ASC_BlockingTime_beforNightClose"></a>
|
||||
<li><strong>ASC_BlockingTime_beforNightClose</strong> - wie viel Sekunden vor dem nächtlichen schließen soll keine öffnen Fahrt mehr stattfinden. (default: 3600)</li>
|
||||
<a id="AutoShuttersControl-attr-ASC_BlockingTime_beforeDayOpen"></a>
|
||||
<li><strong>ASC_BlockingTime_beforeDayOpen</strong> - wie viel Sekunden vor dem morgendlichen öffnen soll keine schließen Fahrt mehr stattfinden. (default: 3600)</li>
|
||||
<a id="AutoShuttersControl-attr-ASC_BlockingTime_beforeNightClose"></a>
|
||||
<li><strong>ASC_BlockingTime_beforeNightClose</strong> - wie viel Sekunden vor dem nächtlichen schließen soll keine öffnen Fahrt mehr stattfinden. (default: 3600)</li>
|
||||
<a id="AutoShuttersControl-attr-ASC_BrightnessSensor"></a>
|
||||
<li><strong>ASC_BrightnessSensor - DEVICE[:READING] WERT-MORGENS:WERT-ABENDS</strong> / 'Sensorname[:brightness [400:800]]' Angaben zum Helligkeitssensor mit (Readingname, optional) für die Beschattung und dem Fahren der Rollladen nach brightness und den optionalen Brightnesswerten für Sonnenauf- und Sonnenuntergang. (default: none)</li>
|
||||
<a id="AutoShuttersControl-attr-ASC_Down"></a>
|
||||
@ -1157,6 +1170,22 @@ __END__
|
||||
<li><strong>ASC_WindowRec_subType</strong> - Typ des verwendeten Fensterkontaktes: twostate (optisch oder magnetisch) oder threestate (Drehgriffkontakt) (default: twostate)</li>
|
||||
<a id="AutoShuttersControl-attr-ASC_SlatPosCmd_SlatDevice"></a>
|
||||
<li><strong>ASC_SlatPosCmd_SlatDevice</strong> - Angaben zu einem Slat (Lamellen) CMD und - sofern diese Lamellen über ein anderes Device gesteuert werden - zum Slat Device. Beispiele: <i>attr ROLLO ASC_SlatPosCmd_SlatDevice slatPct</i> oder <i>attr ROLLO ASC_SlatPosCmd_SlatDevice dim:ROLLOSLATDEVICE</i>. Die Angabe des Devices ist nur erforderlich, wenn zur Steuerung der Lamellen ein anderes Device verwendet wird. Damit das ganze dann auch greift, muss in den 6 Positionsangaben ASC_Open_Pos, ASC_Closed_Pos, ASC_Ventilate_Pos, ASC_ComfortOpen_Pos, ASC_Shading_Pos und ASC_Sleep_Pos ein weiterer Parameter für die Lamellenstellung mit angegeben werden.</li>
|
||||
<a id="AutoShuttersControl-attr-ASC_CommandTemplate"></a>
|
||||
<a id="AutoShuttersControl-attr-ASC_CommandTemplate"></a>
|
||||
<li><strong>ASC_CommandTemplate</strong> - <strong>FHEM-Kommando(s) oder Perl-Anweisung</strong> (in geschweiften Klammern unter Beachtung der üblichen Regeln für das escapen von Semicolons etc.).<br>
|
||||
Dieses Attribut übersteuert das sonst intern ermittelte Fahrkommando und ist <strong>für seltene und spezielle Fälle</strong> gedacht. In der Regel ist es nicht erforderlich, dieses Attribut zu setzen!<br>
|
||||
Die Variablen <i>$name</i> (der Name des Rollladen-Devices), <i>$pos</i> (die Zielposition des Fahrbefehls), <i>$slatPos</i> (die Zielposition des Fahrbefehls für eventuelle Lamellen) und <i>$cause</i> (die interne Benennung des Fahranlasses) werden durch die ermittelten Werte ersetzt, es muss selbst dafür gesorgt werden, dass eventuell unnötige Fahrbefehle aussortiert werden.
|
||||
Beispiele:
|
||||
<ul>
|
||||
<li><i>attr ROLLO ASC_CommandTemplate set $name $pos</i> - Positionsbefehl direkt an Gerät
|
||||
setzen</li>
|
||||
<li><i>attr ROLLO ASC_CommandTemplate set $name pct $pos</i> - Positionsbefehl auf den setter <i>pct</i> absetzen</li>
|
||||
<li><i>attr ROLLO ASC_CommandTemplate set $name datapoint 4.LEVEL_2 $slatPos 4.LEVEL $pos</i> - Positionsbefehl und Lamellen-Ansteuerung für HM-IP-Jalousieaktoren</li>
|
||||
<li><i>attr ROLLO ASC_CommandTemplate { fhem("set $name ".($pos+1024)).";set $name 0")}</i> - Positionsbefehl für eine SPS in Perl umrechnen</li>
|
||||
<li><i>attr ROLLO ASC_CommandTemplate { myPerlFn("$name",$pos,$slatPos,"$cause")}</i> - eigene Perl-Funktion (z.B. in 99_myUtils.pm) aufrufen</li>
|
||||
</ul>
|
||||
<strong>Hinweis: ASC_CommandTemplate</strong> ist für seltene und spezielle Fälle gedacht. In der Regel ist es nicht erforderlich, dieses Attribut zu setzen!
|
||||
</li>
|
||||
</ul>
|
||||
</ul>
|
||||
</p>
|
||||
@ -1436,7 +1465,7 @@ __END__
|
||||
],
|
||||
"release_status": "stable",
|
||||
"license": "GPL_2",
|
||||
"version": "v0.10.15",
|
||||
"version": "v0.10.19",
|
||||
"author": [
|
||||
"Marko Oldenburg <fhemdevelopment@cooltux.net>"
|
||||
],
|
||||
|
||||
@ -1,16 +1,16 @@
|
||||
UPD 2021-09-14_09:46:51 111901 FHEM/73_AutoShuttersControl.pm
|
||||
UPD 2021-09-14_09:46:54 74456 lib/FHEM/Automation/ShuttersControl.pm
|
||||
UPD 2021-09-14_09:46:49 2657 lib/FHEM/Automation/ShuttersControl/Dev.pm
|
||||
UPD 2021-09-14_09:47:28 2496 lib/FHEM/Automation/ShuttersControl/Roommate.pm
|
||||
UPD 2021-09-14_09:47:45 31896 lib/FHEM/Automation/ShuttersControl/Shutters.pm
|
||||
UPD 2021-09-14_09:47:37 25329 lib/FHEM/Automation/ShuttersControl/Shading.pm
|
||||
UPD 2021-06-05_04:49:19 109039 lib/FHEM/Automation/ShuttersControl/EventProcessingFunctions.pm
|
||||
UPD 2021-09-14_09:47:12 40628 lib/FHEM/Automation/ShuttersControl/Helper.pm
|
||||
UPD 2021-09-14_09:47:53 2175 lib/FHEM/Automation/ShuttersControl/Window.pm
|
||||
UPD 2021-09-14_09:48:19 11741 lib/FHEM/Automation/ShuttersControl/Dev/Attr.pm
|
||||
UPD 2021-09-14_09:48:16 7251 lib/FHEM/Automation/ShuttersControl/Dev/Readings.pm
|
||||
UPD 2021-09-14_09:48:36 52525 lib/FHEM/Automation/ShuttersControl/Shutters/Attr.pm
|
||||
UPD 2021-09-14_09:48:43 2903 lib/FHEM/Automation/ShuttersControl/Shutters/Readings.pm
|
||||
UPD 2021-09-14_09:48:55 3980 lib/FHEM/Automation/ShuttersControl/Window/Attr.pm
|
||||
UPD 2021-09-14_09:49:07 2288 lib/FHEM/Automation/ShuttersControl/Window/Readings.pm
|
||||
UPD 2021-06-05_04:49:19 6195 lib/FHEM/Automation/ShuttersControl/Rainprotection.pm
|
||||
UPD 2021-11-14_13:42:55 115685 FHEM/73_AutoShuttersControl.pm
|
||||
UPD 2021-11-14_13:40:41 75264 lib/FHEM/Automation/ShuttersControl.pm
|
||||
UPD 2021-10-09_07:12:54 2657 lib/FHEM/Automation/ShuttersControl/Dev.pm
|
||||
UPD 2021-10-09_07:12:54 2494 lib/FHEM/Automation/ShuttersControl/Roommate.pm
|
||||
UPD 2021-10-24_07:33:53 31900 lib/FHEM/Automation/ShuttersControl/Shutters.pm
|
||||
UPD 2021-10-09_07:12:54 25333 lib/FHEM/Automation/ShuttersControl/Shading.pm
|
||||
UPD 2021-11-10_20:11:14 110681 lib/FHEM/Automation/ShuttersControl/EventProcessingFunctions.pm
|
||||
UPD 2021-11-14_13:37:27 40094 lib/FHEM/Automation/ShuttersControl/Helper.pm
|
||||
UPD 2021-10-09_07:12:54 2173 lib/FHEM/Automation/ShuttersControl/Window.pm
|
||||
UPD 2021-10-09_07:12:54 11739 lib/FHEM/Automation/ShuttersControl/Dev/Attr.pm
|
||||
UPD 2021-10-09_07:12:54 7249 lib/FHEM/Automation/ShuttersControl/Dev/Readings.pm
|
||||
UPD 2021-10-27_08:50:46 52649 lib/FHEM/Automation/ShuttersControl/Shutters/Attr.pm
|
||||
UPD 2021-10-09_07:12:54 2901 lib/FHEM/Automation/ShuttersControl/Shutters/Readings.pm
|
||||
UPD 2021-10-09_07:12:54 3978 lib/FHEM/Automation/ShuttersControl/Window/Attr.pm
|
||||
UPD 2021-10-09_07:12:54 2286 lib/FHEM/Automation/ShuttersControl/Window/Readings.pm
|
||||
UPD 2021-10-27_08:50:46 6716 lib/FHEM/Automation/ShuttersControl/Rainprotection.pm
|
||||
|
||||
@ -184,9 +184,7 @@ BEGIN {
|
||||
delFromAttrList
|
||||
gettimeofday
|
||||
InternalTimer
|
||||
RemoveInternalTimer
|
||||
computeAlignTime
|
||||
ReplaceEventMap)
|
||||
RemoveInternalTimer)
|
||||
);
|
||||
|
||||
#-- Export to main context with different name
|
||||
@ -229,8 +227,8 @@ our %userAttrList = (
|
||||
'ASC_LockOut:soft,hard,off' => '-',
|
||||
'ASC_LockOut_Cmd:inhibit,blocked,protection' => '-',
|
||||
'ASC_BlockingTime_afterManual' => '-',
|
||||
'ASC_BlockingTime_beforNightClose' => '-',
|
||||
'ASC_BlockingTime_beforDayOpen' => '-',
|
||||
'ASC_BlockingTime_beforeNightClose' => '-',
|
||||
'ASC_BlockingTime_beforeDayOpen' => '-',
|
||||
'ASC_BrightnessSensor' => '-',
|
||||
'ASC_Shading_Pos:10,20,30,40,50,60,70,80,90,100' => [ '', 80, 20 ],
|
||||
'ASC_Shading_Mode:absent,always,off,home' => '-',
|
||||
@ -246,7 +244,7 @@ our %userAttrList = (
|
||||
'ASC_WindowRec' => '-',
|
||||
'ASC_WindowRec_subType:twostate,threestate' => '-',
|
||||
'ASC_WindowRec_PosAfterDayClosed:open,lastManual' => '-',
|
||||
'ASC_ShuttersPlace:window,terrace,awning' => '-',
|
||||
'ASC_ShuttersPlace:window,terrace,awning,EG_window' => '-',
|
||||
'ASC_Ventilate_Pos:10,20,30,40,50,60,70,80,90,100' => [ '', 70, 30 ],
|
||||
'ASC_ComfortOpen_Pos:0,10,20,30,40,50,60,70,80,90,100' => [ '', 20, 80 ],
|
||||
'ASC_GuestRoom:on,off' => '-',
|
||||
@ -265,6 +263,7 @@ our %userAttrList = (
|
||||
'ASC_RainProtection:on,off' => '-',
|
||||
'ASC_ExternalTrigger' => '-',
|
||||
'ASC_Adv:on,off' => '-',
|
||||
'ASC_CommandTemplate' => '-',
|
||||
'ASC_SlatPosCmd_SlatDevice' => '-',
|
||||
);
|
||||
|
||||
@ -515,7 +514,7 @@ m{^(ATTR|DELETEATTR)\s(.*ASC_Time_Up_WE_Holiday|.*ASC_Up|.*ASC_Down|.*ASC_AutoAs
|
||||
EventProcessingGeneral( $hash, undef, join( ' ', @{$events} ) );
|
||||
}
|
||||
}
|
||||
elsif ( grep m{^($posReading):\s\d{1,3}$}xms, @{$events} ) {
|
||||
elsif ( grep m{^($posReading):\s\d{1,3}(\.\d{1,3})?$}xms, @{$events} ) {
|
||||
ASC_Debug( 'Notify: '
|
||||
. ' ASC_Pos_Reading Event vom Rollo '
|
||||
. $devname
|
||||
@ -776,11 +775,11 @@ sub WriteReadingsShuttersList {
|
||||
readingsBulkUpdate(
|
||||
$hash,
|
||||
'room_'
|
||||
. makeReadingName( AttrVal( $shuttersDev, 'room', 'unsorted' ) ),
|
||||
. ::makeReadingName( AttrVal( $shuttersDev, 'room', 'unsorted' ) ),
|
||||
ReadingsVal(
|
||||
$name,
|
||||
'room_'
|
||||
. makeReadingName(
|
||||
. ::makeReadingName(
|
||||
AttrVal( $shuttersDev, 'room', 'unsorted' )
|
||||
),
|
||||
''
|
||||
@ -792,7 +791,7 @@ sub WriteReadingsShuttersList {
|
||||
ReadingsVal(
|
||||
$name,
|
||||
'room_'
|
||||
. makeReadingName(
|
||||
. ::makeReadingName(
|
||||
AttrVal( $shuttersDev, 'room', 'unsorted' )
|
||||
),
|
||||
'none'
|
||||
@ -802,14 +801,14 @@ sub WriteReadingsShuttersList {
|
||||
readingsBulkUpdate(
|
||||
$hash,
|
||||
'room_'
|
||||
. makeReadingName( AttrVal( $shuttersDev, 'room', 'unsorted' ) ),
|
||||
. ::makeReadingName( AttrVal( $shuttersDev, 'room', 'unsorted' ) ),
|
||||
$shuttersDev
|
||||
)
|
||||
if (
|
||||
ReadingsVal(
|
||||
$name,
|
||||
'room_'
|
||||
. makeReadingName(
|
||||
. ::makeReadingName(
|
||||
AttrVal( $shuttersDev, 'room', 'unsorted' )
|
||||
),
|
||||
'none'
|
||||
@ -1227,15 +1226,15 @@ sub RenewSunRiseSetShuttersTimer {
|
||||
1, 0 );
|
||||
}
|
||||
|
||||
# $attr{$shuttersDev}{ASC_Drive_Delay} =
|
||||
# AttrVal( $shuttersDev, 'ASC_Drive_Offset', 'none' )
|
||||
# if ( AttrVal( $shuttersDev, 'ASC_Drive_Offset', 'none' ) ne 'none' );
|
||||
# delFromDevAttrList( $shuttersDev, 'ASC_Drive_Offset' );
|
||||
#
|
||||
# $attr{$shuttersDev}{ASC_Drive_DelayStart} =
|
||||
# AttrVal( $shuttersDev, 'ASC_Drive_OffsetStart', 'none' )
|
||||
# if ( AttrVal( $shuttersDev, 'ASC_Drive_OffsetStart', 'none' ) ne 'none' );
|
||||
# delFromDevAttrList( $shuttersDev, 'ASC_Drive_OffsetStart' );
|
||||
$attr{$shuttersDev}{ASC_BlockingTime_beforeNightClose} =
|
||||
AttrVal( $shuttersDev, 'ASC_BlockingTime_beforNightClose', 'none' )
|
||||
if ( AttrVal( $shuttersDev, 'ASC_BlockingTime_beforNightClose', 'none' ) ne 'none' );
|
||||
delFromDevAttrList( $shuttersDev, 'ASC_BlockingTime_beforNightClose' );
|
||||
|
||||
$attr{$shuttersDev}{ASC_BlockingTime_beforeDayOpen} =
|
||||
AttrVal( $shuttersDev, 'ASC_BlockingTime_beforDayOpen', 'none' )
|
||||
if ( AttrVal( $shuttersDev, 'ASC_BlockingTime_beforDayOpen', 'none' ) ne 'none' );
|
||||
delFromDevAttrList( $shuttersDev, 'ASC_BlockingTime_beforDayOpen' );
|
||||
#
|
||||
# $attr{$shuttersDev}{ASC_Shading_StateChange_SunnyCloudy} =
|
||||
# AttrVal( $shuttersDev, 'ASC_Shading_StateChange_Sunny', 'none' ) . ':'
|
||||
@ -1769,8 +1768,9 @@ sub _SetCmdFn {
|
||||
. '. Grund der Fahrt: '
|
||||
. $shutters->getLastDrive );
|
||||
|
||||
my $driveCommand = $shutters->getPosSetCmd . ' ' . $posValue;
|
||||
my $slatPos = -1;
|
||||
my $driveCommand = $shutters->getPosSetCmd . ' ' . $posValue;
|
||||
my $commandTemplate = $shutters->getCommandTemplate;
|
||||
my $slatPos = -1;
|
||||
|
||||
if ( $shutters->getShadingPositionAssignment ne 'none'
|
||||
|| $shutters->getOpenPositionAssignment ne 'none'
|
||||
@ -1822,32 +1822,48 @@ sub _SetCmdFn {
|
||||
}
|
||||
}
|
||||
|
||||
CommandSet( undef,
|
||||
$shuttersDev
|
||||
. ':FILTER='
|
||||
. $shutters->getPosCmd . '!='
|
||||
. $posValue . ' '
|
||||
. $driveCommand );
|
||||
if ( $commandTemplate ne 'none' ) { # Patch von Beta-User Forum https://forum.fhem.de/index.php/topic,123659.0.html
|
||||
# Nutzervariablen setzen
|
||||
my %specials = (
|
||||
'$name' => $shuttersDev,
|
||||
'$pos' => $posValue,
|
||||
'$slatPos' => $slatPos,
|
||||
'$cause' => $shutters->getLastDrive
|
||||
);
|
||||
|
||||
$commandTemplate = ::EvalSpecials($commandTemplate, %specials);
|
||||
# CMD ausführen
|
||||
::AnalyzeCommandChain( $h, $commandTemplate );
|
||||
}
|
||||
else {
|
||||
CommandSet( undef,
|
||||
$shuttersDev
|
||||
. ':FILTER='
|
||||
. $shutters->getPosCmd . '!='
|
||||
. $posValue . ' '
|
||||
. $driveCommand );
|
||||
|
||||
InternalTimer(
|
||||
gettimeofday() + 3,
|
||||
sub() {
|
||||
CommandSet(
|
||||
undef,
|
||||
(
|
||||
$shutters->getSlatDevice ne 'none'
|
||||
? $shutters->getSlatDevice
|
||||
: $shuttersDev
|
||||
)
|
||||
. ' '
|
||||
. $shutters->getSlatPosCmd . ' '
|
||||
. $slatPos
|
||||
);
|
||||
},
|
||||
$shuttersDev
|
||||
)
|
||||
if ( $slatPos > -1
|
||||
&& $shutters->getSlatPosCmd ne 'none' );
|
||||
InternalTimer(
|
||||
gettimeofday() + 3,
|
||||
sub() {
|
||||
CommandSet(
|
||||
undef,
|
||||
(
|
||||
$shutters->getSlatDevice ne 'none'
|
||||
? $shutters->getSlatDevice
|
||||
: $shuttersDev
|
||||
)
|
||||
. ' '
|
||||
. $shutters->getSlatPosCmd . ' '
|
||||
. $slatPos
|
||||
);
|
||||
},
|
||||
$shuttersDev
|
||||
)
|
||||
if ( $slatPos > -1
|
||||
&& $shutters->getSlatPosCmd ne 'none' );
|
||||
|
||||
}
|
||||
|
||||
$shutters->setSelfDefenseAbsent( 0, 0 )
|
||||
if (!$shutters->getSelfDefenseAbsent
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
#
|
||||
# Developed with Kate
|
||||
#
|
||||
# (c) 2018-2021 Copyright: Marko Oldenburg (leongaultier at gmail dot com)
|
||||
# (c) 2018-2021 Copyright: Marko Oldenburg (fhemdevelopment@cooltux.net)
|
||||
# All rights reserved
|
||||
#
|
||||
# Special thanks goes to:
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
#
|
||||
# Developed with Kate
|
||||
#
|
||||
# (c) 2018-2021 Copyright: Marko Oldenburg (leongaultier at gmail dot com)
|
||||
# (c) 2018-2021 Copyright: Marko Oldenburg (fhemdevelopment@cooltux.net)
|
||||
# All rights reserved
|
||||
#
|
||||
# Special thanks goes to:
|
||||
|
||||
@ -324,6 +324,13 @@ sub EventProcessingWindowRec {
|
||||
->getShuttersPlace eq 'terrace'
|
||||
)
|
||||
&& !$FHEM::Automation::ShuttersControl::shutters->getIsDay )
|
||||
|| ( $FHEM::Automation::ShuttersControl::shutters->getStatus ==
|
||||
$FHEM::Automation::ShuttersControl::shutters
|
||||
->getOpenPos
|
||||
&& $FHEM::Automation::ShuttersControl::shutters
|
||||
->getDelayCmd ne 'none'
|
||||
&& $FHEM::Automation::ShuttersControl::shutters
|
||||
->getShuttersPlace eq 'terrace' )
|
||||
)
|
||||
&& ( $FHEM::Automation::ShuttersControl::shutters->getVentilateOpen
|
||||
eq 'on'
|
||||
@ -370,7 +377,12 @@ sub EventProcessingWindowRec {
|
||||
|| $FHEM::Automation::ShuttersControl::shutters
|
||||
->getStatus !=
|
||||
$FHEM::Automation::ShuttersControl::shutters
|
||||
->getLastManPos )
|
||||
->getLastManPos
|
||||
|| ( $FHEM::Automation::ShuttersControl::shutters
|
||||
->getDelayCmd ne 'none'
|
||||
&& $FHEM::Automation::ShuttersControl::shutters
|
||||
->getShuttersPlace eq 'terrace' )
|
||||
)
|
||||
)
|
||||
{
|
||||
if ( $FHEM::Automation::ShuttersControl::shutters
|
||||
@ -395,11 +407,17 @@ sub EventProcessingWindowRec {
|
||||
->setDriveCmd(
|
||||
(
|
||||
$FHEM::Automation::ShuttersControl::shutters
|
||||
->getVentilatePosAfterDayClosed eq 'open'
|
||||
->getDelayCmd ne 'none'
|
||||
&& $FHEM::Automation::ShuttersControl::shutters
|
||||
->getShuttersPlace eq 'terrace'
|
||||
? $FHEM::Automation::ShuttersControl::shutters
|
||||
->getOpenPos
|
||||
->getDelayCmd
|
||||
: ( $FHEM::Automation::ShuttersControl::shutters
|
||||
->getVentilatePosAfterDayClosed eq 'open'
|
||||
? $FHEM::Automation::ShuttersControl::shutters
|
||||
->getOpenPos
|
||||
: $FHEM::Automation::ShuttersControl::shutters
|
||||
->getLastManPos
|
||||
->getLastManPos )
|
||||
)
|
||||
);
|
||||
}
|
||||
@ -977,8 +995,10 @@ sub EventProcessingResidents {
|
||||
|| ( CheckIfShuttersWindowRecOpen($shuttersDev) == 2
|
||||
&& $FHEM::Automation::ShuttersControl::shutters
|
||||
->getSelfDefenseMode eq 'gone'
|
||||
&& $FHEM::Automation::ShuttersControl::shutters
|
||||
->getShuttersPlace eq 'terrace'
|
||||
&& ( $FHEM::Automation::ShuttersControl::shutters
|
||||
->getShuttersPlace eq 'terrace'
|
||||
|| $FHEM::Automation::ShuttersControl::shutters
|
||||
->getShuttersPlace eq 'EG_window' )
|
||||
&& $FHEM::Automation::ShuttersControl::shutters
|
||||
->getSelfDefenseMode ne 'off' )
|
||||
)
|
||||
@ -2440,7 +2460,7 @@ sub EventProcessingExternalTriggerDevice {
|
||||
'external trigger device inactive');
|
||||
$FHEM::Automation::ShuttersControl::shutters->setNoDelay(1);
|
||||
$FHEM::Automation::ShuttersControl::shutters->setExternalTriggerStatus(
|
||||
1);
|
||||
0);
|
||||
FHEM::Automation::ShuttersControl::ShuttersCommandSet(
|
||||
$hash,
|
||||
$shuttersDev,
|
||||
|
||||
@ -994,25 +994,6 @@ sub IsAfterShuttersManualBlocking {
|
||||
else { return 1 }
|
||||
}
|
||||
|
||||
sub makeReadingName {
|
||||
my ($rname) = shift;
|
||||
my %charHash = (
|
||||
chr(0xe4) => "ae", # ä
|
||||
chr(0xc4) => "Ae", # Ä
|
||||
chr(0xfc) => "ue", # ü
|
||||
chr(0xdc) => "Ue", # Ü
|
||||
chr(0xf6) => "oe", # ö
|
||||
chr(0xd6) => "Oe", # Ö
|
||||
chr(0xdf) => "ss" # ß
|
||||
);
|
||||
my $charHashkeys = join( "", keys(%charHash) );
|
||||
|
||||
return $rname if ( $rname =~ m{^\./}xms );
|
||||
$rname =~ s/([$charHashkeys])/$charHash{$1}/xgi;
|
||||
$rname =~ s/[^a-z0-9._\-\/]/_/xgi;
|
||||
return $rname;
|
||||
}
|
||||
|
||||
sub IsWe {
|
||||
return main::IsWe( shift, shift );
|
||||
}
|
||||
|
||||
@ -107,6 +107,18 @@ sub RainProcessing {
|
||||
$FHEM::Automation::ShuttersControl::shutters
|
||||
->setRainProtectionStatus('unprotected');
|
||||
}
|
||||
else {
|
||||
if ( $FHEM::Automation::ShuttersControl::shutters->getStatus != $rainClosedPos
|
||||
&& ($val == 0 || $val < $triggerMin) )
|
||||
{
|
||||
$FHEM::Automation::ShuttersControl::shutters
|
||||
->setRainProtectionStatus('unprotected');
|
||||
}
|
||||
elsif ($val > $triggerMax) {
|
||||
$FHEM::Automation::ShuttersControl::shutters
|
||||
->setRainProtectionStatus('protected');
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return;
|
||||
@ -121,11 +133,13 @@ sub _RainProtected {
|
||||
|
||||
$FHEM::Automation::ShuttersControl::shutters->setLastDrive(
|
||||
'rain protected');
|
||||
$FHEM::Automation::ShuttersControl::shutters->setDriveCmd(
|
||||
$FHEM::Automation::ShuttersControl::ascDev
|
||||
->getRainSensorShuttersClosedPos);
|
||||
$FHEM::Automation::ShuttersControl::shutters
|
||||
->setRainProtectionStatus('protected');
|
||||
|
||||
$FHEM::Automation::ShuttersControl::shutters->setDriveCmd(
|
||||
$FHEM::Automation::ShuttersControl::ascDev
|
||||
->getRainSensorShuttersClosedPos);
|
||||
|
||||
$FHEM::Automation::ShuttersControl::shutters
|
||||
->setRainProtectionStatus('protected');
|
||||
}
|
||||
|
||||
sub _RainUnprotected {
|
||||
@ -156,10 +170,11 @@ sub _RainUnprotected {
|
||||
->getClosedPos
|
||||
)
|
||||
)
|
||||
);
|
||||
)
|
||||
if (IsAfterShuttersTimeBlocking($shuttersDev));
|
||||
|
||||
$FHEM::Automation::ShuttersControl::shutters
|
||||
->setRainProtectionStatus('unprotected');
|
||||
$FHEM::Automation::ShuttersControl::shutters
|
||||
->setRainProtectionStatus('unprotected');
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
#
|
||||
# Developed with Kate
|
||||
#
|
||||
# (c) 2018-2021 Copyright: Marko Oldenburg (leongaultier at gmail dot com)
|
||||
# (c) 2018-2021 Copyright: Marko Oldenburg (fhemdevelopment@cooltux.net)
|
||||
# All rights reserved
|
||||
#
|
||||
# Special thanks goes to:
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
#
|
||||
# Developed with Kate
|
||||
#
|
||||
# (c) 2018-2021 Copyright: Marko Oldenburg (fhemsupport@cooltux.net)
|
||||
# (c) 2018-2021 Copyright: Marko Oldenburg (fhemdevelopment@cooltux.net)
|
||||
# All rights reserved
|
||||
#
|
||||
# Special thanks goes to:
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
#
|
||||
# Developed with Kate
|
||||
#
|
||||
# (c) 2018-2021 Copyright: Marko Oldenburg (leongaultier at gmail dot com)
|
||||
# (c) 2018-2021 Copyright: Marko Oldenburg (fhemdevelopment@cooltux.net)
|
||||
# All rights reserved
|
||||
#
|
||||
# Special thanks goes to:
|
||||
@ -161,9 +161,9 @@ sub setDriveCmd {
|
||||
$FHEM::Automation::ShuttersControl::shutters->setDelayCmd($posValue);
|
||||
$FHEM::Automation::ShuttersControl::ascDev->setDelayCmdReading;
|
||||
$FHEM::Automation::ShuttersControl::shutters->setNoDelay(0);
|
||||
$FHEM::Automation::ShuttersControl::shutters->setExternalTriggerStatus(0)
|
||||
if ( $FHEM::Automation::ShuttersControl::shutters
|
||||
->getExternalTriggerStatus );
|
||||
# $FHEM::Automation::ShuttersControl::shutters->setExternalTriggerStatus(0)
|
||||
# if ( $FHEM::Automation::ShuttersControl::shutters
|
||||
# ->getExternalTriggerStatus );
|
||||
|
||||
FHEM::Automation::ShuttersControl::ASC_Debug( 'setDriveCmd: '
|
||||
. $FHEM::Automation::ShuttersControl::shutters->getShuttersDev
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
#
|
||||
# Developed with Kate
|
||||
#
|
||||
# (c) 2018-2021 Copyright: Marko Oldenburg (leongaultier at gmail dot com)
|
||||
# (c) 2018-2021 Copyright: Marko Oldenburg (fhemdevelopment@cooltux.net)
|
||||
# All rights reserved
|
||||
#
|
||||
# Special thanks goes to:
|
||||
@ -516,6 +516,12 @@ sub getSelfDefenseAbsentDelay {
|
||||
return AttrVal( $self->{shuttersDev}, 'ASC_Self_Defense_AbsentDelay', 300 );
|
||||
}
|
||||
|
||||
sub getCommandTemplate {
|
||||
my $self = shift;
|
||||
|
||||
return AttrVal( $self->{shuttersDev}, 'ASC_CommandTemplate', 'none' );
|
||||
}
|
||||
|
||||
sub setWiggleValue {
|
||||
my $self = shift;
|
||||
my $attrVal = shift;
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
#
|
||||
# Developed with Kate
|
||||
#
|
||||
# (c) 2018-2021 Copyright: Marko Oldenburg (leongaultier at gmail dot com)
|
||||
# (c) 2018-2021 Copyright: Marko Oldenburg (fhemdevelopment@cooltux.net)
|
||||
# All rights reserved
|
||||
#
|
||||
# Special thanks goes to:
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
#
|
||||
# Developed with Kate
|
||||
#
|
||||
# (c) 2018-2021 Copyright: Marko Oldenburg (leongaultier at gmail dot com)
|
||||
# (c) 2018-2021 Copyright: Marko Oldenburg (fhemdevelopment@cooltux.net)
|
||||
# All rights reserved
|
||||
#
|
||||
# Special thanks goes to:
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
#
|
||||
# Developed with Kate
|
||||
#
|
||||
# (c) 2018-2021 Copyright: Marko Oldenburg (leongaultier at gmail dot com)
|
||||
# (c) 2018-2021 Copyright: Marko Oldenburg (fhemdevelopment@cooltux.net)
|
||||
# All rights reserved
|
||||
#
|
||||
# Special thanks goes to:
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
#
|
||||
# Developed with Kate
|
||||
#
|
||||
# (c) 2018-2021 Copyright: Marko Oldenburg (leongaultier at gmail dot com)
|
||||
# (c) 2018-2021 Copyright: Marko Oldenburg (fhemdevelopment@cooltux.net)
|
||||
# All rights reserved
|
||||
#
|
||||
# Special thanks goes to:
|
||||
|
||||
Loading…
Reference in New Issue
Block a user