Fix prod

displayprodLinux/Network.share.xml

@@ -27,16 +27,16 @@
               <!-- Byte 0: Flags -->
               <Union SizeInBit="8">
                 <Memory CodeSegment="%AID%_RS-04-00000" Offset="0" BitOffset="0" />
-                <Parameter Id="%AID%_P-%TT%00001" Name="pLanEnable"
+                <Parameter Id="%AID%_UP-%TT%10001" Name="pLanEnable"
                     ParameterType="%AID%_PT-NetEnable" Offset="0" BitOffset="0"
                     Text="LAN aktivieren" Value="1" />
-                <Parameter Id="%AID%_P-%TT%00002" Name="pLanDhcp"
+                <Parameter Id="%AID%_UP-%TT%00002" Name="pLanDhcp"
                     ParameterType="%AID%_PT-NetMode" Offset="0" BitOffset="1"
                     Text="LAN Adressmodus" Value="0" />
-                <Parameter Id="%AID%_P-%TT%00003" Name="pWlanEnable"
+                <Parameter Id="%AID%_UP-%TT%00003" Name="pWlanEnable"
                     ParameterType="%AID%_PT-NetEnable" Offset="0" BitOffset="2"
                     Text="WLAN aktivieren" Value="0" />
-                <Parameter Id="%AID%_P-%TT%00004" Name="pWlanDhcp"
+                <Parameter Id="%AID%_UP-%TT%00004" Name="pWlanDhcp"
                     ParameterType="%AID%_PT-NetMode" Offset="0" BitOffset="3"
                     Text="WLAN Adressmodus" Value="0" />
               </Union>
@@ -187,10 +187,10 @@
             </Parameters>
             <ParameterRefs>
               <!-- Flags -->
-              <ParameterRef Id="%AID%_P-%TT%00001_R-%TT%0000101" RefId="%AID%_P-%TT%00001" />
+              <ParameterRef Id="%AID%_UP-%TT%10001_R-%TT%1000101" RefId="%AID%_UP-%TT%10001" />
-              <ParameterRef Id="%AID%_P-%TT%00002_R-%TT%0000201" RefId="%AID%_P-%TT%00002" />
+              <ParameterRef Id="%AID%_UP-%TT%00002_R-%TT%0000201" RefId="%AID%_UP-%TT%00002" />
-              <ParameterRef Id="%AID%_P-%TT%00003_R-%TT%0000301" RefId="%AID%_P-%TT%00003" />
+              <ParameterRef Id="%AID%_UP-%TT%00003_R-%TT%0000301" RefId="%AID%_UP-%TT%00003" />
-              <ParameterRef Id="%AID%_P-%TT%00004_R-%TT%0000401" RefId="%AID%_P-%TT%00004" />
+              <ParameterRef Id="%AID%_UP-%TT%00004_R-%TT%0000401" RefId="%AID%_UP-%TT%00004" />
               <!-- LAN IP -->
               <ParameterRef Id="%AID%_P-%TT%00010_R-%TT%0001001" RefId="%AID%_P-%TT%00010" />
               <ParameterRef Id="%AID%_P-%TT%00011_R-%TT%0001101" RefId="%AID%_P-%TT%00011" />
@@ -243,13 +243,13 @@
               <ParameterBlock Id="%AID%_PB-nnn" Name="LAN" Text="LAN Einstellungen"
                   ShowInComObjectTree="false">
                 <ParameterSeparator Id="%AID%_PS-nnn" Text="LAN" UIHint="Headline" />
-                <ParameterRefRef RefId="%AID%_P-%TT%00001_R-%TT%0000101" IndentLevel="1" />
+                <ParameterRefRef RefId="%AID%_UP-%TT%10001_R-%TT%1000101" IndentLevel="1" />
 
-                <choose ParamRefId="%AID%_P-%TT%00001_R-%TT%0000101">
+                <choose ParamRefId="%AID%_UP-%TT%10001_R-%TT%1000101">
                   <when test="1">
-                    <ParameterRefRef RefId="%AID%_P-%TT%00002_R-%TT%0000201" IndentLevel="1" />
+                    <ParameterRefRef RefId="%AID%_UP-%TT%00002_R-%TT%0000201" IndentLevel="1" />
 
-                    <choose ParamRefId="%AID%_P-%TT%00002_R-%TT%0000201">
+                    <choose ParamRefId="%AID%_UP-%TT%00002_R-%TT%0000201">
                       <when test="1">
                         <ParameterSeparator Id="%AID%_PS-nnn" Text="LAN IP Adresse" UIHint="Headline" />
                         <ParameterRefRef RefId="%AID%_P-%TT%00010_R-%TT%0001001" IndentLevel="2" />
