FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-10 09:16:53 +00:00
Code Issues Releases Wiki Activity

HMCCU: fixed syntax errors in HMCCUConf.pm

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@28629 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
zap 2024-03-09 17:04:22 +00:00
parent 38a709229e
commit 6890fcb3d3
4 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fhem/CHANGED
View File

@ -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: Fixed syntax errors in HMCCUConf.pm
- change: 93_DbLog: META.json data corrected
- change: 93_DbRep: Ready for support of MariaDB Perl driver
- change: 98_Installer: change Maintainer, change app version check

21
fhem/FHEM/88_HMCCU.pm
View File

@ -4361,11 +4361,22 @@ sub HMCCU_GetEnumValues ($$$$;$$)
}
else {
# As fallback use values as specified in command definition
my $i = 0;
foreach my $cv (split(',', $argList)) {
$valList{$cv} = $i;
$valIndex{$i} = $cv;
$i++;
if (defined($paramDef) && defined($paramDef->{MIN}) && HMCCU_IsIntNum($paramDef->{MIN})) {
my $i = $paramDef->{MIN};
foreach my $cv (split(',', $argList)) {
$valList{$cv} = $i;
$valIndex{$i} = $cv;
$i++;
}
}
else {
my $i = 0;
foreach my $cv (split(',', $argList)) {
my $j = HMCCU_IsIntNum($cv) ? $cv : $i;
$valList{$cv} = $j;
$valIndex{$j} = $cv;
$i++;
}
}
}
}

2
fhem/FHEM/88_HMCCUCHN.pm
View File

@ -737,7 +737,7 @@ sub HMCCUCHN_Get ($@)
update system variables bound to the device. These variables can be read by using command 'get extValues'.
If <i>filter-expr</i> is specified, only parameters matching the expression are stored as readings.
</li><br/>
<li><b>get &lt;name&gt; weekProgram [&lt;program-number&gt;|<u>all</u>]</b><br/>
<li><b>get &lt;name&gt; week-program [&lt;program-number&gt;|<u>all</u>]</b><br/>
Display week programs. This command is only available if a device supports week programs.
</li>
</ul>

12
fhem/FHEM/HMCCUConf.pm
View File

@ -263,7 +263,7 @@ $HMCCU_CONFIG_VERSION = '5.0';
'CLIMATECONTROL_RT_TRANSCEIVER' =>
'^(C#\.)?ACTUAL_TEMPERATURE$:+measured-temp;'.
'^(C#\.)?ACTUAL_HUMIDITY$:+humidity;'.
'^(C#\.)?SET_TEMPERATURE$:+desired-temp',
'^(C#\.)?SET_TEMPERATURE$:+desired-temp;'.
'^(C#\.)?BOOST_MODE$:+boost',
'CLIMATE_TRANSCEIVER' =>
'^(C#\.)?ACTUAL_TEMPERATURE$:+measured-temp;'.
@ -284,8 +284,9 @@ $HMCCU_CONFIG_VERSION = '5.0';
'^(C#\.)?ACTUAL_TEMPERATURE$:+measured-temp;'.
'^(C#\.)?HUMIDITY$:+humidity;'.
'^(C#\.)?ACTUAL_HUMIDITY$:+humidity;'.
'^(C#\.)?SET_POINT_TEMPERATURE$:+desired-temp',
'^(C#\.)?BOOST_MODE$:+boost',
'^(C#\.)?SET_POINT_TEMPERATURE$:+desired-temp;'.
'^(C#\.)?BOOST_MODE$:+boost;'.
'^(C#\.)?ACTIVE_PROFILE$:+week-program',
'JALOUSIE' =>
'^(C#\.)?LEVEL$:+pct,+level;(C#\.)?LEVEL_SLATS$:+pctSlats',
'KEY' =>
@ -309,7 +310,7 @@ $HMCCU_CONFIG_VERSION = '5.0';
'THERMALCONTROL_TRANSMIT' =>
'^(C#\.)?ACTUAL_TEMPERATURE$:+measured-temp;'.
'^(C#\.)?ACTUAL_HUMIDITY$:+humidity;'.
'^(C#\.)?SET_TEMPERATURE$:+desired-temp',
'^(C#\.)?SET_TEMPERATURE$:+desired-temp;'.
'^(C#\.)?BOOST_MODE$:+boost',
'VIRTUAL_KEY' =>
'^(C#\.)?PRESS_(SHORT|LONG)$:+pressed',
@ -482,7 +483,8 @@ $HMCCU_CONFIG_VERSION = '5.0';
'rpcset party' => 'V:SET_POINT_MODE:2 V:SET_POINT_TEMPERATURE:?temperature V:PARTY_TIME_START:?timeStart V:PARTY_TIME_END:?timeEnd',
'boost' => 'V:BOOST_MODE:#boost=0,1',
'on' => 'V:CONTROL_MODE:1 V:SET_POINT_TEMPERATURE:30.5',
'off' => 'V:CONTROL_MODE:1 V:SET_POINT_TEMPERATURE:4.5'
'off' => 'V:CONTROL_MODE:1 V:SET_POINT_TEMPERATURE:4.5',
'week-program' => 'V:ACTIVE_PROFILE:#profile=1,2,3'
},
'JALOUSIE' => {
'pct' => 'V:LEVEL:?level',