vsslctrl 0.1.5.dev1__tar.gz → 0.1.7.dev1__tar.gz

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

@@ -1,7 +1,7 @@
 Metadata-Version: 2.1
 Name: vsslctrl
-Version: 0.1.5.dev1
-Summary: Package for controlling VSSL amplifiers
+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
 Classifier: Programming Language :: Python :: 3
@@ -20,31 +20,30 @@ Provides-Extra: optional
 Requires-Dist: zeroconf==0.132.2; extra == "optional"
 
 # vsslctrl
- Package for controlling [VSSL](https://www.vssl.com/) range of streaming amplifiers.
+
+ Package for controlling [VSSL's](https://www.vssl.com/) range of streaming amplifiers.
 
  **`vsslctrl` is not endorsed or affiliated with [VSSL](https://www.vssl.com/) in any manner.**
 
- Motovation for this project was to intergrate VSSLs amplifiers into [Home Assistant](https://www.home-assistant.io/) and have control over different subnets (not mDNS dependant)
+## Help
 
- I am looking for testers with any VSSL amplifier models, please get in touch if you interested in helping.
+I am looking for testers with any VSSL amplifier models, please get in touch if you interested in helping. <vsslcontrolled@proton.me>
 
-Important
------------
-Only tested on a VSSL **A.3x** software version **p15305.016.3701**.
+Tested on:
+- Test suite run on a VSSL **A.3x** software version **p15305.016.3701**
+- The Home Assistant [integration](https://github.com/vsslctrl/integration.home-assistant) is reported working on a **A.6x** software version **p15305.017.3701**
 
-**Notice:** VSSLs new iOS app titled `VSSL`can cause connection refused issues if running at the same time as `vsslctrl`. Best to not use the iOS app togeather. The `VSSL Legacy` app works fine
+## Important
 
-**Warning:** no *[VSSL Agent](https://vssl.gitbook.io/vssl-rest-api/getting-started/start)* should be running on the same network. If you dont know what this is, then you can probably ignore this notice.
+There should not be any *[VSSL Agent's](https://vssl.gitbook.io/vssl-rest-api/getting-started/start)* running on the same network. If you dont know what this is, then you can ignore this notice.
 
 ## TODOs
 
-* Test on other models (hardware needed)
-* Home Assistant integration. In progress, [here](https://github.com/vsslctrl/integration.home-assistant)
-* ~~Function scoping to supported feature / models~~ (needs tests)
+* **A1(.x)** specific control e.g sub crossover, bluetooth
 * Better test coverage
 
-Basic Usage
------------
+## Basic Usage
+
 `vsslctrl` needs to be running inside a **[asyncio](https://docs.python.org/3/library/asyncio.html)** event loop.
 
 ```python
@@ -91,8 +90,7 @@ async def main():
 asyncio.run(main())
 ```
 
-API
------------
+# API
 
 Most functionality is achived via `getters` and `setters` of the two main classes `Vssl`, `Zone`. 
 
@@ -284,10 +282,10 @@ zone1.group.dissolve()
 
 ## `Zone.analog_output`
 
-| Property      	| Description | Type		| Values 		| 
-| ---------------------- 	| ----------- | ----------- |----------- |
-| `source`     			 	| Where the AO is routed from. i.e a zone, optical input or off |	`int`	| `AnalogOutput.Sources`
-| `is_fixed_volume`   			| Fix the output volume. Output wont respond to volume control        |	`bool` readonly
+| Property      	| Description | Type		| Values 		| Default |
+| ---------------------- 	| ----------- | ----------- |----------- |----------- |
+| `source`     			 	| Where the AO is routed from. i.e a zone, optical input or off |	`int`	| `AnalogOutput.Sources` | `Off`
+| `is_fixed_volume`   			| Fix the output volume. Output wont respond to volume control        |	`bool` | |`False`
 | `is_fixed_volume_toggle()`   			| Toggle fixed volume      |	`func`  |
 
 ```python
@@ -304,12 +302,12 @@ zone1.analog_output.is_fixed_volume = True
 
 ## `Zone.settings`
 
-| Property      	| Description | Type		| Values 		| 
-| ---------------------- 	| ----------- | ----------- |----------- |
+| Property      	| Description | Type		| Values 		| Default |
+| ---------------------- 	| ----------- | ----------- |----------- |----------- |
 | `name`     			 	| Name |	`str`	| 
-| `disabled`   			| Disable the zone        |	`bool`
+| `disabled`   			| Disable the zone        |	`bool` || `False`
 | `disabled_toggle()`   			| disable / enable        |	`func`  |
-| `mono`   			| Set output to mono or stereo        |	`int`  | `ZoneSettings.StereoMono`
+| `mono`   			| Set output to mono or stereo        |	`int`  | `ZoneSettings.StereoMono` | `Stereo`
 | `mono_toggle()`   			| Toggle mono or stereo        |	`func`  |
 
 ```python
@@ -324,10 +322,10 @@ zone1.mono_toggle()
 
 ## `Zone.settings.analog_input`
 
-| Property      	| Description | Type		| Values 		| 
-| ---------------------- 	| ----------- | ----------- |----------- |
+| Property      	| Description | Type		| Values 		| Default |
+| ---------------------- 	| ----------- | ----------- |----------- |----------- |
 | `name`     			 	| Name |	`str`	| 
-| `fixed_gain`   		| Fix the input gain to a specific value       |`int` | `0...100`
+| `fixed_gain`   		| Fix the input gain to a specific value       |`int` | `0...100` | `0` is disabled or variable gain
 
 ```python
 """Examples"""
@@ -341,11 +339,11 @@ zone1.settings.analog_input.fixed_gain = 50
 
 ## `Zone.settings.volume`
 
-| Property      	| Description | Type		| Values 		| 
-| ---------------------- 	| ----------- | ----------- |----------- |
-| `default_on`     			 	| Default on volume  |	`int`  | `0...100` 
-| `max_left`     			 	| Max volume left channel  |	`int`  | `0...100` 
-| `max_right`     			 	| Max volume right channel  |	`int`  | `0...100` 
+| Property      	| Description | Type		| Values 		| Default |
+| ---------------------- 	| ----------- | ----------- |----------- |----------- |
+| `default_on`     			 	| Default on volume  |	`int`  | `0...100` | `0` is disabled
+| `max_left`     			 	| Max volume left channel  |	`int`  | `0...100` | `75`
+| `max_right`     			 	| Max volume right channel  |	`int`  | `0...100` | `75`
 
 ```python
 """Examples"""
@@ -357,21 +355,21 @@ zone1.settings.volume.default_on = 75
 
 ## `Zone.settings.eq`
 
-| Property      	| Description | Type		| Values 		| 
-| ---------------------- 	| ----------- | ----------- |----------- |
-| `enabled`     			 	| Enable / disable EQ        |	`bool` 
+| Property      	| Description | Type		| Values 		| Default |
+| ---------------------- 	| ----------- | ----------- |----------- |----------- |
+| `enabled`     			 	| Enable / disable EQ        |	`bool` | | `False`
 
 EQ to be set in [decibel](https://en.wikipedia.org/wiki/Decibel) using a range `-10`dB to `+10`dB
 
-| Property      	| Description | Type		| Values 		| 
-| ---------------------- 	| ----------- | ----------- |----------- | 
-| `hz60_db`     			 	| 60Hz |	`int`  | `-10...10`
-| `hz200_db`     			 	| 200Hz |	`int`  | `-10...10`
-| `hz500_db`     			 	| 500Hz |	`int`  | `-10...10`
-| `khz1_db`     			 	| 1kHz |	`int`  | `-10...10`
-| `khz4_db`     			 	| 4kHz |	`int`  | `-10...10`
-| `khz8_db`     			 	| 8kHz |	`int`  | `-10...10`
-| `khz15_db`     			 	| 15kHz |	`int`  | `-10...10`
+| Property      	| Description | Type		| Values 		| Default |
+| ---------------------- 	| ----------- | ----------- |----------- | ----------- |
+| `hz60_db`     			 	| 60Hz |	`int`  | `-10...10` | `0`
+| `hz200_db`     			 	| 200Hz |	`int`  | `-10...10` | `0`
+| `hz500_db`     			 	| 500Hz |	`int`  | `-10...10` | `0`
+| `khz1_db`     			 	| 1kHz |	`int`  | `-10...10` | `0`
+| `khz4_db`     			 	| 4kHz |	`int`  | `-10...10` | `0`
+| `khz8_db`     			 	| 8kHz |	`int`  | `-10...10` | `0`
+| `khz15_db`     			 	| 15kHz |	`int`  | `-10...10` | `0`
 
 ```python
 """Examples"""
@@ -430,10 +428,11 @@ shell_command:
 
 The VSSL API was reverse engineered using Wireshark, VSSLs native "legacy" iOS app and their deprecated [vsslagent](https://vssl.gitbook.io/vssl-rest-api/getting-started/start).
 
+Motovation for this project was to intergrate VSSLs amplifiers into [Home Assistant](https://www.home-assistant.io/) and have control over different subnets (not mDNS dependant)
+
 ## Known Issues & Limitiations
 
-* Tested on VSSL **A.3x** software version **p15305.016.3701**
-* Not tested on A.1x, A.6.x or original A series range of amplifiers (testers welcome)
+* Not tested on A.1x or original A series range of amplifiers (testers welcome)
 * VSSL can not start a stream except for playing a URL directly. This is a limitation of the hardware itself.
 * Not all sources set the volume to 0 when the zone is muted
 * Grouping feedback is flaky on the X series amplifiers
@@ -445,8 +444,8 @@ The VSSL API was reverse engineered using Wireshark, VSSLs native "legacy" iOS a
 
 ## Future
 
+* A.1(x) coverage i.e Bluetooth and subwoofer control
 * REST API / Web App
 * Save and recall EQ
-* A.1(x) coverage i.e Bluetooth
 * IR Control
 

{vsslctrl-0.1.5.dev1 → vsslctrl-0.1.7.dev1}/README.md

@@ -1,29 +1,28 @@
 # vsslctrl
- Package for controlling [VSSL](https://www.vssl.com/) range of streaming amplifiers.
+
+ Package for controlling [VSSL's](https://www.vssl.com/) range of streaming amplifiers.
 
  **`vsslctrl` is not endorsed or affiliated with [VSSL](https://www.vssl.com/) in any manner.**
 
- Motovation for this project was to intergrate VSSLs amplifiers into [Home Assistant](https://www.home-assistant.io/) and have control over different subnets (not mDNS dependant)
+## Help
 
- I am looking for testers with any VSSL amplifier models, please get in touch if you interested in helping.
+I am looking for testers with any VSSL amplifier models, please get in touch if you interested in helping. <vsslcontrolled@proton.me>
 
-Important
------------
-Only tested on a VSSL **A.3x** software version **p15305.016.3701**.
+Tested on:
+- Test suite run on a VSSL **A.3x** software version **p15305.016.3701**
+- The Home Assistant [integration](https://github.com/vsslctrl/integration.home-assistant) is reported working on a **A.6x** software version **p15305.017.3701**
 
-**Notice:** VSSLs new iOS app titled `VSSL`can cause connection refused issues if running at the same time as `vsslctrl`. Best to not use the iOS app togeather. The `VSSL Legacy` app works fine
+## Important
 
-**Warning:** no *[VSSL Agent](https://vssl.gitbook.io/vssl-rest-api/getting-started/start)* should be running on the same network. If you dont know what this is, then you can probably ignore this notice.
+There should not be any *[VSSL Agent's](https://vssl.gitbook.io/vssl-rest-api/getting-started/start)* running on the same network. If you dont know what this is, then you can ignore this notice.
 
 ## TODOs
 
-* Test on other models (hardware needed)
-* Home Assistant integration. In progress, [here](https://github.com/vsslctrl/integration.home-assistant)
-* ~~Function scoping to supported feature / models~~ (needs tests)
+* **A1(.x)** specific control e.g sub crossover, bluetooth
 * Better test coverage
 
-Basic Usage
------------
+## Basic Usage
+
 `vsslctrl` needs to be running inside a **[asyncio](https://docs.python.org/3/library/asyncio.html)** event loop.
 
 ```python
@@ -70,8 +69,7 @@ async def main():
 asyncio.run(main())
 ```
 
-API
------------
+# API
 
 Most functionality is achived via `getters` and `setters` of the two main classes `Vssl`, `Zone`. 
 
@@ -263,10 +261,10 @@ zone1.group.dissolve()
 
 ## `Zone.analog_output`
 
-| Property      	| Description | Type		| Values 		| 
-| ---------------------- 	| ----------- | ----------- |----------- |
-| `source`     			 	| Where the AO is routed from. i.e a zone, optical input or off |	`int`	| `AnalogOutput.Sources`
-| `is_fixed_volume`   			| Fix the output volume. Output wont respond to volume control        |	`bool` readonly
+| Property      	| Description | Type		| Values 		| Default |
+| ---------------------- 	| ----------- | ----------- |----------- |----------- |
+| `source`     			 	| Where the AO is routed from. i.e a zone, optical input or off |	`int`	| `AnalogOutput.Sources` | `Off`
+| `is_fixed_volume`   			| Fix the output volume. Output wont respond to volume control        |	`bool` | |`False`
 | `is_fixed_volume_toggle()`   			| Toggle fixed volume      |	`func`  |
 
 ```python
@@ -283,12 +281,12 @@ zone1.analog_output.is_fixed_volume = True
 
 ## `Zone.settings`
 
-| Property      	| Description | Type		| Values 		| 
-| ---------------------- 	| ----------- | ----------- |----------- |
+| Property      	| Description | Type		| Values 		| Default |
+| ---------------------- 	| ----------- | ----------- |----------- |----------- |
 | `name`     			 	| Name |	`str`	| 
-| `disabled`   			| Disable the zone        |	`bool`
+| `disabled`   			| Disable the zone        |	`bool` || `False`
 | `disabled_toggle()`   			| disable / enable        |	`func`  |
-| `mono`   			| Set output to mono or stereo        |	`int`  | `ZoneSettings.StereoMono`
+| `mono`   			| Set output to mono or stereo        |	`int`  | `ZoneSettings.StereoMono` | `Stereo`
 | `mono_toggle()`   			| Toggle mono or stereo        |	`func`  |
 
 ```python
@@ -303,10 +301,10 @@ zone1.mono_toggle()
 
 ## `Zone.settings.analog_input`
 
-| Property      	| Description | Type		| Values 		| 
-| ---------------------- 	| ----------- | ----------- |----------- |
+| Property      	| Description | Type		| Values 		| Default |
+| ---------------------- 	| ----------- | ----------- |----------- |----------- |
 | `name`     			 	| Name |	`str`	| 
-| `fixed_gain`   		| Fix the input gain to a specific value       |`int` | `0...100`
+| `fixed_gain`   		| Fix the input gain to a specific value       |`int` | `0...100` | `0` is disabled or variable gain
 
 ```python
 """Examples"""
@@ -320,11 +318,11 @@ zone1.settings.analog_input.fixed_gain = 50
 
 ## `Zone.settings.volume`
 
-| Property      	| Description | Type		| Values 		| 
-| ---------------------- 	| ----------- | ----------- |----------- |
-| `default_on`     			 	| Default on volume  |	`int`  | `0...100` 
-| `max_left`     			 	| Max volume left channel  |	`int`  | `0...100` 
-| `max_right`     			 	| Max volume right channel  |	`int`  | `0...100` 
+| Property      	| Description | Type		| Values 		| Default |
+| ---------------------- 	| ----------- | ----------- |----------- |----------- |
+| `default_on`     			 	| Default on volume  |	`int`  | `0...100` | `0` is disabled
+| `max_left`     			 	| Max volume left channel  |	`int`  | `0...100` | `75`
+| `max_right`     			 	| Max volume right channel  |	`int`  | `0...100` | `75`
 
 ```python
 """Examples"""
@@ -336,21 +334,21 @@ zone1.settings.volume.default_on = 75
 
 ## `Zone.settings.eq`
 
-| Property      	| Description | Type		| Values 		| 
-| ---------------------- 	| ----------- | ----------- |----------- |
-| `enabled`     			 	| Enable / disable EQ        |	`bool` 
+| Property      	| Description | Type		| Values 		| Default |
+| ---------------------- 	| ----------- | ----------- |----------- |----------- |
+| `enabled`     			 	| Enable / disable EQ        |	`bool` | | `False`
 
 EQ to be set in [decibel](https://en.wikipedia.org/wiki/Decibel) using a range `-10`dB to `+10`dB
 
-| Property      	| Description | Type		| Values 		| 
-| ---------------------- 	| ----------- | ----------- |----------- | 
-| `hz60_db`     			 	| 60Hz |	`int`  | `-10...10`
-| `hz200_db`     			 	| 200Hz |	`int`  | `-10...10`
-| `hz500_db`     			 	| 500Hz |	`int`  | `-10...10`
-| `khz1_db`     			 	| 1kHz |	`int`  | `-10...10`
-| `khz4_db`     			 	| 4kHz |	`int`  | `-10...10`
-| `khz8_db`     			 	| 8kHz |	`int`  | `-10...10`
-| `khz15_db`     			 	| 15kHz |	`int`  | `-10...10`
+| Property      	| Description | Type		| Values 		| Default |
+| ---------------------- 	| ----------- | ----------- |----------- | ----------- |
+| `hz60_db`     			 	| 60Hz |	`int`  | `-10...10` | `0`
+| `hz200_db`     			 	| 200Hz |	`int`  | `-10...10` | `0`
+| `hz500_db`     			 	| 500Hz |	`int`  | `-10...10` | `0`
+| `khz1_db`     			 	| 1kHz |	`int`  | `-10...10` | `0`
+| `khz4_db`     			 	| 4kHz |	`int`  | `-10...10` | `0`
+| `khz8_db`     			 	| 8kHz |	`int`  | `-10...10` | `0`
+| `khz15_db`     			 	| 15kHz |	`int`  | `-10...10` | `0`
 
 ```python
 """Examples"""
@@ -409,10 +407,11 @@ shell_command:
 
 The VSSL API was reverse engineered using Wireshark, VSSLs native "legacy" iOS app and their deprecated [vsslagent](https://vssl.gitbook.io/vssl-rest-api/getting-started/start).
 
+Motovation for this project was to intergrate VSSLs amplifiers into [Home Assistant](https://www.home-assistant.io/) and have control over different subnets (not mDNS dependant)
+
 ## Known Issues & Limitiations
 
-* Tested on VSSL **A.3x** software version **p15305.016.3701**
-* Not tested on A.1x, A.6.x or original A series range of amplifiers (testers welcome)
+* Not tested on A.1x or original A series range of amplifiers (testers welcome)
 * VSSL can not start a stream except for playing a URL directly. This is a limitation of the hardware itself.
 * Not all sources set the volume to 0 when the zone is muted
 * Grouping feedback is flaky on the X series amplifiers
@@ -424,8 +423,8 @@ The VSSL API was reverse engineered using Wireshark, VSSLs native "legacy" iOS a
 
 ## Future
 
+* A.1(x) coverage i.e Bluetooth and subwoofer control
 * REST API / Web App
 * Save and recall EQ
-* A.1(x) coverage i.e Bluetooth
 * IR Control
 

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

@@ -4,8 +4,8 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "vsslctrl"
-version = "0.1.5.dev1"
-description = "Package for controlling VSSL amplifiers"
+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.5.dev1 → vsslctrl-0.1.7.dev1}/vsslctrl/api_alpha.py

@@ -9,13 +9,14 @@ from .api_base import APIBase
 from .transport import ZoneTransport
 from .settings import EQSettings
 
-from .utils import hex_to_int, clamp_volume
+from .utils import hex_to_int, clamp_volume, hex_to_bytearray_string
 from .decorators import logging_helpers
 from .data_structure import (
     ZoneStatusExtKeys,
     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
 
     #
@@ -199,7 +200,7 @@ class APIAlpha(APIBase):
     # EQ
     #
     def request_action_0D(self, freq: "EQSettings.Freqs", value: int = 0):
-        clamped = max(90, min(value, 110))
+        clamped = max(EQSettings.MIN_VALUE, min(value, EQSettings.MAX_VALUE))
         self._log_debug(
             f"Requesting to set EQ: {freq.name[1:]} ({freq.value}) to {clamped}"
         )
@@ -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]
@@ -924,9 +922,9 @@ class APIAlpha(APIBase):
 
     #
     # 17 [23]
-    # Received Keep Alive
+    # Keep Alive
     #
-    def response_action_17(self, response: bytes):
+    def response_action_17(self, hexl: list, response: bytes):
         self._log_debug(f"Z{self.zone.id} Alpha - Received keep alive: {response}")
         # TODO
         pass
@@ -1026,8 +1024,9 @@ class APIAlpha(APIBase):
     # Command confimation
     #
     def response_action_confimation(self, response: bytes):
+        cmd = response.hex()
         self._log_debug(
-            f"Received command confimation: {response[1]}. Hex: {response.hex()}"
+            f"Received command confimation: {hex_to_bytearray_string(cmd)} Hex: {cmd}"
         )
 
     #
@@ -1035,6 +1034,7 @@ class APIAlpha(APIBase):
     # Default Action
     #
     def response_action_default(self, hexl: list, response: bytes):
+        cmd = response.hex()
         self._log_debug(
-            f"Received unknown command {hexl[1].upper()}. Hex: {response.hex()}"
+            f"Received unknown command: {hex_to_bytearray_string(cmd)} Hex: {cmd}"
         )

{vsslctrl-0.1.5.dev1 → vsslctrl-0.1.7.dev1}/vsslctrl/api_bravo.py

@@ -5,7 +5,7 @@ import struct
 import logging
 
 from .api_base import APIBase
-from .utils import hex_to_int
+from .utils import hex_to_int, hex_to_bytearray_string
 from .decorators import logging_helpers
 from .data_structure import TrackMetadataExtKeys
 
@@ -407,8 +407,10 @@ class APIBravo(APIBase):
     #
     def response_action_70(self, hexl: list, response: bytes):
         length = 4 if hexl[0] == 16 else 10
-        cmd = hexl[length:]
-        self._log_debug(f"Command confirmation: {response[length:]}")
+        cmd = response[length:].hex()
+        self._log_debug(
+            f"Received command confimation: {hex_to_bytearray_string(cmd)} Hex: {cmd}"
+        )
 
     #
     # Default

{vsslctrl-0.1.5.dev1 → vsslctrl-0.1.7.dev1}/vsslctrl/core.py

@@ -69,7 +69,7 @@ class Vssl:
                     self.Events.MODEL_CHANGE, self.ENTITY_ID
                 )
 
-            # Lets make sure the zone is initialised, otherwsie we fail all
+            # Lets make sure the zone is initialised, otherwsie we fail for all zones
             await first_zone.initialise()
 
             # Only continue after we have a model

{vsslctrl-0.1.5.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
 
@@ -253,7 +304,12 @@ class ZoneRouterStatusExtKeys:
     EQ_ENABLED = "eqsw"
     INPUT_SOURCE = "inSrc"
     SOURCE_PRIORITY = "SP"
-    ANALOG_OUTPUT_FIXED_VOLUME_PREFIX = "BF"
+    ANALOG_OUTPUT_1_FIXED_VOLUME = "BF1"
+    ANALOG_OUTPUT_2_FIXED_VOLUME = "BF2"
+    ANALOG_OUTPUT_3_FIXED_VOLUME = "BF3"
+    ANALOG_OUTPUT_4_FIXED_VOLUME = "BF4"
+    ANALOG_OUTPUT_5_FIXED_VOLUME = "BF5"
+    ANALOG_OUTPUT_6_FIXED_VOLUME = "BF6"
     GROUP_SOURCE = "GRS"
     GROUP_MASTER = "GRM"
     POWER_STATE = "Pwr"

{vsslctrl-0.1.5.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.5.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.5.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.5.dev1 → vsslctrl-0.1.7.dev1}/vsslctrl/utils.py

@@ -38,6 +38,19 @@ def group_list_by_property(input_list, property_key):
     return grouped_dict
 
 
+#
+# Logging Helper to show a command in bytearray([]) syntax
+#
+def hex_to_bytearray_string(hex_string):
+    # Convert the hex string to a bytearray
+    byte_array = bytearray.fromhex(hex_string)
+
+    # Create the bytearray string representation
+    bytearray_str = f'bytearray([{", ".join(map(str, byte_array))}])'
+
+    return bytearray_str
+
+
 #
 # Repeat Timer
 #

{vsslctrl-0.1.5.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
@@ -267,6 +269,11 @@ class Zone:
     def _set_mac_addr(self, mac: str):
         mac = mac.strip()
         if mac != self.mac_addr:
+            # Strip Wlan0: from beginging of string
+            # Original A series amps had this prefix
+            if mac.startswith("Wlan0:"):
+                mac = mac[len("Wlan0:") :]
+
             # Define the regular expression pattern for a MAC address
             mac_pattern = re.compile(r"^([0-9A-Fa-f]{2}[:-]){5}([0-9A-Fa-f]{2})$")
 
@@ -401,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.5.dev1 → vsslctrl-0.1.7.dev1}/vsslctrl.egg-info/PKG-INFO

@@ -1,7 +1,7 @@
 Metadata-Version: 2.1
 Name: vsslctrl
-Version: 0.1.5.dev1
-Summary: Package for controlling VSSL amplifiers
+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
 Classifier: Programming Language :: Python :: 3
@@ -20,31 +20,30 @@ Provides-Extra: optional
 Requires-Dist: zeroconf==0.132.2; extra == "optional"
 
 # vsslctrl
- Package for controlling [VSSL](https://www.vssl.com/) range of streaming amplifiers.
+
+ Package for controlling [VSSL's](https://www.vssl.com/) range of streaming amplifiers.
 
  **`vsslctrl` is not endorsed or affiliated with [VSSL](https://www.vssl.com/) in any manner.**
 
- Motovation for this project was to intergrate VSSLs amplifiers into [Home Assistant](https://www.home-assistant.io/) and have control over different subnets (not mDNS dependant)
+## Help
 
- I am looking for testers with any VSSL amplifier models, please get in touch if you interested in helping.
+I am looking for testers with any VSSL amplifier models, please get in touch if you interested in helping. <vsslcontrolled@proton.me>
 
-Important
------------
-Only tested on a VSSL **A.3x** software version **p15305.016.3701**.
+Tested on:
+- Test suite run on a VSSL **A.3x** software version **p15305.016.3701**
+- The Home Assistant [integration](https://github.com/vsslctrl/integration.home-assistant) is reported working on a **A.6x** software version **p15305.017.3701**
 
-**Notice:** VSSLs new iOS app titled `VSSL`can cause connection refused issues if running at the same time as `vsslctrl`. Best to not use the iOS app togeather. The `VSSL Legacy` app works fine
+## Important
 
-**Warning:** no *[VSSL Agent](https://vssl.gitbook.io/vssl-rest-api/getting-started/start)* should be running on the same network. If you dont know what this is, then you can probably ignore this notice.
+There should not be any *[VSSL Agent's](https://vssl.gitbook.io/vssl-rest-api/getting-started/start)* running on the same network. If you dont know what this is, then you can ignore this notice.
 
 ## TODOs
 
-* Test on other models (hardware needed)
-* Home Assistant integration. In progress, [here](https://github.com/vsslctrl/integration.home-assistant)
-* ~~Function scoping to supported feature / models~~ (needs tests)
+* **A1(.x)** specific control e.g sub crossover, bluetooth
 * Better test coverage
 
-Basic Usage
------------
+## Basic Usage
+
 `vsslctrl` needs to be running inside a **[asyncio](https://docs.python.org/3/library/asyncio.html)** event loop.
 
 ```python
@@ -91,8 +90,7 @@ async def main():
 asyncio.run(main())
 ```
 
-API
------------
+# API
 
 Most functionality is achived via `getters` and `setters` of the two main classes `Vssl`, `Zone`. 
 
@@ -284,10 +282,10 @@ zone1.group.dissolve()
 
 ## `Zone.analog_output`
 
-| Property      	| Description | Type		| Values 		| 
-| ---------------------- 	| ----------- | ----------- |----------- |
-| `source`     			 	| Where the AO is routed from. i.e a zone, optical input or off |	`int`	| `AnalogOutput.Sources`
-| `is_fixed_volume`   			| Fix the output volume. Output wont respond to volume control        |	`bool` readonly
+| Property      	| Description | Type		| Values 		| Default |
+| ---------------------- 	| ----------- | ----------- |----------- |----------- |
+| `source`     			 	| Where the AO is routed from. i.e a zone, optical input or off |	`int`	| `AnalogOutput.Sources` | `Off`
+| `is_fixed_volume`   			| Fix the output volume. Output wont respond to volume control        |	`bool` | |`False`
 | `is_fixed_volume_toggle()`   			| Toggle fixed volume      |	`func`  |
 
 ```python
@@ -304,12 +302,12 @@ zone1.analog_output.is_fixed_volume = True
 
 ## `Zone.settings`
 
-| Property      	| Description | Type		| Values 		| 
-| ---------------------- 	| ----------- | ----------- |----------- |
+| Property      	| Description | Type		| Values 		| Default |
+| ---------------------- 	| ----------- | ----------- |----------- |----------- |
 | `name`     			 	| Name |	`str`	| 
-| `disabled`   			| Disable the zone        |	`bool`
+| `disabled`   			| Disable the zone        |	`bool` || `False`
 | `disabled_toggle()`   			| disable / enable        |	`func`  |
-| `mono`   			| Set output to mono or stereo        |	`int`  | `ZoneSettings.StereoMono`
+| `mono`   			| Set output to mono or stereo        |	`int`  | `ZoneSettings.StereoMono` | `Stereo`
 | `mono_toggle()`   			| Toggle mono or stereo        |	`func`  |
 
 ```python
@@ -324,10 +322,10 @@ zone1.mono_toggle()
 
 ## `Zone.settings.analog_input`
 
-| Property      	| Description | Type		| Values 		| 
-| ---------------------- 	| ----------- | ----------- |----------- |
+| Property      	| Description | Type		| Values 		| Default |
+| ---------------------- 	| ----------- | ----------- |----------- |----------- |
 | `name`     			 	| Name |	`str`	| 
-| `fixed_gain`   		| Fix the input gain to a specific value       |`int` | `0...100`
+| `fixed_gain`   		| Fix the input gain to a specific value       |`int` | `0...100` | `0` is disabled or variable gain
 
 ```python
 """Examples"""
@@ -341,11 +339,11 @@ zone1.settings.analog_input.fixed_gain = 50
 
 ## `Zone.settings.volume`
 
-| Property      	| Description | Type		| Values 		| 
-| ---------------------- 	| ----------- | ----------- |----------- |
-| `default_on`     			 	| Default on volume  |	`int`  | `0...100` 
-| `max_left`     			 	| Max volume left channel  |	`int`  | `0...100` 
-| `max_right`     			 	| Max volume right channel  |	`int`  | `0...100` 
+| Property      	| Description | Type		| Values 		| Default |
+| ---------------------- 	| ----------- | ----------- |----------- |----------- |
+| `default_on`     			 	| Default on volume  |	`int`  | `0...100` | `0` is disabled
+| `max_left`     			 	| Max volume left channel  |	`int`  | `0...100` | `75`
+| `max_right`     			 	| Max volume right channel  |	`int`  | `0...100` | `75`
 
 ```python
 """Examples"""
@@ -357,21 +355,21 @@ zone1.settings.volume.default_on = 75
 
 ## `Zone.settings.eq`
 
-| Property      	| Description | Type		| Values 		| 
-| ---------------------- 	| ----------- | ----------- |----------- |
-| `enabled`     			 	| Enable / disable EQ        |	`bool` 
+| Property      	| Description | Type		| Values 		| Default |
+| ---------------------- 	| ----------- | ----------- |----------- |----------- |
+| `enabled`     			 	| Enable / disable EQ        |	`bool` | | `False`
 
 EQ to be set in [decibel](https://en.wikipedia.org/wiki/Decibel) using a range `-10`dB to `+10`dB
 
-| Property      	| Description | Type		| Values 		| 
-| ---------------------- 	| ----------- | ----------- |----------- | 
-| `hz60_db`     			 	| 60Hz |	`int`  | `-10...10`
-| `hz200_db`     			 	| 200Hz |	`int`  | `-10...10`
-| `hz500_db`     			 	| 500Hz |	`int`  | `-10...10`
-| `khz1_db`     			 	| 1kHz |	`int`  | `-10...10`
-| `khz4_db`     			 	| 4kHz |	`int`  | `-10...10`
-| `khz8_db`     			 	| 8kHz |	`int`  | `-10...10`
-| `khz15_db`     			 	| 15kHz |	`int`  | `-10...10`
+| Property      	| Description | Type		| Values 		| Default |
+| ---------------------- 	| ----------- | ----------- |----------- | ----------- |
+| `hz60_db`     			 	| 60Hz |	`int`  | `-10...10` | `0`
+| `hz200_db`     			 	| 200Hz |	`int`  | `-10...10` | `0`
+| `hz500_db`     			 	| 500Hz |	`int`  | `-10...10` | `0`
+| `khz1_db`     			 	| 1kHz |	`int`  | `-10...10` | `0`
+| `khz4_db`     			 	| 4kHz |	`int`  | `-10...10` | `0`
+| `khz8_db`     			 	| 8kHz |	`int`  | `-10...10` | `0`
+| `khz15_db`     			 	| 15kHz |	`int`  | `-10...10` | `0`
 
 ```python
 """Examples"""
@@ -430,10 +428,11 @@ shell_command:
 
 The VSSL API was reverse engineered using Wireshark, VSSLs native "legacy" iOS app and their deprecated [vsslagent](https://vssl.gitbook.io/vssl-rest-api/getting-started/start).
 
+Motovation for this project was to intergrate VSSLs amplifiers into [Home Assistant](https://www.home-assistant.io/) and have control over different subnets (not mDNS dependant)
+
 ## Known Issues & Limitiations
 
-* Tested on VSSL **A.3x** software version **p15305.016.3701**
-* Not tested on A.1x, A.6.x or original A series range of amplifiers (testers welcome)
+* Not tested on A.1x or original A series range of amplifiers (testers welcome)
 * VSSL can not start a stream except for playing a URL directly. This is a limitation of the hardware itself.
 * Not all sources set the volume to 0 when the zone is muted
 * Grouping feedback is flaky on the X series amplifiers
@@ -445,8 +444,8 @@ The VSSL API was reverse engineered using Wireshark, VSSLs native "legacy" iOS a
 
 ## Future
 
+* A.1(x) coverage i.e Bluetooth and subwoofer control
 * REST API / Web App
 * Save and recall EQ
-* A.1(x) coverage i.e Bluetooth
 * IR Control