From 79d6ca4abf15c3d741c6a0053289e0d24851e3b2 Mon Sep 17 00:00:00 2001 From: Ryan Tasson Date: Fri, 14 Jun 2024 11:15:34 -0400 Subject: [PATCH 1/4] Correct power output detail for the every channel used case --- docs/manual/MAIN_CONTROLLER_SPECS.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/manual/MAIN_CONTROLLER_SPECS.md b/docs/manual/MAIN_CONTROLLER_SPECS.md index 40766458e..e89674a17 100644 --- a/docs/manual/MAIN_CONTROLLER_SPECS.md +++ b/docs/manual/MAIN_CONTROLLER_SPECS.md @@ -23,6 +23,7 @@ ||| |Speaker Power | 55 WPC @ 4 Ω | | | 32 WPC @ 8 Ω | +| | 23 WPC all-channel driven power | ||| |Speaker Impedance | 4 - 8 Ω | ||| From 8d70b7476a2a4c67c8386c3fa2e5921fd96d219a Mon Sep 17 00:00:00 2001 From: Ryan Tasson Date: Fri, 14 Jun 2024 11:22:26 -0400 Subject: [PATCH 2/4] Correct power output detail for the every channel used case --- docs/manual/MAIN_CONTROLLER_SPECS.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/manual/MAIN_CONTROLLER_SPECS.md b/docs/manual/MAIN_CONTROLLER_SPECS.md index e89674a17..2c23d6505 100644 --- a/docs/manual/MAIN_CONTROLLER_SPECS.md +++ b/docs/manual/MAIN_CONTROLLER_SPECS.md @@ -23,7 +23,7 @@ ||| |Speaker Power | 55 WPC @ 4 Ω | | | 32 WPC @ 8 Ω | -| | 23 WPC all-channel driven power | +| | 23 RMS WPC power with all channels driven | ||| |Speaker Impedance | 4 - 8 Ω | ||| From ac56d0c86aa70fbd340de1316970883d97fddf49 Mon Sep 17 00:00:00 2001 From: Michael Lohrer Date: Fri, 14 Jun 2024 18:30:03 -0400 Subject: [PATCH 3/4] Fixed typeset_manual script path and ignore intermediate lua output file --- .gitignore | 1 + scripts/typeset_manual | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index ed635c03a..818613fe4 100644 --- a/.gitignore +++ b/.gitignore @@ -185,6 +185,7 @@ rca_status # User Manual compilation byproducts docs/manual/_markdown_manual +manual.markdown.lua # Status File display-status.txt diff --git a/scripts/typeset_manual b/scripts/typeset_manual index abac9bf7d..d741f6bfd 100755 --- a/scripts/typeset_manual +++ b/scripts/typeset_manual @@ -4,4 +4,4 @@ SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" # run the script from the base directory cd ${SCRIPT_DIR}/.. # run the latest version of the markdown -> latex -> psf toolchain from https://github.com/Witiko/markdown -docker run --rm -v $(realpath .)/docs:/docs -w /docs witiko/markdown latexmk -lualatex manual.tex +docker run --rm -v $(realpath .)/docs/manual:/docs/manual -w /docs/manual witiko/markdown latexmk -lualatex manual.tex From 4bbed5114b1923f63d9115e82a0d3892f33f5c93 Mon Sep 17 00:00:00 2001 From: Michael Lohrer Date: Fri, 14 Jun 2024 18:31:41 -0400 Subject: [PATCH 4/4] WIP updating main controller specs to match spec sheet --- docs/manual/MAIN_CONTROLLER_SPECS.md | 62 +++++++++++++++------------- 1 file changed, 34 insertions(+), 28 deletions(-) diff --git a/docs/manual/MAIN_CONTROLLER_SPECS.md b/docs/manual/MAIN_CONTROLLER_SPECS.md index 2c23d6505..c5ed85b73 100644 --- a/docs/manual/MAIN_CONTROLLER_SPECS.md +++ b/docs/manual/MAIN_CONTROLLER_SPECS.md @@ -1,42 +1,48 @@ ### Specifications -|Feature|| -|:------|:-----| -|Streaming Sources | Airplay™, Pandora®, Spotify Connect™, DLNA®, Internet Radio, Bluetooth™* | +| Feature | Description | +| :--------------------------------- | :---------- | ||| -|Control Interfaces| Web App, Mobile App, REST API, Third-Party Software| +| Streaming Sources | Airplay™, Pandora®, Spotify Connect™, DLNA®, Internet Radio, Bluetooth™* | ||| -|Dimensions | 2U 19" rackmount unit, 12.5” L x 19” W x 3.5” H| +| Control Interfaces | Web App, Mobile App, REST API, Third-Party Software | ||| -|Weight | 15 lbs / 6.8 kg | +| Dimensions | 2U 19" rackmount with 315mm depth | ||| -|Connectivity | 100Mbps Ethernet| -| | 2x USB 2.0| +| Weight | 15 lbs / 6.8 kg | ||| -|Power Input | 100-120 VAC or 180-264 VAC, 50-60Hz, Maximum input 782W| +| Connectivity | 100Mbps Ethernet | +| | 2x USB 2.0 | ||| -|Power Consumption | 6.7W Idle | -| | 391W Continuous | -| | 782W Peak | +| Power Input | 100-120 VAC or 180-264 VAC, 50-60Hz | +|  - IEC 60320 C14 Fused Inlet | <10W idle, maximum input 782W | ||| -|Peak Current Consumption|6.8A @ 115VAC or 3.4A @230VAC| +| Peak Current | TODO: Remove? 6.8A @ 115VAC or 3.4A @230VAC| ||| -|Speaker Power | 55 WPC @ 4 Ω | -| | 32 WPC @ 8 Ω | -| | 23 RMS WPC power with all channels driven | +| Amplifier Outputs | Single channel RMS power @ 4 Ω: 55 W | +|  - 6 stereo amplified outputs | Single channel RMS power @ 8 Ω: 32 W | +|  - Euroblock connectors | All channels driven RMS power: 26 W per channel | +| | THD+N <0.1\% @ 1kHz | +| | S/N ratio: >95 dB (A) | +| | Crosstalk: >65 dB | ||| -|Speaker Impedance | 4 - 8 Ω | +| Preamp Outputs | Variable line level output | +|  - 6 stereo analog RCA | -79dB to 0dB gain in 1.0dB steps | +| | Max output level: 2.0 VRMS (6dBV) | ||| -|Stereo Zones | 6 | +| Line Level Audio Inputs | Max input level: 2.0 VRMS (6dBV) | +|  - 4 analog RCA inputs | Input Sensitivity: 0.35 VRMS | ||| -|Audio Input | 4 RCA Line In | -| | Max input level: 2.0 VRMS (6dBV) | -| | Input Sensitivity: 0.35 VRMS | +| Aux Input | 16-bit 48kHz input | +|  - 3.5mm connector | Can be digitally mixed into other sources. | ||| -|Digital Audio Sources | 32-bit 384KHz (Source 1), 16-bit 48KHz (Sources 2, 3, 4)| -| -| -| -| -| -| *\* with third party USB Adapter | +| Digital Audio Sources | 32-bit 384KHz (Source 1), 16-bit 48KHz (Sources 2, 3, 4) | +||| +| Expansion Connector | Control and audio connections for up to 5 zone expander units | +|  - 16-pin IDC | supporting a total of 36 zones. | +||| + +  +\ +\ +\* with third party USB Adapter