Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 40 commits into from
Dec 27, 2024
Merged
Changes from 1 commit
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
22aa336
Fix: Set ComObject Size to Maximum Size of all Ref-Usages
cornelius-koepp Oct 26, 2024
753e1a4
ETS-App: Remove H-Ruler after Channel Type Headline
cornelius-koepp Oct 26, 2024
114cd22
ETS-App: Add Comment-Field (to AND/OR/Prio)
cornelius-koepp Oct 26, 2024
4314687
ETS-App: Cleanup FunctionBlock Definition Blocks Comments
cornelius-koepp Oct 28, 2024
90e6dc9
Fix: Remove Dependency `bblanchon/ArduinoJson`
cornelius-koepp Oct 30, 2024
cca469b
Fix/Cleanup: Unique Block ParamBlock-Name
cornelius-koepp Oct 30, 2024
02f41cb
Fix/Update library.json: Use OpenKNX GitHUB Repo Url
cornelius-koepp Nov 4, 2024
58a4c2e
Cleanup Function Block Creation
cornelius-koepp Oct 27, 2024
b15f524
Set Version to 0.2.0-DEV
cornelius-koepp Nov 4, 2024
e5105fb
Simplify: `valueCompare` will Always Send for NOT initialized
cornelius-koepp Oct 26, 2024
478a3db
Prepare Additional LogicFunctionBlocks
cornelius-koepp Oct 26, 2024
a515fbb
Expicitly Use Type bool
cornelius-koepp Oct 26, 2024
b6222a7
Draft: New Block Type for Count of Bool Value
cornelius-koepp Oct 26, 2024
b3b6e82
ETS-App (Count): Remove H-Ruler after Channel Type Headline
cornelius-koepp Oct 26, 2024
ca50fad
ETS-App (Count): Add Comment-Field
cornelius-koepp Oct 26, 2024
fbd30b0
ETS-App (Count): Cleanup FunctionBlock Definition Blocks Comments
cornelius-koepp Oct 28, 2024
ec13639
Add Missing Headline-Comment for Count
cornelius-koepp Oct 28, 2024
242342f
Draft: New Block Type for Simple Statistic Aggregation (with Subtypes)
cornelius-koepp Oct 28, 2024
2a29f9c
Include Debug Logging
cornelius-koepp Oct 31, 2024
a6b6c99
Rounding Config for Int-Output, Overflow-Handling, UI Improvements on…
cornelius-koepp Oct 31, 2024
d00dba8
Cleanup: DPT-Handling
cornelius-koepp Nov 4, 2024
8c76d81
Cleanup Statistic Calculation - Calc All Values
cornelius-koepp Nov 4, 2024
4cc6259
Fix/Cleanup Value Definition of `%AID%_PT-FCBChannelType`
cornelius-koepp Nov 6, 2024
7e7f686
Add Task for OpenKNX ContextHelp Build
cornelius-koepp Nov 4, 2024
87b56a5
Documentation: Cleanup/Improve Applikationsbeschreibung
cornelius-koepp Nov 4, 2024
6efdef2
Documentation: Include Block-Type Anzahl
cornelius-koepp Nov 4, 2024
fbd1d82
Documentation: Multi-Line-Comment
cornelius-koepp Nov 4, 2024
ad805c0
Documentation: Sendeverhalten - Describe Once Only
cornelius-koepp Nov 5, 2024
14cfc9c
Documentation: Include Block-Type Aggregation
cornelius-koepp Nov 5, 2024
6d615d3
Cleanup ComObject Definitions
cornelius-koepp Nov 5, 2024
078c102
Aggregation Memory Layout Cleanup
cornelius-koepp Nov 5, 2024
ac66349
Documentation: "Kanalauswahl" + Anzahl + Aggregation
cornelius-koepp Nov 5, 2024
9b68392
Draft/WIP: Weighted Aggregation Support for Sum/Avg
cornelius-koepp Nov 5, 2024
500c96d
Cleanup / Refactor / Extract Methods
cornelius-koepp Nov 6, 2024
8d0dad3
Add Block-Types Count + Aggregation to Readme
cornelius-koepp Nov 6, 2024
35ebe26
Fix: Links in Applikationsbeschreibung
cornelius-koepp Nov 6, 2024
a91af10
Cleanup ETS-XML
cornelius-koepp Nov 6, 2024
7b7716e
Fix: Use Channel Label "Range"
cornelius-koepp Nov 6, 2024
186af3a
Fix Doc: Invertiert
cornelius-koepp Nov 14, 2024
0025144
Fix: FunctionText is Required in ComObject
cornelius-koepp Nov 14, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix: Use Channel Label "Range"
  • Loading branch information
cornelius-koepp committed Nov 6, 2024
commit 7b7716e223ea9d8853f65a35ed7e0bafc328849b
2 changes: 1 addition & 1 deletion src/FunctionBlocks/SimpleAggregationBlock.cpp
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@
type == SimpleAggregationBlockType::AggrSUM ? "SUM" : type == SimpleAggregationBlockType::AggrAVG ? "AVG" \
: type == SimpleAggregationBlockType::AggrMIN ? "MIN" \
: type == SimpleAggregationBlockType::AggrMAX ? "MAX" \
: "Width"
: "Range"
/*
: type == SimpleAggregationBlockType::AggrWidth ? "Width" \
: type == SimpleAggregationBlockType::AggrMedian ? "Median" \