diff --git a/displayprodLinux/SmartHomeDisplay.debug.xml b/displayprodLinux/SmartHomeDisplay.debug.xml index ee5bc33..edacac4 100644 --- a/displayprodLinux/SmartHomeDisplay.debug.xml +++ b/displayprodLinux/SmartHomeDisplay.debug.xml @@ -13,7 +13,7 @@ - + @@ -91,67 +91,67 @@ - + - + - + - + - + - + - + - + - + - + - + @@ -173,67 +173,67 @@ - + - + - + - + - + - + - + - + - + - + - + @@ -255,67 +255,67 @@ - + - + - + - + - + - + - + - + - + - + - + @@ -337,67 +337,67 @@ - + - + - + - + - + - + - + - + - + - + - + @@ -419,67 +419,67 @@ - + - + - + - + - + - + - + - + - + - + - + @@ -501,67 +501,67 @@ - + - + - + - + - + - + - + - + - + - + - + @@ -583,67 +583,67 @@ - + - + - + - + - + - + - + - + - + - + - + @@ -665,67 +665,67 @@ - + - + - + - + - + - + - + - + - + - + - + @@ -747,61 +747,61 @@ - + - + - + - + - + - + - + - + - + - + @@ -3593,11 +3593,11 @@ - - + + - + @@ -10592,13 +10592,13 @@ - + - + - + diff --git a/displayprodLinux/SmartHomeDisplay.h b/displayprodLinux/SmartHomeDisplay.h index 9e49ff4..9a48561 100644 --- a/displayprodLinux/SmartHomeDisplay.h +++ b/displayprodLinux/SmartHomeDisplay.h @@ -13,7 +13,7 @@ #define MAIN_ApplicationNumber 206 #define MAIN_ApplicationVersion 4 #define MAIN_ApplicationEncoding iso-8859-15 -#define MAIN_ParameterSize 2548 +#define MAIN_ParameterSize 2188 #define MAIN_MaxKoNumber 9069 #define MAIN_OrderNumber "IA4313" // Parameter with single occurrence @@ -28,7 +28,7 @@ // Parameter per channel #define SC_ParamBlockOffset 1 -#define SC_ParamBlockSize 283 +#define SC_ParamBlockSize 243 #define SC_ParamCalcIndex(index) (index + SC_ParamBlockOffset + _channelIndex * SC_ParamBlockSize) #define SC_pChkTemperatur 59 // 1 Bit, Bit 7 @@ -82,46 +82,46 @@ #define SC_pChkSzene 61 // 1 Bit, Bit 7 #define SC_pChkSzeneMask 0x80 #define SC_pChkSzeneShift 7 -#define SC_fAFunctionType 102 // 1 Bit, Bit 7 +#define SC_fAFunctionType 62 // 1 Bit, Bit 7 #define SC_fAFunctionTypeMask 0x80 #define SC_fAFunctionTypeShift 7 -#define SC_fAOOnKODpt 103 // 8 Bits, Bit 7-0 -#define SC_fBFunctionType 122 // 1 Bit, Bit 7 +#define SC_fAOOnKODpt 63 // 8 Bits, Bit 7-0 +#define SC_fBFunctionType 82 // 1 Bit, Bit 7 #define SC_fBFunctionTypeMask 0x80 #define SC_fBFunctionTypeShift 7 -#define SC_fBOOnKODpt 123 // 8 Bits, Bit 7-0 -#define SC_fCFunctionType 142 // 1 Bit, Bit 7 +#define SC_fBOOnKODpt 83 // 8 Bits, Bit 7-0 +#define SC_fCFunctionType 102 // 1 Bit, Bit 7 #define SC_fCFunctionTypeMask 0x80 #define SC_fCFunctionTypeShift 7 -#define SC_fCOOnKODpt 143 // 8 Bits, Bit 7-0 -#define SC_fDFunctionType 162 // 1 Bit, Bit 7 +#define SC_fCOOnKODpt 103 // 8 Bits, Bit 7-0 +#define SC_fDFunctionType 122 // 1 Bit, Bit 7 #define SC_fDFunctionTypeMask 0x80 #define SC_fDFunctionTypeShift 7 -#define SC_fDOOnKODpt 163 // 8 Bits, Bit 7-0 -#define SC_fEFunctionType 182 // 1 Bit, Bit 7 +#define SC_fDOOnKODpt 123 // 8 Bits, Bit 7-0 +#define SC_fEFunctionType 142 // 1 Bit, Bit 7 #define SC_fEFunctionTypeMask 0x80 #define SC_fEFunctionTypeShift 7 -#define SC_fEOOnKODpt 183 // 8 Bits, Bit 7-0 -#define SC_fFFunctionType 202 // 1 Bit, Bit 7 +#define SC_fEOOnKODpt 143 // 8 Bits, Bit 7-0 +#define SC_fFFunctionType 162 // 1 Bit, Bit 7 #define SC_fFFunctionTypeMask 0x80 #define SC_fFFunctionTypeShift 7 -#define SC_fFOOnKODpt 203 // 8 Bits, Bit 7-0 -#define SC_fGFunctionType 222 // 1 Bit, Bit 7 +#define SC_fFOOnKODpt 163 // 8 Bits, Bit 7-0 +#define SC_fGFunctionType 182 // 1 Bit, Bit 7 #define SC_fGFunctionTypeMask 0x80 #define SC_fGFunctionTypeShift 7 -#define SC_fGOOnKODpt 223 // 8 Bits, Bit 7-0 -#define SC_fHFunctionType 242 // 1 Bit, Bit 7 +#define SC_fGOOnKODpt 183 // 8 Bits, Bit 7-0 +#define SC_fHFunctionType 202 // 1 Bit, Bit 7 #define SC_fHFunctionTypeMask 0x80 #define SC_fHFunctionTypeShift 7 -#define SC_fHOOnKODpt 243 // 8 Bits, Bit 7-0 -#define SC_fIFunctionType 262 // 1 Bit, Bit 7 +#define SC_fHOOnKODpt 203 // 8 Bits, Bit 7-0 +#define SC_fIFunctionType 222 // 1 Bit, Bit 7 #define SC_fIFunctionTypeMask 0x80 #define SC_fIFunctionTypeShift 7 -#define SC_fIOOnKODpt 263 // 8 Bits, Bit 7-0 -#define SC_fJFunctionType 282 // 1 Bit, Bit 7 +#define SC_fIOOnKODpt 223 // 8 Bits, Bit 7-0 +#define SC_fJFunctionType 242 // 1 Bit, Bit 7 #define SC_fJFunctionTypeMask 0x80 #define SC_fJFunctionTypeShift 7 -#define SC_fJOOnKODpt 283 // 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)) diff --git a/displayprodLinux/SmartHomeDisplay.knxprod b/displayprodLinux/SmartHomeDisplay.knxprod index d8fde79..70b97b2 100644 Binary files a/displayprodLinux/SmartHomeDisplay.knxprod and b/displayprodLinux/SmartHomeDisplay.knxprod differ