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

fix wrong package name for GetAttrValues() fn

Browse Source
This commit is contained in:
Marko Oldenburg
2020-11-08 07:46:33 +01:00
parent 4ceb3a1ab8
commit 0289358b83
3 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -87,7 +87,7 @@ sub getBrightnessMaxVal {
$self->{ASC_brightness}->{LASTGETTIME} = int( gettimeofday() ); $self->{ASC_brightness}->{LASTGETTIME} = int( gettimeofday() );
my ( $triggermax, $triggermin ) = my ( $triggermax, $triggermin ) =
FHEM::Automation::ShuttersControl::GetAttrValues( $name, FHEM::Automation::ShuttersControl::Helper::GetAttrValues( $name,
'ASC_brightnessDriveUpDown', '800:500' ); 'ASC_brightnessDriveUpDown', '800:500' );
## erwartetes Ergebnis ## erwartetes Ergebnis
@@ -189,7 +189,7 @@ sub _getTempSensor {
&& ( gettimeofday() - $self->{ASC_tempSensor}->{LASTGETTIME} ) < 2 ); && ( gettimeofday() - $self->{ASC_tempSensor}->{LASTGETTIME} ) < 2 );
$self->{ASC_tempSensor}->{LASTGETTIME} = int( gettimeofday() ); $self->{ASC_tempSensor}->{LASTGETTIME} = int( gettimeofday() );
my ( $device, $reading ) = my ( $device, $reading ) =
FHEM::Automation::ShuttersControl::GetAttrValues( $name, 'ASC_tempSensor', FHEM::Automation::ShuttersControl::Helper::GetAttrValues( $name, 'ASC_tempSensor',
'none' ); 'none' );
## erwartetes Ergebnis ## erwartetes Ergebnis
@@ -223,7 +223,7 @@ sub _getResidentsDev {
&& ( gettimeofday() - $self->{ASC_residentsDev}->{LASTGETTIME} ) < 2 ); && ( gettimeofday() - $self->{ASC_residentsDev}->{LASTGETTIME} ) < 2 );
$self->{ASC_residentsDev}->{LASTGETTIME} = int( gettimeofday() ); $self->{ASC_residentsDev}->{LASTGETTIME} = int( gettimeofday() );
my ( $device, $reading ) = my ( $device, $reading ) =
FHEM::Automation::ShuttersControl::GetAttrValues( $name, FHEM::Automation::ShuttersControl::Helper::GetAttrValues( $name,
'ASC_residentsDev', 'none' ); 'ASC_residentsDev', 'none' );
$self->{ASC_residentsDev}->{device} = $device; $self->{ASC_residentsDev}->{device} = $device;
@@ -255,7 +255,7 @@ sub _getRainSensor {
&& ( gettimeofday() - $self->{ASC_rainSensor}->{LASTGETTIME} ) < 2 ); && ( gettimeofday() - $self->{ASC_rainSensor}->{LASTGETTIME} ) < 2 );
$self->{ASC_rainSensor}->{LASTGETTIME} = int( gettimeofday() ); $self->{ASC_rainSensor}->{LASTGETTIME} = int( gettimeofday() );
my ( $device, $reading, $max, $hyst, $pos, $wait ) = my ( $device, $reading, $max, $hyst, $pos, $wait ) =
FHEM::Automation::ShuttersControl::GetAttrValues( $name, 'ASC_rainSensor', FHEM::Automation::ShuttersControl::Helper::GetAttrValues( $name, 'ASC_rainSensor',
'none' ); 'none' );
## erwartetes Ergebnis ## erwartetes Ergebnis
@@ -357,7 +357,7 @@ sub _getWindSensor {
&& ( gettimeofday() - $self->{ASC_windSensor}->{LASTGETTIME} ) < 2 ); && ( gettimeofday() - $self->{ASC_windSensor}->{LASTGETTIME} ) < 2 );
$self->{ASC_windSensor}->{LASTGETTIME} = int( gettimeofday() ); $self->{ASC_windSensor}->{LASTGETTIME} = int( gettimeofday() );
my ( $device, $reading ) = my ( $device, $reading ) =
FHEM::Automation::ShuttersControl::GetAttrValues( $name, 'ASC_windSensor', FHEM::Automation::ShuttersControl::Helper::GetAttrValues( $name, 'ASC_windSensor',
'none' ); 'none' );
return $device if ( $device eq 'none' ); return $device if ( $device eq 'none' );

24
lib/FHEM/Automation/ShuttersControl/Shutters/Attr.pm
View File

