Add Clock widget with customizable time and date display

Author: raoulh

cmake/sources.cmake

@@ -32,6 +32,7 @@ set(MAIN_SOURCES
     main/widgets/light_switch_wide_widget.cpp
     main/widgets/temperature_widget.cpp
     main/widgets/scenario_widget.cpp
+    main/widgets/clock_widget.cpp
 )
 
 # Flux architecture sources

main/calaos_protocol.cpp

@@ -108,16 +108,34 @@ PagesConfig PagesConfig::fromJson(const std::string& json_str)
                                 widget.h = widget_json["height"].get<int>();
                         }
 
-                        // Validate widget
-                        if (widget.io_id.empty())
+                        // Collect extra parameters (unknown keys) into params map
+                        static const std::vector<std::string> knownKeys = {
+                            "io_id", "type", "name", "x", "y", "w", "h", "width", "height"
+                        };
+                        for (auto it = widget_json.begin(); it != widget_json.end(); ++it)
                         {
-                            ESP_LOGW(TAG, "Skipping widget with empty io_id");
-                            continue;
+                            const std::string& key = it.key();
+                            bool isKnown = false;
+                            for (const auto& k : knownKeys)
+                            {
+                                if (key == k)
+                                {
+                                    isKnown = true;
+                                    break;
+                                }
+                            }
+                            if (!isKnown && it.value().is_string())
+                                widget.params[key] = it.value().get<std::string>();
+                            else if (!isKnown && it.value().is_number())
+                                widget.params[key] = std::to_string(it.value().get<int>());
+                            else if (!isKnown && it.value().is_boolean())
+                                widget.params[key] = it.value().get<bool>() ? "true" : "false";
                         }
 
+                        // Validate widget
                         if (widget.type.empty())
                         {
-                            ESP_LOGW(TAG, "Skipping widget %s with empty type", widget.io_id.c_str());
+                            ESP_LOGW(TAG, "Skipping widget with empty type");
                             continue;
                         }
 

main/calaos_protocol.h

