boneio 1.4.0.dev7__tar.gz → 1.4.0.dev8__tar.gz

{boneio-1.4.0.dev7/boneio.egg-info → boneio-1.4.0.dev8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: boneio
-Version: 1.4.0.dev7
+Version: 1.4.0.dev8
 Summary: Python App for BoneIO
 Author-email: Paweł Szafer <pszafer@gmail.com>
 License: GNU General Public License v3.0

{boneio-1.4.0.dev7 → boneio-1.4.0.dev8}/boneio/core/manager/irrigation.py

@@ -551,6 +551,10 @@ class IrrigationManager:
                 ),
             )
 
+            # Duration max: configured time + 20min, clamped to [30, 120]
+            zone_duration_min = max(1, round(zone.run_duration / 60))
+            duration_max = min(120, max(30, zone_duration_min + 20))
+
             _pub(
                 id=f"{ctrl.id}_zone_{zone.id}_duration",
                 ha_type="number",
@@ -560,7 +564,7 @@ class IrrigationManager:
                     suffix=f"zone/{zone.id}/duration",
                     name=f"{ctrl.name} {zone.name} Duration",
                     min_val=1,
-                    max_val=1440,
+                    max_val=duration_max,
                     step=1,
                     unit="min",
                     config_helper=cfg,

{boneio-1.4.0.dev7 → boneio-1.4.0.dev8}/boneio/schema/schema.yaml

@@ -473,12 +473,13 @@ modbus_devices:
           - lower
         allowed:
           [
+            'boneio-edge-temp',
             'cwt',
             'dts1964_3f',
             'dyp-a12-ultrasonic',
+            'eht-topventil-plus',
             'gdfs',
             'gdfx',
-            'boneio-edge-temp',
             'liquid-sensor',
             'orno-or-we-517',
             'pt100',
@@ -496,7 +497,6 @@ modbus_devices:
             'sofar',
             'ventclear',
             'esp32_relay_x4_modbus',
-            'eht-topventil-plus'
           ]
         meta:
           label: Model to load from database.

boneio-1.4.0.dev8/boneio/version.py

@@ -0,0 +1,2 @@
+# flake8: noqa
+__version__ = "1.4.0dev8"

{boneio-1.4.0.dev7 → boneio-1.4.0.dev8}/boneio/webui/dashboard_cards.py

@@ -184,7 +184,7 @@ def slider_tile(
         "entity": entity,
         "name": name,
         "icon": icon,
-        "features": [{"type": "numeric-input", "style": "slider"}],
+        "features": [{"type": "numeric-input", "style": "buttons"}],
     }
 
 

{boneio-1.4.0.dev7 → boneio-1.4.0.dev8}/boneio/webui/frontend-dist/schema/config.schema.json

@@ -1847,7 +1847,7 @@
               "ventclear"
             ],
             "examples": [
-              "cwt"
+              "boneio-edge-temp"
             ],
             "description": "Model to load from database.",
             "title": "Model"

{boneio-1.4.0.dev7/boneio/webui → boneio-1.4.0.dev8/boneio/webui/frontend-dist}/schema/modbus_devices.schema.json

@@ -113,7 +113,7 @@
               "ventclear"
             ],
             "examples": [
-              "cwt"
+              "boneio-edge-temp"
             ],
             "description": "Model to load from database.",
             "title": "Model"

{boneio-1.4.0.dev7 → boneio-1.4.0.dev8}/boneio/webui/routes/irrigation.py

