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

change code for more shift

Browse Source
This commit is contained in:
Marko Oldenburg
2020-07-08 22:04:48 +02:00
parent f8800e910b
commit 864138a2e3
4 changed files with 58 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
controls_AutoShuttersControl.txt
View File

@@ -1,13 +1,13 @@
UPD 2020-07-07_14:49:19 97041 FHEM/73_AutoShuttersControl.pm UPD 2020-07-08_22:02:31 97041 FHEM/73_AutoShuttersControl.pm
UPD 2020-07-08_20:43:22 144312 lib/FHEM/Automation/ShuttersControl.pm UPD 2020-07-08_22:02:28 143748 lib/FHEM/Automation/ShuttersControl.pm
UPD 2020-06-22_09:41:40 2657 lib/FHEM/Automation/ShuttersControl/Dev.pm UPD 2020-06-22_09:41:40 2657 lib/FHEM/Automation/ShuttersControl/Dev.pm
UPD 2020-07-07_14:49:19 2496 lib/FHEM/Automation/ShuttersControl/Roommate.pm UPD 2020-07-07_14:49:19 2496 lib/FHEM/Automation/ShuttersControl/Roommate.pm
UPD 2020-07-08_14:55:44 30718 lib/FHEM/Automation/ShuttersControl/Shutters.pm UPD 2020-07-08_22:02:10 30760 lib/FHEM/Automation/ShuttersControl/Shutters.pm
UPD 2020-07-08_19:33:26 21666 lib/FHEM/Automation/ShuttersControl/Shading.pm UPD 2020-07-08_22:02:26 21666 lib/FHEM/Automation/ShuttersControl/Shading.pm
UPD 2020-06-22_09:41:40 2175 lib/FHEM/Automation/ShuttersControl/Window.pm UPD 2020-06-22_09:41:40 2175 lib/FHEM/Automation/ShuttersControl/Window.pm
UPD 2020-07-08_20:16:15 11566 lib/FHEM/Automation/ShuttersControl/Dev/Attr.pm UPD 2020-07-08_21:52:11 11569 lib/FHEM/Automation/ShuttersControl/Dev/Attr.pm
UPD 2020-07-03_11:29:10 7251 lib/FHEM/Automation/ShuttersControl/Dev/Readings.pm UPD 2020-07-03_11:29:10 7251 lib/FHEM/Automation/ShuttersControl/Dev/Readings.pm
UPD 2020-07-03_11:29:10 52390 lib/FHEM/Automation/ShuttersControl/Shutters/Attr.pm UPD 2020-07-08_22:02:14 51957 lib/FHEM/Automation/ShuttersControl/Shutters/Attr.pm
UPD 2020-06-22_09:41:40 2903 lib/FHEM/Automation/ShuttersControl/Shutters/Readings.pm UPD 2020-06-22_09:41:40 2903 lib/FHEM/Automation/ShuttersControl/Shutters/Readings.pm
UPD 2020-06-22_09:41:40 3972 lib/FHEM/Automation/ShuttersControl/Window/Attr.pm UPD 2020-06-22_09:41:40 3972 lib/FHEM/Automation/ShuttersControl/Window/Attr.pm
UPD 2020-06-22_09:41:40 2288 lib/FHEM/Automation/ShuttersControl/Window/Readings.pm UPD 2020-06-22_09:41:40 2288 lib/FHEM/Automation/ShuttersControl/Window/Readings.pm

61
lib/FHEM/Automation/ShuttersControl.pm
View File

