python-mobius 0.6.0__tar.gz → 0.7.1__tar.gz

{python_mobius-0.6.0 → python_mobius-0.7.1}/CHANGELOG.md

@@ -1,5 +1,28 @@
 # Changelog
 
+## 0.7.1
+
+- Added scene support: get_configured_scenes(), get_current_scene(),
+  start_scene(). Fixed get_current_scene() crashing on a custom
+  (non-preset) scene, and start_scene()'s duration being in seconds,
+  not minutes as previously labeled.
+
+## 0.7.0
+
+- Added get_full_poll_batch() -- one round-trip for device identity +
+  metadata + light/pump state, confirmed 2-2.6x faster on real
+  hardware. Requires the caller to already know the device's own
+  PrimitiveType (permanent for its lifetime, so never re-fetched).
+- get_current_pump_block() now accepts an optional pre-fetched
+  `points` param, skipping its own redundant re-fetch of the same
+  schedule attribute.
+- Added get_light_poll_batch() -- one round-trip for a light's own
+  schedule, lunar/acclimation/insolation state, and Epoch/LocalTime,
+  falling back to the original individual reads if the batch fails.
+- Extracted every light-schedule-related method's own decode/compute
+  logic into pure, standalone functions, laying the groundwork for
+  get_light_poll_batch() above. No behavior change.
+
 ## 0.6.0
 
 - get_metadata_batch() now falls back to individual reads if the

