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 +7 -6
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit e02395a82f - Show all commits

2
controls_AutoShuttersControl.txt
View File

@@ -1,5 +1,5 @@
UPD 2022-01-01_20:15:38 115601 FHEM/73_AutoShuttersControl.pm UPD 2022-01-01_20:15:38 115601 FHEM/73_AutoShuttersControl.pm
UPD 2022-01-02_08:30:53 75824 lib/FHEM/Automation/ShuttersControl.pm UPD 2022-01-02_08:49:11 75839 lib/FHEM/Automation/ShuttersControl.pm
UPD 2022-01-02_07:57:18 2691 lib/FHEM/Automation/ShuttersControl/Dev.pm UPD 2022-01-02_07:57:18 2691 lib/FHEM/Automation/ShuttersControl/Dev.pm
UPD 2022-01-02_07:57:18 2677 lib/FHEM/Automation/ShuttersControl/Roommate.pm UPD 2022-01-02_07:57:18 2677 lib/FHEM/Automation/ShuttersControl/Roommate.pm
UPD 2022-01-02_08:24:00 32016 lib/FHEM/Automation/ShuttersControl/Shutters.pm UPD 2022-01-02_08:24:00 32016 lib/FHEM/Automation/ShuttersControl/Shutters.pm

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

@@ -172,7 +172,8 @@ BEGIN {
} }
## Die Attributsliste welche an die Rolläden verteilt wird. Zusammen mit Default Werten ## Die Attributsliste welche an die Rolläden verteilt wird. Zusammen mit Default Werten
my %userAttrList = ( ##no critic
our %userAttrList = (
'ASC_Mode_Up:absent,always,off,home' => '-', 'ASC_Mode_Up:absent,always,off,home' => '-',
'ASC_Mode_Down:absent,always,off,home' => '-', 'ASC_Mode_Down:absent,always,off,home' => '-',
'ASC_Up:time,astro,brightness,roommate' => '-', 'ASC_Up:time,astro,brightness,roommate' => '-',
@@ -242,8 +243,9 @@ my %userAttrList = (
); );
## 2 Objekte werden erstellt ## 2 Objekte werden erstellt
my $shutters = FHEM::Automation::ShuttersControl::Shutters->new(); our $shutters = FHEM::Automation::ShuttersControl::Shutters->new();
my $ascDev = FHEM::Automation::ShuttersControl::Dev->new(); our $ascDev = FHEM::Automation::ShuttersControl::Dev->new();
##use critic
my %posSetCmds = ( my %posSetCmds = (
ZWave => 'dim', ZWave => 'dim',
@@ -486,8 +488,7 @@ sub Notify {
if ( if (
grep { grep {
/^(ATTR|DELETEATTR)\s(.*ASC_Time_Up_WE_Holiday|.*ASC_Up|.*ASC_Down|.*ASC_AutoAstroModeMorning|.*ASC_AutoAstroModeMorningHorizon|.*ASC_AutoAstroModeEvening|.*ASC_AutoAstroModeEveningHorizon|.*ASC_Time_Up_Early|.*ASC_Time_Up_Late|.*ASC_Time_Down_Early|.*ASC_Time_Down_Late|.*ASC_autoAstroModeMorning|.*ASC_autoAstroModeMorningHorizon|.*ASC_PrivacyDownValue_beforeNightClose|.*ASC_PrivacyUpValue_beforeDayOpen|.*ASC_autoAstroModeEvening|.*ASC_autoAstroModeEveningHorizon|.*ASC_Roommate_Device|.*ASC_WindowRec|.*ASC_residentsDev|.*ASC_rainSensor|.*ASC_windSensor|.*ASC_tempSensor|.*ASC_BrightnessSensor|.*ASC_twilightDevice|.*ASC_ExternalTrigger|.*ASC_Shading_StateChange_SunnyCloudy|.*ASC_TempSensor|.*ASC_Shading_Mode)(\s.*|$) / /^(ATTR|DELETEATTR)\s(.*ASC_Time_Up_WE_Holiday|.*ASC_Up|.*ASC_Down|.*ASC_AutoAstroModeMorning|.*ASC_AutoAstroModeMorningHorizon|.*ASC_AutoAstroModeEvening|.*ASC_AutoAstroModeEveningHorizon|.*ASC_Time_Up_Early|.*ASC_Time_Up_Late|.*ASC_Time_Down_Early|.*ASC_Time_Down_Late|.*ASC_autoAstroModeMorning|.*ASC_autoAstroModeMorningHorizon|.*ASC_PrivacyDownValue_beforeNightClose|.*ASC_PrivacyUpValue_beforeDayOpen|.*ASC_autoAstroModeEvening|.*ASC_autoAstroModeEveningHorizon|.*ASC_Roommate_Device|.*ASC_WindowRec|.*ASC_residentsDev|.*ASC_rainSensor|.*ASC_windSensor|.*ASC_tempSensor|.*ASC_BrightnessSensor|.*ASC_twilightDevice|.*ASC_ExternalTrigger|.*ASC_Shading_StateChange_SunnyCloudy|.*ASC_TempSensor|.*ASC_Shading_Mode)(\s.*|$) /
}, } @{$events}
@{$events}
) )
{ {
EventProcessingGeneral( $hash, undef, join( ' ', @{$events} ) ); EventProcessingGeneral( $hash, undef, join( ' ', @{$events} ) );