Fixes
This commit is contained in:
parent
cd80e8a8bc
commit
6c67516a4c
@ -39,9 +39,6 @@
|
||||
<Enumeration Text="10" Value="10" Id="%ENID%" />
|
||||
</TypeRestriction>
|
||||
</ParameterType>
|
||||
<ParameterType Id="%AID%_PT-ArcRange" Name="ArcRange">
|
||||
<TypeNumber SizeInBit="16" Type="signedInt" minInclusive="-1000" maxInclusive="10000" />
|
||||
</ParameterType>
|
||||
<ParameterType Id="%AID%_PT-Checkbox" Name="Checkbox">
|
||||
<TypeRestriction Base="Value" SizeInBit="1">
|
||||
<Enumeration Text="Deaktiviert" Value="0" Id="%ENID%" />
|
||||
|
||||
@ -79,80 +79,6 @@
|
||||
Text="Szene" Value="0" />
|
||||
</Union>
|
||||
|
||||
<!-- Arc Min/Max Parameter für analoge KOs (40 Bytes Union) -->
|
||||
<Union SizeInBit="320">
|
||||
<Memory CodeSegment="%AID%_RS-04-00000" Offset="62" BitOffset="0" />
|
||||
<!-- Temperatur -->
|
||||
<Parameter Id="%AID%_UP-%TT%%CC%030" Name="p%C%ArcMinTemp"
|
||||
ParameterType="%AID%_PT-ArcRange" Offset="0" BitOffset="0"
|
||||
Text=" Arc Min" Value="-20" />
|
||||
<Parameter Id="%AID%_UP-%TT%%CC%031" Name="p%C%ArcMaxTemp"
|
||||
ParameterType="%AID%_PT-ArcRange" Offset="2" BitOffset="0"
|
||||
Text=" Arc Max" Value="50" />
|
||||
<!-- Luftfeuchtigkeit -->
|
||||
<Parameter Id="%AID%_UP-%TT%%CC%032" Name="p%C%ArcMinHum"
|
||||
ParameterType="%AID%_PT-ArcRange" Offset="4" BitOffset="0"
|
||||
Text=" Arc Min" Value="0" />
|
||||
<Parameter Id="%AID%_UP-%TT%%CC%033" Name="p%C%ArcMaxHum"
|
||||
ParameterType="%AID%_PT-ArcRange" Offset="6" BitOffset="0"
|
||||
Text=" Arc Max" Value="100" />
|
||||
<!-- Solltemperatur -->
|
||||
<Parameter Id="%AID%_UP-%TT%%CC%034" Name="p%C%ArcMinSetTemp"
|
||||
ParameterType="%AID%_PT-ArcRange" Offset="8" BitOffset="0"
|
||||
Text=" Arc Min" Value="15" />
|
||||
<Parameter Id="%AID%_UP-%TT%%CC%035" Name="p%C%ArcMaxSetTemp"
|
||||
ParameterType="%AID%_PT-ArcRange" Offset="10" BitOffset="0"
|
||||
Text=" Arc Max" Value="30" />
|
||||
<!-- Heizungsventil -->
|
||||
<Parameter Id="%AID%_UP-%TT%%CC%036" Name="p%C%ArcMinValve"
|
||||
ParameterType="%AID%_PT-ArcRange" Offset="12" BitOffset="0"
|
||||
Text=" Arc Min" Value="0" />
|
||||
<Parameter Id="%AID%_UP-%TT%%CC%037" Name="p%C%ArcMaxValve"
|
||||
ParameterType="%AID%_PT-ArcRange" Offset="14" BitOffset="0"
|
||||
Text=" Arc Max" Value="100" />
|
||||
<!-- Dimmen 1 -->
|
||||
<Parameter Id="%AID%_UP-%TT%%CC%038" Name="p%C%ArcMinDim1"
|
||||
ParameterType="%AID%_PT-ArcRange" Offset="16" BitOffset="0"
|
||||
Text=" Arc Min" Value="0" />
|
||||
<Parameter Id="%AID%_UP-%TT%%CC%039" Name="p%C%ArcMaxDim1"
|
||||
ParameterType="%AID%_PT-ArcRange" Offset="18" BitOffset="0"
|
||||
Text=" Arc Max" Value="100" />
|
||||
<!-- Dimmen 2 -->
|
||||
<Parameter Id="%AID%_UP-%TT%%CC%040" Name="p%C%ArcMinDim2"
|
||||
ParameterType="%AID%_PT-ArcRange" Offset="20" BitOffset="0"
|
||||
Text=" Arc Min" Value="0" />
|
||||
<Parameter Id="%AID%_UP-%TT%%CC%041" Name="p%C%ArcMaxDim2"
|
||||
ParameterType="%AID%_PT-ArcRange" Offset="22" BitOffset="0"
|
||||
Text=" Arc Max" Value="100" />
|
||||
<!-- Jalousie 1 -->
|
||||
<Parameter Id="%AID%_UP-%TT%%CC%042" Name="p%C%ArcMinJal1"
|
||||
ParameterType="%AID%_PT-ArcRange" Offset="24" BitOffset="0"
|
||||
Text=" Arc Min" Value="0" />
|
||||
<Parameter Id="%AID%_UP-%TT%%CC%043" Name="p%C%ArcMaxJal1"
|
||||
ParameterType="%AID%_PT-ArcRange" Offset="26" BitOffset="0"
|
||||
Text=" Arc Max" Value="100" />
|
||||
<!-- Jalousie 2 -->
|
||||
<Parameter Id="%AID%_UP-%TT%%CC%044" Name="p%C%ArcMinJal2"
|
||||
ParameterType="%AID%_PT-ArcRange" Offset="28" BitOffset="0"
|
||||
Text=" Arc Min" Value="0" />
|
||||
<Parameter Id="%AID%_UP-%TT%%CC%045" Name="p%C%ArcMaxJal2"
|
||||
ParameterType="%AID%_PT-ArcRange" Offset="30" BitOffset="0"
|
||||
Text=" Arc Max" Value="100" />
|
||||
<!-- CO2 -->
|
||||
<Parameter Id="%AID%_UP-%TT%%CC%046" Name="p%C%ArcMinCO2"
|
||||
ParameterType="%AID%_PT-ArcRange" Offset="32" BitOffset="0"
|
||||
Text=" Arc Min" Value="0" />
|
||||
<Parameter Id="%AID%_UP-%TT%%CC%047" Name="p%C%ArcMaxCO2"
|
||||
ParameterType="%AID%_PT-ArcRange" Offset="34" BitOffset="0"
|
||||
Text=" Arc Max" Value="3000" />
|
||||
<!-- Helligkeit -->
|
||||
<Parameter Id="%AID%_UP-%TT%%CC%048" Name="p%C%ArcMinLux"
|
||||
ParameterType="%AID%_PT-ArcRange" Offset="36" BitOffset="0"
|
||||
Text=" Arc Min" Value="0" />
|
||||
<Parameter Id="%AID%_UP-%TT%%CC%049" Name="p%C%ArcMaxLux"
|
||||
ParameterType="%AID%_PT-ArcRange" Offset="38" BitOffset="0"
|
||||
Text=" Arc Max" Value="1000" />
|
||||
</Union>
|
||||
|
||||
<Parameter Id="%AID%_P-%TT%%CC%005" Name="p%C%FunctionCount" Offset="0"
|
||||
BitOffset="8" ParameterType="%AID%_PT-FunctionCount"
|
||||
@ -199,49 +125,6 @@
|
||||
RefId="%AID%_UP-%TT%%CC%025" />
|
||||
<ParameterRef Id="%AID%_UP-%TT%%CC%026_R-%TT%%CC%02601"
|
||||
RefId="%AID%_UP-%TT%%CC%026" />
|
||||
|
||||
<!-- Arc Min/Max ParameterRefs -->
|
||||
<ParameterRef Id="%AID%_UP-%TT%%CC%030_R-%TT%%CC%03001"
|
||||
RefId="%AID%_UP-%TT%%CC%030" />
|
||||
<ParameterRef Id="%AID%_UP-%TT%%CC%031_R-%TT%%CC%03101"
|
||||
RefId="%AID%_UP-%TT%%CC%031" />
|
||||
<ParameterRef Id="%AID%_UP-%TT%%CC%032_R-%TT%%CC%03201"
|
||||
RefId="%AID%_UP-%TT%%CC%032" />
|
||||
<ParameterRef Id="%AID%_UP-%TT%%CC%033_R-%TT%%CC%03301"
|
||||
RefId="%AID%_UP-%TT%%CC%033" />
|
||||
<ParameterRef Id="%AID%_UP-%TT%%CC%034_R-%TT%%CC%03401"
|
||||
RefId="%AID%_UP-%TT%%CC%034" />
|
||||
<ParameterRef Id="%AID%_UP-%TT%%CC%035_R-%TT%%CC%03501"
|
||||
RefId="%AID%_UP-%TT%%CC%035" />
|
||||
<ParameterRef Id="%AID%_UP-%TT%%CC%036_R-%TT%%CC%03601"
|
||||
RefId="%AID%_UP-%TT%%CC%036" />
|
||||
<ParameterRef Id="%AID%_UP-%TT%%CC%037_R-%TT%%CC%03701"
|
||||
RefId="%AID%_UP-%TT%%CC%037" />
|
||||
<ParameterRef Id="%AID%_UP-%TT%%CC%038_R-%TT%%CC%03801"
|
||||
RefId="%AID%_UP-%TT%%CC%038" />
|
||||
<ParameterRef Id="%AID%_UP-%TT%%CC%039_R-%TT%%CC%03901"
|
||||
RefId="%AID%_UP-%TT%%CC%039" />
|
||||
<ParameterRef Id="%AID%_UP-%TT%%CC%040_R-%TT%%CC%04001"
|
||||
RefId="%AID%_UP-%TT%%CC%040" />
|
||||
<ParameterRef Id="%AID%_UP-%TT%%CC%041_R-%TT%%CC%04101"
|
||||
RefId="%AID%_UP-%TT%%CC%041" />
|
||||
<ParameterRef Id="%AID%_UP-%TT%%CC%042_R-%TT%%CC%04201"
|
||||
RefId="%AID%_UP-%TT%%CC%042" />
|
||||
<ParameterRef Id="%AID%_UP-%TT%%CC%043_R-%TT%%CC%04301"
|
||||
RefId="%AID%_UP-%TT%%CC%043" />
|
||||
<ParameterRef Id="%AID%_UP-%TT%%CC%044_R-%TT%%CC%04401"
|
||||
RefId="%AID%_UP-%TT%%CC%044" />
|
||||
<ParameterRef Id="%AID%_UP-%TT%%CC%045_R-%TT%%CC%04501"
|
||||
RefId="%AID%_UP-%TT%%CC%045" />
|
||||
<ParameterRef Id="%AID%_UP-%TT%%CC%046_R-%TT%%CC%04601"
|
||||
RefId="%AID%_UP-%TT%%CC%046" />
|
||||
<ParameterRef Id="%AID%_UP-%TT%%CC%047_R-%TT%%CC%04701"
|
||||
RefId="%AID%_UP-%TT%%CC%047" />
|
||||
<ParameterRef Id="%AID%_UP-%TT%%CC%048_R-%TT%%CC%04801"
|
||||
RefId="%AID%_UP-%TT%%CC%048" />
|
||||
<ParameterRef Id="%AID%_UP-%TT%%CC%049_R-%TT%%CC%04901"
|
||||
RefId="%AID%_UP-%TT%%CC%049" />
|
||||
|
||||
<ParameterRef Id="%AID%_UP-%TT%%CC%005_R-%TT%%CC%00501"
|
||||
RefId="%AID%_P-%TT%%CC%005" />
|
||||
|
||||
@ -670,12 +553,10 @@
|
||||
<ParameterRefRef RefId="%AID%_UP-%TT%%CC%026_R-%TT%%CC%02601"
|
||||
IndentLevel="1" />
|
||||
|
||||
<!-- Bedingte KO-Anzeige + Arc-Parameter per Checkbox -->
|
||||
<!-- Temperatur (Arc Min/Max + Ausgang) -->
|
||||
<!-- Bedingte KO-Anzeige per Checkbox -->
|
||||
<!-- Temperatur (Ausgang) -->
|
||||
<choose ParamRefId="%AID%_UP-%TT%%CC%010_R-%TT%%CC%01001">
|
||||
<when test="1">
|
||||
<ParameterRefRef RefId="%AID%_UP-%TT%%CC%030_R-%TT%%CC%03001" IndentLevel="2" />
|
||||
<ParameterRefRef RefId="%AID%_UP-%TT%%CC%031_R-%TT%%CC%03101" IndentLevel="2" />
|
||||
<ComObjectRefRef RefId="%AID%_O-%TT%%CC%050_R-%TT%%CC%05001" />
|
||||
<ComObjectRefRef RefId="%AID%_O-%TT%%CC%079_R-%TT%%CC%07901" />
|
||||
</when>
|
||||
@ -683,8 +564,6 @@
|
||||
<!-- Luftfeuchtigkeit (Arc Min/Max + Ausgang) -->
|
||||
<choose ParamRefId="%AID%_UP-%TT%%CC%011_R-%TT%%CC%01101">
|
||||
<when test="1">
|
||||
<ParameterRefRef RefId="%AID%_UP-%TT%%CC%032_R-%TT%%CC%03201" IndentLevel="2" />
|
||||
<ParameterRefRef RefId="%AID%_UP-%TT%%CC%033_R-%TT%%CC%03301" IndentLevel="2" />
|
||||
<ComObjectRefRef RefId="%AID%_O-%TT%%CC%051_R-%TT%%CC%05101" />
|
||||
<ComObjectRefRef RefId="%AID%_O-%TT%%CC%080_R-%TT%%CC%08001" />
|
||||
</when>
|
||||
@ -701,20 +580,16 @@
|
||||
<ComObjectRefRef RefId="%AID%_O-%TT%%CC%053_R-%TT%%CC%05301" />
|
||||
</when>
|
||||
</choose>
|
||||
<!-- Solltemperatur (Arc Min/Max + Ausgang) -->
|
||||
<!-- Solltemperatur (Ausgang) -->
|
||||
<choose ParamRefId="%AID%_UP-%TT%%CC%014_R-%TT%%CC%01401">
|
||||
<when test="1">
|
||||
<ParameterRefRef RefId="%AID%_UP-%TT%%CC%034_R-%TT%%CC%03401" IndentLevel="2" />
|
||||
<ParameterRefRef RefId="%AID%_UP-%TT%%CC%035_R-%TT%%CC%03501" IndentLevel="2" />
|
||||
<ComObjectRefRef RefId="%AID%_O-%TT%%CC%054_R-%TT%%CC%05401" />
|
||||
<ComObjectRefRef RefId="%AID%_O-%TT%%CC%084_R-%TT%%CC%08401" />
|
||||
</when>
|
||||
</choose>
|
||||
<!-- Heizungsventil (Arc Min/Max + Ausgang) -->
|
||||
<!-- Heizungsventil (Ausgang) -->
|
||||
<choose ParamRefId="%AID%_UP-%TT%%CC%015_R-%TT%%CC%01501">
|
||||
<when test="1">
|
||||
<ParameterRefRef RefId="%AID%_UP-%TT%%CC%036_R-%TT%%CC%03601" IndentLevel="2" />
|
||||
<ParameterRefRef RefId="%AID%_UP-%TT%%CC%037_R-%TT%%CC%03701" IndentLevel="2" />
|
||||
<ComObjectRefRef RefId="%AID%_O-%TT%%CC%055_R-%TT%%CC%05501" />
|
||||
<ComObjectRefRef RefId="%AID%_O-%TT%%CC%081_R-%TT%%CC%08101" />
|
||||
</when>
|
||||
@ -747,64 +622,52 @@
|
||||
<ComObjectRefRef RefId="%AID%_O-%TT%%CC%063_R-%TT%%CC%06301" />
|
||||
</when>
|
||||
</choose>
|
||||
<!-- Dimmen 1 (Arc Min/Max, 3 KOs + Ausgang) -->
|
||||
<!-- Dimmen 1 (3 KOs + Ausgang) -->
|
||||
<choose ParamRefId="%AID%_UP-%TT%%CC%020_R-%TT%%CC%02001">
|
||||
<when test="1">
|
||||
<ParameterRefRef RefId="%AID%_UP-%TT%%CC%038_R-%TT%%CC%03801" IndentLevel="2" />
|
||||
<ParameterRefRef RefId="%AID%_UP-%TT%%CC%039_R-%TT%%CC%03901" IndentLevel="2" />
|
||||
<ComObjectRefRef RefId="%AID%_O-%TT%%CC%064_R-%TT%%CC%06401" />
|
||||
<ComObjectRefRef RefId="%AID%_O-%TT%%CC%065_R-%TT%%CC%06501" />
|
||||
<ComObjectRefRef RefId="%AID%_O-%TT%%CC%066_R-%TT%%CC%06601" />
|
||||
<ComObjectRefRef RefId="%AID%_O-%TT%%CC%085_R-%TT%%CC%08501" />
|
||||
</when>
|
||||
</choose>
|
||||
<!-- Dimmen 2 (Arc Min/Max, 3 KOs + Ausgang) -->
|
||||
<!-- Dimmen 2 ( 3 KOs + Ausgang) -->
|
||||
<choose ParamRefId="%AID%_UP-%TT%%CC%021_R-%TT%%CC%02101">
|
||||
<when test="1">
|
||||
<ParameterRefRef RefId="%AID%_UP-%TT%%CC%040_R-%TT%%CC%04001" IndentLevel="2" />
|
||||
<ParameterRefRef RefId="%AID%_UP-%TT%%CC%041_R-%TT%%CC%04101" IndentLevel="2" />
|
||||
<ComObjectRefRef RefId="%AID%_O-%TT%%CC%067_R-%TT%%CC%06701" />
|
||||
<ComObjectRefRef RefId="%AID%_O-%TT%%CC%068_R-%TT%%CC%06801" />
|
||||
<ComObjectRefRef RefId="%AID%_O-%TT%%CC%069_R-%TT%%CC%06901" />
|
||||
<ComObjectRefRef RefId="%AID%_O-%TT%%CC%086_R-%TT%%CC%08601" />
|
||||
</when>
|
||||
</choose>
|
||||
<!-- Jalousie 1 (Arc Min/Max, 3 KOs + Ausgang) -->
|
||||
<!-- Jalousie 1 (3 KOs + Ausgang) -->
|
||||
<choose ParamRefId="%AID%_UP-%TT%%CC%022_R-%TT%%CC%02201">
|
||||
<when test="1">
|
||||
<ParameterRefRef RefId="%AID%_UP-%TT%%CC%042_R-%TT%%CC%04201" IndentLevel="2" />
|
||||
<ParameterRefRef RefId="%AID%_UP-%TT%%CC%043_R-%TT%%CC%04301" IndentLevel="2" />
|
||||
<ComObjectRefRef RefId="%AID%_O-%TT%%CC%070_R-%TT%%CC%07001" />
|
||||
<ComObjectRefRef RefId="%AID%_O-%TT%%CC%071_R-%TT%%CC%07101" />
|
||||
<ComObjectRefRef RefId="%AID%_O-%TT%%CC%072_R-%TT%%CC%07201" />
|
||||
<ComObjectRefRef RefId="%AID%_O-%TT%%CC%087_R-%TT%%CC%08701" />
|
||||
</when>
|
||||
</choose>
|
||||
<!-- Jalousie 2 (Arc Min/Max, 3 KOs + Ausgang) -->
|
||||
<!-- Jalousie 2 (3 KOs + Ausgang) -->
|
||||
<choose ParamRefId="%AID%_UP-%TT%%CC%023_R-%TT%%CC%02301">
|
||||
<when test="1">
|
||||
<ParameterRefRef RefId="%AID%_UP-%TT%%CC%044_R-%TT%%CC%04401" IndentLevel="2" />
|
||||
<ParameterRefRef RefId="%AID%_UP-%TT%%CC%045_R-%TT%%CC%04501" IndentLevel="2" />
|
||||
<ComObjectRefRef RefId="%AID%_O-%TT%%CC%073_R-%TT%%CC%07301" />
|
||||
<ComObjectRefRef RefId="%AID%_O-%TT%%CC%074_R-%TT%%CC%07401" />
|
||||
<ComObjectRefRef RefId="%AID%_O-%TT%%CC%075_R-%TT%%CC%07501" />
|
||||
<ComObjectRefRef RefId="%AID%_O-%TT%%CC%088_R-%TT%%CC%08801" />
|
||||
</when>
|
||||
</choose>
|
||||
<!-- CO2 (Arc Min/Max + Ausgang) -->
|
||||
<!-- CO2 (Ausgang) -->
|
||||
<choose ParamRefId="%AID%_UP-%TT%%CC%024_R-%TT%%CC%02401">
|
||||
<when test="1">
|
||||
<ParameterRefRef RefId="%AID%_UP-%TT%%CC%046_R-%TT%%CC%04601" IndentLevel="2" />
|
||||
<ParameterRefRef RefId="%AID%_UP-%TT%%CC%047_R-%TT%%CC%04701" IndentLevel="2" />
|
||||
<ComObjectRefRef RefId="%AID%_O-%TT%%CC%076_R-%TT%%CC%07601" />
|
||||
<ComObjectRefRef RefId="%AID%_O-%TT%%CC%082_R-%TT%%CC%08201" />
|
||||
</when>
|
||||
</choose>
|
||||
<!-- Helligkeit (Arc Min/Max + Ausgang) -->
|
||||
<!-- Helligkeit (Ausgang) -->
|
||||
<choose ParamRefId="%AID%_UP-%TT%%CC%025_R-%TT%%CC%02501">
|
||||
<when test="1">
|
||||
<ParameterRefRef RefId="%AID%_UP-%TT%%CC%048_R-%TT%%CC%04801" IndentLevel="2" />
|
||||
<ParameterRefRef RefId="%AID%_UP-%TT%%CC%049_R-%TT%%CC%04901" IndentLevel="2" />
|
||||
<ComObjectRefRef RefId="%AID%_O-%TT%%CC%077_R-%TT%%CC%07701" />
|
||||
<ComObjectRefRef RefId="%AID%_O-%TT%%CC%083_R-%TT%%CC%08301" />
|
||||
</when>
|
||||
@ -823,9 +686,13 @@
|
||||
RefId="%AID%_UP-%TT%%CC%005_R-%TT%%CC%00501"
|
||||
IndentLevel="1" />
|
||||
|
||||
<op:usePart name="FN"
|
||||
xpath="//Dynamic/ChannelIndependentBlock/*" instance="1" />
|
||||
<choose ParamRefId="%AID%_UP-%TT%%CC%005_R-%TT%%CC%00501">
|
||||
<!-- FN 1 -->
|
||||
<when test=">0">
|
||||
<op:usePart name="FN"
|
||||
xpath="//Dynamic/ChannelIndependentBlock/*"
|
||||
instance="1" />
|
||||
</when>
|
||||
<!-- FN 2 -->
|
||||
<when test=">1">
|
||||
<op:usePart name="FN"
|
||||
|
||||
Loading…
Reference in New Issue
Block a user