From e19ab90b457428514cff0d1ce4a23353b9ceb798 Mon Sep 17 00:00:00 2001 From: zap <> Date: Fri, 27 Dec 2024 09:41:44 +0000 Subject: [PATCH] HMCCU: Version 2024-12 git-svn-id: https://svn.fhem.de/fhem/trunk@29453 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/CHANGED | 1 + fhem/FHEM/88_HMCCU.pm | 4 ++-- fhem/FHEM/88_HMCCUCHN.pm | 2 +- fhem/FHEM/88_HMCCUDEV.pm | 2 +- fhem/FHEM/88_HMCCURPCPROC.pm | 2 +- fhem/FHEM/HMCCUConf.pm | 26 +++++++++++++++++++++----- 6 files changed, 27 insertions(+), 10 deletions(-) diff --git a/fhem/CHANGED b/fhem/CHANGED index a1089160f..3ae94dbe9 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 + - bugfix: 88_HMCCU: Role STATUS_INDICATOR - feature: 76_SolarForecast: consumer key surpmeth - various surplus variants - change: 76_SolarForecast: improve Bat careSoC management when dark doldrums - change: 76_SolarForecast: prepare for further development diff --git a/fhem/FHEM/88_HMCCU.pm b/fhem/FHEM/88_HMCCU.pm index 303ed8ebc..e5c4024d7 100755 --- a/fhem/FHEM/88_HMCCU.pm +++ b/fhem/FHEM/88_HMCCU.pm @@ -58,7 +58,7 @@ my %HMCCU_CUST_CHN_DEFAULTS; my %HMCCU_CUST_DEV_DEFAULTS; # HMCCU version -my $HMCCU_VERSION = '5.0 2024-04'; +my $HMCCU_VERSION = '2024-12'; # Timeout for CCU requests (seconds) my $HMCCU_TIMEOUT_REQUEST = 4; @@ -7568,7 +7568,7 @@ sub HMCCU_DisplayWeekProgram ($$$;$$) $s .= '
'; } $s .= ''; - + return $s; } diff --git a/fhem/FHEM/88_HMCCUCHN.pm b/fhem/FHEM/88_HMCCUCHN.pm index fc47c401e..8113af6a1 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 2024-04'; +my $HMCCUCHN_VERSION = '2024-12'; ###################################################################### # Initialize module diff --git a/fhem/FHEM/88_HMCCUDEV.pm b/fhem/FHEM/88_HMCCUDEV.pm index 9345c68ba..10fe8a1ff 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 2024-04'; +my $HMCCUDEV_VERSION = '2024-12'; ###################################################################### # Initialize module diff --git a/fhem/FHEM/88_HMCCURPCPROC.pm b/fhem/FHEM/88_HMCCURPCPROC.pm index 90af36980..4335a277d 100755 --- a/fhem/FHEM/88_HMCCURPCPROC.pm +++ b/fhem/FHEM/88_HMCCURPCPROC.pm @@ -36,7 +36,7 @@ use SetExtensions; ###################################################################### # HMCCURPC version -my $HMCCURPCPROC_VERSION = '5.0 2024-04'; +my $HMCCURPCPROC_VERSION = '2024-12'; # 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 cb873f2e3..d2d2323dc 100644 --- a/fhem/FHEM/HMCCUConf.pm +++ b/fhem/FHEM/HMCCUConf.pm @@ -197,6 +197,9 @@ $HMCCU_CONFIG_VERSION = '5.0'; 'SHUTTER_VIRTUAL_RECEIVER' => { F => 3, S => 'LEVEL', C => 'LEVEL', V => 'open:100,close:0', P => 2 }, + 'STATUS_INDICATOR' => { + F => 3, S => 'STATE', C => 'STATE', V => 'on:true,off:false', P => 2 + }, 'SWITCH' => { F => 3, S => 'STATE', C => 'STATE', V => 'on:true,off:false', P => 2 }, @@ -543,6 +546,13 @@ $HMCCU_CONFIG_VERSION = '5.0'; 'SMOKE_DETECTOR' => { 'command' => 'V:SMOKE_DETECTOR_COMMAND:#command' }, + 'STATUS_INDICATOR' => { + 'on' => 'V:STATE:1', + 'off' => 'V:STATE:0', + 'on-for-timer' => 'V:ON_TIME:?duration V:STATE:1', + 'on-till' => 'V:ON_TIME:?time V:STATE:1', + 'toggle' => 'V:STATE:0,1' + }, 'SWITCH' => { 'on' => 'V:STATE:1', 'off' => 'V:STATE:0', @@ -697,6 +707,9 @@ $HMCCU_CONFIG_VERSION = '5.0'; 'webCmd' => 'pct:open:close:stop', 'widgetOverride' => 'pct:slider,0,10,100' }, + 'STATUS_INDICATOR' => { + 'cmdIcon' => 'on:general_an off:general_aus' + }, 'SWITCH' => { 'cmdIcon' => 'on:general_an off:general_aus' }, @@ -805,20 +818,23 @@ $HMCCU_CONFIG_VERSION = '5.0'; 'ALARM_SWITCH_VIRTUAL_RECEIVER' => { 'STATE' => { '0' => 'ok', '1' => 'alarm', 'false' => 'ok', 'true' => 'alarm' } }, + 'STATUS_INDICATOR' => { + 'STATE' => { '0' => 'off', 'false' => 'off', '1' => 'on', 'true' => 'on', 'off' => '0', 'on' => '1' } + }, 'SWITCH' => { - 'STATE' => { '0' => 'off', 'false' => 'off', '1' => 'on', 'true' => 'on', 'off' => '0', 'on' => '1' }, + 'STATE' => { '0' => 'off', 'false' => 'off', '1' => 'on', 'true' => 'on', 'off' => '0', 'on' => '1' } }, 'SWITCH_PANIC' => { - 'STATE' => { '0' => 'off', 'false' => 'off', '1' => 'on', 'true' => 'on', 'off' => '0', 'on' => '1' }, + 'STATE' => { '0' => 'off', 'false' => 'off', '1' => 'on', 'true' => 'on', 'off' => '0', 'on' => '1' } }, 'SWITCH_SENSOR' => { - 'STATE' => { '0' => 'off', 'false' => 'off', '1' => 'on', 'true' => 'on', 'off' => '0', 'on' => '1' }, + 'STATE' => { '0' => 'off', 'false' => 'off', '1' => 'on', 'true' => 'on', 'off' => '0', 'on' => '1' } }, 'SWITCH_TRANSMITTER' => { - 'STATE' => { '0' => 'off', 'false' => 'off', '1' => 'on', 'true' => 'on', 'off' => '0', 'on' => '1' }, + 'STATE' => { '0' => 'off', 'false' => 'off', '1' => 'on', 'true' => 'on', 'off' => '0', 'on' => '1' } }, 'SWITCH_VIRTUAL_RECEIVER' => { - 'STATE' => { '0' => 'off', 'false' => 'off', '1' => 'on', 'true' => 'on', 'off' => '0', 'on' => '1' }, + 'STATE' => { '0' => 'off', 'false' => 'off', '1' => 'on', 'true' => 'on', 'off' => '0', 'on' => '1' } }, 'BLIND' => { 'LEVEL' => { '0' => 'closed', '100' => 'open', 'closed' => '0', 'open' => '100' },