@@ -577,6 +577,16 @@ def _irr_id(serial: str, entity_type: str, ctrl_id: str, suffix: str = "") -> st
 def _generate_irrigation_dashboard_cards(ctrl: Any, serial: str) -> list[dict]:
     """Generate HA dashboard cards for a single irrigation controller.
 
+    Layout:
+      1. Header — controller name + main switch badge + next run badge
+      2. Podlewanie ręczne — valve tiles for manual control
+      3. Czasy podlewania — zone durations (inline entities card)
+      4. Ustawienia — auto-advance, standby, multiplier, etc.
+      5. Sterowanie — pause / resume / next valve buttons
+      6. Harmonogramy — schedule skip switches
+      7. Sensory — zone end time, next run time
+      8. Zdarzenia — event entity
+
     Args:
         ctrl: IrrigationController instance.
         serial: Device serial number.
@@ -591,14 +601,37 @@ def _generate_irrigation_dashboard_cards(ctrl: Any, serial: str) -> list[dict]:
     next_run = eid("sensor", "next_run_time")
     zone_end = eid("sensor", "zone_end_time")
 
-    # Controller header
+    # ── 1. Controller header ──────────────────────────────────────────
     cards.append(heading_card(
         f"🌿 {ctrl.name}",
         style="title",
         badges=[entity_badge(main_switch), entity_badge(next_run)],
     ))
 
-    # Settings entities
+    # ── 2. Podlewanie ręczne — valve tiles in rows of 2 ──────────────
+    cards.append(heading_card("Podlewanie ręczne", style="subtitle"))
+    zone_tiles: list[dict] = []
+    for zone in ctrl.zones:
+        zone_valve = eid("valve", f"zone_{zone.id}")
+        zone_tiles.append(tile_card(
+            zone_valve, zone.name, "mdi:sprinkler-variant",
+            state_content=["last_changed", "state"],
+        ))
+    # Pack tiles into horizontal-stacks of 2
+    for i in range(0, len(zone_tiles), 2):
+        pair = zone_tiles[i : i + 2]
+        if len(pair) == 1:
+            cards.append(pair[0])
+        else:
+            cards.append(horizontal_stack(pair))
+
+    # ── 3. Czasy podlewania — inline entities card ────────────────────
+    duration_entities: list[str] = [
+        eid("number", f"zone_{zone.id}_duration") for zone in ctrl.zones
+    ]
+    cards.append(entities_card(duration_entities, title="Czasy podlewania"))
+
+    # ── 4. Ustawienia ─────────────────────────────────────────────────
     controls: list[str | dict] = [
         eid("switch", s) for s in ("auto_advance", "standby", "skip_next_run", "reverse")
     ]
@@ -606,40 +639,18 @@ def _generate_irrigation_dashboard_cards(ctrl: Any, serial: str) -> list[dict]:
     controls.append(eid("number", "repeat"))
     cards.append(entities_card(controls, title="Ustawienia"))
 
-    # Action buttons
-    cards.append(horizontal_stack([
-        button_card(eid("button", "pause"), "Pauza", "mdi:pause"),
-        button_card(eid("button", "resume"), "Wznów", "mdi:play"),
-        button_card(eid("button", "next_valve"), "Następna", "mdi:skip-next"),
-    ]))
+    # ── 5. Sterowanie ─────────────────────────────────────────────────
+    cards.append(entities_card([
+        eid("button", "pause"),
+        eid("button", "resume"),
+        eid("button", "next_valve"),
+    ], title="Sterowanie"))
 
     # Water source select (if multiple)
     if len(ctrl.water_sources) > 1:
         cards.append(entities_card([eid("select", "water_source")], title="Źródło wody"))
 
-    # Sensors row
-    cards.append(horizontal_stack([
-        sensor_tile(zone_end, "Koniec strefy", "mdi:timer-sand", state_content=["state", "last_changed"]),
-        sensor_tile(next_run, "Następne uruchomienie", "mdi:calendar-clock", state_content=["state", "last_changed"]),
-    ]))
-
-    # Zone cards
-    for zone in ctrl.zones:
-        zone_valve = eid("valve", f"zone_{zone.id}")
-        zone_enabled = eid("switch", f"zone_{zone.id}_enabled")
-        zone_duration = eid("number", f"zone_{zone.id}_duration")
-
-        cards.append(heading_card(
-            zone.name, style="subtitle",
-            badges=[entity_badge(zone_valve), entity_badge(zone_enabled)],
-        ))
-        cards.append(tile_card(
-            zone_valve, zone.name, "mdi:sprinkler-variant",
-            state_content=["last_changed", "state"],
-        ))
-        cards.append(slider_tile(zone_duration, f"{zone.name} czas"))
-
-    # Schedule skip switches
+    # ── 6. Harmonogramy ───────────────────────────────────────────────
     for idx, sched in enumerate(ctrl._schedule):
         sched_skip = eid("switch", f"schedule_{idx}_skip")
         time_str = sched.get("time", "")
@@ -648,7 +659,13 @@ def _generate_irrigation_dashboard_cards(ctrl: Any, serial: str) -> list[dict]:
             [sched_skip], title=f"Harmonogram {idx + 1}: {time_str} ({days_str})",
         ))
 
-    # Event entity
+    # ── 7. Sensory ────────────────────────────────────────────────────
+    cards.append(horizontal_stack([
+        sensor_tile(zone_end, "Koniec strefy", "mdi:timer-sand", state_content=["state", "last_changed"]),
+        sensor_tile(next_run, "Następne uruchomienie", "mdi:calendar-clock", state_content=["state", "last_changed"]),
+    ]))
+
+    # ── 8. Zdarzenia ──────────────────────────────────────────────────
     cards.append(entities_card([eid("event", "event")], title="Zdarzenia"))
 
     return cards

{boneio-1.4.0.dev7 → boneio-1.4.0.dev8}/boneio/webui/schema/config.schema.json

@@ -1847,7 +1847,7 @@
               "ventclear"
             ],
             "examples": [
-              "cwt"
+              "boneio-edge-temp"
             ],
             "description": "Model to load from database.",
             "title": "Model"

{boneio-1.4.0.dev7/boneio/webui/frontend-dist → boneio-1.4.0.dev8/boneio/webui}/schema/modbus_devices.schema.json

@@ -113,7 +113,7 @@
               "ventclear"
             ],
             "examples": [
-              "cwt"
+              "boneio-edge-temp"
             ],
             "description": "Model to load from database.",
             "title": "Model"

{boneio-1.4.0.dev7 → boneio-1.4.0.dev8/boneio.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: boneio
-Version: 1.4.0.dev7
+Version: 1.4.0.dev8
 Summary: Python App for BoneIO
 Author-email: Paweł Szafer <pszafer@gmail.com>
 License: GNU General Public License v3.0

boneio-1.4.0.dev7/boneio/version.py

@@ -1,2 +0,0 @@
-# flake8: noqa
-__version__ = "1.4.0dev7"