@@ -281,13 +281,13 @@
               <ParameterBlock Id="%AID%_PB-nnn" Name="WLAN" Text="WLAN Einstellungen"
                   ShowInComObjectTree="false">
                 <ParameterSeparator Id="%AID%_PS-nnn" Text="WLAN" UIHint="Headline" />
-                <ParameterRefRef RefId="%AID%_P-%TT%00003_R-%TT%0000301" IndentLevel="1" />
+                <ParameterRefRef RefId="%AID%_UP-%TT%00003_R-%TT%0000301" IndentLevel="1" />
 
-                <choose ParamRefId="%AID%_P-%TT%00003_R-%TT%0000301">
+                <choose ParamRefId="%AID%_UP-%TT%00003_R-%TT%0000301">
                   <when test="1">
-                    <ParameterRefRef RefId="%AID%_P-%TT%00004_R-%TT%0000401" IndentLevel="1" />
+                    <ParameterRefRef RefId="%AID%_UP-%TT%00004_R-%TT%0000401" IndentLevel="1" />
 
-                    <choose ParamRefId="%AID%_P-%TT%00004_R-%TT%0000401">
+                    <choose ParamRefId="%AID%_UP-%TT%00004_R-%TT%0000401">
                       <when test="1">
                         <ParameterSeparator Id="%AID%_PS-nnn" Text="WLAN IP Adresse" UIHint="Headline" />
                         <ParameterRefRef RefId="%AID%_P-%TT%00030_R-%TT%0003001" IndentLevel="2" />

displayprodLinux/SmartHomeDisplay.appl.debug.xml

@@ -17,36 +17,43 @@
             </Code>
             <ParameterTypes>
               <op:include href="Common.share.xml" xpath="//ApplicationProgram/Static/ParameterTypes/ParameterType" prefix="BASE" />
+              <op:include href="Network.share.xml" xpath="//ApplicationProgram/Static/ParameterTypes/ParameterType" prefix="NW" />
               <op:include href="Section.share.xml" xpath="//ApplicationProgram/Static/ParameterTypes/ParameterType" prefix="SC" />
               <op:include href="Section.templ.xml" xpath="//ApplicationProgram/Static/ParameterTypes/ParameterType" type="template" prefix="SC" />
             </ParameterTypes>
             <Parameters>
               <op:include href="Common.share.xml" xpath="//ApplicationProgram/Static/Parameters/Parameter|//ApplicationProgram/Static/Parameters/Union" type="parameter" prefix="BASE" />
+              <op:include href="Network.share.xml" xpath="//ApplicationProgram/Static/Parameters/Parameter|//ApplicationProgram/Static/Parameters/Union" type="parameter" prefix="NW" />
               <op:include href="Section.share.xml" xpath="//ApplicationProgram/Static/Parameters/Parameter|//ApplicationProgram/Static/Parameters/Union" type="parameter" prefix="SC" />
               <op:include href="Section.templ.xml" xpath="//ApplicationProgram/Static/Parameters/Parameter|//ApplicationProgram/Static/Parameters/Union" type="template" prefix="SC" />
             </Parameters>
             <ParameterRefs>
               <op:include href="Common.share.xml" xpath="//ApplicationProgram/Static/ParameterRefs/ParameterRef" prefix="BASE" />
+              <op:include href="Network.share.xml" xpath="//ApplicationProgram/Static/ParameterRefs/ParameterRef" prefix="NW" />
               <op:include href="Section.share.xml" xpath="//ApplicationProgram/Static/ParameterRefs/ParameterRef" prefix="SC" />
               <op:include href="Section.templ.xml" xpath="//ApplicationProgram/Static/ParameterRefs/ParameterRef" type="template" prefix="SC" />
             </ParameterRefs>
             <ParameterCalculations>
               <op:include href="Common.share.xml" xpath="//ApplicationProgram/Static/ParameterCalculations/ParameterCalculation" prefix="BASE" />
+              <op:include href="Network.share.xml" xpath="//ApplicationProgram/Static/ParameterCalculations/ParameterCalculation" prefix="NW" />
               <op:include href="Section.share.xml" xpath="//ApplicationProgram/Static/ParameterCalculations/ParameterCalculation" prefix="SC" />
               <op:include href="Section.templ.xml" xpath="//ApplicationProgram/Static/ParameterCalculations/ParameterCalculation" type="template" prefix="SC" />
             </ParameterCalculations>
             <ParameterValidations>
               <op:include href="Common.share.xml" xpath="//ApplicationProgram/Static/ParameterValidations/ParameterValidation" prefix="BASE" />
