FHEM/mod-AutoShuttersControl
1
0
Fork 0
Code Issues 12 Pull Requests Releases 9 Wiki Activity

testing #94

Merged
marko merged 54 commits from testing into main 2022-01-14 07:48:29 +00:00
Conversation 0 Commits 54 Files Changed 17 +37 -37
2 changed files with 37 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit ef650b2d4b - Show all commits

32
controls_AutoShuttersControl.txt
View File

@@ -1,16 +1,16 @@
UPD 2022-01-01_09:39:12 115601 FHEM/73_AutoShuttersControl.pm
UPD 2022-01-01_09:25:20 75212 lib/FHEM/Automation/ShuttersControl.pm
UPD 2022-01-01_09:25:20 2693 lib/FHEM/Automation/ShuttersControl/Dev.pm
UPD 2022-01-01_09:25:20 2405 lib/FHEM/Automation/ShuttersControl/Roommate.pm
UPD 2022-01-01_09:25:20 32020 lib/FHEM/Automation/ShuttersControl/Shutters.pm
UPD 2022-01-01_09:25:20 25426 lib/FHEM/Automation/ShuttersControl/Shading.pm
UPD 2022-01-01_09:25:20 112138 lib/FHEM/Automation/ShuttersControl/EventProcessingFunctions.pm
UPD 2022-01-01_09:25:20 40296 lib/FHEM/Automation/ShuttersControl/Helper.pm
UPD 2022-01-01_09:25:20 2211 lib/FHEM/Automation/ShuttersControl/Window.pm
UPD 2022-01-01_09:25:20 11706 lib/FHEM/Automation/ShuttersControl/Dev/Attr.pm
UPD 2022-01-01_09:25:20 7265 lib/FHEM/Automation/ShuttersControl/Dev/Readings.pm
UPD 2022-01-01_09:25:20 52751 lib/FHEM/Automation/ShuttersControl/Shutters/Attr.pm
UPD 2022-01-01_09:25:20 2799 lib/FHEM/Automation/ShuttersControl/Shutters/Readings.pm
UPD 2022-01-01_09:25:20 3887 lib/FHEM/Automation/ShuttersControl/Window/Attr.pm
UPD 2022-01-01_09:25:20 2200 lib/FHEM/Automation/ShuttersControl/Window/Readings.pm
UPD 2022-01-01_09:25:20 7087 lib/FHEM/Automation/ShuttersControl/Rainprotection.pm
UPD 2022-01-01_20:15:38 115601 FHEM/73_AutoShuttersControl.pm
UPD 2022-01-01_20:15:38 75212 lib/FHEM/Automation/ShuttersControl.pm
UPD 2022-01-01_20:15:38 2693 lib/FHEM/Automation/ShuttersControl/Dev.pm
UPD 2022-01-01_20:15:38 2405 lib/FHEM/Automation/ShuttersControl/Roommate.pm
UPD 2022-01-01_20:15:38 32020 lib/FHEM/Automation/ShuttersControl/Shutters.pm
UPD 2022-01-01_20:15:38 25426 lib/FHEM/Automation/ShuttersControl/Shading.pm
UPD 2022-01-01_20:20:47 112096 lib/FHEM/Automation/ShuttersControl/EventProcessingFunctions.pm
UPD 2022-01-01_20:15:38 40296 lib/FHEM/Automation/ShuttersControl/Helper.pm
UPD 2022-01-01_20:15:38 2211 lib/FHEM/Automation/ShuttersControl/Window.pm
UPD 2022-01-01_20:15:38 11706 lib/FHEM/Automation/ShuttersControl/Dev/Attr.pm
UPD 2022-01-01_20:15:38 7265 lib/FHEM/Automation/ShuttersControl/Dev/Readings.pm
UPD 2022-01-01_20:15:38 52751 lib/FHEM/Automation/ShuttersControl/Shutters/Attr.pm
UPD 2022-01-01_20:15:38 2799 lib/FHEM/Automation/ShuttersControl/Shutters/Readings.pm
UPD 2022-01-01_20:15:38 3887 lib/FHEM/Automation/ShuttersControl/Window/Attr.pm
UPD 2022-01-01_20:15:38 2200 lib/FHEM/Automation/ShuttersControl/Window/Readings.pm
UPD 2022-01-01_20:15:38 7087 lib/FHEM/Automation/ShuttersControl/Rainprotection.pm

42
lib/FHEM/Automation/ShuttersControl/EventProcessingFunctions.pm
View File

