vsslctrl 0.1.6.dev1__tar.gz → 0.1.7.dev1__tar.gz

{vsslctrl-0.1.6.dev1 → vsslctrl-0.1.7.dev1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: vsslctrl
-Version: 0.1.6.dev1
+Version: 0.1.7.dev1
 Summary: Package for controlling VSSL's range of streaming amplifiers
 Author-email: vsslctrl <vsslcontrolled@proton.me>
 Classifier: Development Status :: 4 - Beta

{vsslctrl-0.1.6.dev1 → vsslctrl-0.1.7.dev1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "vsslctrl"
-version = "0.1.6.dev1"
+version = "0.1.7.dev1"
 description = "Package for controlling VSSL's range of streaming amplifiers"
 authors = [
   { name="vsslctrl", email="vsslcontrolled@proton.me" },

{vsslctrl-0.1.6.dev1 → vsslctrl-0.1.7.dev1}/vsslctrl/api_alpha.py

@@ -16,6 +16,7 @@ from .data_structure import (
     ZoneEQStatusExtKeys,
     ZoneRouterStatusExtKeys,
     DeviceStatusExtKeys,
+    DeviceStatusExtendedExtKeys,
 )
 
 
@@ -94,10 +95,10 @@ class APIAlpha(APIBase):
 
     #
     # 00 [0] - 0B [11]
-    # Status BT (Bluetooth)
+    # Status device extended
     #
     def request_action_00_0B(self):
-        self._log_debug("Requesting status bluetooth")
+        self._log_debug("Requesting device status extended")
         self.send(bytearray([16, 0, 1, 11]))  # HEX: 1000010B
 
     #
@@ -746,28 +747,25 @@ class APIAlpha(APIBase):
 
     #
     # 00_0B
-    # System Status 0B (Not Sure)
+    # Device Status Extended 0B
     #
     # {'IRMskL': '241', 'IRMskH': '255', 'BTSta': '0', 'Crs': '0', 'Fes': '0', 'Drk': '0'}
     #
-    #
-    # IRMskL / IRMskH:
-    # These could potentially be related to Infrared (IR) remote control signals. "IRMskL" and "IRMskH" might represent the low and high values of the modulation frequency or pulse width for an infrared signal.
-    #
-    # BTSta:
-    # This might represent the Bluetooth status, with "0" indicating that Bluetooth is currently not active or disconnected.
-    #
-    # Crs:
-    # It could stand for "Crossfade" and may represent a setting related to crossfading between audio tracks.
-    #
-    # Fes:
-    # This might stand for "Frequency" or "Filter Effect Setting," representing a parameter related to frequency or filtering effects.
-    #
-    # Drk: ?
-    #
     def response_action_00_0B(self, metadata: list):
         self._log_debug(f"Received 0B Status: {metadata}")
-        pass
+
+        # Bluetooth
+        if DeviceStatusExtendedExtKeys.BLUETOOTH_STATUS in metadata:
+            self.vssl.settings._set_property(
+                "bluetooth", int(metadata[DeviceStatusExtendedExtKeys.BLUETOOTH_STATUS])
+            )
+
+        # Subwoofer Crossover
+        if DeviceStatusExtendedExtKeys.SUBWOOFER_CROSSOVER in metadata:
+            self.zone.settings.subwoofer._set_property(
+                "crossover",
+                int(metadata[DeviceStatusExtendedExtKeys.SUBWOOFER_CROSSOVER]),
+            )
 
     #
     # 2A [42]

{vsslctrl-0.1.6.dev1 → vsslctrl-0.1.7.dev1}/vsslctrl/data_structure.py

@@ -92,6 +92,57 @@ class DeviceStatusExtKeys:
         return f"B{zone_id}Src"
 
 
+"""
+JSON Structure
+
+DO NOT CHANGE - VSSL Defined
+
+
+ IRMskL / IRMskH:
+ These could potentially be related to Infrared (IR) remote control signals. "IRMskL" and "IRMskH" might represent the low and high values of the modulation frequency or pulse width for an infrared signal.
+
+ BTSta:
+ This might represent the Bluetooth status, with "0" indicating that Bluetooth is currently not active or disconnected.
+
+ Crs:
+ It could stand for "Crossfade" and may represent a setting related to crossfading between audio tracks.
+
+ Fes:
+ This might stand for "Frequency" or "Filter Effect Setting," representing a parameter related to frequency or filtering effects.
+
+ Drk: ?
+
+
+A3.x
+{
+    'IRMskL': '241', 
+    'IRMskH': '255', 
+    'BTSta': '0', 
+    'Crs': '0', 
+    'Fes': '0', 
+    'Drk': '0'
+}
+
+A6.x
+{
+    "IRMskL":"255",
+    "IRMskH":"255",
+    "BTSta":"0",
+    "Crs":"0",
+    "Fes":"0",
+    "Drk":"0"
+'
+
+"""
+
+
+class DeviceStatusExtendedExtKeys:
+    IR_HIGH = "IRMskH"  # Guess - To Confirm
+    IR_LOW = "IRMskL"  # Guess - To Confirm
+    BLUETOOTH_STATUS = "BTSta"  # Guess - To Confirm
+    SUBWOOFER_CROSSOVER = "Crs"  # Guess - To Confirm
+
+
 """
 JSON Structure
 

{vsslctrl-0.1.6.dev1 → vsslctrl-0.1.7.dev1}/vsslctrl/device.py

@@ -36,6 +36,7 @@ class Features(VsslIntEnum):
     GROUPING = 1000
     BLUETOOTH = 1001
     PARTY_MODE = 1002
+    SUBWOOFER_CROSSOVER = 1003
 
 
 class Model:
@@ -65,7 +66,7 @@ class Models(VsslEnum):
             "zones": SINGLE_ZONE,
             "input_sources": INPUT_SOURCES_FOR_1_ZONE_DEVICE,
             "analog_output_sources": ANALOG_OUTPUT_SOURCES_FOR_1_ZONE_DEVICE,
-            "features": [Features.BLUETOOTH],
+            "features": [Features.BLUETOOTH, Features.SUBWOOFER_CROSSOVER],
         }
     )
     A3 = Model(
@@ -92,7 +93,7 @@ class Models(VsslEnum):
             "zones": SINGLE_ZONE,
             "input_sources": INPUT_SOURCES_FOR_1_ZONE_DEVICE,
             "analog_output_sources": ANALOG_OUTPUT_SOURCES_FOR_1_ZONE_DEVICE,
-            "features": [Features.GROUPING, Features.BLUETOOTH],
+            "features": [Features.BLUETOOTH, Features.SUBWOOFER_CROSSOVER],
         }
     )
     A3X = Model(

{vsslctrl-0.1.6.dev1 → vsslctrl-0.1.7.dev1}/vsslctrl/io.py

@@ -49,8 +49,8 @@ class InputRouter(ZoneDataClass):
     def __init__(self, zone: "zone.Zone"):
         self.zone = zone
 
-        self._priority = self.Priorities.STREAM
-        self._source = self.Sources.STREAM
+        self._priority = self.DEFAULTS["priority"]
+        self._source = self.DEFAULTS["source"]
 
     #
     # Input Priority
@@ -138,7 +138,7 @@ class AnalogOutput(ZoneDataClass):
     def __init__(self, zone: "zone.Zone"):
         self.zone = zone
 
-        self._is_fixed_volume = False
+        self._is_fixed_volume = self.DEFAULTS["is_fixed_volume"]
         self._source = self.Sources(zone.id + 2)
 
     #
@@ -199,7 +199,7 @@ class AnalogInput(ZoneDataClass):
         self.zone = zone
 
         self._name = f"Analog In {self.zone.id}"
-        self._fixed_gain = 0
+        self._fixed_gain = self.DEFAULTS["fixed_gain"]
 
     #
     # Analog Input Name

{vsslctrl-0.1.6.dev1 → vsslctrl-0.1.7.dev1}/vsslctrl/settings.py

@@ -2,6 +2,7 @@ import logging
 from typing import Dict, Union
 from .utils import clamp_volume
 from .io import AnalogInput
+from .device import Features as DeviceFeatures
 from .data_structure import (
     VsslIntEnum,
     VsslDataClass,
@@ -16,6 +17,7 @@ class VsslSettings(VsslDataClass):
     class Keys:
         NAME = "name"
         OPTICAL_INPUT_NAME = "optical_input_name"
+        BLUETOOTH = "bluetooth"
 
     #
     # VSSL Events
@@ -24,17 +26,23 @@ class VsslSettings(VsslDataClass):
         PREFIX = VSSL_SETTINGS_EVENT_PREFIX
         NAME_CHANGE = PREFIX + "name_changed"
         OPTICAL_INPUT_NAME_CHANGE = PREFIX + "optical_input_name_changed"
+        BLUETOOTH_CHANGE = PREFIX + "bluetooth_changed"
 
     #
     # Defaults
     #
-    DEFAULTS = {Keys.NAME: None, Keys.OPTICAL_INPUT_NAME: "Optical In"}
+    DEFAULTS = {
+        Keys.NAME: None,
+        Keys.OPTICAL_INPUT_NAME: "Optical In",
+        Keys.BLUETOOTH: 0,
+    }
 
     def __init__(self, vssl: "vsslctrl.Vssl"):
         self._vssl = vssl
 
         self._name = None  # device name
         self._optical_input_name = self.DEFAULTS[self.Keys.OPTICAL_INPUT_NAME]
+        self._bluetooth = self.DEFAULTS[self.Keys.BLUETOOTH]
         self.power = VsslPowerSettings(vssl)
 
     #
@@ -63,6 +71,30 @@ class VsslSettings(VsslDataClass):
         if zone:
             zone.api_alpha.request_action_15_12(name)
 
+    #
+    # Bluetooth
+    #
+    @property
+    def bluetooth(self):
+        return bool(self._bluetooth)
+
+    @bluetooth.setter
+    def bluetooth(self, enabled: bool):
+        if not self._vssl.model.supports_feature(DeviceFeatures.BLUETOOTH):
+            self._vssl._log_error(
+                f"VSSL {self._vssl.model.name} does not support Bluetooth"
+            )
+            return
+
+        zone = self._vssl.get_connected_zone()
+        if zone:
+            # TODO
+            # zone.api_alpha.request_action_bluetooth(not not enabled)
+            pass
+
+    def bluetooth_toggle(self):
+        self.bluetooth = False if self.bluetooth else True
+
 
 class VsslPowerSettings(VsslDataClass):
     #
@@ -165,6 +197,7 @@ class ZoneSettings(ZoneDataClass):
         self._mono = self.StereoMono.Stereo
 
         self.eq = EQSettings(zone)
+        self.subwoofer = SubwooferSettings(zone)
         self.volume = VolumeSettings(zone)
         self.analog_input = AnalogInput(zone)
 
@@ -653,3 +686,59 @@ class EQSettings(ZoneDataClass):
     @khz15_db.setter
     def khz15_db(self, val: int):
         self._set_frequency_on_device_db(self.Freqs.KHZ15, val)
+
+
+# Not in io.py to prevent circ import in device.py
+class SubwooferSettings(ZoneDataClass):
+    MIN_VALUE = 0
+    MAX_VALUE = 1000
+
+    #
+    # Subwoofer events
+    #
+    class Events:
+        PREFIX = "zone.subwoofer."
+        CROSSOVER_CHANGE = PREFIX + "crossover_change"
+
+    #
+    # Defaults
+    #
+    DEFAULTS = {"crossover": 0}
+
+    def __init__(self, zone: "zone.Zone"):
+        self.zone = zone
+
+        self._crossover = self.DEFAULTS["crossover"]
+
+    #
+    # Clamp between min and max
+    #
+    def _clamp_crossover(self, value: int = 100):
+        return int(max(self.MIN_VALUE, min(value, self.MAX_VALUE)))
+
+    #
+    # Crossover freq
+    #
+    @property
+    def crossover(self):
+        return self._crossover
+
+    @crossover.setter
+    def crossover(self, freq: int):
+        if not self.zone.vssl.model.supports_feature(
+            DeviceFeatures.SUBWOOFER_CROSSOVER
+        ):
+            self.zone._log_error(
+                f"VSSL {self.zone.vssl.model.name} does not have a subwoofer output"
+            )
+            return
+        #
+        # TODO
+        #
+        # self.zone.api_alpha.request_action_crossover(freq)
+
+    def _set_crossover(self, freq: int):
+        freq = self._clamp_crossover(freq)
+        if self.crossover != freq:
+            self._crossover = freq
+            return True

{vsslctrl-0.1.6.dev1 → vsslctrl-0.1.7.dev1}/vsslctrl/zone.py

@@ -74,7 +74,7 @@ class Zone:
                 self._request_eq_status,
                 self._request_track,
                 self._request_name,
-                self._request_bt_status,
+                self._request_status_extended,
             ],
         )
 
@@ -128,6 +128,8 @@ class Zone:
         self.initialisation.set()
         self.vssl.event_bus.publish(self.Events.INITIALISED, self.id, self)
 
+        self._log_info(f"Zone {self.id} initialised")
+
         return self
 
     @property
@@ -406,7 +408,7 @@ class Zone:
         self.api_alpha.request_action_00_0A()
         return self
 
-    def _request_bt_status(self):
+    def _request_status_extended(self):
         self.api_alpha.request_action_00_0B()
         return self
 

{vsslctrl-0.1.6.dev1 → vsslctrl-0.1.7.dev1}/vsslctrl.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: vsslctrl
-Version: 0.1.6.dev1
+Version: 0.1.7.dev1
 Summary: Package for controlling VSSL's range of streaming amplifiers
 Author-email: vsslctrl <vsslcontrolled@proton.me>
 Classifier: Development Status :: 4 - Beta