boneIO 1.4.0.dev8__py3-none-any.whl → 1.4.0.dev10__py3-none-any.whl

boneio/core/manager/irrigation.py

@@ -276,17 +276,21 @@ class IrrigationManager:
         # Build list of discovery IDs to remove
         discovery_ids: list[tuple[str, str]] = [
             (f"{ctrl.id}", "switch"),
-            (f"{ctrl.id}_auto_advance", "switch"),
-            (f"{ctrl.id}_reverse", "switch"),
             (f"{ctrl.id}_skip_next_run", "switch"),
             (f"{ctrl.id}_standby", "switch"),
             (f"{ctrl.id}_multiplier", "number"),
             (f"{ctrl.id}_repeat", "number"),
-            (f"{ctrl.id}_next_valve", "button"),
             (f"{ctrl.id}_pause", "button"),
             (f"{ctrl.id}_resume", "button"),
             (f"{ctrl.id}_event", "event"),
         ]
+        # Multi-zone-only entities
+        if len(ctrl.zones) > 1:
+            discovery_ids.extend([
+                (f"{ctrl.id}_auto_advance", "switch"),
+                (f"{ctrl.id}_reverse", "switch"),
+                (f"{ctrl.id}_next_valve", "button"),
+            ])
         for zone in ctrl.zones:
             discovery_ids.append((f"{ctrl.id}_zone_{zone.id}", "valve"))
             discovery_ids.append((f"{ctrl.id}_zone_{zone.id}_enabled", "switch"))
@@ -338,8 +342,10 @@ class IrrigationManager:
         async def handle_standby(_topic: str, payload: str, _ctrl: IrrigationController = ctrl) -> None:
             await _ctrl.set_standby(payload.strip().upper() == ON)
 
-        await self._subscribe_topic(ctrl._setting_cmd_topic("auto_advance"), handle_auto_advance)
-        await self._subscribe_topic(ctrl._setting_cmd_topic("reverse"), handle_reverse)
+        # Subscribe multi-zone-only MQTT handlers
+        if len(ctrl.zones) > 1:
+            await self._subscribe_topic(ctrl._setting_cmd_topic("auto_advance"), handle_auto_advance)
+            await self._subscribe_topic(ctrl._setting_cmd_topic("reverse"), handle_reverse)
         await self._subscribe_topic(ctrl._setting_cmd_topic("multiplier"), handle_multiplier)
         await self._subscribe_topic(ctrl._setting_cmd_topic("repeat"), handle_repeat)
         await self._subscribe_topic(ctrl._setting_cmd_topic("skip_next_run"), handle_skip_next)
@@ -401,29 +407,31 @@ class IrrigationManager:
             payload=ha_irrigation_main_switch_message(ctrl.id, ctrl.name, cfg),
         )
 
-        _pub(
-            id=f"{ctrl.id}_auto_advance",
-            ha_type="switch",
-            payload=ha_irrigation_switch_message(
-                ctrl.id,
-                ctrl.name,
-                suffix="auto_advance",
-                name=f"{ctrl.name} Auto Advance",
-                config_helper=cfg,
-            ),
-        )
+        # Multi-zone-only switches: auto_advance, reverse
+        if len(ctrl.zones) > 1:
+            _pub(
+                id=f"{ctrl.id}_auto_advance",
+                ha_type="switch",
+                payload=ha_irrigation_switch_message(
+                    ctrl.id,
+                    ctrl.name,
+                    suffix="auto_advance",
+                    name=f"{ctrl.name} Auto Advance",
+                    config_helper=cfg,
+                ),
+            )
 
-        _pub(
-            id=f"{ctrl.id}_reverse",
-            ha_type="switch",
-            payload=ha_irrigation_switch_message(
-                ctrl.id,
-                ctrl.name,
-                suffix="reverse",
-                name=f"{ctrl.name} Reverse",
-                config_helper=cfg,
-            ),
-        )
+            _pub(
+                id=f"{ctrl.id}_reverse",
+                ha_type="switch",
+                payload=ha_irrigation_switch_message(
+                    ctrl.id,
+                    ctrl.name,
+                    suffix="reverse",
+                    name=f"{ctrl.name} Reverse",
+                    config_helper=cfg,
+                ),
+            )
 
         _pub(
             id=f"{ctrl.id}_skip_next_run",
@@ -481,18 +489,20 @@ class IrrigationManager:
             ),
         )
 