@@ -120,7 +120,7 @@ sub _getPosition {
} }
else { else {
( $position, $posAssignment ) = ( $position, $posAssignment ) =
FHEM::Automation::ShuttersControl::GetAttrValues( FHEM::Automation::ShuttersControl::Helper::GetAttrValues(
$self->{shuttersDev}, $self->{shuttersDev},
$attr, $attr,
$FHEM::Automation::ShuttersControl::userAttrList{$userAttrList} $FHEM::Automation::ShuttersControl::userAttrList{$userAttrList}
@@ -243,7 +243,7 @@ sub getSlatPosCmd {
$self->{ $self->{shuttersDev} }->{ASC_SlatPosCmd_SlatDevice}->{LASTGETTIME} $self->{ $self->{shuttersDev} }->{ASC_SlatPosCmd_SlatDevice}->{LASTGETTIME}
= int( gettimeofday() ); = int( gettimeofday() );
my ( $slatPosCmd, $slatDevice ) = my ( $slatPosCmd, $slatDevice ) =
FHEM::Automation::ShuttersControl::GetAttrValues( $self->{shuttersDev}, FHEM::Automation::ShuttersControl::Helper::GetAttrValues( $self->{shuttersDev},
'ASC_SlatPosCmd_SlatDevice', 'none:none' ); 'ASC_SlatPosCmd_SlatDevice', 'none:none' );
## Erwartetes Ergebnis ## Erwartetes Ergebnis
@@ -306,7 +306,7 @@ sub getPrivacyUpTime {
$self->{ $self->{shuttersDev} }->{ASC_PrivacyUpValue_beforeDayOpen} $self->{ $self->{shuttersDev} }->{ASC_PrivacyUpValue_beforeDayOpen}
->{LASTGETTIME} = int( gettimeofday() ); ->{LASTGETTIME} = int( gettimeofday() );
my ( $upTime, $upBrightnessVal ) = my ( $upTime, $upBrightnessVal ) =
FHEM::Automation::ShuttersControl::GetAttrValues( $self->{shuttersDev}, FHEM::Automation::ShuttersControl::Helper::GetAttrValues( $self->{shuttersDev},
'ASC_PrivacyUpValue_beforeDayOpen', '-1:-1' ); 'ASC_PrivacyUpValue_beforeDayOpen', '-1:-1' );
## Erwartetes Ergebnis ## Erwartetes Ergebnis
@@ -385,7 +385,7 @@ sub getPrivacyDownTime {
$self->{ $self->{shuttersDev} }->{ASC_PrivacyDownValue_beforeNightClose} $self->{ $self->{shuttersDev} }->{ASC_PrivacyDownValue_beforeNightClose}
->{LASTGETTIME} = int( gettimeofday() ); ->{LASTGETTIME} = int( gettimeofday() );
my ( $downTime, $downBrightnessVal ) = my ( $downTime, $downBrightnessVal ) =
FHEM::Automation::ShuttersControl::GetAttrValues( $self->{shuttersDev}, FHEM::Automation::ShuttersControl::Helper::GetAttrValues( $self->{shuttersDev},
'ASC_PrivacyDownValue_beforeNightClose', '-1:-1' ); 'ASC_PrivacyDownValue_beforeNightClose', '-1:-1' );
## Erwartetes Ergebnis ## Erwartetes Ergebnis
@@ -605,7 +605,7 @@ sub _getTempSensor {
$self->{ $self->{shuttersDev} }->{ASC_TempSensor}->{LASTGETTIME} = $self->{ $self->{shuttersDev} }->{ASC_TempSensor}->{LASTGETTIME} =
int( gettimeofday() ); int( gettimeofday() );
my ( $device, $reading ) = my ( $device, $reading ) =
FHEM::Automation::ShuttersControl::GetAttrValues( $self->{shuttersDev}, FHEM::Automation::ShuttersControl::Helper::GetAttrValues( $self->{shuttersDev},
'ASC_TempSensor', 'none' ); 'ASC_TempSensor', 'none' );
### erwartetes Ergebnis ### erwartetes Ergebnis
@@ -665,7 +665,7 @@ sub _getIdleDetectionReading {
$self->{ $self->{shuttersDev} }->{ASC_Shutter_IdleDetection}->{LASTGETTIME} $self->{ $self->{shuttersDev} }->{ASC_Shutter_IdleDetection}->{LASTGETTIME}
= int( gettimeofday() ); = int( gettimeofday() );
my ( $reading, $value ) = my ( $reading, $value ) =
FHEM::Automation::ShuttersControl::GetAttrValues( $self->{shuttersDev}, FHEM::Automation::ShuttersControl::Helper::GetAttrValues( $self->{shuttersDev},
'ASC_Shutter_IdleDetection', 'none' ); 'ASC_Shutter_IdleDetection', 'none' );
### erwartetes Ergebnis ### erwartetes Ergebnis
@@ -729,7 +729,7 @@ sub _getBrightnessSensor {
$self->{ $self->{shuttersDev} }->{ASC_BrightnessSensor}->{LASTGETTIME} = $self->{ $self->{shuttersDev} }->{ASC_BrightnessSensor}->{LASTGETTIME} =
int( gettimeofday() ); int( gettimeofday() );
my ( $device, $reading, $max, $min ) = my ( $device, $reading, $max, $min ) =
FHEM::Automation::ShuttersControl::GetAttrValues( $self->{shuttersDev}, FHEM::Automation::ShuttersControl::Helper::GetAttrValues( $self->{shuttersDev},
'ASC_BrightnessSensor', 'none' ); 'ASC_BrightnessSensor', 'none' );
### erwartetes Ergebnis ### erwartetes Ergebnis
@@ -815,7 +815,7 @@ sub getShadingAzimuthRight {
$self->{ $self->{shuttersDev} }->{ASC_Shading_InOutAzimuth}->{LASTGETTIME} $self->{ $self->{shuttersDev} }->{ASC_Shading_InOutAzimuth}->{LASTGETTIME}
= int( gettimeofday() ); = int( gettimeofday() );
my ( $left, $right ) = my ( $left, $right ) =
FHEM::Automation::ShuttersControl::GetAttrValues( $self->{shuttersDev}, FHEM::Automation::ShuttersControl::Helper::GetAttrValues( $self->{shuttersDev},
'ASC_Shading_InOutAzimuth', '95:265' ); 'ASC_Shading_InOutAzimuth', '95:265' );
### erwartetes Ergebnis ### erwartetes Ergebnis
@@ -874,7 +874,7 @@ sub getShadingMinElevation {
$self->{ $self->{shuttersDev} }->{ASC_Shading_MinMax_Elevation} $self->{ $self->{shuttersDev} }->{ASC_Shading_MinMax_Elevation}
->{LASTGETTIME} = int( gettimeofday() ); ->{LASTGETTIME} = int( gettimeofday() );
my ( $min, $max ) = my ( $min, $max ) =
FHEM::Automation::ShuttersControl::GetAttrValues( $self->{shuttersDev}, FHEM::Automation::ShuttersControl::Helper::GetAttrValues( $self->{shuttersDev},
'ASC_Shading_MinMax_Elevation', '25.0:100.0' ); 'ASC_Shading_MinMax_Elevation', '25.0:100.0' );
### erwartetes Ergebnis ### erwartetes Ergebnis
@@ -944,7 +944,7 @@ sub getShadingStateChangeSunny {
$self->{ $self->{shuttersDev} }->{ASC_Shading_StateChange_SunnyCloudy} $self->{ $self->{shuttersDev} }->{ASC_Shading_StateChange_SunnyCloudy}
->{LASTGETTIME} = int( gettimeofday() ); ->{LASTGETTIME} = int( gettimeofday() );
my ( $sunny, $cloudy, $maxBrightnessAverageArrayObjects ) = my ( $sunny, $cloudy, $maxBrightnessAverageArrayObjects ) =
FHEM::Automation::ShuttersControl::GetAttrValues( $self->{shuttersDev}, FHEM::Automation::ShuttersControl::Helper::GetAttrValues( $self->{shuttersDev},
'ASC_Shading_StateChange_SunnyCloudy', 'ASC_Shading_StateChange_SunnyCloudy',
'35000:20000' ); '35000:20000' );
@@ -1048,7 +1048,7 @@ sub getExternalTriggerDevice {
int( gettimeofday() ); int( gettimeofday() );
my ( $device, $reading, $valueActive, $valueInactive, $posActive, my ( $device, $reading, $valueActive, $valueInactive, $posActive,
$posInactive, $valueActive2, $posActive2 ) $posInactive, $valueActive2, $posActive2 )
= FHEM::Automation::ShuttersControl::GetAttrValues( $self->{shuttersDev}, = FHEM::Automation::ShuttersControl::Helper::GetAttrValues( $self->{shuttersDev},
'ASC_ExternalTrigger', 'none' ); 'ASC_ExternalTrigger', 'none' );
### erwartetes Ergebnis ### erwartetes Ergebnis
@@ -1545,7 +1545,7 @@ sub getWindMax {
$self->{ $self->{shuttersDev} }->{ASC_WindParameters}->{LASTGETTIME} = $self->{ $self->{shuttersDev} }->{ASC_WindParameters}->{LASTGETTIME} =
int( gettimeofday() ); int( gettimeofday() );
my ( $max, $hyst, $pos ) = my ( $max, $hyst, $pos ) =
FHEM::Automation::ShuttersControl::GetAttrValues( $self->{shuttersDev}, FHEM::Automation::ShuttersControl::Helper::GetAttrValues( $self->{shuttersDev},
'ASC_WindParameters', '50:20' ); 'ASC_WindParameters', '50:20' );
## Erwartetes Ergebnis ## Erwartetes Ergebnis

2
lib/FHEM/Automation/ShuttersControl/Window/Attr.pm
View File

@@ -94,7 +94,7 @@ sub _getWinDev {
$self->{ $self->{shuttersDev} }->{ASC_WindowRec}->{LASTGETTIME} = $self->{ $self->{shuttersDev} }->{ASC_WindowRec}->{LASTGETTIME} =
int( gettimeofday() ); int( gettimeofday() );
my ( $device, $reading ) = my ( $device, $reading ) =
FHEM::Automation::ShuttersControl::GetAttrValues( $self->{shuttersDev}, FHEM::Automation::ShuttersControl::Helper::GetAttrValues( $self->{shuttersDev},
'ASC_WindowRec', 'none' ); 'ASC_WindowRec', 'none' );
### erwartetes Ergebnis ### erwartetes Ergebnis