Fixes

displayprodLinux/Function.input-e1-e2.part.xml

@@ -18,13 +18,13 @@
                         </ParameterRefs>
                         <ComObjectTable>
                             <ComObject Id="%AID%_O-%TT%%CC%%PPP+00%" Name="KOf-%TT%%CC%%PPP+00%  "
-                                Text="Eingang %CC%%Pn%" Number="%Pn%"
+                                Text="Eingang %CC%%Pn%" Number="%C%%Pn%"
                                 FunctionText="Bereich %CC%, Funktion Eingang %Pn%" ObjectSize="4 Bytes"
                                 ReadFlag="Disabled" WriteFlag="Enabled" CommunicationFlag="Enabled"
                                 TransmitFlag="Disabled" UpdateFlag="Enabled"
                                 ReadOnInitFlag="Disabled" />
                             <ComObject Id="%AID%_O-%TT%%CC%%PPP+01%" Name="KOf-%TT%%CC%%PPP+01%  "
-                                Text="Ausgang %CC%%Pn+1%" Number="%Pn+1%"
+                                Text="Ausgang %CC%%Pn+1%" Number="%C%%Pn+1%"
                                 FunctionText="Bereich %CC%, Funktion Ausgang %Pn+1%" ObjectSize="4 Bytes"
                                 ReadFlag="Disabled" WriteFlag="Disabled" CommunicationFlag="Enabled"
                                 TransmitFlag="Enabled" UpdateFlag="Disabled"

displayprodLinux/Section.share.xml

@@ -40,7 +40,7 @@
                 </TypeRestriction>
               </ParameterType>
               <ParameterType Id="%AID%_PT-Checkbox" Name="Checkbox">
-                <TypeRestriction Base="Value" SizeInBit="1" UIHint="CheckBox">
+                <TypeRestriction Base="Value" SizeInBit="1">
                   <Enumeration Text="Deaktiviert" Value="0" Id="%ENID%" />
                   <Enumeration Text="Aktiviert" Value="1" Id="%ENID%" />
                 </TypeRestriction>

displayprodLinux/Section.templ.xml

@@ -9,7 +9,7 @@
                     <op:part href="Function.parts.xml" name="FN" instances="10">
                         <op:param name="%ParamOffset%" value="62" increment="20" />
                         <op:param name="%Pl%" value="0" asLetter="true" increment="1" />
-                        <op:param name="%Pn%" value="30" increment="2" digits="3" />
+                        <op:param name="%Pn%" value="50" increment="2" digits="3" />
                         <op:param name="%PPP%" value="100" increment="100" digits="3" />
                         <op:param name="%TRef%" value="26" increment="1" digits="2" />
                     </op:part>
@@ -135,203 +135,203 @@
                             <!-- Standard-KOs (Index 0-28), ID-Suffixe 050-078 -->
                             <!-- 0: Temperatur -->
                             <ComObject Id="%AID%_O-%TT%%CC%050" Name="KoS%CC%000"
-                                Text="Temperatur" Number="0"
+                                Text="Temperatur" Number="%CCC%0"
                                 FunctionText="Bereich %CC%, Temperatur" ObjectSize="2 Bytes"
                                 ReadFlag="Disabled" WriteFlag="Enabled" CommunicationFlag="Enabled"
                                 TransmitFlag="Disabled" UpdateFlag="Enabled"
                                 ReadOnInitFlag="Disabled" />
                             <!-- 1: Luftfeuchtigkeit -->
                             <ComObject Id="%AID%_O-%TT%%CC%051" Name="KoS%CC%001"
-                                Text="Luftfeuchtigkeit" Number="1"
+                                Text="Luftfeuchtigkeit" Number="%CCC%1"
                                 FunctionText="Bereich %CC%, Luftfeuchtigkeit" ObjectSize="2 Bytes"
                                 ReadFlag="Disabled" WriteFlag="Enabled" CommunicationFlag="Enabled"
                                 TransmitFlag="Disabled" UpdateFlag="Enabled"
                                 ReadOnInitFlag="Disabled" />
                             <!-- 2: Präsenz -->
                             <ComObject Id="%AID%_O-%TT%%CC%052" Name="KoS%CC%002"
-                                Text="Präsenz" Number="2"
+                                Text="Präsenz" Number="%CCC%2"
                                 FunctionText="Bereich %CC%, Präsenz" ObjectSize="1 Bit"
                                 ReadFlag="Disabled" WriteFlag="Enabled" CommunicationFlag="Enabled"
                                 TransmitFlag="Disabled" UpdateFlag="Enabled"
                                 ReadOnInitFlag="Disabled" />
                             <!-- 3: Fensterkontakt -->
                             <ComObject Id="%AID%_O-%TT%%CC%053" Name="KoS%CC%003"
-                                Text="Fensterkontakt" Number="3"
+                                Text="Fensterkontakt" Number="%CCC%3"
                                 FunctionText="Bereich %CC%, Fensterkontakt" ObjectSize="1 Bit"
                                 ReadFlag="Disabled" WriteFlag="Enabled" CommunicationFlag="Enabled"
                                 TransmitFlag="Disabled" UpdateFlag="Enabled"
                                 ReadOnInitFlag="Disabled" />
                             <!-- 4: Solltemperatur -->
                             <ComObject Id="%AID%_O-%TT%%CC%054" Name="KoS%CC%004"
-                                Text="Solltemperatur" Number="4"
+                                Text="Solltemperatur" Number="%CCC%4"
                                 FunctionText="Bereich %CC%, Solltemperatur" ObjectSize="2 Bytes"
                                 ReadFlag="Enabled" WriteFlag="Enabled" CommunicationFlag="Enabled"
                                 TransmitFlag="Enabled" UpdateFlag="Enabled"
                                 ReadOnInitFlag="Disabled" />
                             <!-- 5: Heizungsventil -->
                             <ComObject Id="%AID%_O-%TT%%CC%055" Name="KoS%CC%005"
