Update tables to be in latex, add SPECS_TITLE.md as a means of keepin…

…g the .tex graphs in the table of contents, remove references to multiple QR codes on links page
micro-nova · SteveMicroNova · Aug 30, 2024 · Sep 13, 2024 · Sep 16, 2024 · Sep 16, 2024
commit 3e141e8442878e299b7eaa32075f597ce1eb4830
diff --git a/docs/manuals/common/SPECS_TITLE.md b/docs/manuals/common/SPECS_TITLE.md
@@ -0,0 +1 @@
+## Specifications
diff --git a/docs/manuals/common/TROUBLESHOOTING.md b/docs/manuals/common/TROUBLESHOOTING.md
@@ -55,7 +55,7 @@ These backups are dated tarballs stored at `/home/pi/backups`. This tarball cont
 3. Start AmpliPi again (`systemctl start --user amplipi`).`
 
 ## Reimaging AmpliPro
-For directions on how to bring AmpliPro system back to a previous version, scan the QR labeled "Reimaging Instructions" on the links page at the start of this manual, or [click this link](https://github.com/micro-nova/AmpliPi/blob/main/docs/imaging_etcher.md). It is a good idea to take a system backup before running this process; see the above section labelled "Taking and restoring configuration backups".
+For directions on how to bring AmpliPro system back to a previous version, scan the QR on the links page at the start of this manual and select "Reimaging Instructions", or [click this link](https://github.com/micro-nova/AmpliPi/blob/main/docs/imaging_etcher.md). It is a good idea to take a system backup before running this process; see the above section labelled "Taking and restoring configuration backups".
 
 ## Still need help?
 

diff --git a/docs/manuals/expander-manual.tex b/docs/manuals/expander-manual.tex
@@ -17,6 +17,10 @@
 \usepackage[parfill]{parskip}
 \usepackage[hybrid]{markdown}
 
+\usepackage{colortbl}
+\usepackage{array}
+\usepackage{booktabs}
+
 \usepackage{xcolor}
 \definecolor{ampliproblue}{RGB}{0, 77, 255}
 \usepackage{sectsty}
@@ -62,7 +66,8 @@
 \newpage
 \markdownInput{expander/OVERVIEW.md}
 \newpage
-\markdownInput{expander/ZONE_EXPANDER_SPECS.md}
+\markdownInput{common/SPECS_TITLE.md}
+\input{expander/ZONE_EXPANDER_SPECS.tex}
 \newpage
 \markdownInput{expander/INSTALLATION.md}
 \newpage

diff --git a/docs/manuals/expander/ZONE_EXPANDER_SPECS.md b/docs/manuals/expander/ZONE_EXPANDER_SPECS.md
diff --git a/docs/manuals/expander/ZONE_EXPANDER_SPECS.tex b/docs/manuals/expander/ZONE_EXPANDER_SPECS.tex
@@ -0,0 +1,87 @@
+\renewcommand{\arraystretch}{2}
+\rowcolors{2}{gray!25}{white}
+\setlength{\arrayrulewidth}{0.5mm}
+
+\resizebox{\textwidth}{!}{
+  \begin{tabular}{|p{4cm}|p{10cm}|}
+  \hline
+  \textbf{Feature} & \textbf{Description} \\
+  \hline
+
+  Dimensions
+  &
+  2U 19" rackmount unit with 300mm depth, 12.5” L x 19” W x 3.5” H \\
+
+  \hline
+
+  Weight
+  &
+  15 lbs / 6.8 kg \\
+
+  \hline
+
+  Power Input
+  &
+  100-240VAC 50-60Hz max input 45W \\
+
+  \hline
+
+  Power Consumption
+  &
+  6.7W Idle \newline
+  391W Continuous \newline
+  782W Peak \\
+
+  \hline
+
+  Peak Current Consumption
+  &
+  6.8A @ 115VAC or 3.4A @230VAC \\
+
+  \hline
+
+  Outputs
+  &
+  4 x Line-Level RCA \newline Ch 1: up to 32-bit 384 kHz DAC output \newline Ch 2-4: up to 16-bit 48 kHz DAC output \\
+
+  \hline
+
+  Speaker Power
+  &
+  55 WPC @ 4 Ω \newline
+  32 WPC @ 8 Ω \\
+
+  \hline
+
+  Speaker Power
+  &
+  55 WPC @ 4 Ω \newline
+  32 WPC @ 8 Ω \\
+
+  \hline
+
+  Speaker Impedance
+  &
+  4 - 8 Ω \\
+
+  \hline
+
+  Speaker Zones
+  &
+  6, Expandable up to 36 with AmpliPro Expansion Units\\
+
+  \hline
+
+  Inputs
+  &
+  1 x Chain In (audio from Chain Out from main unit) \\
+
+  \hline
+
+  Digital Audio Sources
+  &
+  32-bit 384KHz (Source 1), 16-bit 48KHz (Sources 2, 3, 4) \\
+
+  \hline
+  \end{tabular}
+}
diff --git a/docs/manuals/main-manual.tex b/docs/manuals/main-manual.tex
@@ -17,6 +17,10 @@
 \usepackage[parfill]{parskip}
 \usepackage[hybrid]{markdown}
 
+\usepackage{colortbl}
+\usepackage{array}
+\usepackage{booktabs}
+
 \usepackage{xcolor}
 \definecolor{ampliproblue}{RGB}{0, 77, 255}
 \usepackage{sectsty}
@@ -56,7 +60,7 @@
 \newpage
 \pagenumbering{arabic}
 
-\markdownInput{common/LINKS.md}
+\markdownInput{main/LINKS.md}
 \newpage
 \markdownInput{common/SAFETY.md}
 \newpage
@@ -66,7 +70,8 @@
 \newpage
 \markdownInput{main/MAIN_CONTROLLER.md}
 \newpage
-\markdownInput{main/MAIN_CONTROLLER_SPECS.md}
+\markdownInput{common/SPECS_TITLE.md}
+\input{main/MAIN_CONTROLLER_SPECS.tex}
 \newpage
 \markdownInput{main/INSTALLATION.md}
 \newpage

diff --git a/docs/manuals/main/INSTALLATION.md b/docs/manuals/main/INSTALLATION.md
@@ -73,7 +73,7 @@ Now that the AmpliPro unit is powered on, it's time to use the software. To acce
 
 ### Mobile App
 
-1. We offer mobile apps available on Android and iOS, simply search for "Amplipi" on the Google Play Store or Apple's App Store or go to the Links page at the start of this manual for QR codes for each version
+1. We offer mobile apps available on Android and iOS, simply search for "Amplipi" on the Google Play Store or Apple's App Store or go to the Links page at the start of this manual, scan the QR code, and click "Apps". Otherwise, follow this link on a mobile device: https://www.amplipi.com/app.
 2. Once you have the app downloaded, permit the app to access devices on your local network. The app will automatically search your network for active AmpliPro units.
 3. If you have multiple controllers, it will ask which unit you wish to connect to. We suggest giving different hostnames to each unit if you have multiple controllers on the same network for this reason.
 

diff --git a/docs/manuals/main/LINKS.md b/docs/manuals/main/LINKS.md
@@ -0,0 +1,5 @@
+# Links
+Follow this QR code to go to a page that contains links to go to our community forums, developer blog, app downloads, quick-start video, and the newest version of this manual.
+\
+Can't follow the QR? Go to https://www.amplipi.com/main-links.
+![QR Code](main/qr-page.png)
diff --git a/docs/manuals/main/MAIN_CONTROLLER_SPECS.md b/docs/manuals/main/MAIN_CONTROLLER_SPECS.md
diff --git a/docs/manuals/main/MAIN_CONTROLLER_SPECS.tex b/docs/manuals/main/MAIN_CONTROLLER_SPECS.tex
@@ -0,0 +1,114 @@
+\renewcommand{\arraystretch}{2}
+\rowcolors{2}{gray!25}{white}
+\setlength{\arrayrulewidth}{0.5mm}
+
+\resizebox{\textwidth}{!}{
+  \begin{tabular}{|p{4cm}|p{10cm}|}
+  \hline
+  \textbf{Feature} & \textbf{Description} \\
+  \hline
+
+  Streaming Sources
+  &
+  Airplay\texttrademark, Pandora\textregistered, Spotify Connect\texttrademark, DLNA\textregistered,\newline
+  Lyrion Media Server (LMS), Internet Radio,\newline
+  FM Radio*, Bluetooth\texttrademark*, Local Media Playback* \\
+
+  \hline
+
+  Control Interfaces
+  &
+  Web App, Mobile App, REST API, Third-Party Drivers \\
+
+  \hline
+
+  Dimensions
+  &
+  2U 19" rackmount unit, 12.5” L x 19” W x 3.5” H \\
+
+  \hline
+
+  Weight
+  &
+  15 lbs / 6.8 kg \\
+
+  \hline
+
+  Connectivity
+  &
+  100Mbps Ethernet\\
+
+  \hline
+
+  Power Input
+  &
+  100-120 VAC or 180-264 VAC, 50-60Hz, Maximum input 782W \\
+
+  \hline
+
+  Power Consumption
+  &
+  6.7W Idle \newline
+  391W Continuous \newline
+  782W Peak \\
+
+  \hline
+
+  Peak Current Consumption
+  &
+  6.8A @ 115VAC or 3.4A @230VAC \\
+
+  \hline
+
+  Outputs
+  &
+  4 x Line-Level RCA \newline Ch 1: up to 32-bit 384 kHz DAC output \newline Ch 2-4: up to 16-bit 48 kHz DAC output \\
+
+  \hline
+
+  Speaker Power
+  &
+  55 WPC @ 4 Ω \newline
+  32 WPC @ 8 Ω \\
+
+  \hline
+
+  Speaker Power
+  &
+  55 WPC @ 4 Ω \newline
+  32 WPC @ 8 Ω \\
+
+  \hline
+
+  Speaker Impedance
+  &
+  4 - 8 Ω \\
+
+  \hline
+
+  Speaker Zones
+  &
+  6, Expandable up to 36 with AmpliPro Expansion Units\\
+
+  \hline
+
+  Inputs
+  &
+  4 x RCA Line In \newline
+  Max input level: 2.0 VRMS (6dBV) \newline
+  Input Sensitivity: 0.35 VRMS \newline
+  2 x External USB 2.0 \newline
+  1 x Internal USB 2.0 \newline
+  1 x 3.5mm Audio Jack \\
+
+  \hline
+
+  Digital Audio Sources
+  &
+  32-bit 384KHz (Source 1), 16-bit 48KHz (Sources 2, 3, 4) \\
+
+  \hline
+  \end{tabular}
+}
+
+*With third-party USB hardware
diff --git a/docs/manuals/main/OVERVIEW.md b/docs/manuals/main/OVERVIEW.md
@@ -22,4 +22,4 @@ The following optional accessories are available and can be purchased separately
 AmpliPro hosts a web app (referred to as "AmpliPi") that can control the system from any PC or mobile phone on the local network. It is designed with the idea that each of the four audio sources could be controlled separately by different people in the house.
 \
 \
-There is also a downloadable app for iOS and Android devices, simply search for "AmpliPi" on your respective app distributor, or scan the proper QR code for your device on the Links page at the start of this manual
+There is also a downloadable app for iOS and Android devices, simply search for "AmpliPi" on your respective app distributor, or scan the proper QR code for your device on the Links page at the start of this manual, scan the QR code, and click "Apps". Otherwise, follow this link on a mobile device: https://www.amplipi.com/app.
diff --git a/docs/manuals/main/qr-page.png b/docs/manuals/main/qr-page.png
diff --git a/docs/manuals/streamer-manual.tex b/docs/manuals/streamer-manual.tex
@@ -68,6 +68,7 @@
 \newpage
 \markdownInput{streamer/OVERVIEW.md}
 \newpage
+\markdownInput{common/SPECS_TITLE.md}
 \input{streamer/STREAMER_SPECS.tex}
 \newpage
 \markdownInput{streamer/INSTALLATION.md}

diff --git a/docs/manuals/streamer/INSTALLATION.md b/docs/manuals/streamer/INSTALLATION.md
@@ -29,7 +29,7 @@ Now that the AmpliPro Streamer is powered on, it's time to use the software. To
 
 ### Mobile App
 
-1. We offer mobile apps available on Android and iOS, simply search for "Amplipi" on the Google Play Store or Apple's App Store or go to the Links page at the start of this manual for QR codes for each version
+1. We offer mobile apps available on Android and iOS, simply search for "Amplipi" on the Google Play Store or Apple's App Store or go to the Links page at the start of this manual, scan the QR code, and click "Apps". Otherwise, follow this link on a mobile device: https://www.amplipi.com/app.
 2. Once you have the app downloaded, permit the app to access devices on your local network. The app will automatically search your network for active AmpliPro units.
 3. If you have multiple controllers (main units or streamers), it will ask which unit you wish to connect to. We suggest giving different hostnames to each unit if you have multiple controllers on the same network for this reason.
 

diff --git a/docs/manuals/streamer/LINKS.md b/docs/manuals/streamer/LINKS.md
@@ -2,4 +2,4 @@
 Follow this QR code to go to a page that contains links to go to our community forums, developer blog, app downloads, quick-start video, and the newest version of this manual.
 \
 Can't follow the QR? Go to https://www.amplipi.com/streamer-links.
-![QR Code](streamer/qr-page-streamer.png)
+![QR Code](streamer/qr-page.png)