Merge pull request 'close: #50 expand regex to detect position event with dot's' (#51) from patch-driveDetection into devel

Reviewed-on: #51

FHEM/73_AutoShuttersControl.pm

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

controls_AutoShuttersControl.txt

@@ -1,16 +1,16 @@
-UPD 2021-10-09_07:07:29 111901 FHEM/73_AutoShuttersControl.pm
+UPD 2021-10-24_07:33:53 111901 FHEM/73_AutoShuttersControl.pm
-UPD 2021-09-14_09:51:23 74456 lib/FHEM/Automation/ShuttersControl.pm
+UPD 2021-10-24_17:15:09 74468 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-24_07:33:53 31900 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-24_07:33:53 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-24_07:33:53 6693 lib/FHEM/Automation/ShuttersControl/Rainprotection.pm

lib/FHEM/Automation/ShuttersControl.pm

@@ -246,7 +246,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'                                 => '-',
@@ -515,7 +515,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

lib/FHEM/Automation/ShuttersControl/EventProcessingFunctions.pm

@@ -977,8 +977,10 @@ sub EventProcessingResidents {
                         || ( CheckIfShuttersWindowRecOpen($shuttersDev) == 2
                             && $FHEM::Automation::ShuttersControl::shutters
                             ->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
                             ->getSelfDefenseMode ne 'off' )
                     )
@@ -2440,7 +2442,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,

lib/FHEM/Automation/ShuttersControl/Rainprotection.pm

@@ -108,11 +108,16 @@ sub RainProcessing {
                 ->setRainProtectionStatus('unprotected');
         }
         else {
-            $FHEM::Automation::ShuttersControl::shutters
+            if (  $FHEM::Automation::ShuttersControl::shutters->getStatus != $rainClosedPos
-                ->setRainProtectionStatus('unprotected')
+              && ($val == 0 || $val < $triggerMin) )
-              if (  $FHEM::Automation::ShuttersControl::shutters->getStatus !=
+            {
-                      $rainClosedPos
+                $FHEM::Automation::ShuttersControl::shutters
-                && ($val == 0 || $val < $triggerMin) );
+                  ->setRainProtectionStatus('unprotected');
+            }
+            elsif ($val > $triggerMax) {
+                $FHEM::Automation::ShuttersControl::shutters
+                  ->setRainProtectionStatus('protected');
+            }     
         }
     }
 

lib/FHEM/Automation/ShuttersControl/Shutters.pm

@@ -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)
+#         $FHEM::Automation::ShuttersControl::shutters->setExternalTriggerStatus(0)
-          if ( $FHEM::Automation::ShuttersControl::shutters
+#           if ( $FHEM::Automation::ShuttersControl::shutters
-            ->getExternalTriggerStatus );
+#             ->getExternalTriggerStatus );
 
         FHEM::Automation::ShuttersControl::ASC_Debug( 'setDriveCmd: '
               . $FHEM::Automation::ShuttersControl::shutters->getShuttersDev