-                                Text="Heizungsventil" Number="5"
+                                Text="Heizungsventil" Number="%CCC%5"
                                 FunctionText="Bereich %CC%, Heizungsventil" ObjectSize="1 Byte"
                                 ReadFlag="Disabled" WriteFlag="Enabled" CommunicationFlag="Enabled"
                                 TransmitFlag="Disabled" UpdateFlag="Enabled"
                                 ReadOnInitFlag="Disabled" />
                             <!-- 6: Steckdose 1 Schalten -->
                             <ComObject Id="%AID%_O-%TT%%CC%056" Name="KoS%CC%006"
-                                Text="Steckdose 1 Schalten" Number="6"
+                                Text="Steckdose 1 Schalten" Number="%CCC%6"
                                 FunctionText="Bereich %CC%, Steckdose 1 Schalten" ObjectSize="1 Bit"
                                 ReadFlag="Enabled" WriteFlag="Enabled" CommunicationFlag="Enabled"
                                 TransmitFlag="Enabled" UpdateFlag="Enabled"
                                 ReadOnInitFlag="Disabled" />
                             <!-- 7: Steckdose 1 Status -->
                             <ComObject Id="%AID%_O-%TT%%CC%057" Name="KoS%CC%007"
-                                Text="Steckdose 1 Status" Number="7"
+                                Text="Steckdose 1 Status" Number="%CCC%7"
                                 FunctionText="Bereich %CC%, Steckdose 1 Status" ObjectSize="1 Bit"
                                 ReadFlag="Disabled" WriteFlag="Enabled" CommunicationFlag="Enabled"
                                 TransmitFlag="Disabled" UpdateFlag="Enabled"
                                 ReadOnInitFlag="Disabled" />
                             <!-- 8: Steckdose 2 Schalten -->
                             <ComObject Id="%AID%_O-%TT%%CC%058" Name="KoS%CC%008"
-                                Text="Steckdose 2 Schalten" Number="8"
+                                Text="Steckdose 2 Schalten" Number="%CCC%8"
                                 FunctionText="Bereich %CC%, Steckdose 2 Schalten" ObjectSize="1 Bit"
                                 ReadFlag="Enabled" WriteFlag="Enabled" CommunicationFlag="Enabled"
                                 TransmitFlag="Enabled" UpdateFlag="Enabled"
                                 ReadOnInitFlag="Disabled" />
                             <!-- 9: Steckdose 2 Status -->
                             <ComObject Id="%AID%_O-%TT%%CC%059" Name="KoS%CC%009"
-                                Text="Steckdose 2 Status" Number="9"
+                                Text="Steckdose 2 Status" Number="%CCC%9"
                                 FunctionText="Bereich %CC%, Steckdose 2 Status" ObjectSize="1 Bit"
                                 ReadFlag="Disabled" WriteFlag="Enabled" CommunicationFlag="Enabled"
                                 TransmitFlag="Disabled" UpdateFlag="Enabled"
                                 ReadOnInitFlag="Disabled" />
                             <!-- 10: Licht 1 Schalten -->
                             <ComObject Id="%AID%_O-%TT%%CC%060" Name="KoS%CC%010"
-                                Text="Licht 1 Schalten" Number="10"
+                                Text="Licht 1 Schalten" Number="%CCC%10"
                                 FunctionText="Bereich %CC%, Licht 1 Schalten" ObjectSize="1 Bit"
                                 ReadFlag="Enabled" WriteFlag="Enabled" CommunicationFlag="Enabled"
                                 TransmitFlag="Enabled" UpdateFlag="Enabled"
                                 ReadOnInitFlag="Disabled" />
                             <!-- 11: Licht 1 Status -->
                             <ComObject Id="%AID%_O-%TT%%CC%061" Name="KoS%CC%011"
-                                Text="Licht 1 Status" Number="11"
+                                Text="Licht 1 Status" Number="%CCC%11"
                                 FunctionText="Bereich %CC%, Licht 1 Status" ObjectSize="1 Bit"
                                 ReadFlag="Disabled" WriteFlag="Enabled" CommunicationFlag="Enabled"
                                 TransmitFlag="Disabled" UpdateFlag="Enabled"
                                 ReadOnInitFlag="Disabled" />
                             <!-- 12: Licht 2 Schalten -->
                             <ComObject Id="%AID%_O-%TT%%CC%062" Name="KoS%CC%012"
-                                Text="Licht 2 Schalten" Number="12"
+                                Text="Licht 2 Schalten" Number="%CCC%12"
                                 FunctionText="Bereich %CC%, Licht 2 Schalten" ObjectSize="1 Bit"
                                 ReadFlag="Enabled" WriteFlag="Enabled" CommunicationFlag="Enabled"
                                 TransmitFlag="Enabled" UpdateFlag="Enabled"
                                 ReadOnInitFlag="Disabled" />
                             <!-- 13: Licht 2 Status -->
                             <ComObject Id="%AID%_O-%TT%%CC%063" Name="KoS%CC%013"
-                                Text="Licht 2 Status" Number="13"
+                                Text="Licht 2 Status" Number="%CCC%13"
                                 FunctionText="Bereich %CC%, Licht 2 Status" ObjectSize="1 Bit"
                                 ReadFlag="Disabled" WriteFlag="Enabled" CommunicationFlag="Enabled"
                                 TransmitFlag="Disabled" UpdateFlag="Enabled"
                                 ReadOnInitFlag="Disabled" />
                             <!-- 14: Dimmen 1 Schalten -->
                             <ComObject Id="%AID%_O-%TT%%CC%064" Name="KoS%CC%014"
-                                Text="Dimmen 1 Schalten" Number="14"
+                                Text="Dimmen 1 Schalten" Number="%CCC%14"
                                 FunctionText="Bereich %CC%, Dimmen 1 Schalten" ObjectSize="1 Bit"
                                 ReadFlag="Enabled" WriteFlag="Enabled" CommunicationFlag="Enabled"
                                 TransmitFlag="Enabled" UpdateFlag="Enabled"
                                 ReadOnInitFlag="Disabled" />
                             <!-- 15: Dimmen 1 Wert -->
                             <ComObject Id="%AID%_O-%TT%%CC%065" Name="KoS%CC%015"