{python_mobius-0.6.0 → python_mobius-0.7.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: python-mobius
-Version: 0.6.0
+Version: 0.7.1
 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

{python_mobius-0.6.0 → python_mobius-0.7.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "python-mobius"
-version = "0.6.0"
+version = "0.7.1"
 description = "Reverse-engineered Python client for the Mobius BLE protocol (EcoTech Marine VorTech/Radion, AquaIllumination, Neptune Systems, NYOS)"
 readme = "README.md"
 license = { text = "GPL-2.0-only" }

{python_mobius-0.6.0 → python_mobius-0.7.1}/src/mobius/__init__.py

@@ -35,6 +35,7 @@ from .schedule import (
     LightPrimitive, SchedulePoint, interpolate_light_schedule,
     PumpPrimitiveValue, PumpSchedulePoint, get_active_pump_block,
 )
+from .scenes import Scene, ActiveScene, decode_configured_scenes, decode_active_scene
 from .manufacturer import MOBIUS_COMPANY_ID_ECOTECH, MOBIUS_COMPANY_ID_AQUAILLUMINATION, MOBIUS_COMPANY_IDS, MobiusAdvertisement, parse_manufacturer_data
 from .modifiers import (
     AcclimationInfo, is_night_segment,
@@ -56,7 +57,7 @@ from .mesh_address import (
 )
 from .relay import RelayedMobiusDevice
 from .device import (
-    MobiusDevice, MobiusPump, LightIntensityResult,
+    MobiusDevice, MobiusPump, LightIntensityResult, LightPollResult, FullPollResult,
     SERVICE_GENERAL, CHAR_RX_DATA, CHAR_RX_FINAL, CHAR_TX_DATA, CHAR_TX_FINAL,
 )
 from .discovery import (
@@ -71,7 +72,7 @@ from .dump import (
     enrich_attribute_dump,
 )
 
-__version__ = "0.6.0"
+__version__ = "0.7.1"
 
 __all__ = [
     "__version__",
@@ -98,6 +99,8 @@ __all__ = [
     # schedule
     "LightPrimitive", "SchedulePoint", "interpolate_light_schedule",
     "PumpPrimitiveValue", "PumpSchedulePoint", "get_active_pump_block",
+    # scenes
+    "Scene", "ActiveScene", "decode_configured_scenes", "decode_active_scene",
     # manufacturer
     "MOBIUS_COMPANY_ID_ECOTECH", "MOBIUS_COMPANY_ID_AQUAILLUMINATION", "MOBIUS_COMPANY_IDS", "MobiusAdvertisement", "parse_manufacturer_data",
     # modifiers
@@ -117,7 +120,7 @@ __all__ = [
     "build_rloc_address", "extract_short_address", "is_short_address_derived",
     "RelayedMobiusDevice",
     # device
-    "MobiusDevice", "MobiusPump", "LightIntensityResult",
+    "MobiusDevice", "MobiusPump", "LightIntensityResult", "LightPollResult", "FullPollResult",
     "SERVICE_GENERAL", "CHAR_RX_DATA", "CHAR_RX_FINAL", "CHAR_TX_DATA", "CHAR_TX_FINAL",
     # discovery
     "scan_for_mobius_devices", "scan_for_mobius_devices_with_info", "group_by_pan_id",

{python_mobius-0.6.0 → python_mobius-0.7.1}/src/mobius/cli.py

@@ -18,6 +18,7 @@ from .device import MobiusDevice
 from .relay import RelayedMobiusDevice
 from .device_status import MeshPeer
 from .mesh_address import extract_short_address
+from .constants import PrimitiveType, SceneID
 from .discovery import (
     scan_for_mobius_devices_with_info, group_by_pan_id, dedupe_by_serial,
     find_device_by_serial, discover_mesh_peers_via_direct_connect, discover_tank,
@@ -99,6 +100,37 @@ async def _dump_schedule(device: MobiusDevice, support: str) -> None:
         print(f"    (schedule dumping not supported for support={support!r})")
 
 
+async def _dump_scenes(device: MobiusDevice, primitive: PrimitiveType | None) -> None:
+    """Prints every configured scene, at whatever slot it lives in,
+    including empty/unused slots. The currently active scene is
+    already shown by the summary above (info["current_scene"])."""
+    print("  --- configured scenes ---")
+    scenes = await device.get_configured_scenes(primitive=primitive)
+    if not scenes:
+        print("    (none)")
+        return
+    for scene in scenes:
+        if scene.scene_type == SceneID.EmptyScene and not scene.name:
+            print(f"    [{scene.index}] (empty)")
+            continue
+        type_label = scene.scene_type.name if scene.scene_type else "custom"
+        if scene.light is not None:
+            payload = ", ".join(
+                f"{vid.name}={val}"
+                for vid, val in sorted(scene.light.channels.items(), key=lambda x: x[0].name)
+            )
+        elif scene.pump is not None:
+            params = ", ".join(
+                f"{p.name}={v.hex() if isinstance(v, bytes) else (v.name if hasattr(v, 'name') else v)}"
+                for p, v in scene.pump.params.items()
+            )
+            payload = f"mode={scene.pump.mode.name} {params}"
+        else:
+            payload = "(no primitive data decoded)"
+        print(f"    [{scene.index}] id={scene.id} ({type_label}) name={scene.name!r} "
+              f"timeout={scene.timeout}s: {payload}")
+
+
 async def _debug_mesh_discovery(device) -> list:
     """
     Verbose, step-by-step version of discover_mesh_peers_auto() for CLI
@@ -273,6 +305,10 @@ async def _run(args) -> None:
                     print(f"  {k}: {v}")
                 if args.dump_schedule:
                     await _dump_schedule(mdevice, summary.get("support", ""))
+                if args.dump_scenes:
+                    primitive_name = summary.get("primitive_type")
+                    primitive = PrimitiveType[primitive_name] if primitive_name else None
+                    await _dump_scenes(mdevice, primitive)
 
                 relayed = None  # set below only if --relay-target resolves successfully
                 if args.dump_mesh_peers or args.relay_target:
@@ -620,6 +656,10 @@ async def _run(args) -> None:
                     print(f"  {k}: {v}")
                 if args.dump_schedule:
                     await _dump_schedule(mdevice, summary.get("support", ""))
+                if args.dump_scenes:
+                    primitive_name = summary.get("primitive_type")
+                    primitive = PrimitiveType[primitive_name] if primitive_name else None
+                    await _dump_scenes(mdevice, primitive)
         except Exception as e:
             print("  failed to connect/read:", e)
 
@@ -667,6 +707,12 @@ def main() -> None:
                               "hardware -- see LunarPhaseInfo's own docstring) -- compare against "
                               "\"current_intensities\"/\"light_diagnostics\" in the summary output "
                               "above for this library's own calculated value.")
+    parser.add_argument("--dump-scenes", action="store_true",
+                         help="Also print every configured scene on each connected device -- "
+                              "id, name, timeout, and its own light/pump payload -- at whatever "
+                              "slot it lives in, including empty/unused slots. The currently "
+                              "active scene is already shown by the summary above "
+                              "(\"current_scene\").")
     parser.add_argument("--dump-mesh-peers", action="store_true",
                          help="Only usable with --by-serial. After connecting, calls "
                               "discover_mesh_peers_auto() on it and prints every other device "

{python_mobius-0.6.0 → python_mobius-0.7.1}/src/mobius/constants.py

@@ -436,6 +436,7 @@ class C2Attribute(IntEnum):
     SceneTimeout = 402
     SceneTimer = 403
     # Scene diagnostics -- named, not yet exposed by a get_*() method.
+    LiveDemoSceneNero = 404
     LiveDemoTimeout = 405
     LiveDemoTimer = 406
     LiveDemoScene = 407