@@ -700,7 +700,7 @@ sub EventProcessingRoommate {
$FHEM::Automation::ShuttersControl::shutters->getOpenPos;
}
FHEM::Automation::ShuttersControl::Shutters::CommandSet( $hash,
FHEM::Automation::ShuttersControl::ShuttersCommandSet( $hash,
$shuttersDev, $posValue );
}
elsif (
@@ -770,7 +770,7 @@ sub EventProcessingRoommate {
->getLastDrive . ' - ventilate mode' );
}
FHEM::Automation::ShuttersControl::Shutters::CommandSet(
FHEM::Automation::ShuttersControl::ShuttersCommandSet(
$hash, $shuttersDev, $posValue );
}
elsif (
@@ -794,7 +794,7 @@ sub EventProcessingRoommate {
{
$FHEM::Automation::ShuttersControl::shutters
->setLastDrive('shading in');
FHEM::Automation::ShuttersControl::Shutters::CommandSet(
FHEM::Automation::ShuttersControl::ShuttersCommandSet(
$hash,
$shuttersDev,
$FHEM::Automation::ShuttersControl::shutters
@@ -840,7 +840,7 @@ sub EventProcessingRoommate {
)
);
FHEM::Automation::ShuttersControl::Shutters::CommandSet(
FHEM::Automation::ShuttersControl::ShuttersCommandSet(
$hash,
$shuttersDev,
$FHEM::Automation::ShuttersControl::shutters
@@ -883,7 +883,7 @@ sub EventProcessingRoommate {
. ' - ventilate mode' );
}
FHEM::Automation::ShuttersControl::Shutters::CommandSet( $hash,
FHEM::Automation::ShuttersControl::ShuttersCommandSet( $hash,
$shuttersDev, $posValue );
}
elsif (
@@ -919,7 +919,7 @@ sub EventProcessingRoommate {
$FHEM::Automation::ShuttersControl::shutters->setLastDrive(
'shading in');
FHEM::Automation::ShuttersControl::Shutters::CommandSet(
FHEM::Automation::ShuttersControl::ShuttersCommandSet(
$hash,
$shuttersDev,
$FHEM::Automation::ShuttersControl::shutters->getShadingPos
@@ -935,7 +935,7 @@ sub EventProcessingRoommate {
$FHEM::Automation::ShuttersControl::shutters->setLastDrive(
'roommate absent');
FHEM::Automation::ShuttersControl::Shutters::CommandSet(
FHEM::Automation::ShuttersControl::ShuttersCommandSet(
$hash,
$shuttersDev,
$FHEM::Automation::ShuttersControl::shutters->getClosedPos
@@ -952,7 +952,7 @@ sub EventProcessingRoommate {
$FHEM::Automation::ShuttersControl::shutters->setLastDrive(
'roommate absent');
FHEM::Automation::ShuttersControl::Shutters::CommandSet( $hash,
FHEM::Automation::ShuttersControl::ShuttersCommandSet( $hash,
$shuttersDev,
$FHEM::Automation::ShuttersControl::shutters->getOpenPos );
}
@@ -1800,7 +1800,7 @@ sub EventProcessingBrightness {
->setPrivacyUpStatus(2);
$FHEM::Automation::ShuttersControl::shutters
->setLastDrive('brightness privacy day open');
FHEM::Automation::ShuttersControl::Shutters::CommandSet(
FHEM::Automation::ShuttersControl::ShuttersCommandSet(
$hash,
$shuttersDev,
$FHEM::Automation::ShuttersControl::shutters
@@ -1818,7 +1818,7 @@ sub EventProcessingBrightness {
'EventProcessingBrightness: '
. $FHEM::Automation::ShuttersControl::shutters
->getShuttersDev
. ' - Verarbeitung für Sunrise Privacy Down. Roommatestatus korrekt zum fahren. Fahrbefehl wird an die Funktion FnFHEM::Automation::ShuttersControl::Shutters::CommandSet gesendet. Grund des fahrens: '
. ' - Verarbeitung für Sunrise Privacy Down. Roommatestatus korrekt zum fahren. Fahrbefehl wird an die Funktion FnFHEM::Automation::ShuttersControl::ShuttersCommandSet gesendet. Grund des fahrens: '
. $FHEM::Automation::ShuttersControl::shutters
->getLastDrive );
@@ -1837,7 +1837,7 @@ sub EventProcessingBrightness {
->setPrivacyUpStatus(0)
if ( $FHEM::Automation::ShuttersControl::shutters
->getPrivacyUpStatus == 2 );
FHEM::Automation::ShuttersControl::Shutters::CommandSet(
FHEM::Automation::ShuttersControl::ShuttersCommandSet(
$hash,
$shuttersDev,
$FHEM::Automation::ShuttersControl::shutters
@@ -1848,7 +1848,7 @@ sub EventProcessingBrightness {
'EventProcessingBrightness: '
. $FHEM::Automation::ShuttersControl::shutters
->getShuttersDev
. ' - Verarbeitung für Sunrise. Roommatestatus korrekt zum fahren. Fahrbefehl wird an die Funktion FnFHEM::Automation::ShuttersControl::Shutters::CommandSet gesendet. Grund des fahrens: '
. ' - Verarbeitung für Sunrise. Roommatestatus korrekt zum fahren. Fahrbefehl wird an die Funktion FnFHEM::Automation::ShuttersControl::ShuttersCommandSet gesendet. Grund des fahrens: '
. $FHEM::Automation::ShuttersControl::shutters
->getLastDrive );
}
@@ -1953,7 +1953,7 @@ sub EventProcessingBrightness {
'EventProcessingBrightness: '
. $FHEM::Automation::ShuttersControl::shutters
->getShuttersDev
. ' - Verarbeitung für Sunset Privacy Down. Roommatestatus korrekt zum fahren. Fahrbefehl wird an die Funktion FnFHEM::Automation::ShuttersControl::Shutters::CommandSet gesendet. Grund des fahrens: '
. ' - Verarbeitung für Sunset Privacy Down. Roommatestatus korrekt zum fahren. Fahrbefehl wird an die Funktion FnFHEM::Automation::ShuttersControl::ShuttersCommandSet gesendet. Grund des fahrens: '
. $FHEM::Automation::ShuttersControl::shutters
->getLastDrive );
}
@@ -2009,14 +2009,14 @@ sub EventProcessingBrightness {
$FHEM::Automation::ShuttersControl::shutters->setSunset(1);
}
FHEM::Automation::ShuttersControl::Shutters::CommandSet( $hash,
FHEM::Automation::ShuttersControl::ShuttersCommandSet( $hash,
$shuttersDev, $posValue );
FHEM::Automation::ShuttersControl::ASC_Debug(
'EventProcessingBrightness: '
. $FHEM::Automation::ShuttersControl::shutters
->getShuttersDev
. ' - Verarbeitung für Sunset. Roommatestatus korrekt zum fahren. Fahrbefehl wird an die Funktion FnFHEM::Automation::ShuttersControl::Shutters::CommandSet gesendet. Zielposition: '
. ' - Verarbeitung für Sunset. Roommatestatus korrekt zum fahren. Fahrbefehl wird an die Funktion FnFHEM::Automation::ShuttersControl::ShuttersCommandSet gesendet. Zielposition: '
. $posValue
. ' Grund des fahrens: '
. $FHEM::Automation::ShuttersControl::shutters
@@ -2267,7 +2267,7 @@ sub EventProcessingPartyMode {
);
$FHEM::Automation::ShuttersControl::shutters->setLastDrive(
'drive after party mode');
FHEM::Automation::ShuttersControl::Shutters::CommandSet(
FHEM::Automation::ShuttersControl::ShuttersCommandSet(
$hash,
$shuttersDev,
(
@@ -2293,7 +2293,7 @@ sub EventProcessingPartyMode {
{
$FHEM::Automation::ShuttersControl::shutters->setLastDrive(
'drive after party mode');
FHEM::Automation::ShuttersControl::Shutters::CommandSet( $hash,
FHEM::Automation::ShuttersControl::ShuttersCommandSet( $hash,
$shuttersDev,
$FHEM::Automation::ShuttersControl::shutters->getDelayCmd );
}
@@ -2317,7 +2317,7 @@ sub EventProcessingAdvShuttersClose {
$FHEM::Automation::ShuttersControl::shutters->setLastDrive(
'adv delay close');
$FHEM::Automation::ShuttersControl::shutters->setAdvDelay(1);
FHEM::Automation::ShuttersControl::Shutters::CommandSet(
FHEM::Automation::ShuttersControl::ShuttersCommandSet(
$hash,
$shuttersDev,
(
@@ -2477,7 +2477,7 @@ sub EventProcessingExternalTriggerDevice {
$FHEM::Automation::ShuttersControl::shutters->setNoDelay(1);
$FHEM::Automation::ShuttersControl::shutters
->setExternalTriggerStatus(1);
FHEM::Automation::ShuttersControl::Shutters::CommandSet( $hash,
FHEM::Automation::ShuttersControl::ShuttersCommandSet( $hash,
$shuttersDev, $triggerPosActive2 );
}
else {
@@ -2486,7 +2486,7 @@ sub EventProcessingExternalTriggerDevice {
$FHEM::Automation::ShuttersControl::shutters->setNoDelay(1);
$FHEM::Automation::ShuttersControl::shutters
->setExternalTriggerStatus(1);
FHEM::Automation::ShuttersControl::Shutters::CommandSet( $hash,
FHEM::Automation::ShuttersControl::ShuttersCommandSet( $hash,
$shuttersDev, $triggerPosActive );
}
}
@@ -2510,7 +2510,7 @@ sub EventProcessingExternalTriggerDevice {
$FHEM::Automation::ShuttersControl::shutters->setNoDelay(1);
$FHEM::Automation::ShuttersControl::shutters->setExternalTriggerStatus(
0);
FHEM::Automation::ShuttersControl::Shutters::CommandSet(
FHEM::Automation::ShuttersControl::ShuttersCommandSet(
$hash,
$shuttersDev,
(