-                                Text="Dimmen 1 Wert" Number="15"
+                                Text="Dimmen 1 Wert" Number="%CCC%15"
                                 FunctionText="Bereich %CC%, Dimmen 1 Wert" ObjectSize="1 Byte"
                                 ReadFlag="Enabled" WriteFlag="Enabled" CommunicationFlag="Enabled"
                                 TransmitFlag="Enabled" UpdateFlag="Enabled"
                                 ReadOnInitFlag="Disabled" />
                             <!-- 16: Dimmen 1 Status -->
                             <ComObject Id="%AID%_O-%TT%%CC%066" Name="KoS%CC%016"
-                                Text="Dimmen 1 Status" Number="16"
+                                Text="Dimmen 1 Status" Number="%CCC%16"
                                 FunctionText="Bereich %CC%, Dimmen 1 Status" ObjectSize="1 Byte"
                                 ReadFlag="Disabled" WriteFlag="Enabled" CommunicationFlag="Enabled"
                                 TransmitFlag="Disabled" UpdateFlag="Enabled"
                                 ReadOnInitFlag="Disabled" />
                             <!-- 17: Dimmen 2 Schalten -->
                             <ComObject Id="%AID%_O-%TT%%CC%067" Name="KoS%CC%017"
-                                Text="Dimmen 2 Schalten" Number="17"
+                                Text="Dimmen 2 Schalten" Number="%CCC%17"
                                 FunctionText="Bereich %CC%, Dimmen 2 Schalten" ObjectSize="1 Bit"
                                 ReadFlag="Enabled" WriteFlag="Enabled" CommunicationFlag="Enabled"
                                 TransmitFlag="Enabled" UpdateFlag="Enabled"
                                 ReadOnInitFlag="Disabled" />
                             <!-- 18: Dimmen 2 Wert -->
                             <ComObject Id="%AID%_O-%TT%%CC%068" Name="KoS%CC%018"
-                                Text="Dimmen 2 Wert" Number="18"
+                                Text="Dimmen 2 Wert" Number="%CCC%18"
                                 FunctionText="Bereich %CC%, Dimmen 2 Wert" ObjectSize="1 Byte"
                                 ReadFlag="Enabled" WriteFlag="Enabled" CommunicationFlag="Enabled"
                                 TransmitFlag="Enabled" UpdateFlag="Enabled"
                                 ReadOnInitFlag="Disabled" />
                             <!-- 19: Dimmen 2 Status -->
                             <ComObject Id="%AID%_O-%TT%%CC%069" Name="KoS%CC%019"
-                                Text="Dimmen 2 Status" Number="19"
+                                Text="Dimmen 2 Status" Number="%CCC%19"
                                 FunctionText="Bereich %CC%, Dimmen 2 Status" ObjectSize="1 Byte"
                                 ReadFlag="Disabled" WriteFlag="Enabled" CommunicationFlag="Enabled"
                                 TransmitFlag="Disabled" UpdateFlag="Enabled"
                                 ReadOnInitFlag="Disabled" />
                             <!-- 20: Jalousie 1 Auf/Ab -->
                             <ComObject Id="%AID%_O-%TT%%CC%070" Name="KoS%CC%020"
-                                Text="Jalousie 1 Auf/Ab" Number="20"
+                                Text="Jalousie 1 Auf/Ab" Number="%CCC%20"
                                 FunctionText="Bereich %CC%, Jalousie 1 Auf/Ab" ObjectSize="1 Bit"
                                 ReadFlag="Enabled" WriteFlag="Enabled" CommunicationFlag="Enabled"
                                 TransmitFlag="Enabled" UpdateFlag="Enabled"
                                 ReadOnInitFlag="Disabled" />
                             <!-- 21: Jalousie 1 Position -->
                             <ComObject Id="%AID%_O-%TT%%CC%071" Name="KoS%CC%021"
-                                Text="Jalousie 1 Position" Number="21"
+                                Text="Jalousie 1 Position" Number="%CCC%21"
                                 FunctionText="Bereich %CC%, Jalousie 1 Position" ObjectSize="1 Byte"
                                 ReadFlag="Enabled" WriteFlag="Enabled" CommunicationFlag="Enabled"
                                 TransmitFlag="Enabled" UpdateFlag="Enabled"
                                 ReadOnInitFlag="Disabled" />
                             <!-- 22: Jalousie 1 Pos. Status -->
                             <ComObject Id="%AID%_O-%TT%%CC%072" Name="KoS%CC%022"
-                                Text="Jalousie 1 Pos. Status" Number="22"
+                                Text="Jalousie 1 Pos. Status" Number="%CCC%22"
                                 FunctionText="Bereich %CC%, Jalousie 1 Pos. Status" ObjectSize="1 Byte"
                                 ReadFlag="Disabled" WriteFlag="Enabled" CommunicationFlag="Enabled"
                                 TransmitFlag="Disabled" UpdateFlag="Enabled"
                                 ReadOnInitFlag="Disabled" />
                             <!-- 23: Jalousie 2 Auf/Ab -->
                             <ComObject Id="%AID%_O-%TT%%CC%073" Name="KoS%CC%023"
-                                Text="Jalousie 2 Auf/Ab" Number="23"
+                                Text="Jalousie 2 Auf/Ab" Number="%CCC%23"
                                 FunctionText="Bereich %CC%, Jalousie 2 Auf/Ab" ObjectSize="1 Bit"
                                 ReadFlag="Enabled" WriteFlag="Enabled" CommunicationFlag="Enabled"
                                 TransmitFlag="Enabled" UpdateFlag="Enabled"
                                 ReadOnInitFlag="Disabled" />
                             <!-- 24: Jalousie 2 Position -->
                             <ComObject Id="%AID%_O-%TT%%CC%074" Name="KoS%CC%024"
-                                Text="Jalousie 2 Position" Number="24"
+                                Text="Jalousie 2 Position" Number="%CCC%24"
                                 FunctionText="Bereich %CC%, Jalousie 2 Position" ObjectSize="1 Byte"
                                 ReadFlag="Enabled" WriteFlag="Enabled" CommunicationFlag="Enabled"
                                 TransmitFlag="Enabled" UpdateFlag="Enabled"
                                 ReadOnInitFlag="Disabled" />
                             <!-- 25: Jalousie 2 Pos. Status -->
                             <ComObject Id="%AID%_O-%TT%%CC%075" Name="KoS%CC%025"
