diff --git a/fhem/CHANGED b/fhem/CHANGED index 954772cbb..97d379e3d 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.pm: fixed attribute substexcl - update: 88_HMCCU.pm: new version 3.7 - bugfix: contrib/Widgets/DateTimePicker/fhemweb_datetime.js: - added set parameter to ID to differentiate datetime widgets diff --git a/fhem/FHEM/88_HMCCU.pm b/fhem/FHEM/88_HMCCU.pm index 9c503ba6b..299432f97 100755 --- a/fhem/FHEM/88_HMCCU.pm +++ b/fhem/FHEM/88_HMCCU.pm @@ -1985,9 +1985,9 @@ sub HMCCU_UpdateClientReading ($@) foreach my $rn (@readings) { HMCCU_BulkUpdate ($ch, $rn, $value, $cvalue) if ($rn ne ''); } - HMCCU_BulkUpdate ($ch, 'control', $value, $cvalue) + HMCCU_BulkUpdate ($ch, 'control', $fvalue, $cvalue) if ($cd ne '' && $dpt eq $cd && $chn eq $cc); - HMCCU_BulkUpdate ($ch, 'state', $value, $cvalue) + HMCCU_BulkUpdate ($ch, 'state', $fvalue, $cvalue) if ($dpt eq $st && ($sc eq '' || $sc eq $chn)); my ($hms_chn, $hms_dpt, $hms_val) = HMCCU_GetHMState ($cn, undef); HMCCU_BulkUpdate ($ch, 'hmstate', $hms_val, $hms_val) if (defined ($hms_val)); @@ -3809,9 +3809,9 @@ sub HMCCU_UpdateSingleReading ($$$$$) foreach my $rn (@$readings) { HMCCU_BulkUpdate ($hash, $rn, $value, $cvalue) if ($rn ne ''); } - HMCCU_BulkUpdate ($hash, 'control', $value, $cvalue) + HMCCU_BulkUpdate ($hash, 'control', $fvalue, $cvalue) if ($cd ne '' && $dpt eq $cd && $chn eq $cc); - HMCCU_BulkUpdate ($hash, 'state', $value, $cvalue) + HMCCU_BulkUpdate ($hash, 'state', $fvalue, $cvalue) if ($dpt eq $sd && ($sc eq '' || $sc eq $chn)); my ($hms_chn, $hms_dpt, $hms_val) = HMCCU_GetHMState ($name, undef); HMCCU_BulkUpdate ($hash, 'hmstate', $hms_val, $hms_val) if (defined ($hms_val)); @@ -4263,9 +4263,9 @@ sub HMCCU_UpdateDeviceReadings ($$) foreach my $rn (@readings) { HMCCU_BulkUpdate ($cl_hash, $rn, $value, $cvalue) if ($rn ne ''); } - HMCCU_BulkUpdate ($cl_hash, 'control', $value, $cvalue) + HMCCU_BulkUpdate ($cl_hash, 'control', $fvalue, $cvalue) if ($cd ne '' && $adrtoks[2] eq $cd && $chn eq $cc); - HMCCU_BulkUpdate ($cl_hash, "state", $value, $cvalue) + HMCCU_BulkUpdate ($cl_hash, "state", $fvalue, $cvalue) if (($adrtoks[2] eq $sd) && ($sc eq '' || $sc eq $chn)); $uc++; } @@ -4389,9 +4389,9 @@ foreach (sChannel, sChnList.Split(",")) { HMCCU_BulkUpdate ($hash, $rn, $value, $cvalue); $result .= $rn.'='.$cvalue."\n"; } - HMCCU_BulkUpdate ($hash, 'control', $value, $cvalue) + HMCCU_BulkUpdate ($hash, 'control', $fvalue, $cvalue) if ($cd ne '' && $adrtoks[2] eq $cd && $chn eq $cc); - HMCCU_BulkUpdate ($hash, 'state', $value, $cvalue) + HMCCU_BulkUpdate ($hash, 'state', $fvalue, $cvalue) if (($adrtoks[2] eq $sd) && ($sc eq '' || $sc eq $chn)); } $value = $cvalue;