+              <op:include href="Network.share.xml" xpath="//ApplicationProgram/Static/ParameterValidations/ParameterValidation" prefix="NW" />
               <op:include href="Section.share.xml" xpath="//ApplicationProgram/Static/ParameterValidations/ParameterValidation" prefix="SC" />
               <op:include href="Section.templ.xml" xpath="//ApplicationProgram/Static/ParameterValidations/ParameterValidation" type="template" prefix="SC" />
             </ParameterValidations>
             <ComObjectTable>
               <op:include href="Common.share.xml" xpath="//ApplicationProgram/Static/ComObjectTable/ComObject" prefix="BASE" />
+              <op:include href="Network.share.xml" xpath="//ApplicationProgram/Static/ComObjectTable/ComObject" prefix="NW" />
               <op:include href="Section.share.xml" xpath="//ApplicationProgram/Static/ComObjectTable/ComObject" prefix="SC" />
               <op:include href="Section.templ.xml" xpath="//ApplicationProgram/Static/ComObjectTable/ComObject" type="template" prefix="SC" />
             </ComObjectTable>
             <ComObjectRefs>
               <op:include href="Common.share.xml" xpath="//ApplicationProgram/Static/ComObjectRefs/ComObjectRef" prefix="BASE" />
+              <op:include href="Network.share.xml" xpath="//ApplicationProgram/Static/ComObjectRefs/ComObjectRef" prefix="NW" />
               <op:include href="Section.share.xml" xpath="//ApplicationProgram/Static/ComObjectRefs/ComObjectRef" prefix="SC" />
               <op:include href="Section.templ.xml" xpath="//ApplicationProgram/Static/ComObjectRefs/ComObjectRef" type="template" prefix="SC" />
             </ComObjectRefs>
@@ -73,27 +80,32 @@
             <Messages>
               <Message Id="%AID%_M-1" Name="VersionMismatch" Text="Diese Applikation und die installierte Firmware passen nicht zusammen." />
               <op:include href="Common.share.xml" xpath="//ApplicationProgram/Static/Messages/*" prefix="BASE" />
+              <op:include href="Network.share.xml" xpath="//ApplicationProgram/Static/Messages/*" prefix="NW" />
               <op:include href="Section.share.xml" xpath="//ApplicationProgram/Static/Messages/*" prefix="SC" />
             </Messages>
             <Script>
               <op:include href="Common.share.xml" xpath="//ApplicationProgram/Static/Script/text()" prefix="BASE" />
+              <op:include href="Network.share.xml" xpath="//ApplicationProgram/Static/Script/text()" prefix="NW" />
               <op:include href="Section.share.xml" xpath="//ApplicationProgram/Static/Script/text()" prefix="SC" />
             </Script>
             <Options TextParameterEncoding="iso-8859-15" />
           </Static>
           <ModuleDefs>
             <op:include href="Common.share.xml" xpath="//ApplicationProgram/ModuleDefs/*" prefix="BASE" />
+            <op:include href="Network.share.xml" xpath="//ApplicationProgram/ModuleDefs/*" prefix="NW" />
             <op:include href="Section.share.xml" xpath="//ApplicationProgram/ModuleDefs/*" prefix="SC" />
             <op:include href="Section.templ.xml" xpath="//ApplicationProgram/ModuleDefs/*" type="template" prefix="SC" />
           </ModuleDefs>
           <Dynamic>
             <op:include href="Common.share.xml" xpath="//ApplicationProgram/Dynamic/*" prefix="BASE" />
+            <op:include href="Network.share.xml" xpath="//ApplicationProgram/Dynamic/*" prefix="NW" />
             <op:include href="Section.share.xml" xpath="//ApplicationProgram/Dynamic/*" prefix="SC" />
           </Dynamic>
         </ApplicationProgram>
       </ApplicationPrograms>
       <Baggages>
         <op:include href="Common.share.xml" xpath="//Manufacturer/Baggages/*" prefix="BASE" />
+        <op:include href="Network.share.xml" xpath="//Manufacturer/Baggages/*" prefix="NW" />
         <op:include href="Section.share.xml" xpath="//Manufacturer/Baggages/*" prefix="SC" />
       </Baggages>
       <Hardware>