-                                Text="Jalousie 2 Pos. Status" Number="25"
+                                Text="Jalousie 2 Pos. Status" Number="%CCC%25"
                                 FunctionText="Bereich %CC%, Jalousie 2 Pos. Status" ObjectSize="1 Byte"
                                 ReadFlag="Disabled" WriteFlag="Enabled" CommunicationFlag="Enabled"
                                 TransmitFlag="Disabled" UpdateFlag="Enabled"
                                 ReadOnInitFlag="Disabled" />
                             <!-- 26: CO2 -->
                             <ComObject Id="%AID%_O-%TT%%CC%076" Name="KoS%CC%026"
-                                Text="CO2" Number="26"
+                                Text="CO2" Number="%CCC%26"
                                 FunctionText="Bereich %CC%, CO2" ObjectSize="2 Bytes"
                                 ReadFlag="Disabled" WriteFlag="Enabled" CommunicationFlag="Enabled"
                                 TransmitFlag="Disabled" UpdateFlag="Enabled"
                                 ReadOnInitFlag="Disabled" />
                             <!-- 27: Helligkeit -->
                             <ComObject Id="%AID%_O-%TT%%CC%077" Name="KoS%CC%027"
-                                Text="Helligkeit" Number="27"
+                                Text="Helligkeit" Number="%CCC%27"
                                 FunctionText="Bereich %CC%, Helligkeit" ObjectSize="2 Bytes"
                                 ReadFlag="Disabled" WriteFlag="Enabled" CommunicationFlag="Enabled"
                                 TransmitFlag="Disabled" UpdateFlag="Enabled"
                                 ReadOnInitFlag="Disabled" />
                             <!-- 28: Szene -->
                             <ComObject Id="%AID%_O-%TT%%CC%078" Name="KoS%CC%028"
-                                Text="Szene" Number="28"
+                                Text="Szene" Number="%CCC%28"
                                 FunctionText="Bereich %CC%, Szene" ObjectSize="1 Byte"
                                 ReadFlag="Enabled" WriteFlag="Enabled" CommunicationFlag="Enabled"
                                 TransmitFlag="Enabled" UpdateFlag="Enabled"

displayprodLinux/SmartHomeDisplay.h

@@ -13,8 +13,8 @@
 #define MAIN_ApplicationNumber 206
 #define MAIN_ApplicationVersion 4
 #define MAIN_ApplicationEncoding iso-8859-15
-#define MAIN_ParameterSize 2
+#define MAIN_ParameterSize 4861
-#define MAIN_MaxKoNumber 1020
+#define MAIN_MaxKoNumber 20069
 #define MAIN_OrderNumber "IA4313"
 // Parameter with single occurrence
 
@@ -24,54 +24,139 @@
 // Anzahl Bereiche
 #define ParamSC_Section_Count                       (knx.paramByte(SC_Section_Count))
 
-#define SC_ChannelCount 1
+#define SC_ChannelCount 20
 
 // Parameter per channel
 #define SC_ParamBlockOffset 1
-#define SC_ParamBlockSize 1
+#define SC_ParamBlockSize 243
 #define SC_ParamCalcIndex(index) (index + SC_ParamBlockOffset + _channelIndex * SC_ParamBlockSize)
 
-#define SC_fAFunctionType                       0      // 1 Bit, Bit 7
+#define SC_pChkTemperatur                      59      // 1 Bit, Bit 7
+#define     SC_pChkTemperaturMask 0x80
+#define     SC_pChkTemperaturShift 7
+#define SC_pChkLuftfeuchtigkeit                59      // 1 Bit, Bit 6
+#define     SC_pChkLuftfeuchtigkeitMask 0x40
+#define     SC_pChkLuftfeuchtigkeitShift 6
+#define SC_pChkPraesenz                        59      // 1 Bit, Bit 5
+#define     SC_pChkPraesenzMask 0x20
+#define     SC_pChkPraesenzShift 5
+#define SC_pChkFensterkontakt                  59      // 1 Bit, Bit 4
+#define     SC_pChkFensterkontaktMask 0x10
+#define     SC_pChkFensterkontaktShift 4
+#define SC_pChkSolltemperatur                  59      // 1 Bit, Bit 3
+#define     SC_pChkSolltemperaturMask 0x08
+#define     SC_pChkSolltemperaturShift 3
+#define SC_pChkHeizungsventil                  59      // 1 Bit, Bit 2
+#define     SC_pChkHeizungsventilMask 0x04
+#define     SC_pChkHeizungsventilShift 2
+#define SC_pChkSteckdose1                      59      // 1 Bit, Bit 1
+#define     SC_pChkSteckdose1Mask 0x02
+#define     SC_pChkSteckdose1Shift 1
+#define SC_pChkSteckdose2                      59      // 1 Bit, Bit 0
+#define     SC_pChkSteckdose2Mask 0x01
+#define     SC_pChkSteckdose2Shift 0
+#define SC_pChkLicht1                          60      // 1 Bit, Bit 7
+#define     SC_pChkLicht1Mask 0x80
+#define     SC_pChkLicht1Shift 7
+#define SC_pChkLicht2                          60      // 1 Bit, Bit 6
+#define     SC_pChkLicht2Mask 0x40
+#define     SC_pChkLicht2Shift 6
+#define SC_pChkDimmen1                         60      // 1 Bit, Bit 5
+#define     SC_pChkDimmen1Mask 0x20
+#define     SC_pChkDimmen1Shift 5
+#define SC_pChkDimmen2                         60      // 1 Bit, Bit 4
+#define     SC_pChkDimmen2Mask 0x10
+#define     SC_pChkDimmen2Shift 4
+#define SC_pChkJalousie1                       60      // 1 Bit, Bit 3
+#define     SC_pChkJalousie1Mask 0x08
+#define     SC_pChkJalousie1Shift 3
+#define SC_pChkJalousie2                       60      // 1 Bit, Bit 2
+#define     SC_pChkJalousie2Mask 0x04
+#define     SC_pChkJalousie2Shift 2
+#define SC_pChkCO2                             60      // 1 Bit, Bit 1
+#define     SC_pChkCO2Mask 0x02
+#define     SC_pChkCO2Shift 1
+#define SC_pChkHelligkeit                      60      // 1 Bit, Bit 0
+#define     SC_pChkHelligkeitMask 0x01
+#define     SC_pChkHelligkeitShift 0
+#define SC_pChkSzene                           61      // 1 Bit, Bit 7
+#define     SC_pChkSzeneMask 0x80
+#define     SC_pChkSzeneShift 7
+#define SC_fAFunctionType                      62      // 1 Bit, Bit 7
 #define     SC_fAFunctionTypeMask 0x80
 #define     SC_fAFunctionTypeShift 7
