diff --git a/fhem/CHANGED b/fhem/CHANGED index 7d7a19ba2..346575fe1 100644 --- a/fhem/CHANGED +++ b/fhem/CHANGED @@ -1,5 +1,6 @@ # Add changes at the top of the list. Keep it in ASCII, and 80-char wide. # Do not insert empty lines here, update check depends on it. + - change: 36_Shelly: 'set ... pos' instead of 'set ... pct' is undone - feature: 76_SolarForecast: run collection definitely at end/start of an hour - feature: 93_DbRep: new setter multiCmd, change autoForward bugfix: reducelog problem Forum:#136581 diff --git a/fhem/FHEM/36_Shelly.pm b/fhem/FHEM/36_Shelly.pm index 30997ac76..06e16b01d 100644 --- a/fhem/FHEM/36_Shelly.pm +++ b/fhem/FHEM/36_Shelly.pm @@ -64,6 +64,8 @@ # 5.16 Bug Fix: function of dimmer # 5.17 Add: Roller devices: 'set ... position' equivalent to 'pct' # 5.18 Bug Fix: function of all Gen1 relay devices +# 5.19 change back: roller devices: use 'set ... pct' as command + package main; @@ -81,7 +83,7 @@ sub Log($$); sub Shelly_Set ($@); #-- globals on start -my $version = "5.18 10.01.2024"; +my $version = "5.19 11.01.2024"; my $defaultINTERVAL = 60; my $secndIntervalMulti = 4; # Multiplier for 'long update' @@ -233,7 +235,7 @@ my %shelly_dropdowns = ( "Shelly"=> "config interval password reboot:noArg update:noArg name reset:disconnects,energy", "Onoff" => " on off toggle on-for-timer off-for-timer", "Multi" => " ON:noArg OFF:noArg xtrachannels:noArg", - "Rol" => " closed open stop:noArg pos:slider,0,1,100 delta zero:noArg predefAttr:noArg", #pct is deprecated + "Rol" => " closed open stop:noArg pct:slider,0,1,100 delta zero:noArg predefAttr:noArg", "RgbwW" => " pct dim dimup dimdown dim-for-timer", "BulbW" => " ct:colorpicker,CT,3000,10,6500 pct:slider,0,1,100", "RgbwC" => " rgbw rgb:colorpicker,HSV hsv white:slider,0,1,100 gain:slider,0,1,100" @@ -1541,12 +1543,7 @@ sub Shelly_Attr(@) { } #--------------------------------------- }elsif( $attrName eq "webCmd" ){ - if( $shelly_models{$model}[1] > 0 && $mode ne "relay" && $attrVal =~ /pct/ ){ - $error="$name\: use of \'pct\' in attribute \"$attrName\" is deprecated, use \'pos\' instead"; - Log3 $name,1,"[Shelly_Attr] $error "; - #$_[3] = $attrVal; - #return "\n$error"; # print message on start screen - } + Log3 $name,5,"[Shelly_Attr] $name: webCmd is set to $attrVal"; #--------------------------------------- }elsif( $attrName eq "shellyuser" ){ Log3 $name,5,"[Shelly_Attr] $name: shellyuser is set to $attrVal"; @@ -2141,19 +2138,18 @@ sub Shelly_Set ($@) { $cmd .= "&duration=$value" if(defined($value)); }elsif( $cmd eq "pct" || $cmd =~ /pos/ || $cmd eq "delta" ){ - Log3 $name,1,"[Shelly_Set] $name: use of \'set ... pct\' is deprecated, use \'set ... pos[ition]\' instead" if($cmd eq "pct"); my $targetpct = $value; my $pos = ReadingsVal($name,"position",""); my $pct = ReadingsVal($name,"pct",undef); - #if( "$value" =~ /[\+-]\d*/ ){ - # $targetpct = eval($pct."$value"); - #} + if( $cmd eq "pct" && "$value" =~ /[\+-]\d*/ ){ + $targetpct = eval($pct."$value"); + } #-- check for sign if( $cmd eq "delta" ){ if( $value =~ /[\+-]\d*/ ){ $targetpct += $pct; }else{ - Log3 $name,1,"[Shelly_Set] $name: Wrong format, must consist of a plus or minus sign followed by an integer value"; + Log3 $name,1,"[Shelly_Set] $name: Wrong format of comand \'$cmd\', must consist of a plus or minus sign followed by an integer value"; return; } } @@ -2405,10 +2401,10 @@ sub Shelly_Set ($@) { my $devStateIcon; my $changes = 0; if( !AttrVal($name,"devStateIcon",undef) ){ - if( AttrVal($name, "pct100", "closed") eq "closed" ){ - $devStateIcon = $predefAttrs{'roller_closed100'}; - }else{ + if( AttrVal($name,"pct100","open") eq "open" ){ $devStateIcon = $predefAttrs{'roller_open100'}; + }else{ + $devStateIcon = $predefAttrs{'roller_closed100'}; } # set the devStateIcon-attribute when the devStateIcon attribute is not set yet $attr{$hash->{NAME}}{devStateIcon} = $devStateIcon; @@ -2441,10 +2437,10 @@ sub Shelly_Set ($@) { $msg .= "\n"; if( !AttrVal($name,"eventMap",undef) ){ # set the eventMap-attribute when the eventMap attribute is not set yet - if( AttrVal($name, "pct100", "closed") eq "closed" ){ - $attr{$hash->{NAME}}{eventMap} = $predefAttrs{'roller_eventMap_closed100'}; - }else{ + if( AttrVal($name,"pct100","open") eq "open" ){ $attr{$hash->{NAME}}{eventMap} = $predefAttrs{'roller_eventMap_open100'}; + }else{ + $attr{$hash->{NAME}}{eventMap} = $predefAttrs{'roller_eventMap_closed100'}; } Log3 $name,5,"[Shelly_Get] the attribute \'eventMap\' of device $name is set "; $msg .= "eventMap attribute is set"; @@ -5176,7 +5172,7 @@ Shelly_readingsBulkUpdate($$$@) # derived from fhem.pl readingsBulkUpdateIfChang carries a sign + or - the following number will be added to the current value of the position to acquire the target value.
set <name> pct <integer percent value> -
same as set <name> pos <integer percent value> deprecated +
same as set <name> pos <integer percent value>
  • @@ -5723,7 +5719,7 @@ Shelly_readingsBulkUpdate($$$@) # derived from fhem.pl readingsBulkUpdateIfChang wird der Wert auf den aktuellen Positionswert hinzugezählt.
    - äquivalent zu set <name> pct <integer percent value> nicht mehr verwenden + äquivalent zu set <name> pct <integer percent value>
    • @@ -5988,7 +5984,7 @@ Shelly_readingsBulkUpdate($$$@) # derived from fhem.pl readingsBulkUpdateIfChang
  • attr <name> pct100 open|closed (default:open) -
    Festlegen der 100%-Endlage für Rollladen offen (pct100=open) oder Rolladen geschlossen (pct100=closed)
    • +
    Festlegen der 100%-Endlage für Rollladen offen (pct100=open) oder Rollladen geschlossen (pct100=closed)
    Für Energiemeter ShellyPro3EM