@@ -286,7 +286,9 @@ our $shutters = FHEM::Automation::ShuttersControl::Shutters->new();
our $ascDev = FHEM::Automation::ShuttersControl::Dev->new(); our $ascDev = FHEM::Automation::ShuttersControl::Dev->new();
sub ascAPIget { sub ascAPIget {
my ( $getCommand, $shutterDev, $value ) = @_; my $getCommand = shift;
my $shutterDev = shift;
my $value = shift;
my $getter = 'get' . $getCommand; my $getter = 'get' . $getCommand;
@@ -306,7 +308,9 @@ sub ascAPIget {
} }
sub ascAPIset { sub ascAPIset {
my ( $setCommand, $shutterDev, $value ) = @_; my $setCommand = shift;
my $shutterDev = shift;
my $value = shift;
my $setter = 'set' . $setCommand; my $setter = 'set' . $setCommand;
@@ -523,7 +527,10 @@ m{^(ATTR|DELETEATTR)\s(.*ASC_Time_Up_WE_Holiday|.*ASC_Up|.*ASC_Down|.*ASC_AutoAs
} }
sub EventProcessingGeneral { sub EventProcessingGeneral {
my ( $hash, $devname, $events ) = @_; my $hash = shift;
my $devname = shift;
my $events = shift;
my $name = $hash->{NAME}; my $name = $hash->{NAME};
if ( defined($devname) && ($devname) ) if ( defined($devname) && ($devname) )
@@ -1053,7 +1060,9 @@ sub AddNotifyDev {
## entfernt aus dem NOTIFYDEV Hash Devices welche als Wert in Attributen steckten ## entfernt aus dem NOTIFYDEV Hash Devices welche als Wert in Attributen steckten
sub DeleteNotifyDev { sub DeleteNotifyDev {
my ( $hash, $shuttersDev, $shuttersAttr ) = @_; my $hash = shift;
my $shuttersDev = shift;
my $shuttersAttr = shift;
my $name = $hash->{NAME}; my $name = $hash->{NAME};
@@ -1086,7 +1095,9 @@ sub DeleteNotifyDev {
## Sub zum steuern der Rolläden bei einem Fenster Event ## Sub zum steuern der Rolläden bei einem Fenster Event
sub EventProcessingWindowRec { sub EventProcessingWindowRec {
my ( $hash, $shuttersDev, $events ) = @_; my $hash = shift;
my $shuttersDev = shift;
my $events = shift;
my $name = $hash->{NAME}; my $name = $hash->{NAME};
@@ -1275,7 +1286,9 @@ sub EventProcessingWindowRec {
## Sub zum steuern der Rolladen bei einem Bewohner/Roommate Event ## Sub zum steuern der Rolladen bei einem Bewohner/Roommate Event
sub EventProcessingRoommate { sub EventProcessingRoommate {
my ( $hash, $shuttersDev, $events ) = @_; my $hash = shift;
my $shuttersDev = shift;
my $events = shift;
my $name = $hash->{NAME}; my $name = $hash->{NAME};
@@ -1533,7 +1546,9 @@ sub EventProcessingRoommate {
} }
sub EventProcessingResidents { sub EventProcessingResidents {
my ( $hash, $device, $events ) = @_; my $hash = shift;
my $device = shift;
my $events = shift;
my $name = $device; my $name = $device;
my $reading = $ascDev->getResidentsReading; my $reading = $ascDev->getResidentsReading;
@@ -1769,7 +1784,9 @@ sub EventProcessingRain {
#### Ist noch nicht fertig, es fehlt noch das verzögerte Prüfen auf erhalten bleiben des getriggerten Wertes. #### Ist noch nicht fertig, es fehlt noch das verzögerte Prüfen auf erhalten bleiben des getriggerten Wertes.
my ( $hash, $device, $events ) = @_; my $hash = shift;
my $device = shift;
my $events = shift;
my $name = $device; my $name = $device;
my $reading = $ascDev->getRainSensorReading // 'none'; my $reading = $ascDev->getRainSensorReading // 'none';
@@ -1831,7 +1848,9 @@ sub RainProtection {
} }
sub EventProcessingWind { sub EventProcessingWind {
my ( $hash, $shuttersDev, $events ) = @_; my $hash = shift;
my $shuttersDev = shift;
my $events = shift;
my $name = $hash->{NAME}; my $name = $hash->{NAME};
$shutters->setShuttersDev($shuttersDev); $shutters->setShuttersDev($shuttersDev);
@@ -1907,7 +1926,9 @@ sub EventProcessingWind {
########## ##########
sub EventProcessingBrightness { sub EventProcessingBrightness {
my ( $hash, $shuttersDev, $events ) = @_; my $hash = shift;
my $shuttersDev = shift;
my $events = shift;
my $name = $hash->{NAME}; my $name = $hash->{NAME};
$shutters->setShuttersDev($shuttersDev); $shutters->setShuttersDev($shuttersDev);
@@ -2347,7 +2368,9 @@ sub EventProcessingBrightness {
} }
sub EventProcessingShadingBrightness { sub EventProcessingShadingBrightness {
my ( $hash, $shuttersDev, $events ) = @_; my $hash = shift;
my $shuttersDev = shift;
my $events = shift;
my $name = $hash->{NAME}; my $name = $hash->{NAME};
$shutters->setShuttersDev($shuttersDev); $shutters->setShuttersDev($shuttersDev);
@@ -2411,7 +2434,9 @@ sub EventProcessingShadingBrightness {
} }
sub EventProcessingTwilightDevice { sub EventProcessingTwilightDevice {
my ( $hash, $device, $events ) = @_; my $hash = shift;
my $device = shift;
my $events = shift;
# Twilight # Twilight
# azimuth = azimuth = Sonnenwinkel # azimuth = azimuth = Sonnenwinkel
@@ -2565,7 +2590,9 @@ sub EventProcessingAdvShuttersClose {
} }
sub EventProcessingShutters { sub EventProcessingShutters {
my ( $hash, $shuttersDev, $events ) = @_; my $hash = shift;
my $shuttersDev = shift;
my $events = shift;
my $name = $hash->{NAME}; my $name = $hash->{NAME};
@@ -2628,7 +2655,9 @@ sub EventProcessingShutters {
} }
sub EventProcessingExternalTriggerDevice { sub EventProcessingExternalTriggerDevice {
my ( $hash, $shuttersDev, $events ) = @_; my $hash = shift;
my $shuttersDev = shift;
my $events = shift;
my $name = $hash->{NAME}; my $name = $hash->{NAME};
@@ -2705,7 +2734,9 @@ sub EventProcessingExternalTriggerDevice {
# Sub für das Zusammensetzen der Rolläden Steuerbefehle # Sub für das Zusammensetzen der Rolläden Steuerbefehle
sub ShuttersCommandSet { sub ShuttersCommandSet {
my ( $hash, $shuttersDev, $posValue ) = @_; my $hash = shift;
my $shuttersDev = shift;
my $posValue = shift;
my $name = $hash->{NAME}; my $name = $hash->{NAME};
$shutters->setShuttersDev($shuttersDev); $shutters->setShuttersDev($shuttersDev);

3
lib/FHEM/Automation/ShuttersControl/Dev/Attr.pm
View File

@@ -392,4 +392,7 @@ sub getBlockAscDrivesAfterManual {
return AttrVal( $name, 'ASC_blockAscDrivesAfterManual', 0 ); return AttrVal( $name, 'ASC_blockAscDrivesAfterManual', 0 );
} }
1; 1;

3
lib/FHEM/Automation/ShuttersControl/Shutters.pm
View File

@@ -1062,4 +1062,7 @@ sub getShadingLastPos {
### Ende Beschattung ### Ende Beschattung
1; 1;