-#define SC_fAOOnKODpt                           1      // 8 Bits, Bit 7-0
+#define SC_fAOOnKODpt                          63      // 8 Bits, Bit 7-0
-#define SC_fBFunctionType                       0      // 1 Bit, Bit 7
+#define SC_fBFunctionType                      82      // 1 Bit, Bit 7
 #define     SC_fBFunctionTypeMask 0x80
 #define     SC_fBFunctionTypeShift 7
-#define SC_fBOOnKODpt                           1      // 8 Bits, Bit 7-0
+#define SC_fBOOnKODpt                          83      // 8 Bits, Bit 7-0
-#define SC_fCFunctionType                       0      // 1 Bit, Bit 7
+#define SC_fCFunctionType                      102      // 1 Bit, Bit 7
 #define     SC_fCFunctionTypeMask 0x80
 #define     SC_fCFunctionTypeShift 7
-#define SC_fCOOnKODpt                           1      // 8 Bits, Bit 7-0
+#define SC_fCOOnKODpt                          103      // 8 Bits, Bit 7-0
-#define SC_fDFunctionType                       0      // 1 Bit, Bit 7
+#define SC_fDFunctionType                      122      // 1 Bit, Bit 7
 #define     SC_fDFunctionTypeMask 0x80
 #define     SC_fDFunctionTypeShift 7
-#define SC_fDOOnKODpt                           1      // 8 Bits, Bit 7-0
+#define SC_fDOOnKODpt                          123      // 8 Bits, Bit 7-0
-#define SC_fEFunctionType                       0      // 1 Bit, Bit 7
+#define SC_fEFunctionType                      142      // 1 Bit, Bit 7
 #define     SC_fEFunctionTypeMask 0x80
 #define     SC_fEFunctionTypeShift 7
-#define SC_fEOOnKODpt                           1      // 8 Bits, Bit 7-0
+#define SC_fEOOnKODpt                          143      // 8 Bits, Bit 7-0
-#define SC_fFFunctionType                       0      // 1 Bit, Bit 7
+#define SC_fFFunctionType                      162      // 1 Bit, Bit 7
 #define     SC_fFFunctionTypeMask 0x80
 #define     SC_fFFunctionTypeShift 7
-#define SC_fFOOnKODpt                           1      // 8 Bits, Bit 7-0
+#define SC_fFOOnKODpt                          163      // 8 Bits, Bit 7-0
-#define SC_fGFunctionType                       0      // 1 Bit, Bit 7
+#define SC_fGFunctionType                      182      // 1 Bit, Bit 7
 #define     SC_fGFunctionTypeMask 0x80
 #define     SC_fGFunctionTypeShift 7
-#define SC_fGOOnKODpt                           1      // 8 Bits, Bit 7-0
+#define SC_fGOOnKODpt                          183      // 8 Bits, Bit 7-0
-#define SC_fHFunctionType                       0      // 1 Bit, Bit 7
+#define SC_fHFunctionType                      202      // 1 Bit, Bit 7
 #define     SC_fHFunctionTypeMask 0x80
 #define     SC_fHFunctionTypeShift 7
-#define SC_fHOOnKODpt                           1      // 8 Bits, Bit 7-0
+#define SC_fHOOnKODpt                          203      // 8 Bits, Bit 7-0
-#define SC_fIFunctionType                       0      // 1 Bit, Bit 7
+#define SC_fIFunctionType                      222      // 1 Bit, Bit 7
 #define     SC_fIFunctionTypeMask 0x80
 #define     SC_fIFunctionTypeShift 7
-#define SC_fIOOnKODpt                           1      // 8 Bits, Bit 7-0
+#define SC_fIOOnKODpt                          223      // 8 Bits, Bit 7-0
-#define SC_fJFunctionType                       0      // 1 Bit, Bit 7
+#define SC_fJFunctionType                      242      // 1 Bit, Bit 7
 #define     SC_fJFunctionTypeMask 0x80
 #define     SC_fJFunctionTypeShift 7
-#define SC_fJOOnKODpt                           1      // 8 Bits, Bit 7-0
+#define SC_fJOOnKODpt                          243      // 8 Bits, Bit 7-0
 
