python-mobius 0.1.0__py3-none-any.whl → 0.1.1__py3-none-any.whl

mobius/__init__.py

@@ -23,7 +23,8 @@ from .frame import (
 from .constants import (
     PrimitiveType, PRIMITIVE_SIZE, LIGHT_PRIMITIVES,
     PUMP_PRIMITIVES_VERIFIED, PUMP_PRIMITIVES_EXPERIMENTAL,
-    Model, ErrorState, C2Attribute, PhysicalValueID, VisualID,
+    Model, MODEL_MANUFACTURER, manufacturer_for_model,
+    ErrorState, C2Attribute, PhysicalValueID, VisualID,
     SceneID, OperationState, FsciStatus,
     PumpMode, RampType, PumpParam, PUMP_PARAM_SIZE, PUMP_MODE_PARAMS,
 )
@@ -40,7 +41,7 @@ from .discovery import (
     scan_for_mobius_devices, scan_for_mobius_devices_with_info, group_by_pan_id,
 )
 
-__version__ = "0.1.0"
+__version__ = "0.1.1"
 
 __all__ = [
     "__version__",
@@ -57,7 +58,8 @@ __all__ = [
     # constants
     "PrimitiveType", "PRIMITIVE_SIZE", "LIGHT_PRIMITIVES",
     "PUMP_PRIMITIVES_VERIFIED", "PUMP_PRIMITIVES_EXPERIMENTAL",
-    "Model", "ErrorState", "C2Attribute", "PhysicalValueID", "VisualID",
+    "Model", "MODEL_MANUFACTURER", "manufacturer_for_model",
+    "ErrorState", "C2Attribute", "PhysicalValueID", "VisualID",
     "SceneID", "OperationState", "FsciStatus",
     "PumpMode", "RampType", "PumpParam", "PUMP_PARAM_SIZE", "PUMP_MODE_PARAMS",
     # schedule

mobius/constants.py

@@ -11,6 +11,7 @@ See documentation/ for the full derivation of each table.
 from __future__ import annotations
 
 from enum import IntEnum
+from typing import Optional
 
 
 # --------------------------------------------------------------------------
@@ -107,6 +108,65 @@ class Model(IntEnum):
     Coffee2 = 397            # "Quantum 220/300" (NYOS)
 
 
+# Ported from M.Model.getManufacturer(). The decompiled version branches on
+# enum *ordinal* against a hardcoded position list (the full ~100-entry
+# Model enum's index 1-37 range, plus a few extras, all map to "EcoTech
+# Marine"); since this library only implements a curated subset of Model,
+# this is re-derived by name pattern against that same logic instead of by
+# ordinal position -- functionally equivalent for every Model value defined
+# above, but if you add more Model entries, add their manufacturer here too.
+MODEL_MANUFACTURER: dict[Model, str] = {
+    Model.Unknown: "Unknown",
+    Model.VorTechMP10wES: "EcoTech Marine",
+    Model.VorTechMP10wQD: "EcoTech Marine",
+    Model.VorTechMP40wES: "EcoTech Marine",
+    Model.VorTechMP40wQD: "EcoTech Marine",
+    Model.VorTechMP40wG3QD: "EcoTech Marine",
+    Model.VorTechMP60wES: "EcoTech Marine",
+    Model.VorTechMP60wQD: "EcoTech Marine",
+    Model.RadionXR30w: "EcoTech Marine",
+    Model.RadionXR30wG2: "EcoTech Marine",
+    Model.RadionXR30wPro: "EcoTech Marine",
+    Model.RadionXR30wG3: "EcoTech Marine",
+    Model.RadionXR30wG3Pro: "EcoTech Marine",
+    Model.RadionXR30wG4: "EcoTech Marine",
+    Model.RadionXR30wG4Pro: "EcoTech Marine",
+    Model.RadionXR30wFWPro: "EcoTech Marine",
+    Model.RadionXR30wPrototype: "EcoTech Marine",
+    Model.RadionXR15wG3Pro: "EcoTech Marine",
+    Model.RadionXR15wFW: "EcoTech Marine",
+    Model.RadionXR15wG4Pro: "EcoTech Marine",
+    Model.RadionXR15wFWPro: "EcoTech Marine",
+    Model.RadionXR15wPrototype: "EcoTech Marine",
+    Model.RadionXR15G5Pro: "EcoTech Marine",
+    Model.RadionXR15wG5Blue: "EcoTech Marine",
+    Model.RadionXR15wG5FW: "EcoTech Marine",
+    Model.RadionXR15wG6Pro: "EcoTech Marine",
+    Model.RadionXR15wG6Blue: "EcoTech Marine",
+    Model.RadionXR30wG5Pro: "EcoTech Marine",
+    Model.RadionXR30wG5Blue: "EcoTech Marine",
+    Model.VectraM1: "EcoTech Marine",
+    Model.VectraL1: "EcoTech Marine",
+    Model.VectraS1: "EcoTech Marine",
+    Model.VectraS2: "EcoTech Marine",
+    Model.VectraM2: "EcoTech Marine",
+    Model.VectraL2: "EcoTech Marine",
+    Model.Nero5: "AquaIllumination",
+    Model.Nero3: "AquaIllumination",
+    Model.DosingPump: "AquaIllumination",
+    Model.Muffler: "Neptune Systems",   # confirmed explicitly in the decompile's manufacturer list
+    Model.Coffee1: "NYOS",               # confirmed explicitly (CoffeeV1 branch)
+    Model.Coffee2: "NYOS",
+}
+
+
+def manufacturer_for_model(model: Optional[Model]) -> Optional[str]:
+    """Returns the manufacturer name for a Model, or None if unknown/unmapped."""
+    if model is None:
+        return None
+    return MODEL_MANUFACTURER.get(model)
+
+
 class ErrorState(IntEnum):
     """Confirmed literal values from M.ErrorState (subset covering common
     pump/light fault codes -- the full enum also has dosing-pump-specific codes)."""

mobius/device.py

@@ -29,7 +29,7 @@ from .frame import (
 )
 from .constants import (
     C2Attribute, PrimitiveType, Model, ErrorState, SceneID, OperationState,
-    FsciStatus, PhysicalValueID, VisualID,
+    FsciStatus, PhysicalValueID, VisualID, manufacturer_for_model,
     PRIMITIVE_SIZE, LIGHT_PRIMITIVES, PUMP_PRIMITIVES_VERIFIED, PUMP_PRIMITIVES_EXPERIMENTAL,
 )
 from .schedule import (
@@ -48,6 +48,25 @@ CHAR_TX_DATA = "01ff0103-ba5e-f4ee-5ca1-eb1e5e4b1ce0"   # write: app -> device,
 CHAR_TX_FINAL = "01ff0104-ba5e-f4ee-5ca1-eb1e5e4b1ce0"  # write: app -> device, last fragment
 
 
+def _decode_serial(raw: bytes) -> str:
+    """
+    Serial numbers are printable ASCII on every device tested (confirmed by
+    cross-validating the GATT-read serial against the same serial parsed
+    from BLE advertisement manufacturer data -- see manufacturer.py and
+    documentation/08-manufacturer-data.md), so decode as text rather than
+    hex-encoding raw bytes. Falls back to hex for any non-printable-ASCII
+    edge case not yet observed, rather than raising.
+    """
+    text = raw.rstrip(b"\x00")
+    try:
+        decoded = text.decode("ascii")
+    except UnicodeDecodeError:
+        return raw.hex()
+    if decoded and all(32 <= ord(c) < 127 for c in decoded):
+        return decoded
+    return raw.hex()
+
+
 class MobiusDevice:
     """
     High-level async client for a single Mobius-protocol BLE device.
@@ -252,8 +271,9 @@ class MobiusDevice:
         return {
             "model_raw": model_val,
             "model": model.name if model is not None else (f"unknown({model_val})" if model_val is not None else None),
+            "manufacturer": manufacturer_for_model(model),
             "name": name_raw.decode("utf-8", errors="replace").rstrip("\x00") if name_raw else None,
-            "serial": serial_raw.hex() if serial_raw else None,
+            "serial": _decode_serial(serial_raw) if serial_raw else None,
             "primitive_type": PrimitiveType(primitive_raw[0]).name if primitive_raw else None,
             "error_state": error.name if error is not None else (f"unknown({error_val})" if error_val is not None else None),
             "mac_address": ":".join(f"{b:02X}" for b in mac_raw) if mac_raw else None,

{python_mobius-0.1.0.dist-info → python_mobius-0.1.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-mobius
-Version: 0.1.0
+Version: 0.1.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.1.1.dist-info/RECORD

@@ -0,0 +1,14 @@
+mobius/__init__.py,sha256=JK6iAhOfAJ1LBf2tKUi3OQY7NMNwOudyyExjYKbehNU,3381
+mobius/cli.py,sha256=uhGZIDrhpTp8LkTGOl4BZVQWgJYHbaIVH2HzX3RFCCs,2642
+mobius/constants.py,sha256=wKrWU-QnqMuWuvczHwt3ha3sPw6D9NNK-kIhxJcTbHA,14702
+mobius/crc.py,sha256=WwIfUXGN_UKdsv-_Q303-L1-L1Rc1fvJnB5176ftzqU,2669
+mobius/device.py,sha256=VeBBT2z0XyqwdnUxw56GrG_ZlVe5Oq05tF-m4z-rMDY,20805
+mobius/discovery.py,sha256=4MjGwpd0bUK-koiZ-a2Cvq-gCTImAKAQ4lZ-9vOge3Q,2290
+mobius/frame.py,sha256=zG2vh8PceJHD8R43MwZiJnm0Ge1dr8nFcKsJR9_c9LM,6135
+mobius/manufacturer.py,sha256=8-vBzckN8xmsPSMj5EWtOCXenbyQueoY5pnZHePgb_k,1937
+mobius/schedule.py,sha256=kHr684TIKPZ2BplIySoeD-Yn1Xa_2bE6rfGUs-waWMQ,7483
+python_mobius-0.1.1.dist-info/METADATA,sha256=m9dnMFZU2-Qdq_kLSpxPqoYE05Ac3E7NhtSjSmwjXNo,5907
+python_mobius-0.1.1.dist-info/WHEEL,sha256=lCkmxWfQsSc9CfIClYeavTdQeEX2toPqufh9gI35EQA,87
+python_mobius-0.1.1.dist-info/entry_points.txt,sha256=Q2hlcek-bWm70zvd12v32essflPgC2su-dKDHAqbPoE,48
+python_mobius-0.1.1.dist-info/licenses/LICENSE,sha256=7a72Msu2Q-TnoiFxemxEGkwafJGObk1W3rw9hzmyM_Y,17984
+python_mobius-0.1.1.dist-info/RECORD,,

python_mobius-0.1.0.dist-info/RECORD

@@ -1,14 +0,0 @@
-mobius/__init__.py,sha256=wtCy-JKP5KhFr3dq_C0V4458R-msyZt2EP96vH16Tr8,3281
-mobius/cli.py,sha256=uhGZIDrhpTp8LkTGOl4BZVQWgJYHbaIVH2HzX3RFCCs,2642
-mobius/constants.py,sha256=9OtNEOU4FXXhdgayGrz5e_T8s6M20UE31B6GQ-mywnY,12022
-mobius/crc.py,sha256=WwIfUXGN_UKdsv-_Q303-L1-L1Rc1fvJnB5176ftzqU,2669
-mobius/device.py,sha256=CbCQQjmLQmg-zFufRufcRPkA3PlO_18AkeCP_eDE0EA,19993
-mobius/discovery.py,sha256=4MjGwpd0bUK-koiZ-a2Cvq-gCTImAKAQ4lZ-9vOge3Q,2290
-mobius/frame.py,sha256=zG2vh8PceJHD8R43MwZiJnm0Ge1dr8nFcKsJR9_c9LM,6135
-mobius/manufacturer.py,sha256=8-vBzckN8xmsPSMj5EWtOCXenbyQueoY5pnZHePgb_k,1937
-mobius/schedule.py,sha256=kHr684TIKPZ2BplIySoeD-Yn1Xa_2bE6rfGUs-waWMQ,7483
-python_mobius-0.1.0.dist-info/METADATA,sha256=pwoXT7fGt7RyDQKMvRzjvNJZaaFtzENzOUWI_OwmELs,5907
-python_mobius-0.1.0.dist-info/WHEEL,sha256=lCkmxWfQsSc9CfIClYeavTdQeEX2toPqufh9gI35EQA,87
-python_mobius-0.1.0.dist-info/entry_points.txt,sha256=Q2hlcek-bWm70zvd12v32essflPgC2su-dKDHAqbPoE,48
-python_mobius-0.1.0.dist-info/licenses/LICENSE,sha256=7a72Msu2Q-TnoiFxemxEGkwafJGObk1W3rw9hzmyM_Y,17984
-python_mobius-0.1.0.dist-info/RECORD,,