diff --git a/.cache/clangd/index/ArcWidget.cpp.C855CC6EB2D676E3.idx b/.cache/clangd/index/ArcWidget.cpp.C855CC6EB2D676E3.idx index ab37e96..06b4216 100644 Binary files a/.cache/clangd/index/ArcWidget.cpp.C855CC6EB2D676E3.idx and b/.cache/clangd/index/ArcWidget.cpp.C855CC6EB2D676E3.idx differ diff --git a/.cache/clangd/index/ButtonWidget.cpp.6932614AE5FC71F9.idx b/.cache/clangd/index/ButtonWidget.cpp.6932614AE5FC71F9.idx index 5d3e3f1..3cdff96 100644 Binary files a/.cache/clangd/index/ButtonWidget.cpp.6932614AE5FC71F9.idx and b/.cache/clangd/index/ButtonWidget.cpp.6932614AE5FC71F9.idx differ diff --git a/.cache/clangd/index/KnxWorker.cpp.DE6DF2C0B88ED24E.idx b/.cache/clangd/index/KnxWorker.cpp.DE6DF2C0B88ED24E.idx index a533842..0a31b2e 100644 Binary files a/.cache/clangd/index/KnxWorker.cpp.DE6DF2C0B88ED24E.idx and b/.cache/clangd/index/KnxWorker.cpp.DE6DF2C0B88ED24E.idx differ diff --git a/.cache/clangd/index/RoomCardWidgetBase.cpp.E82CB8390DB7EE04.idx b/.cache/clangd/index/RoomCardWidgetBase.cpp.E82CB8390DB7EE04.idx index 41e8598..d5bb3d8 100644 Binary files a/.cache/clangd/index/RoomCardWidgetBase.cpp.E82CB8390DB7EE04.idx and b/.cache/clangd/index/RoomCardWidgetBase.cpp.E82CB8390DB7EE04.idx differ diff --git a/.cache/clangd/index/WidgetConfig.cpp.FD56F9F36C29A5DA.idx b/.cache/clangd/index/WidgetConfig.cpp.FD56F9F36C29A5DA.idx index f888f8a..6be5d83 100644 Binary files a/.cache/clangd/index/WidgetConfig.cpp.FD56F9F36C29A5DA.idx and b/.cache/clangd/index/WidgetConfig.cpp.FD56F9F36C29A5DA.idx differ diff --git a/.cache/clangd/index/WidgetConfig.hpp.CAEFE2EEEB2A6996.idx b/.cache/clangd/index/WidgetConfig.hpp.CAEFE2EEEB2A6996.idx index 34fe364..f859c88 100644 Binary files a/.cache/clangd/index/WidgetConfig.hpp.CAEFE2EEEB2A6996.idx and b/.cache/clangd/index/WidgetConfig.hpp.CAEFE2EEEB2A6996.idx differ diff --git a/.cache/clangd/index/WidgetManager.cpp.D8CE609DC911F13E.idx b/.cache/clangd/index/WidgetManager.cpp.D8CE609DC911F13E.idx index 4ddfceb..b0c4f56 100644 Binary files a/.cache/clangd/index/WidgetManager.cpp.D8CE609DC911F13E.idx and b/.cache/clangd/index/WidgetManager.cpp.D8CE609DC911F13E.idx differ diff --git a/displayprodLinux/Section.share.xml b/displayprodLinux/Section.share.xml index ef525b8..ebf4f42 100644 --- a/displayprodLinux/Section.share.xml +++ b/displayprodLinux/Section.share.xml @@ -39,6 +39,9 @@ + + + diff --git a/displayprodLinux/Section.templ.xml b/displayprodLinux/Section.templ.xml index dcb1951..a06c64d 100644 --- a/displayprodLinux/Section.templ.xml +++ b/displayprodLinux/Section.templ.xml @@ -7,7 +7,7 @@ - + @@ -79,6 +79,81 @@ Text="Szene" Value="0" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -125,6 +200,48 @@ + + + + + + + + + + + + + + + + + + + + + + @@ -336,8 +453,78 @@ ReadFlag="Enabled" WriteFlag="Enabled" CommunicationFlag="Enabled" TransmitFlag="Enabled" UpdateFlag="Enabled" ReadOnInitFlag="Disabled" /> + + + + + + + + + + + + + + + + + + + + - + @@ -400,6 +587,27 @@ RefId="%AID%_O-%TT%%CC%077" DatapointType="DPST-9-4" /> + + + + + + + + + + + @@ -462,115 +670,146 @@ - + + + + + - + + + + - + - + - + + + + - + + + + - + - + - + - + - + + + + - + + + + - + + + + - + + + + - + + + + - + + + + - + diff --git a/main/widgets/ArcWidget.cpp b/main/widgets/ArcWidget.cpp index 039d4f5..7b457b6 100644 --- a/main/widgets/ArcWidget.cpp +++ b/main/widgets/ArcWidget.cpp @@ -3,7 +3,6 @@ #include #include #include -#include ArcWidget::ArcWidget(const WidgetConfig& config) : Widget(config) @@ -17,16 +16,6 @@ static int32_t clampToRange(float value, int32_t minValue, int32_t maxValue) { return static_cast(std::lround(value)); } -int32_t ArcWidget::initialValueFromText() const { - if (config_.text[0] == '\0') return 75; - - char* end = nullptr; - long parsed = strtol(config_.text, &end, 10); - if (end == config_.text) return 75; - - return static_cast(parsed); -} - lv_obj_t* ArcWidget::create(lv_obj_t* parent) { obj_ = lv_arc_create(parent); if (!obj_) return nullptr; @@ -52,8 +41,8 @@ lv_obj_t* ArcWidget::create(lv_obj_t* parent) { } lv_arc_set_range(obj_, minValue, maxValue); - lastValue_ = static_cast(initialValueFromText()); - lv_arc_set_value(obj_, clampToRange(lastValue_, minValue, maxValue)); + lastValue_ = static_cast(minValue); + lv_arc_set_value(obj_, minValue); // Create scale as child of arc scale_ = lv_scale_create(obj_); diff --git a/main/widgets/ArcWidget.hpp b/main/widgets/ArcWidget.hpp index 2bf085e..ed53922 100644 --- a/main/widgets/ArcWidget.hpp +++ b/main/widgets/ArcWidget.hpp @@ -13,7 +13,6 @@ public: void onKnxSwitch(bool value) override; private: - int32_t initialValueFromText() const; void updateValueLabel(float value); static const char* unitSuffix(uint8_t unit);