+// Temperatur
+#define ParamSC_pChkTemperatur                      ((bool)(knx.paramByte(SC_ParamCalcIndex(SC_pChkTemperatur)) & SC_pChkTemperaturMask))
+// Luftfeuchtigkeit
+#define ParamSC_pChkLuftfeuchtigkeit                ((bool)(knx.paramByte(SC_ParamCalcIndex(SC_pChkLuftfeuchtigkeit)) & SC_pChkLuftfeuchtigkeitMask))
+// Präsenz
+#define ParamSC_pChkPraesenz                        ((bool)(knx.paramByte(SC_ParamCalcIndex(SC_pChkPraesenz)) & SC_pChkPraesenzMask))
+// Fensterkontakt
+#define ParamSC_pChkFensterkontakt                  ((bool)(knx.paramByte(SC_ParamCalcIndex(SC_pChkFensterkontakt)) & SC_pChkFensterkontaktMask))
+// Solltemperatur
+#define ParamSC_pChkSolltemperatur                  ((bool)(knx.paramByte(SC_ParamCalcIndex(SC_pChkSolltemperatur)) & SC_pChkSolltemperaturMask))
+// Heizungsventil
+#define ParamSC_pChkHeizungsventil                  ((bool)(knx.paramByte(SC_ParamCalcIndex(SC_pChkHeizungsventil)) & SC_pChkHeizungsventilMask))
+// Steckdose 1
+#define ParamSC_pChkSteckdose1                      ((bool)(knx.paramByte(SC_ParamCalcIndex(SC_pChkSteckdose1)) & SC_pChkSteckdose1Mask))
+// Steckdose 2
+#define ParamSC_pChkSteckdose2                      ((bool)(knx.paramByte(SC_ParamCalcIndex(SC_pChkSteckdose2)) & SC_pChkSteckdose2Mask))
+// Licht 1
+#define ParamSC_pChkLicht1                          ((bool)(knx.paramByte(SC_ParamCalcIndex(SC_pChkLicht1)) & SC_pChkLicht1Mask))
+// Licht 2
+#define ParamSC_pChkLicht2                          ((bool)(knx.paramByte(SC_ParamCalcIndex(SC_pChkLicht2)) & SC_pChkLicht2Mask))
+// Dimmen 1
+#define ParamSC_pChkDimmen1                         ((bool)(knx.paramByte(SC_ParamCalcIndex(SC_pChkDimmen1)) & SC_pChkDimmen1Mask))
+// Dimmen 2
+#define ParamSC_pChkDimmen2                         ((bool)(knx.paramByte(SC_ParamCalcIndex(SC_pChkDimmen2)) & SC_pChkDimmen2Mask))
+// Jalousie 1
+#define ParamSC_pChkJalousie1                       ((bool)(knx.paramByte(SC_ParamCalcIndex(SC_pChkJalousie1)) & SC_pChkJalousie1Mask))
+// Jalousie 2
+#define ParamSC_pChkJalousie2                       ((bool)(knx.paramByte(SC_ParamCalcIndex(SC_pChkJalousie2)) & SC_pChkJalousie2Mask))
+// CO2
+#define ParamSC_pChkCO2                             ((bool)(knx.paramByte(SC_ParamCalcIndex(SC_pChkCO2)) & SC_pChkCO2Mask))
+// Helligkeit
+#define ParamSC_pChkHelligkeit                      ((bool)(knx.paramByte(SC_ParamCalcIndex(SC_pChkHelligkeit)) & SC_pChkHelligkeitMask))
+// Szene
+#define ParamSC_pChkSzene                           ((bool)(knx.paramByte(SC_ParamCalcIndex(SC_pChkSzene)) & SC_pChkSzeneMask))
 // Funktionstyp
 #define ParamSC_fAFunctionType                      ((bool)(knx.paramByte(SC_ParamCalcIndex(SC_fAFunctionType)) & SC_fAFunctionTypeMask))
 //     DPT des Kommunikationsobjekts
@@ -114,76 +199,163 @@
 #define ParamSC_fJOOnKODpt                          (knx.paramByte(SC_ParamCalcIndex(SC_fJOOnKODpt)))
 
 // deprecated
-#define SC_KoOffset 20
+#define SC_KoOffset 10
 
 // Communication objects per channel (multiple occurrence)
-#define SC_KoBlockOffset 20
+#define SC_KoBlockOffset 10
-#define SC_KoBlockSize 20
+#define SC_KoBlockSize 49
 
 #define SC_KoCalcNumber(index) (index + SC_KoBlockOffset + _channelIndex * SC_KoBlockSize)
 #define SC_KoCalcIndex(number) ((number >= SC_KoCalcNumber(0) && number < SC_KoCalcNumber(SC_KoBlockSize)) ? (number - SC_KoBlockOffset) % SC_KoBlockSize : -1)
 #define SC_KoCalcChannel(number) ((number >= SC_KoBlockOffset && number < SC_KoBlockOffset + SC_ChannelCount * SC_KoBlockSize) ? (number - SC_KoBlockOffset) / SC_KoBlockSize : -1)
 
-#define SC_KoKOf-%TT%%CC%100__ %CC%001
+#define SC_KoKoS%CC%000 %CCC%0
-#define SC_KoKOf-%TT%%CC%101__ %CC%002
+#define SC_KoKoS%CC%001 %CCC%1
-#define SC_KoKOf-%TT%%CC%200__ %CC%003
+#define SC_KoKoS%CC%002 %CCC%2
-#define SC_KoKOf-%TT%%CC%201__ %CC%004
+#define SC_KoKoS%CC%003 %CCC%3
-#define SC_KoKOf-%TT%%CC%300__ %CC%005
+#define SC_KoKoS%CC%004 %CCC%4
-#define SC_KoKOf-%TT%%CC%301__ %CC%006
+#define SC_KoKoS%CC%005 %CCC%5
-#define SC_KoKOf-%TT%%CC%400__ %CC%007
+#define SC_KoKoS%CC%006 %CCC%6
-#define SC_KoKOf-%TT%%CC%401__ %CC%008
+#define SC_KoKoS%CC%007 %CCC%7
-#define SC_KoKOf-%TT%%CC%500__ %CC%009
+#define SC_KoKoS%CC%008 %CCC%8
-#define SC_KoKOf-%TT%%CC%501__ %CC%010
+#define SC_KoKoS%CC%009 %CCC%9
-#define SC_KoKOf-%TT%%CC%600__ %CC%011
+#define SC_KoKoS%CC%010 %CCC%10
-#define SC_KoKOf-%TT%%CC%601__ %CC%012
+#define SC_KoKoS%CC%011 %CCC%11
-#define SC_KoKOf-%TT%%CC%700__ %CC%013
+#define SC_KoKoS%CC%012 %CCC%12
-#define SC_KoKOf-%TT%%CC%701__ %CC%014
+#define SC_KoKoS%CC%013 %CCC%13
-#define SC_KoKOf-%TT%%CC%800__ %CC%015
+#define SC_KoKoS%CC%014 %CCC%14
-#define SC_KoKOf-%TT%%CC%801__ %CC%016
+#define SC_KoKoS%CC%015 %CCC%15
-#define SC_KoKOf-%TT%%CC%900__ %CC%017
+#define SC_KoKoS%CC%016 %CCC%16
-#define SC_KoKOf-%TT%%CC%901__ %CC%018
+#define SC_KoKoS%CC%017 %CCC%17
-#define SC_KoKOf-%TT%%CC%1000__ %CC%019
+#define SC_KoKoS%CC%018 %CCC%18
-#define SC_KoKOf-%TT%%CC%1001__ %CC%020
+#define SC_KoKoS%CC%019 %CCC%19
+#define SC_KoKoS%CC%020 %CCC%20
+#define SC_KoKoS%CC%021 %CCC%21
+#define SC_KoKoS%CC%022 %CCC%22
+#define SC_KoKoS%CC%023 %CCC%23
+#define SC_KoKoS%CC%024 %CCC%24
+#define SC_KoKoS%CC%025 %CCC%25
+#define SC_KoKoS%CC%026 %CCC%26
+#define SC_KoKoS%CC%027 %CCC%27
+#define SC_KoKoS%CC%028 %CCC%28
+#define SC_KoKOf-%TT%%CC%100__ %C%050
+#define SC_KoKOf-%TT%%CC%101__ %C%051
+#define SC_KoKOf-%TT%%CC%200__ %C%052
+#define SC_KoKOf-%TT%%CC%201__ %C%053
+#define SC_KoKOf-%TT%%CC%300__ %C%054
+#define SC_KoKOf-%TT%%CC%301__ %C%055
+#define SC_KoKOf-%TT%%CC%400__ %C%056
+#define SC_KoKOf-%TT%%CC%401__ %C%057
+#define SC_KoKOf-%TT%%CC%500__ %C%058
+#define SC_KoKOf-%TT%%CC%501__ %C%059
+#define SC_KoKOf-%TT%%CC%600__ %C%060
+#define SC_KoKOf-%TT%%CC%601__ %C%061
+#define SC_KoKOf-%TT%%CC%700__ %C%062
+#define SC_KoKOf-%TT%%CC%701__ %C%063
+#define SC_KoKOf-%TT%%CC%800__ %C%064
+#define SC_KoKOf-%TT%%CC%801__ %C%065
+#define SC_KoKOf-%TT%%CC%900__ %C%066
+#define SC_KoKOf-%TT%%CC%901__ %C%067
+#define SC_KoKOf-%TT%%CC%1000__ %C%068
+#define SC_KoKOf-%TT%%CC%1001__ %C%069
 