displayprodLinux/SmartHomeDisplay.h

@@ -13,13 +13,131 @@
 #define MAIN_ApplicationNumber 206
 #define MAIN_ApplicationVersion 4
 #define MAIN_ApplicationEncoding iso-8859-15
-#define MAIN_ParameterSize 2188
+#define MAIN_ParameterSize 2221
 #define MAIN_MaxKoNumber 9069
 #define MAIN_OrderNumber "IA4313"
 // Parameter with single occurrence
 
 
-#define SC_Section_Count                        0      // uint8_t
+#define NW_pLanEnable                           0      // 1 Bit, Bit 7
+#define     NW_pLanEnableMask 0x80
+#define     NW_pLanEnableShift 7
+#define NW_pLanDhcp                             0      // 1 Bit, Bit 6
+#define     NW_pLanDhcpMask 0x40
+#define     NW_pLanDhcpShift 6
+#define NW_pWlanEnable                          0      // 1 Bit, Bit 5
+#define     NW_pWlanEnableMask 0x20
+#define     NW_pWlanEnableShift 5
+#define NW_pWlanDhcp                            0      // 1 Bit, Bit 4
+#define     NW_pWlanDhcpMask 0x10
+#define     NW_pWlanDhcpShift 4
+#define NW_pLanIp1                              1      // uint8_t
+#define NW_pLanIp2                              2      // uint8_t
+#define NW_pLanIp3                              3      // uint8_t
+#define NW_pLanIp4                              4      // uint8_t
+#define NW_pLanSub1                             5      // uint8_t
+#define NW_pLanSub2                             6      // uint8_t
+#define NW_pLanSub3                             7      // uint8_t
+#define NW_pLanSub4                             8      // uint8_t
+#define NW_pLanGw1                              9      // uint8_t
+#define NW_pLanGw2                             10      // uint8_t
+#define NW_pLanGw3                             11      // uint8_t
+#define NW_pLanGw4                             12      // uint8_t
+#define NW_pLanDns1                            13      // uint8_t
+#define NW_pLanDns2                            14      // uint8_t
+#define NW_pLanDns3                            15      // uint8_t
+#define NW_pLanDns4                            16      // uint8_t
+#define NW_pWlanIp1                            17      // uint8_t
+#define NW_pWlanIp2                            18      // uint8_t
+#define NW_pWlanIp3                            19      // uint8_t
+#define NW_pWlanIp4                            20      // uint8_t
+#define NW_pWlanSub1                           21      // uint8_t
+#define NW_pWlanSub2                           22      // uint8_t
+#define NW_pWlanSub3                           23      // uint8_t
+#define NW_pWlanSub4                           24      // uint8_t
+#define NW_pWlanGw1                            25      // uint8_t
+#define NW_pWlanGw2                            26      // uint8_t
+#define NW_pWlanGw3                            27      // uint8_t
+#define NW_pWlanGw4                            28      // uint8_t
+#define NW_pWlanDns1                           29      // uint8_t
+#define NW_pWlanDns2                           30      // uint8_t
+#define NW_pWlanDns3                           31      // uint8_t
+#define NW_pWlanDns4                           32      // uint8_t
+
+// LAN aktivieren
+#define ParamNW_pLanEnable                          ((bool)(knx.paramByte(NW_pLanEnable) & NW_pLanEnableMask))
+// LAN Adressmodus
+#define ParamNW_pLanDhcp                            ((bool)(knx.paramByte(NW_pLanDhcp) & NW_pLanDhcpMask))
+// WLAN aktivieren
+#define ParamNW_pWlanEnable                         ((bool)(knx.paramByte(NW_pWlanEnable) & NW_pWlanEnableMask))
+// WLAN Adressmodus
+#define ParamNW_pWlanDhcp                           ((bool)(knx.paramByte(NW_pWlanDhcp) & NW_pWlanDhcpMask))
+// LAN IP Adresse 1. Oktett
+#define ParamNW_pLanIp1                             (knx.paramByte(NW_pLanIp1))
+// LAN IP Adresse 2. Oktett
+#define ParamNW_pLanIp2                             (knx.paramByte(NW_pLanIp2))
+// LAN IP Adresse 3. Oktett
+#define ParamNW_pLanIp3                             (knx.paramByte(NW_pLanIp3))
+// LAN IP Adresse 4. Oktett
+#define ParamNW_pLanIp4                             (knx.paramByte(NW_pLanIp4))
+// LAN Subnetzmaske 1. Oktett
+#define ParamNW_pLanSub1                            (knx.paramByte(NW_pLanSub1))
+// LAN Subnetzmaske 2. Oktett
+#define ParamNW_pLanSub2                            (knx.paramByte(NW_pLanSub2))
+// LAN Subnetzmaske 3. Oktett
+#define ParamNW_pLanSub3                            (knx.paramByte(NW_pLanSub3))
+// LAN Subnetzmaske 4. Oktett
+#define ParamNW_pLanSub4                            (knx.paramByte(NW_pLanSub4))
+// LAN Gateway 1. Oktett
+#define ParamNW_pLanGw1                             (knx.paramByte(NW_pLanGw1))
+// LAN Gateway 2. Oktett
+#define ParamNW_pLanGw2                             (knx.paramByte(NW_pLanGw2))
+// LAN Gateway 3. Oktett
+#define ParamNW_pLanGw3                             (knx.paramByte(NW_pLanGw3))
+// LAN Gateway 4. Oktett
+#define ParamNW_pLanGw4                             (knx.paramByte(NW_pLanGw4))
+// LAN DNS 1. Oktett
+#define ParamNW_pLanDns1                            (knx.paramByte(NW_pLanDns1))
+// LAN DNS 2. Oktett
+#define ParamNW_pLanDns2                            (knx.paramByte(NW_pLanDns2))
+// LAN DNS 3. Oktett
+#define ParamNW_pLanDns3                            (knx.paramByte(NW_pLanDns3))
+// LAN DNS 4. Oktett
+#define ParamNW_pLanDns4                            (knx.paramByte(NW_pLanDns4))
+// WLAN IP Adresse 1. Oktett
+#define ParamNW_pWlanIp1                            (knx.paramByte(NW_pWlanIp1))
+// WLAN IP Adresse 2. Oktett
+#define ParamNW_pWlanIp2                            (knx.paramByte(NW_pWlanIp2))
+// WLAN IP Adresse 3. Oktett
+#define ParamNW_pWlanIp3                            (knx.paramByte(NW_pWlanIp3))
+// WLAN IP Adresse 4. Oktett
+#define ParamNW_pWlanIp4                            (knx.paramByte(NW_pWlanIp4))
+// WLAN Subnetzmaske 1. Oktett
+#define ParamNW_pWlanSub1                           (knx.paramByte(NW_pWlanSub1))
+// WLAN Subnetzmaske 2. Oktett
+#define ParamNW_pWlanSub2                           (knx.paramByte(NW_pWlanSub2))
+// WLAN Subnetzmaske 3. Oktett
+#define ParamNW_pWlanSub3                           (knx.paramByte(NW_pWlanSub3))
+// WLAN Subnetzmaske 4. Oktett
+#define ParamNW_pWlanSub4                           (knx.paramByte(NW_pWlanSub4))
+// WLAN Gateway 1. Oktett
+#define ParamNW_pWlanGw1                            (knx.paramByte(NW_pWlanGw1))
+// WLAN Gateway 2. Oktett
+#define ParamNW_pWlanGw2                            (knx.paramByte(NW_pWlanGw2))
+// WLAN Gateway 3. Oktett
+#define ParamNW_pWlanGw3                            (knx.paramByte(NW_pWlanGw3))
+// WLAN Gateway 4. Oktett
+#define ParamNW_pWlanGw4                            (knx.paramByte(NW_pWlanGw4))
+// WLAN DNS 1. Oktett
+#define ParamNW_pWlanDns1                           (knx.paramByte(NW_pWlanDns1))
+// WLAN DNS 2. Oktett
+#define ParamNW_pWlanDns2                           (knx.paramByte(NW_pWlanDns2))
+// WLAN DNS 3. Oktett
+#define ParamNW_pWlanDns3                           (knx.paramByte(NW_pWlanDns3))
+// WLAN DNS 4. Oktett
+#define ParamNW_pWlanDns4                           (knx.paramByte(NW_pWlanDns4))
+
+#define SC_Section_Count                       33      // uint8_t
 
 // Anzahl Bereiche
 #define ParamSC_Section_Count                       (knx.paramByte(SC_Section_Count))
@@ -27,7 +145,7 @@
 #define SC_ChannelCount 9
 
 // Parameter per channel
-#define SC_ParamBlockOffset 1
+#define SC_ParamBlockOffset 34
 #define SC_ParamBlockSize 243
 #define SC_ParamCalcIndex(index) (index + SC_ParamBlockOffset + _channelIndex * SC_ParamBlockSize)