vsslctrl 0.1.5.dev1__tar.gz → 0.1.6.dev1__tar.gz

{vsslctrl-0.1.5.dev1 → vsslctrl-0.1.6.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.6.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.6.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.6.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.6.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.6.dev1}/vsslctrl/api_alpha.py

@@ -9,7 +9,7 @@ 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,
@@ -199,7 +199,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}"
         )
@@ -924,9 +924,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 +1026,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 +1036,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.6.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.6.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.6.dev1}/vsslctrl/data_structure.py

@@ -253,7 +253,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.6.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.6.dev1}/vsslctrl/zone.py

@@ -267,6 +267,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})$")
 

{vsslctrl-0.1.5.dev1 → vsslctrl-0.1.6.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.6.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