-// Eingang %CC%001
+// Temperatur
+#define KoSC_KoS%CC%000                          (knx.getGroupObject(SC_KoCalcNumber(SC_KoKoS%CC%000)))
+// Luftfeuchtigkeit
+#define KoSC_KoS%CC%001                          (knx.getGroupObject(SC_KoCalcNumber(SC_KoKoS%CC%001)))
+// Präsenz
+#define KoSC_KoS%CC%002                          (knx.getGroupObject(SC_KoCalcNumber(SC_KoKoS%CC%002)))
+// Fensterkontakt
+#define KoSC_KoS%CC%003                          (knx.getGroupObject(SC_KoCalcNumber(SC_KoKoS%CC%003)))
+// Solltemperatur
+#define KoSC_KoS%CC%004                          (knx.getGroupObject(SC_KoCalcNumber(SC_KoKoS%CC%004)))
+// Heizungsventil
+#define KoSC_KoS%CC%005                          (knx.getGroupObject(SC_KoCalcNumber(SC_KoKoS%CC%005)))
+// Steckdose 1 Schalten
+#define KoSC_KoS%CC%006                          (knx.getGroupObject(SC_KoCalcNumber(SC_KoKoS%CC%006)))
+// Steckdose 1 Status
+#define KoSC_KoS%CC%007                          (knx.getGroupObject(SC_KoCalcNumber(SC_KoKoS%CC%007)))
+// Steckdose 2 Schalten
+#define KoSC_KoS%CC%008                          (knx.getGroupObject(SC_KoCalcNumber(SC_KoKoS%CC%008)))
+// Steckdose 2 Status
+#define KoSC_KoS%CC%009                          (knx.getGroupObject(SC_KoCalcNumber(SC_KoKoS%CC%009)))
+// Licht 1 Schalten
+#define KoSC_KoS%CC%010                          (knx.getGroupObject(SC_KoCalcNumber(SC_KoKoS%CC%010)))
+// Licht 1 Status
+#define KoSC_KoS%CC%011                          (knx.getGroupObject(SC_KoCalcNumber(SC_KoKoS%CC%011)))
+// Licht 2 Schalten
+#define KoSC_KoS%CC%012                          (knx.getGroupObject(SC_KoCalcNumber(SC_KoKoS%CC%012)))
+// Licht 2 Status
+#define KoSC_KoS%CC%013                          (knx.getGroupObject(SC_KoCalcNumber(SC_KoKoS%CC%013)))
+// Dimmen 1 Schalten
+#define KoSC_KoS%CC%014                          (knx.getGroupObject(SC_KoCalcNumber(SC_KoKoS%CC%014)))
+// Dimmen 1 Wert
+#define KoSC_KoS%CC%015                          (knx.getGroupObject(SC_KoCalcNumber(SC_KoKoS%CC%015)))
+// Dimmen 1 Status
+#define KoSC_KoS%CC%016                          (knx.getGroupObject(SC_KoCalcNumber(SC_KoKoS%CC%016)))
+// Dimmen 2 Schalten
+#define KoSC_KoS%CC%017                          (knx.getGroupObject(SC_KoCalcNumber(SC_KoKoS%CC%017)))
+// Dimmen 2 Wert
+#define KoSC_KoS%CC%018                          (knx.getGroupObject(SC_KoCalcNumber(SC_KoKoS%CC%018)))
+// Dimmen 2 Status
+#define KoSC_KoS%CC%019                          (knx.getGroupObject(SC_KoCalcNumber(SC_KoKoS%CC%019)))
+// Jalousie 1 Auf/Ab
+#define KoSC_KoS%CC%020                          (knx.getGroupObject(SC_KoCalcNumber(SC_KoKoS%CC%020)))
+// Jalousie 1 Position
+#define KoSC_KoS%CC%021                          (knx.getGroupObject(SC_KoCalcNumber(SC_KoKoS%CC%021)))
+// Jalousie 1 Pos. Status
+#define KoSC_KoS%CC%022                          (knx.getGroupObject(SC_KoCalcNumber(SC_KoKoS%CC%022)))
+// Jalousie 2 Auf/Ab
+#define KoSC_KoS%CC%023                          (knx.getGroupObject(SC_KoCalcNumber(SC_KoKoS%CC%023)))
+// Jalousie 2 Position
+#define KoSC_KoS%CC%024                          (knx.getGroupObject(SC_KoCalcNumber(SC_KoKoS%CC%024)))
+// Jalousie 2 Pos. Status
+#define KoSC_KoS%CC%025                          (knx.getGroupObject(SC_KoCalcNumber(SC_KoKoS%CC%025)))
+// CO2
+#define KoSC_KoS%CC%026                          (knx.getGroupObject(SC_KoCalcNumber(SC_KoKoS%CC%026)))
+// Helligkeit
+#define KoSC_KoS%CC%027                          (knx.getGroupObject(SC_KoCalcNumber(SC_KoKoS%CC%027)))
+// Szene
+#define KoSC_KoS%CC%028                          (knx.getGroupObject(SC_KoCalcNumber(SC_KoKoS%CC%028)))
+// Eingang %CC%050
 #define KoSC_KOf-%TT%%CC%100__                   (knx.getGroupObject(SC_KoCalcNumber(SC_KoKOf-%TT%%CC%100__)))