-        _pub(
-            id=f"{ctrl.id}_next_valve",
-            ha_type="button",
-            payload=ha_irrigation_button_message(
-                ctrl.id,
-                ctrl.name,
-                suffix="next_valve",
-                name=f"{ctrl.name} Next Valve",
-                payload_press=NEXT_VALVE,
-                config_helper=cfg,
-            ),
-        )
+        # Multi-zone-only button: next_valve
+        if len(ctrl.zones) > 1:
+            _pub(
+                id=f"{ctrl.id}_next_valve",
+                ha_type="button",
+                payload=ha_irrigation_button_message(
+                    ctrl.id,
+                    ctrl.name,
+                    suffix="next_valve",
+                    name=f"{ctrl.name} Next Valve",
+                    payload_press=NEXT_VALVE,
+                    config_helper=cfg,
+                ),
+            )
 
         _pub(
             id=f"{ctrl.id}_pause",

boneio/version.py

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

boneio/webui/dashboard_cards.py

@@ -184,10 +184,40 @@ def slider_tile(
         "entity": entity,
         "name": name,
         "icon": icon,
-        "features": [{"type": "numeric-input", "style": "buttons"}],
+        "vertical": False,
+        "features": [{"type": "numeric-input", "style": "slider"}],
+        "features_position": "inline",
     }
 
 
+def inline_tile(
+    entity: str,
+    features: list[dict[str, Any]] | None = None,
+) -> dict[str, Any]:
+    """Create a compact inline tile card using the entity's HA name.
+
+    Uses ``name: {type: entity}`` so HA displays the entity's friendly
+    name automatically.  ``features_position`` is always ``inline``.
+
+    Args:
+        entity: Full HA entity ID.
+        features: Optional features list (e.g. ``[{type: numeric-input}]``).
+
+    Returns:
+        Inline tile card dict.
+    """
+    card: dict[str, Any] = {
+        "type": "tile",
+        "entity": entity,
+        "name": {"type": "entity"},
+        "vertical": False,
+        "features_position": "inline",
+    }
+    if features:
+        card["features"] = features
+    return card
+
+
 def entities_card(
     entities: list[str | dict[str, Any]],
     title: str = "",

boneio/webui/routes/irrigation.py

@@ -551,6 +551,7 @@ from boneio.webui.dashboard_cards import (
     entity_badge,
     heading_card,
     horizontal_stack,
+    inline_tile,
     sensor_tile,
     slider_tile,
     tile_card,
@@ -608,55 +609,58 @@ def _generate_irrigation_dashboard_cards(ctrl: Any, serial: str) -> list[dict]:
         badges=[entity_badge(main_switch), entity_badge(next_run)],
     ))
 
-    # ── 2. Podlewanie ręczne — valve tiles in rows of 2 ──────────────
+    # ── 2. Podlewanie ręczne — valve tiles ──────────────────────────
     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(
+        cards.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"))
+    # ── 3. Czasy podlewania — tile cards with +/- buttons ──────────
+    cards.append(heading_card("Czasy podlewania", style="subtitle"))
+    for zone in ctrl.zones:
+        zone_duration = eid("number", f"zone_{zone.id}_duration")
+        cards.append(slider_tile(zone_duration, f"{zone.name} czas"))
 
     # ── 4. Ustawienia ─────────────────────────────────────────────────
-    controls: list[str | dict] = [
-        eid("switch", s) for s in ("auto_advance", "standby", "skip_next_run", "reverse")
-    ]
-    controls.append(eid("number", "multiplier"))
-    controls.append(eid("number", "repeat"))
-    cards.append(entities_card(controls, title="Ustawienia"))
+    cards.append(heading_card("Ustawienia", style="subtitle"))
+    # Multi-zone-only switches
+    if len(ctrl.zones) > 1:
+        for s in ("auto_advance", "standby", "skip_next_run", "reverse"):
+            cards.append(inline_tile(eid("switch", s)))
+    else:
+        for s in ("standby", "skip_next_run"):
+            cards.append(inline_tile(eid("switch", s)))
+    cards.append(inline_tile(
+        eid("number", "multiplier"),
+        features=[{"type": "numeric-input", "style": "buttons"}],
+    ))
+    cards.append(inline_tile(
+        eid("number", "repeat"),
+        features=[{"type": "numeric-input", "style": "buttons"}],
+    ))
+    # Schedule skip switches (inline, folded into Ustawienia)
+    for idx, _sched in enumerate(ctrl._schedule):
+        cards.append(inline_tile(eid("switch", f"schedule_{idx}_skip")))
 
     # ── 5. Sterowanie ─────────────────────────────────────────────────
-    cards.append(entities_card([
-        eid("button", "pause"),
-        eid("button", "resume"),
-        eid("button", "next_valve"),
-    ], title="Sterowanie"))
+    cards.append(heading_card("Sterowanie", style="subtitle"))
+    control_tiles = []
+    if len(ctrl.zones) > 1:
+        control_tiles.append(tile_card(eid("button", "next_valve"), "Next valve", "mdi:skip-next"))
+    control_tiles.append(tile_card(eid("button", "pause"), "Pause", "mdi:pause"))
+    control_tiles.append(tile_card(eid("button", "resume"), "Resume", "mdi:play"))
+    cards.append(horizontal_stack(control_tiles))
 
     # Water source select (if multiple)
     if len(ctrl.water_sources) > 1:
-        cards.append(entities_card([eid("select", "water_source")], title="Źródło wody"))
-
-    # ── 6. Harmonogramy ───────────────────────────────────────────────
-    for idx, sched in enumerate(ctrl._schedule):
-        sched_skip = eid("switch", f"schedule_{idx}_skip")
-        time_str = sched.get("time", "")
-        days_str = sched.get("days", "daily")
-        cards.append(entities_card(
-            [sched_skip], title=f"Harmonogram {idx + 1}: {time_str} ({days_str})",
+        cards.append(heading_card("Źródło wody", style="subtitle"))
+        cards.append(tile_card(
+            eid("select", "water_source"), "Źródło wody", "mdi:water-pump",
+            features=[{"type": "select-options"}],
+            features_position="inline",
         ))
 
     # ── 7. Sensory ────────────────────────────────────────────────────

{boneio-1.4.0.dev8.dist-info → boneio-1.4.0.dev10.dist-info}/METADATA

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

{boneio-1.4.0.dev8.dist-info → boneio-1.4.0.dev10.dist-info}/RECORD

@@ -3,7 +3,7 @@ boneio/bonecli.py,sha256=MfkiiMkoIZ98davH3L7IrBvugQbiIpAidWEabn5GZmQ,13160
 boneio/const.py,sha256=M981R2gwfjDX3lcoufWOyGlNxvGMESWgXOjVkmJfX60,7208
 boneio/exceptions.py,sha256=cBph-TsLF7FSz6p4wYeMs3pjVmVRaNQRJP82JgYYV-c,810
 boneio/runner.py,sha256=q_3050BKgnDcsT1ChFr9IZrAn2p6EyGp4DFKQy9BVno,17886
-boneio/version.py,sha256=wzBqnG04PYPRWxDR2HMRsisX8CzxTr1RMyjv4-ekT_I,41
+boneio/version.py,sha256=4sfGul1aAJUPadvpf2CD68UZzkAG4IOmKwCqixxOQxo,42
 boneio/boards/0.2/input.yaml,sha256=K5EcB44BZ8PxbPnH1izYwJ-ePo8gs4qZttMXhnMnfQ8,1259
 boneio/boards/0.2/output_24_16.yaml,sha256=GQGM3gUK7UobdGL-Ejt9UKdCs1HLPgZ7kziVZ1tjQlA,1462
 boneio/boards/0.2/output_32_10.yaml,sha256=169ubuzRqFLGiOr7zgB1xL1tKdQyOx2FJZvTCkxCA4U,1920
@@ -99,7 +99,7 @@ boneio/core/manager/canopen.py,sha256=t5CNPFB5CZtAgfm0Maac72fBKHNTEYqu6rwdVKoIjd
 boneio/core/manager/covers.py,sha256=es4bxUpUv10XI4S3VmNFXtdXkOn3rcLJnSrjxUYxKr0,20744
 boneio/core/manager/display.py,sha256=MeuCvagebfXsJfr2I3PButkQPhPJQeEAIuTPnn9jMFg,12819
 boneio/core/manager/inputs.py,sha256=0QfLmFu2u-ENtpUglfDYrGTCtR7Neu7iOHlRtbHqPic,41370
-boneio/core/manager/irrigation.py,sha256=UjDPtJq-naNRZGS47qgHMQ0ixkfz6O-Rj8dZPk7UPXk,24513
+boneio/core/manager/irrigation.py,sha256=kFTmBa6mKOylV6o2gflPFCZoztuejxlku4C77ggvYwM,25035
 boneio/core/manager/manager.py,sha256=wLKIANaissYd7Q0ihU9Fh2vfStmAsHM88yuMOjAOFC0,81704
 boneio/core/manager/modbus.py,sha256=xkKdn3gQviHubW8VwYq_cW0tCyI31Jna2TcOyxRsNfc,15854
 boneio/core/manager/outputs.py,sha256=XKu4RFcPirdpul89-airVEEBrfQH4ZJlUmCXx6VNNzw,37983
@@ -325,7 +325,7 @@ boneio/schema/temp_unit.yaml,sha256=m32VGz9RTW92Lz08l9n6RftkcVNZquOGPPr5mc3eZVc,
 boneio/schema/update_interval.yaml,sha256=RBuAFj1gGn89ydZkaUUP-f88utvth1Qtt5u6lau2iOc,186
 boneio/webui/action_validation.py,sha256=2tdshl9MpgjHIYXYDV4XHW6lGTZn-05XgicFMWRcny4,7318
 boneio/webui/app.py,sha256=yN53jS8p91hIiwKKJFLprv3nQ6gVhknchF_c9nSbCL4,33123
-boneio/webui/dashboard_cards.py,sha256=c1V6B2oCoXU8o-4MwgPDO_lYJewXwf0pjj9EykDlvAM,6986
+boneio/webui/dashboard_cards.py,sha256=ssurw3oD5VH3-52AbizTQsRPP-A3Bfyafx_Fd810dw4,7800
 boneio/webui/web_server.py,sha256=EZRUqwLqwLA5kdUZeYuriBY0nCq0Ffmo5f-Dz_eSxxg,9471
 boneio/webui/websocket_manager.py,sha256=MGo_yaXEC-30EB0mvA1dnZ14YZglFZlXBq-vTgl1rlc,6430
 boneio/webui/frontend-dist/boneio-192.png,sha256=2Q-HiAx3kB1yppMriZ46fDZ94Ft_1VpDbZ9EShGUBSo,23489
@@ -390,7 +390,7 @@ boneio/webui/routes/caddy.py,sha256=zS21OctOueuza_zigWoEz9V9-1S6IN4D77AKI5U7Pd4,
 boneio/webui/routes/can.py,sha256=18RVS2pPe_bNeZDcHSmwoLqsdmizjvTf18IdphfmeuU,14660
 boneio/webui/routes/config.py,sha256=Lg70p4CA-k7DcKkSGizTi4IaNWz83O8vT4hr6i9ln9U,52450
 boneio/webui/routes/covers.py,sha256=DtT4hSomRjR2MzBrfBiT0e4T0xbwet49hlpjXGv8vuw,3719
-boneio/webui/routes/irrigation.py,sha256=HZYVRUim-Mk-RyQCgxZkxgltO9F-nXZopzwisDngBcY,25916
+boneio/webui/routes/irrigation.py,sha256=BCJMNtXNqQ0oNGjZJcjlzXS-l17c0x-h_qCYxxe9PQg,26186
 boneio/webui/routes/migrations.py,sha256=Xa2CUg8wvhIRgHkDqd7C9AVVXLfZSLeSA74U62SFkLU,5895
 boneio/webui/routes/modbus.py,sha256=4ZLB0Wrpdf1xLUMGbJXNE7txoHrpi4UPJ-ejrnjcxoA,28401
 boneio/webui/routes/outputs.py,sha256=5ze6qYHYGcM0L0Hsx-4TPX-SG_WkfAWWAvKjaGKxJlQ,6241
@@ -435,9 +435,9 @@ boneio/webui/schema/virtual_energy_sensor.schema.json,sha256=BN6Egh-CAnXSa80bQ6Y
 boneio/webui/schema/web.schema.json,sha256=cactLq1MVwDL5hu8bLeuq5yiz49BWVS4OtjWLmhbw2M,2592
 boneio/webui/services/__init__.py,sha256=l_L3YUPhc0ZbrWqKH1RurC7UQ4q0k-5ABGTwOSS-YFQ,282
 boneio/webui/services/logs.py,sha256=7n596oxeWNIPDyKYdMJXFpH-GCvdKb_YrqTLy6kPBWA,11423
-boneio-1.4.0.dev8.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-boneio-1.4.0.dev8.dist-info/METADATA,sha256=jJyXXtfE0Ri6ocp6qgGCH74Q-JaoPwmh2bj1Fgb3qvE,1961
-boneio-1.4.0.dev8.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
-boneio-1.4.0.dev8.dist-info/entry_points.txt,sha256=JX7gluDIkQ6MBlzzxGHMItnBjciiJ73tsXwYcazMW_U,47
-boneio-1.4.0.dev8.dist-info/top_level.txt,sha256=ag9S5n1_KXZfyk9tN8R0YUDYbdA--e5a2w2FOD_yMdg,7
-boneio-1.4.0.dev8.dist-info/RECORD,,
+boneio-1.4.0.dev10.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+boneio-1.4.0.dev10.dist-info/METADATA,sha256=bq4xV70Z3ODICX7nS1utyc2hne3GpEuhUQ8fSZvcadI,1962
+boneio-1.4.0.dev10.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
+boneio-1.4.0.dev10.dist-info/entry_points.txt,sha256=JX7gluDIkQ6MBlzzxGHMItnBjciiJ73tsXwYcazMW_U,47
+boneio-1.4.0.dev10.dist-info/top_level.txt,sha256=ag9S5n1_KXZfyk9tN8R0YUDYbdA--e5a2w2FOD_yMdg,7
+boneio-1.4.0.dev10.dist-info/RECORD,,