New Block-Types Count (Boolean Inputs) and Aggregation (Sum, Mean, Min, Max, Range)

library.json

@@ -1,9 +1,6 @@
 {
     "name": "OFM-FunctionBlocks",
-    "version": "0.1.0",
-    "dependencies": {
-        "bblanchon/ArduinoJson": "^7.0.4"
-    },
+    "version": "0.2.0-DEV",
     "description": "Function Blocks",
     "homepage": "https://openknx.de",
     "authors": {
@@ -14,6 +11,6 @@
     },
     "repository": {
         "type": "git",
-        "url": "https://github.com/mgeramb/OFM-FunctionBlocks"
+        "url": "https://github.com/OpenKNX/OFM-FunctionBlocks"
     }
 }

src/Baggages/Icons/LICENSE

@@ -0,0 +1,17 @@
+Icons with "openknx" in filename were designed individually for this project.
+
+Others were created as custom export from Pictogrammers Material Design Icons Collection:
+
+> Pictogrammers Free License
+> --------------------------
+>
+> Last Updated: February 1st, 2023
+>
+> This package is released as free, open-source, and GPL friendly by
+> the [Pictogrammers](https://pictogrammers.com/). You may use it
+> for commercial projects, open-source projects, or anything really.
+>
+> # Icons: Apache 2.0 (https://www.apache.org/licenses/LICENSE-2.0)
+> Some of the icons are redistributed under the Apache 2.0 license. All other
+> icons are either redistributed under their respective licenses or are
+> distributed under the Apache 2.0 license.

src/FunctionBlocks.share.xml

@@ -11,12 +11,82 @@
 							<ParameterType Id="%AID%_PT-FCBNumChannels" Name="FCBNumChannels">
 								<TypeNumber SizeInBit="8" Type="unsignedInt" minInclusive="0" maxInclusive="%N%" />
 							</ParameterType>
+
 							<ParameterType Id="%AID%_PT-FCBChannelType" Name="FCBChannelType" >
 								<TypeRestriction Base="Value" SizeInBit="8" >
 									<Enumeration Text="Deaktiviert" Value="0" Id="%ENID%" />
 									<Enumeration Text="UND" Value="1" Id="%ENID%" />
 									<Enumeration Text="ODER" Value="2" Id="%ENID%" />
 									<Enumeration Text="Prioritätsschalter" Value="3" Id="%ENID%" />
+									<Enumeration Text="Anzahl" Value="4" Id="%ENID%" />
+									<Enumeration Text="Statistische Aggregation" Value="5" Id="%ENID%" />
+								</TypeRestriction>
+							</ParameterType>
+
+							<ParameterType Id="%AID%_PT-FCBNumericDpt" Name="FCBNumericDpt" >
+								<TypeRestriction Base="Value" SizeInBit="8" >
+									<!-- align for visibility in ETS -->
+									<!--
+									<Enumeration Text="inaktiv"                                         Value="0"   Id="%ENID%" />
+									<Enumeration Text="1.*           1-Bit (0/1)"                      Value="10"   Id="%ENID%" />
+									<Enumeration Text="2.*           1-Bit gesteuert (Zwangsführung)"  Value="20"   Id="%ENID%" />
+									-->
+									<Enumeration Text="5.*           8-Bit vorzeichenlos"              Value="50"   Id="%ENID%" />
+									<Enumeration Text="5.001       Prozent (0..100%)"                  Value="51"   Id="%ENID%" />
+									<Enumeration Text="6.*           8-Bit vorzeichenbehaftet"         Value="61"   Id="%ENID%" />
+									<Enumeration Text="7.*           2-Byte vorzeichenlos"             Value="70"   Id="%ENID%" />
+									<Enumeration Text="8.*           2-Byte vorzeichenbehaftet"        Value="80"   Id="%ENID%" />
+									<Enumeration Text="9.*           2-Byte Gleitkommawert"            Value="90"   Id="%ENID%" />
+									<Enumeration Text="12.*         4-Byte vorzeichenlos"             Value="120"   Id="%ENID%" />
+									<Enumeration Text="13.*         4-Byte vorzeichenbehaftet"        Value="130"   Id="%ENID%" />
+									<Enumeration Text="14.*         4-Byte Gleitkommawert"            Value="140"   Id="%ENID%" />
+									<!--
+									<Enumeration Text="16.001     Zeichen (ISO 8859-1)"               Value="161"   Id="%ENID%" />
+									<Enumeration Text="17.001     Szenen Nummer"                      Value="171"   Id="%ENID%" />
+									<Enumeration Text="232.600   RGB Wert 3x(0..255)"                 Value="232"   Id="%ENID%" />
+									-->
+								</TypeRestriction>
+							</ParameterType>
+
+							<ParameterType Id="%AID%_PT-FCBNumericOutputDpt" Name="FCBNumericOutputDpt" >
+								<TypeRestriction Base="Value" SizeInBit="8" >
+									<Enumeration Text="identisch mit Eingängen"                       Value="255"   Id="%ENID%" />
+									<!-- align for visibility in ETS -->
+									<!--
+									<Enumeration Text="1.*           1-Bit (0/1)"                      Value="10"   Id="%ENID%" />
+									<Enumeration Text="2.*           1-Bit gesteuert (Zwangsführung)"  Value="20"   Id="%ENID%" />
+									-->
+									<Enumeration Text="5.*           8-Bit vorzeichenlos"              Value="50"   Id="%ENID%" />
+									<Enumeration Text="5.001       Prozent (0..100%)"                  Value="51"   Id="%ENID%" />
+									<Enumeration Text="6.*           8-Bit vorzeichenbehaftet"         Value="61"   Id="%ENID%" />
+									<Enumeration Text="7.*           2-Byte vorzeichenlos"             Value="70"   Id="%ENID%" />
+									<Enumeration Text="8.*           2-Byte vorzeichenbehaftet"        Value="80"   Id="%ENID%" />
+									<Enumeration Text="9.*           2-Byte Gleitkommawert"            Value="90"   Id="%ENID%" />
+									<Enumeration Text="12.*         4-Byte vorzeichenlos"             Value="120"   Id="%ENID%" />
+									<Enumeration Text="13.*         4-Byte vorzeichenbehaftet"        Value="130"   Id="%ENID%" />
+									<Enumeration Text="14.*         4-Byte Gleitkommawert"            Value="140"   Id="%ENID%" />
+									<!--
+									<Enumeration Text="16.001     Zeichen (ISO 8859-1)"               Value="161"   Id="%ENID%" />
+									<Enumeration Text="17.001     Szenen Nummer"                      Value="171"   Id="%ENID%" />
+									<Enumeration Text="232.600   RGB Wert 3x(0..255)"                 Value="232"   Id="%ENID%" />
+									-->
+								</TypeRestriction>
+							</ParameterType>
+
+							<ParameterType Id="%AID%_PT-FCBOutputRounding" Name="FCBOutputRounding" >
+								<TypeRestriction Base="Value" SizeInBit="1" >
+									<Enumeration Id="%ENID%" Value="0"   Text="Nachkommastellen verwerfen"   />
+									<Enumeration Id="%ENID%" Value="1"   Text="Runden (ab 0,5 aufrunden)"    />
+								</TypeRestriction>
+							</ParameterType>
+
+							<ParameterType Id="%AID%_PT-FCBOutputOverflow" Name="FCBOutputOverflow" >
+								<TypeRestriction Base="Value" SizeInBit="2" >
+									<Enumeration Id="%ENID%" Value="0"   Text="KO nicht aktualisieren / nicht senden"   />
+									<Enumeration Id="%ENID%" Value="1"   Text="Auf Bereichsrand setzen"                 />
+									<!--
+									<Enumeration Id="%ENID%" Value="2"   Text="überlauf"                         />
+									-->
 								</TypeRestriction>
 							</ParameterType>
 
@@ -59,6 +129,32 @@
 								</TypeRestriction>
 							</ParameterType>
 
+							<ParameterType Id="%AID%_PT-FCBNumericInputKoUsage" Name="FCBNumericInputKoUsage" >
+								<TypeRestriction Base="Value" SizeInBit="2" >
+									<Enumeration Id="%ENID%" Value="0" Text="Deaktiviert"   />
+									<Enumeration Id="%ENID%" Value="1" Text="Aktiv"         />
+									<!--
+									<Enumeration Id="%ENID%" Value="2" Text="Invertiert"    />
+									-->
+								</TypeRestriction>
+							</ParameterType>
+
+							<ParameterType Id="%AID%_PT-FCBSimpleStatAggTyp" Name="FCBSimpleStatAggTyp" >
+								<TypeRestriction Base="Value" SizeInBit="8" >
+									<Enumeration Id="%ENID%" Value="0"  Text="Summe"                              />
+									<Enumeration Id="%ENID%" Value="1"  Text="Mittelwert"                         />
+									<Enumeration Id="%ENID%" Value="2"  Text="Minimum"                            />
+									<Enumeration Id="%ENID%" Value="3"  Text="Maximum"                            />
+									<Enumeration Id="%ENID%" Value="4"  Text="Spannbreite (Maximum - Minimum)"    />
+									<!--
+									<Enumeration Id="%ENID%" Value="5"  Text="Median"                             />
+									<Enumeration Id="%ENID%" Value="6"  Text="Q25"                                />
+									<Enumeration Id="%ENID%" Value="7"  Text="Q75"                                />
+									<Enumeration Id="%ENID%" Value="8"  Text="STD"                                />
+									-->
+								</TypeRestriction>
+							</ParameterType>
+
 						</ParameterTypes>
 						<Parameters>
 							<!-- Base Settings -->