-// Ausgang %CC%002
+// Ausgang %CC%051
 #define KoSC_KOf-%TT%%CC%101__                   (knx.getGroupObject(SC_KoCalcNumber(SC_KoKOf-%TT%%CC%101__)))
-// Eingang %CC%003
+// Eingang %CC%052
 #define KoSC_KOf-%TT%%CC%200__                   (knx.getGroupObject(SC_KoCalcNumber(SC_KoKOf-%TT%%CC%200__)))
-// Ausgang %CC%004
+// Ausgang %CC%053
 #define KoSC_KOf-%TT%%CC%201__                   (knx.getGroupObject(SC_KoCalcNumber(SC_KoKOf-%TT%%CC%201__)))
-// Eingang %CC%005
+// Eingang %CC%054
 #define KoSC_KOf-%TT%%CC%300__                   (knx.getGroupObject(SC_KoCalcNumber(SC_KoKOf-%TT%%CC%300__)))
-// Ausgang %CC%006
+// Ausgang %CC%055
 #define KoSC_KOf-%TT%%CC%301__                   (knx.getGroupObject(SC_KoCalcNumber(SC_KoKOf-%TT%%CC%301__)))
-// Eingang %CC%007
+// Eingang %CC%056
 #define KoSC_KOf-%TT%%CC%400__                   (knx.getGroupObject(SC_KoCalcNumber(SC_KoKOf-%TT%%CC%400__)))
-// Ausgang %CC%008
+// Ausgang %CC%057
 #define KoSC_KOf-%TT%%CC%401__                   (knx.getGroupObject(SC_KoCalcNumber(SC_KoKOf-%TT%%CC%401__)))
-// Eingang %CC%009
+// Eingang %CC%058
 #define KoSC_KOf-%TT%%CC%500__                   (knx.getGroupObject(SC_KoCalcNumber(SC_KoKOf-%TT%%CC%500__)))
-// Ausgang %CC%010
+// Ausgang %CC%059
 #define KoSC_KOf-%TT%%CC%501__                   (knx.getGroupObject(SC_KoCalcNumber(SC_KoKOf-%TT%%CC%501__)))
-// Eingang %CC%011
+// Eingang %CC%060
 #define KoSC_KOf-%TT%%CC%600__                   (knx.getGroupObject(SC_KoCalcNumber(SC_KoKOf-%TT%%CC%600__)))
-// Ausgang %CC%012
+// Ausgang %CC%061
 #define KoSC_KOf-%TT%%CC%601__                   (knx.getGroupObject(SC_KoCalcNumber(SC_KoKOf-%TT%%CC%601__)))
-// Eingang %CC%013
+// Eingang %CC%062
 #define KoSC_KOf-%TT%%CC%700__                   (knx.getGroupObject(SC_KoCalcNumber(SC_KoKOf-%TT%%CC%700__)))
-// Ausgang %CC%014
+// Ausgang %CC%063
 #define KoSC_KOf-%TT%%CC%701__                   (knx.getGroupObject(SC_KoCalcNumber(SC_KoKOf-%TT%%CC%701__)))
-// Eingang %CC%015
+// Eingang %CC%064
 #define KoSC_KOf-%TT%%CC%800__                   (knx.getGroupObject(SC_KoCalcNumber(SC_KoKOf-%TT%%CC%800__)))
-// Ausgang %CC%016
+// Ausgang %CC%065
 #define KoSC_KOf-%TT%%CC%801__                   (knx.getGroupObject(SC_KoCalcNumber(SC_KoKOf-%TT%%CC%801__)))
-// Eingang %CC%017
+// Eingang %CC%066
 #define KoSC_KOf-%TT%%CC%900__                   (knx.getGroupObject(SC_KoCalcNumber(SC_KoKOf-%TT%%CC%900__)))
-// Ausgang %CC%018
+// Ausgang %CC%067
 #define KoSC_KOf-%TT%%CC%901__                   (knx.getGroupObject(SC_KoCalcNumber(SC_KoKOf-%TT%%CC%901__)))
-// Eingang %CC%019
+// Eingang %CC%068
 #define KoSC_KOf-%TT%%CC%1000__                  (knx.getGroupObject(SC_KoCalcNumber(SC_KoKOf-%TT%%CC%1000__)))
-// Ausgang %CC%020
+// Ausgang %CC%069
 #define KoSC_KOf-%TT%%CC%1001__                  (knx.getGroupObject(SC_KoCalcNumber(SC_KoKOf-%TT%%CC%1001__)))
 
 

displayprodLinux/SmartHomeDisplay.xml

@@ -29,7 +29,7 @@
     <op:define prefix="SC" 
                 share="Section.share.xml" 
                 template="Section.templ.xml"
-                NumChannels="25"
+                NumChannels="9"
                 KoOffset="10"
                 ModuleType="10" >
         <!--<op:verify File="../lib/OFM-LogicModule/library.json" ModuleVersion="%LOG_VerifyVersion%" /> -->