diff --git a/fhem/CHANGED b/fhem/CHANGED index 1b32400aa..353e23d0c 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: 88_HMCCU: Switched close to closed - bugfix: 70_Klafs: package main was removed from source code - bugfix: 31_LightScene: fixes for configDB (by Beta-User) - change: 93_DbRep: reduce memory allocation of reduceLog command diff --git a/fhem/FHEM/88_HMCCU.pm b/fhem/FHEM/88_HMCCU.pm index 291258d97..d1cc71173 100755 --- a/fhem/FHEM/88_HMCCU.pm +++ b/fhem/FHEM/88_HMCCU.pm @@ -57,7 +57,7 @@ my %HMCCU_CUST_CHN_DEFAULTS; my %HMCCU_CUST_DEV_DEFAULTS; # HMCCU version -my $HMCCU_VERSION = '5.0 222611615'; +my $HMCCU_VERSION = '5.0 222632130'; # Timeout for CCU requests (seconds) my $HMCCU_TIMEOUT_REQUEST = 4; @@ -10028,7 +10028,7 @@ sub HMCCU_BuildURL ($$) $password = HMCCU_Decrypt ($encpass); } my $auth = ($username ne '' && $password ne '') ? "$username:$password".'@' : ''; - + if ($backend eq 'rega') { $url = $hash->{prot}."://$auth".$hash->{host}.':'. $HMCCU_REGA_PORT{$hash->{prot}}.'/tclrega.exe'; @@ -10686,8 +10686,7 @@ sub HMCCU_MaxHashEntries ($$) Acknowledge "device was unreachable" messages in CCU.
  • set <name> authentication [<username> <password>]
    - Set credentials for CCU authentication. Authentication must be activated by setting flag - 'authenticate' in attribute 'ccuflags'.
    + Set credentials for CCU authentication.
    When executing this command without arguments, the credentials are deleted.

  • set <name> clear [<reading-exp>]
    diff --git a/fhem/FHEM/88_HMCCUCHN.pm b/fhem/FHEM/88_HMCCUCHN.pm index 2e2443037..8071fe35b 100644 --- a/fhem/FHEM/88_HMCCUCHN.pm +++ b/fhem/FHEM/88_HMCCUCHN.pm @@ -30,7 +30,7 @@ sub HMCCUCHN_Set ($@); sub HMCCUCHN_Get ($@); sub HMCCUCHN_Attr ($@); -my $HMCCUCHN_VERSION = '5.0 222611615'; +my $HMCCUCHN_VERSION = '5.0 222632130'; ###################################################################### # Initialize module diff --git a/fhem/FHEM/88_HMCCUDEV.pm b/fhem/FHEM/88_HMCCUDEV.pm index f55022138..c1ed5d124 100644 --- a/fhem/FHEM/88_HMCCUDEV.pm +++ b/fhem/FHEM/88_HMCCUDEV.pm @@ -31,7 +31,7 @@ sub HMCCUDEV_Set ($@); sub HMCCUDEV_Get ($@); sub HMCCUDEV_Attr ($@); -my $HMCCUDEV_VERSION = '5.0 222611615'; +my $HMCCUDEV_VERSION = '5.0 222632130'; ###################################################################### # Initialize module diff --git a/fhem/FHEM/88_HMCCURPCPROC.pm b/fhem/FHEM/88_HMCCURPCPROC.pm index cb1205180..f890e9d60 100755 --- a/fhem/FHEM/88_HMCCURPCPROC.pm +++ b/fhem/FHEM/88_HMCCURPCPROC.pm @@ -39,7 +39,7 @@ use SetExtensions; ###################################################################### # HMCCURPC version -my $HMCCURPCPROC_VERSION = '5.0 222611615'; +my $HMCCURPCPROC_VERSION = '5.0 222632130'; # Maximum number of events processed per call of Read() my $HMCCURPCPROC_MAX_EVENTS = 100; diff --git a/fhem/FHEM/HMCCUConf.pm b/fhem/FHEM/HMCCUConf.pm index e9d73583b..25717f5d6 100644 --- a/fhem/FHEM/HMCCUConf.pm +++ b/fhem/FHEM/HMCCUConf.pm @@ -717,16 +717,16 @@ $HMCCU_CONFIG_VERSION = '5.0'; 'STATE' => { '0' => 'off', 'false' => 'off', '1' => 'on', 'true' => 'on' } }, 'SHUTTER_CONTACT' => { - 'STATE' => { '0' => 'close', '1' => 'open', 'false' => 'close', 'true' => 'open' } + 'STATE' => { '0' => 'closed', '1' => 'open', 'false' => 'closed', 'true' => 'open' } }, 'SHUTTER_CONTACT_TRANSCEIVER' => { - 'STATE' => { '0' => 'close', '1' => 'open', 'false' => 'close', 'true' => 'open' } + 'STATE' => { '0' => 'closed', '1' => 'open', 'false' => 'closed', 'true' => 'open' } }, 'ROTARY_HANDLE_SENSOR' => { - 'STATE' => { '0' => 'close', '1' => 'tilted', '2' => 'open' } + 'STATE' => { '0' => 'closed', '1' => 'tilted', '2' => 'open' } }, 'ROTARY_HANDLE_TRANSCEIVER' => { - 'STATE' => { '0' => 'close', '1' => 'tilted', '2' => 'open' } + 'STATE' => { '0' => 'closed', '1' => 'tilted', '2' => 'open' } }, 'ALARM_SWITCH_VIRTUAL_RECEIVER' => { 'STATE' => { '0' => 'ok', '1' => 'alarm', 'false' => 'ok', 'true' => 'alarm' } @@ -747,29 +747,29 @@ $HMCCU_CONFIG_VERSION = '5.0'; 'STATE' => { '0' => 'off', 'false' => 'off', '1' => 'on', 'true' => 'on', 'off' => '0', 'on' => '1' }, }, 'BLIND' => { - 'LEVEL' => { '0' => 'close', '100' => 'open', 'close' => '0', 'open' => '100' }, + 'LEVEL' => { '0' => 'closed', '100' => 'open', 'closed' => '0', 'open' => '100' }, 'DIRECTION' => { '0' => 'none', '1' => 'up', '2' => 'down' }, 'WORKING' => { '0' => 'no', 'false' => 'no', '1' => 'yes', 'true' => 'yes' } }, 'BLIND_TRANSMITTER' => { - 'LEVEL' => { '0' => 'close', '100' => 'open', 'close' => '0', 'open' => '100' } + 'LEVEL' => { '0' => 'closed', '100' => 'open', 'closed' => '0', 'open' => '100' } }, 'BLIND_VIRTUAL_RECEIVER' => { - 'LEVEL' => { '0' => 'close', '100' => 'open', 'close' => '0', 'open' => '100' }, + 'LEVEL' => { '0' => 'closed', '100' => 'open', 'closed' => '0', 'open' => '100' }, 'DIRECTION' => { '0' => 'none', '1' => 'up', '2' => 'down' }, 'WORKING' => { '0' => 'no', 'false' => 'no', '1' => 'yes', 'true' => 'yes' } }, 'JALOUSIE' => { - 'LEVEL' => { '0' => 'close', '100' => 'open', 'close' => '0', 'open' => '100' }, - 'LEVEL_SLATS' => { '0' => 'close', '100' => 'open', 'close' => '0', 'open' => '100' }, + 'LEVEL' => { '0' => 'closed', '100' => 'open', 'closed' => '0', 'open' => '100' }, + 'LEVEL_SLATS' => { '0' => 'closed', '100' => 'open', 'closed' => '0', 'open' => '100' }, 'DIRECTION' => { '0' => 'none', '1' => 'up', '2' => 'down' }, 'WORKING' => { '0' => 'no', 'false' => 'no', '1' => 'yes', 'true' => 'yes' } }, 'SHUTTER_TRANSMITTER' => { - 'LEVEL' => { '0' => 'close', '100' => 'open', 'close' => '0', 'open' => '100' } + 'LEVEL' => { '0' => 'closed', '100' => 'open', 'closed' => '0', 'open' => '100' } }, 'SHUTTER_VIRTUAL_RECEIVER' => { - 'LEVEL' => { '0' => 'close', '100' => 'open', 'close' => '0', 'open' => '100' } + 'LEVEL' => { '0' => 'closed', '100' => 'open', 'closed' => '0', 'open' => '100' } }, 'DIMMER' => { 'LEVEL' => { '0' => 'off', '100' => 'on', 'off' => '0', 'on' => '100' }, @@ -788,7 +788,7 @@ $HMCCU_CONFIG_VERSION = '5.0'; }, 'THERMALCONTROL_TRANSMIT' => { 'SET_TEMPERATURE' => { '4.5' => 'off', '30.5' => 'on' }, - 'WINDOW_OPEN_REPORTING' => { '0' => 'close', '1' => 'open', 'false' => 'close', 'true' => 'open' } + 'WINDOW_OPEN_REPORTING' => { '0' => 'closed', '1' => 'open', 'false' => 'closed', 'true' => 'open' } }, 'CLIMATECONTROL_RT_TRANSCEIVER' => { 'SET_TEMPERATURE' => { '4.5' => 'off', '30.5' => 'on' } @@ -796,7 +796,7 @@ $HMCCU_CONFIG_VERSION = '5.0'; 'HEATING_CLIMATECONTROL_TRANSCEIVER' => { 'SET_POINT_TEMPERATURE' => { '4.5' => 'off', '30.5' => 'on' }, 'SET_POINT_MODE' => { '0' => 'auto', '1' => 'manual', '2' => 'boost', '3' => 'off' }, - 'WINDOW_STATE' => { '0' => 'close', '1' => 'open', 'false' => 'close', 'true' => 'open' } + 'WINDOW_STATE' => { '0' => 'closed', '1' => 'open', 'false' => 'closed', 'true' => 'open' } }, 'CLIMATECONTROL_REGULATOR' => { 'SETPOINT' => { '4.5' => 'off', '30.5' => 'on' } @@ -805,7 +805,7 @@ $HMCCU_CONFIG_VERSION = '5.0'; 'ALARMSTATE' => { '0' => 'noAlarm', '1' => 'alarm', 'false' => 'noAlarm', 'true' => 'alarm' } }, 'WINMATIC' => { - 'LEVEL' => { '0' => 'close', '100' => 'open', '-0.005' => 'locked' } + 'LEVEL' => { '0' => 'closed', '100' => 'open', '-0.005' => 'locked' } }, 'DEFAULT' => { 'AES_KEY' => { '0' => 'off', 'false' => 'off', '1' => 'on', 'true' => 'on' },