@@ -37,14 +37,17 @@ inline constexpr const char* FW_HEADER_HARDWARE_ID = "X-Device-Hardware-Id";
  */
 struct WidgetConfig
 {
-    std::string io_id;          // IO unique identifier (e.g., "io_0")
-    std::string type;           // Widget type (e.g., "LightSwitch", "Temperature")
+    std::string io_id;          // IO unique identifier (e.g., "io_0"), empty for non-IO widgets
+    std::string type;           // Widget type (e.g., "LightSwitch", "Temperature", "Clock")
     std::string override_name;  // Optional user-defined name override for display
     int x = 0;                  // Grid position X
     int y = 0;                  // Grid position Y
     int w = 1;                  // Grid width
     int h = 1;                  // Grid height
 
+    // Extra parameters from JSON/XML attributes (e.g., clock_timezone, clock_format)
+    std::map<std::string, std::string> params;
+
     WidgetConfig() = default;
 
     WidgetConfig(const std::string& io_id,

main/calaos_widget.cpp

@@ -24,26 +24,34 @@ CalaosWidget::CalaosWidget(lv_obj_t* parent,
     setBgOpa(LV_OPA_COVER);
     setPadding(0, 0, 0, 0);
 
-    // Subscribe to state changes
-    subscribeToStateChanges();
-
-    // Try to get initial state from AppStore
-    const AppState& state = AppStore::getInstance().getState();
-    auto it = state.ioStates.find(config.io_id);
-    if (it != state.ioStates.end())
+    // Only subscribe to IO state changes if io_id is set (non-IO widgets like Clock skip this)
+    if (!config.io_id.empty())
     {
-        currentState = it->second;
-        ESP_LOGI(TAG, "Widget %s found initial state: %s",
-                config.io_id.c_str(), currentState.state.c_str());
+        // Subscribe to state changes
+        subscribeToStateChanges();
+
+        // Try to get initial state from AppStore
+        const AppState& state = AppStore::getInstance().getState();
+        auto it = state.ioStates.find(config.io_id);
+        if (it != state.ioStates.end())
+        {
+            currentState = it->second;
+            ESP_LOGI(TAG, "Widget %s found initial state: %s",
+                    config.io_id.c_str(), currentState.state.c_str());
+        }
+        else
+        {
+            ESP_LOGW(TAG, "Widget %s: IO state not found in AppStore", config.io_id.c_str());
+            // Set default state
+            currentState.id = config.io_id;
+            currentState.type = config.type;
+            currentState.state = "unknown";
+            currentState.name = config.io_id;
+        }
     }
     else
     {
-        ESP_LOGW(TAG, "Widget %s: IO state not found in AppStore", config.io_id.c_str());
-        // Set default state
-        currentState.id = config.io_id;
-        currentState.type = config.type;
-        currentState.state = "unknown";
-        currentState.name = config.io_id;
+        ESP_LOGI(TAG, "Widget type=%s has no io_id, skipping IO state subscription", config.type.c_str());
     }
 }
 
@@ -67,10 +75,11 @@ const std::string& CalaosWidget::getDisplayName(const CalaosProtocol::IoState& s
 
 CalaosWidget::~CalaosWidget()
 {
-    ESP_LOGI(TAG, "Destroying widget: %s", config.io_id.c_str());
+    ESP_LOGI(TAG, "Destroying widget: type=%s io_id=%s", config.type.c_str(), config.io_id.c_str());
 
     // Unsubscribe from AppStore to prevent dangling pointer
-    AppStore::getInstance().unsubscribe(subscriptionId_);
+    if (subscriptionId_ != 0)
+        AppStore::getInstance().unsubscribe(subscriptionId_);
 }
 
 void CalaosWidget::calculateAndApplyPosition()

main/widget_factory.cpp

@@ -4,6 +4,7 @@
 #include "widgets/light_switch_wide_widget.h"
 #include "widgets/temperature_widget.h"
 #include "widgets/scenario_widget.h"
+#include "widgets/clock_widget.h"
 #include "logging.h"
 #include <sstream>
 
@@ -31,10 +32,18 @@ void WidgetFactory::registerWidget(const std::string& typeName,
     ESP_LOGI(TAG, "Registered widget: %s", key.c_str());
 }
 
+void WidgetFactory::registerWidgetAnySize(const std::string& typeName, WidgetCreator creator)
+{
+    anySizeCreators[typeName] = creator;
+    ESP_LOGI(TAG, "Registered any-size widget: %s", typeName.c_str());
+}
+
 bool WidgetFactory::isRegistered(const std::string& typeName, int width, int height) const
 {
     std::string key = makeKey(typeName, width, height);
-    return creators.find(key) != creators.end();
+    if (creators.find(key) != creators.end())
+        return true;
+    return anySizeCreators.find(typeName) != anySizeCreators.end();
 }
 
 std::string WidgetFactory::makeKey(const std::string& type, int w, int h) const
@@ -53,14 +62,22 @@ std::unique_ptr<CalaosWidget> WidgetFactory::createWidget(
 
     ESP_LOGI(TAG, "Creating widget: %s (io_id=%s)", key.c_str(), config.io_id.c_str());
 
-    // Look up creator
+    // Look up creator - first try exact Type_WxH match
     auto it = creators.find(key);
     if (it != creators.end())
     {
-        // Found - create the widget
+        // Found exact match - create the widget
         return it->second(parent, config, gridInfo);
     }
 
+    // Try any-size fallback for this type
+    auto anyIt = anySizeCreators.find(config.type);
+    if (anyIt != anySizeCreators.end())
+    {
+        ESP_LOGI(TAG, "Using any-size creator for type: %s", config.type.c_str());
+        return anyIt->second(parent, config, gridInfo);
+    }
+
     // Not found - create WidgetError
     ESP_LOGW(TAG, "Widget type/size not supported: %s - creating WidgetError", key.c_str());
 
@@ -110,5 +127,13 @@ void WidgetFactory::registerBuiltinWidgets()
         }
     );
 
-    ESP_LOGI(TAG, "Built-in widgets registered: %zu", creators.size());
+    // Register Clock for any size (dynamically adapts to grid dimensions)
+    registerWidgetAnySize("Clock",
+        [](lv_obj_t* parent, const auto& config, const auto& gridInfo) {
+            return std::make_unique<ClockWidget>(parent, config, gridInfo);
+        }
+    );
+
+    ESP_LOGI(TAG, "Built-in widgets registered: %zu sized + %zu any-size",
+             creators.size(), anySizeCreators.size());
 }

main/widget_factory.h

@@ -54,12 +54,24 @@ class WidgetFactory
                        int height,
                        WidgetCreator creator);
 
+    /**
+     * @brief Register a widget type that accepts any size
+     *
+     * Used for widgets like Clock that dynamically adapt to whatever grid size
+     * is configured. The any-size creator is used as a fallback when no exact
+     * Type_WxH match is found.
+     *
+     * @param typeName Widget type name (e.g., "Clock")
+     * @param creator Function that creates the widget
+     */
+    void registerWidgetAnySize(const std::string& typeName, WidgetCreator creator);
+
     /**
      * @brief Check if a widget type/size is registered
      * @param typeName Widget type name
      * @param width Widget width in grid units
      * @param height Widget height in grid units
-     * @return true if registered
+     * @return true if registered (exact match or any-size)
      */
     bool isRegistered(const std::string& typeName, int width, int height) const;
 
@@ -86,7 +98,11 @@ class WidgetFactory
      */
     std::string makeKey(const std::string& type, int w, int h) const;
 
-    // Map of widget creators
+    // Map of widget creators for specific sizes
     // Key format: "LightSwitch_1x1", "Temperature_1x1", etc.
     std::map<std::string, WidgetCreator> creators;
+
+    // Map of widget creators that accept any size (fallback when no exact match)
+    // Key: type name (e.g., "Clock")
+    std::map<std::string, WidgetCreator> anySizeCreators;
 };