add EG_window to ShuttersPlace and expand ProcessingResidents Fn for

close Shutter by open window then gone
This commit is contained in:
Marko Oldenburg 2021-10-09 07:53:53 +02:00
parent 6a62226a39
commit 63393b4cd4
4 changed files with 22 additions and 20 deletions

View File

@ -1436,7 +1436,7 @@ __END__
], ],
"release_status": "stable", "release_status": "stable",
"license": "GPL_2", "license": "GPL_2",
"version": "v0.10.16", "version": "v0.10.17",
"author": [ "author": [
"Marko Oldenburg <fhemdevelopment@cooltux.net>" "Marko Oldenburg <fhemdevelopment@cooltux.net>"
], ],

View File

@ -1,16 +1,16 @@
UPD 2021-10-09_07:07:29 111901 FHEM/73_AutoShuttersControl.pm UPD 2021-10-09_07:52:33 111901 FHEM/73_AutoShuttersControl.pm
UPD 2021-09-14_09:51:23 74456 lib/FHEM/Automation/ShuttersControl.pm UPD 2021-10-09_07:44:09 74456 lib/FHEM/Automation/ShuttersControl.pm
UPD 2021-09-14_09:51:23 2657 lib/FHEM/Automation/ShuttersControl/Dev.pm UPD 2021-10-09_07:12:54 2657 lib/FHEM/Automation/ShuttersControl/Dev.pm
UPD 2021-10-09_07:08:59 2494 lib/FHEM/Automation/ShuttersControl/Roommate.pm UPD 2021-10-09_07:12:54 2494 lib/FHEM/Automation/ShuttersControl/Roommate.pm
UPD 2021-10-09_07:09:33 31894 lib/FHEM/Automation/ShuttersControl/Shutters.pm UPD 2021-10-09_07:12:54 31894 lib/FHEM/Automation/ShuttersControl/Shutters.pm
UPD 2021-10-09_07:09:29 25333 lib/FHEM/Automation/ShuttersControl/Shading.pm UPD 2021-10-09_07:12:54 25333 lib/FHEM/Automation/ShuttersControl/Shading.pm
UPD 2021-10-01_08:09:29 109370 lib/FHEM/Automation/ShuttersControl/EventProcessingFunctions.pm UPD 2021-10-09_07:53:18 109522 lib/FHEM/Automation/ShuttersControl/EventProcessingFunctions.pm
UPD 2021-09-14_09:51:23 40628 lib/FHEM/Automation/ShuttersControl/Helper.pm UPD 2021-10-09_07:12:54 40628 lib/FHEM/Automation/ShuttersControl/Helper.pm
UPD 2021-10-09_07:09:47 2173 lib/FHEM/Automation/ShuttersControl/Window.pm UPD 2021-10-09_07:12:54 2173 lib/FHEM/Automation/ShuttersControl/Window.pm
UPD 2021-10-09_07:10:04 11739 lib/FHEM/Automation/ShuttersControl/Dev/Attr.pm UPD 2021-10-09_07:12:54 11739 lib/FHEM/Automation/ShuttersControl/Dev/Attr.pm
UPD 2021-10-09_07:10:16 7249 lib/FHEM/Automation/ShuttersControl/Dev/Readings.pm UPD 2021-10-09_07:12:54 7249 lib/FHEM/Automation/ShuttersControl/Dev/Readings.pm
UPD 2021-10-09_07:10:38 52523 lib/FHEM/Automation/ShuttersControl/Shutters/Attr.pm UPD 2021-10-09_07:12:54 52523 lib/FHEM/Automation/ShuttersControl/Shutters/Attr.pm
UPD 2021-10-09_07:10:47 2901 lib/FHEM/Automation/ShuttersControl/Shutters/Readings.pm UPD 2021-10-09_07:12:54 2901 lib/FHEM/Automation/ShuttersControl/Shutters/Readings.pm
UPD 2021-10-09_07:11:04 3978 lib/FHEM/Automation/ShuttersControl/Window/Attr.pm UPD 2021-10-09_07:12:54 3978 lib/FHEM/Automation/ShuttersControl/Window/Attr.pm
UPD 2021-10-09_07:11:27 2286 lib/FHEM/Automation/ShuttersControl/Window/Readings.pm UPD 2021-10-09_07:12:54 2286 lib/FHEM/Automation/ShuttersControl/Window/Readings.pm
UPD 2021-10-08_11:44:44 6506 lib/FHEM/Automation/ShuttersControl/Rainprotection.pm UPD 2021-10-09_07:12:54 6506 lib/FHEM/Automation/ShuttersControl/Rainprotection.pm

View File

@ -246,7 +246,7 @@ our %userAttrList = (
'ASC_WindowRec' => '-', 'ASC_WindowRec' => '-',
'ASC_WindowRec_subType:twostate,threestate' => '-', 'ASC_WindowRec_subType:twostate,threestate' => '-',
'ASC_WindowRec_PosAfterDayClosed:open,lastManual' => '-', '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_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_ComfortOpen_Pos:0,10,20,30,40,50,60,70,80,90,100' => [ '', 20, 80 ],
'ASC_GuestRoom:on,off' => '-', 'ASC_GuestRoom:on,off' => '-',

View File

@ -977,8 +977,10 @@ sub EventProcessingResidents {
|| ( CheckIfShuttersWindowRecOpen($shuttersDev) == 2 || ( CheckIfShuttersWindowRecOpen($shuttersDev) == 2
&& $FHEM::Automation::ShuttersControl::shutters && $FHEM::Automation::ShuttersControl::shutters
->getSelfDefenseMode eq 'gone' ->getSelfDefenseMode eq 'gone'
&& $FHEM::Automation::ShuttersControl::shutters && ( $FHEM::Automation::ShuttersControl::shutters
->getShuttersPlace eq 'terrace' ->getShuttersPlace eq 'terrace'
|| $FHEM::Automation::ShuttersControl::shutters
->getShuttersPlace eq 'EG_window' )
&& $FHEM::Automation::ShuttersControl::shutters && $FHEM::Automation::ShuttersControl::shutters
->getSelfDefenseMode ne 'off' ) ->getSelfDefenseMode ne 'off' )
) )