python-mobius 0.7.1__py3-none-any.whl → 0.7.2__py3-none-any.whl

mobius/__init__.py

@@ -72,7 +72,7 @@ from .dump import (
     enrich_attribute_dump,
 )
 
-__version__ = "0.7.1"
+__version__ = "0.7.2"
 
 __all__ = [
     "__version__",

mobius/device.py

@@ -12,7 +12,7 @@ from __future__ import annotations
 import asyncio
 import struct
 import time
-from dataclasses import dataclass
+from dataclasses import dataclass, field
 from typing import Optional, Callable
 
 from bleak import BleakClient, BleakScanner
@@ -190,6 +190,11 @@ class FullPollResult:
     caller needing a separate get_pump_schedule() call just to also
     get schedule_point_count alongside everything else here.
 
+    configured_scenes/current_scene -- everything get_configured_scenes()/
+    get_current_scene() themselves cover, for whichever device types
+    support scenes at all (an empty list / None if not, matching those
+    methods' own behavior exactly).
+
     used_batch mirrors every other *Result/Snapshot's own field of the
     same name and purpose.
     """
@@ -198,6 +203,8 @@ class FullPollResult:
     light_poll: Optional[LightPollResult]
     pump_telemetry: Optional[dict]
     pump_schedule_points: Optional[list[PumpSchedulePoint]] = None
+    configured_scenes: list[Scene] = field(default_factory=list)
+    current_scene: Optional[ActiveScene] = None
     used_batch: bool = True
 
 
@@ -1277,18 +1284,31 @@ class MobiusDevice:
 
     # ---- scenes -----------------------------------------------------------
 
-    async def start_scene(self, scene_id: int, duration_seconds: int = 0) -> None:
+    async def start_scene(self, scene_id: int, duration_seconds: int = 0, broadcast: bool = True) -> None:
         """
         Activates a scene by id -- one of the ten SceneID presets, or a
         user-created scene's own device-assigned id (see get_configured_scenes()).
         duration_seconds=0 lets the device use the scene's own configured
         timeout instead.
+
+        broadcast=True (the default) sets the frame's own reserved-byte
+        "group" field to 1 (see make_reserved()), which propagates this
+        write to the rest of the mesh from a single write to just this
+        device -- confirmed against real hardware for set_time_to_now()'s
+        own Epoch write; the same group=1 mechanism is used here, though
+        this hasn't been independently confirmed against real hardware
+        for CurrentScene specifically. group=1 only ever reaches devices
+        on THIS SAME mesh (a Thread network is its own isolated network,
+        identified by its own pan_id) -- it cannot reach a different
+        tank's own, separate mesh, even one within physical radio range.
+        Pass broadcast=False to write to only this one device instead.
         """
         value = struct.pack("<HH", int(scene_id), duration_seconds)
-        await self.set_attribute(C2Attribute.CurrentScene, value)
+        reserved = make_reserved(group=1) if broadcast else b"\x00\x00"
+        await self.set_attribute(C2Attribute.CurrentScene, value, reserved=reserved)
 
-    async def start_feed_mode(self, duration_seconds: int = 0) -> None:
-        await self.start_scene(SceneID.FeedMode, duration_seconds)
+    async def start_feed_mode(self, duration_seconds: int = 0, broadcast: bool = True) -> None:
+        await self.start_scene(SceneID.FeedMode, duration_seconds, broadcast=broadcast)
 
     async def resume_schedule(self) -> None:
         """Cancel whatever scene is running and go back to the normal schedule."""
@@ -3655,6 +3675,8 @@ class MobiusDevice:
             (C2Attribute.FirmwareVersion, 0, 0xFFFF),
             (C2Attribute.HardwareRevision, 0, 0xFFFF),
             (schedule_attr, 0, 0xFFFF),
+            (C2Attribute.ConfiguredScenes, 0, 0xFFFF),
+            (C2Attribute.CurrentScene, 0, 1),
         ]
         if primitive == PrimitiveType.VisualV1:
             intensity_attr = C2Attribute.Schedule1Intensity if which == 1 else C2Attribute.Schedule2Intensity
@@ -3726,10 +3748,16 @@ class MobiusDevice:
                 [motor_power_raw] if motor_power_raw else [], flow_range, model, primitive,
             )
 
+        configured_scenes = decode_configured_scenes(_values_for(C2Attribute.ConfiguredScenes), primitive)
+        current_scene_raw = _first_value(C2Attribute.CurrentScene)
+        current_scene = decode_active_scene(current_scene_raw) if current_scene_raw else None
+
         return FullPollResult(
             device_info=device_info, metadata=metadata,
             light_poll=light_poll, pump_telemetry=pump_telemetry,
-            pump_schedule_points=pump_schedule_points, used_batch=True,
+            pump_schedule_points=pump_schedule_points,
+            configured_scenes=configured_scenes, current_scene=current_scene,
+            used_batch=True,
         )
 
     async def _get_full_poll_via_individual_reads(
@@ -3752,10 +3780,17 @@ class MobiusDevice:
         else:
             pump_schedule_points = await self.get_pump_schedule(which=which)
             pump_telemetry = await self.get_pump_telemetry(model=model, primitive=primitive)
+        try:
+            configured_scenes = await self.get_configured_scenes(primitive=primitive)
+        except Exception:
+            configured_scenes = []
+        current_scene = await self.get_current_scene()
         return FullPollResult(
             device_info=device_info, metadata=metadata,
             light_poll=light_poll, pump_telemetry=pump_telemetry,
-            pump_schedule_points=pump_schedule_points, used_batch=False,
+            pump_schedule_points=pump_schedule_points,
+            configured_scenes=configured_scenes, current_scene=current_scene,
+            used_batch=False,
         )
 
     async def get_current_light_percentages(self, which: int = 1,

{python_mobius-0.7.1.dist-info → python_mobius-0.7.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: python-mobius
-Version: 0.7.1
+Version: 0.7.2
 Summary: Reverse-engineered Python client for the Mobius BLE protocol (EcoTech Marine VorTech/Radion, AquaIllumination, Neptune Systems, NYOS)
 Project-URL: Homepage, https://code.r3pek.org/r3pek/python-mobius
 Project-URL: Documentation, https://code.r3pek.org/r3pek/python-mobius/src/branch/main/documentation
@@ -108,14 +108,25 @@ mobius-scan --adapter hci0
 - **Read light schedules**: per-channel intensity at any given time,
   replicating the app's own client-side interpolation (there's no "current
   intensity" attribute — lights only expose the programmed curve).
+- **Read every configured scene** (`get_configured_scenes()`) — name,
+  timeout, and its own light/pump payload, at whatever slot it lives in,
+  plus the currently active one (`get_current_scene()`).
+- **Control scenes**: start feed mode, resume the normal schedule, or any
+  other configured scene — one write, broadcast to the whole mesh by
+  default (`broadcast=True`). Uses the same mesh-propagation mechanism
+  confirmed against real hardware for the clock-sync write below;
+  applying it to scene activation specifically hasn't been
+  independently verified the same way yet.
+- **Fetch everything one device poll needs in a single round-trip**
+  (`get_full_poll_batch()`) — identity, metadata, light/pump state, and
+  scene data together, confirmed 2-2.6x faster on real hardware than
+  reading each piece separately.
 - **Read device-specific settings**: VorTech's own "Local Control"/"Led
   Auto Dim" and Radion's own "Max Fan Speed"/"Fan Shutdown"
   (`get_advanced_features()`), plus Vectra and NYOS Quantum settings
   (`get_vectra_info()`/`get_coffee_info()` — no real hardware to verify
   either against, see
   [known gaps](./documentation/10-known-gaps-and-open-questions.md)).
-- **Control scenes**: start feed mode, resume the normal schedule, or any
-  other configured scene.
 - **Fix a desynced device clock** (`set_time_to_now()`) — a WRITE.
   Writing to one device appears to propagate to the rest of its Thread
   mesh too, confirmed against real hardware — see

{python_mobius-0.7.1.dist-info → python_mobius-0.7.2.dist-info}/RECORD

@@ -1,9 +1,9 @@
-mobius/__init__.py,sha256=f4AxA0NoRP8SEz44ucmCOIDJ7pLbwubew8SmiooX15I,6788
+mobius/__init__.py,sha256=gcj_rnHfu_zczKCP4aBKOuKREHxuvmdXV9zFvMcj4eQ,6788
 mobius/cli.py,sha256=antaLPQysyPethop24fjeKowczEvfoVodgYkyIT5YxE,50008
 mobius/coap.py,sha256=dRE4yUp413etAMhDg2bLvFMLWusqjEWgUpC36i76mJs,10966
 mobius/constants.py,sha256=ytpf9S_cHBKFWi_scr06ydmv-MW1dLGlG3CYfOAkiAw,42480
 mobius/crc.py,sha256=kLtAYWZvLbo5_p9ep08ZlLg5Yah8Q2qq0IwTvqbBGW0,2700
-mobius/device.py,sha256=sJcAeCRyfsvNTh_kkpLs4pefWzgiZfmucmuG9MevYTM,188683
+mobius/device.py,sha256=YxfIgKWsERx1m-ueU1Bau1cXCWYOf-dzu2z3fUq7IeI,190773
 mobius/device_status.py,sha256=xlLCMU4gLnp59Uqix679jRdVBY2Jt6oI4EUr8fraeRg,34089
 mobius/discovery.py,sha256=Q_Z0riOBrEOwqpwAhk1wesh3340fiIYFi-8BWqhZ0JI,11949
 mobius/dump.py,sha256=S7-KNeDi9TOETm4ty5DwMXTrthvuMau196UENDQoAb4,16785
@@ -16,8 +16,8 @@ mobius/pump_status.py,sha256=RWTl8ZViCFDbiFU2mX-WAIH_cWhZOZ0M2B0oYXnPx3Y,1598
 mobius/relay.py,sha256=IG15TtKDjSkmmi_C2cJwPmucX7V4psfamI0hKgTb_v8,24197
 mobius/scenes.py,sha256=Wt0Ys2x1YjF8MNDEd6kxWqYBIYPdBSbfzXD-L5ZKzag,3592
 mobius/schedule.py,sha256=kkQgwkFtM3pvik7UFzHKVhPVZrCGSH9AYvAlVA6kAck,10848
-python_mobius-0.7.1.dist-info/METADATA,sha256=8JSsNXxyRdn4ZlcmVS_MdJrLAGbZIZke3cnfFGjcKWg,8306
-python_mobius-0.7.1.dist-info/WHEEL,sha256=zOwg4jB6zX2kU910N-cMawjivD6tO8NEWvE12je1bVk,87
-python_mobius-0.7.1.dist-info/entry_points.txt,sha256=Q2hlcek-bWm70zvd12v32essflPgC2su-dKDHAqbPoE,48
-python_mobius-0.7.1.dist-info/licenses/LICENSE,sha256=7a72Msu2Q-TnoiFxemxEGkwafJGObk1W3rw9hzmyM_Y,17984
-python_mobius-0.7.1.dist-info/RECORD,,
+python_mobius-0.7.2.dist-info/METADATA,sha256=X1Pa4FH6dPjYwjNRxFaRpu-hHgRn68f5F5eZubCNgqg,9036
+python_mobius-0.7.2.dist-info/WHEEL,sha256=zOwg4jB6zX2kU910N-cMawjivD6tO8NEWvE12je1bVk,87
+python_mobius-0.7.2.dist-info/entry_points.txt,sha256=Q2hlcek-bWm70zvd12v32essflPgC2su-dKDHAqbPoE,48
+python_mobius-0.7.2.dist-info/licenses/LICENSE,sha256=7a72Msu2Q-TnoiFxemxEGkwafJGObk1W3rw9hzmyM_Y,17984
+python_mobius-0.7.2.dist-info/RECORD,,