diff --git a/doc/TESTBenches.md b/doc/TESTBenches.md index 6495b001ce..77aab0a487 100644 --- a/doc/TESTBenches.md +++ b/doc/TESTBenches.md @@ -38,7 +38,7 @@ Note: The available resources, and their current usage, is indicated here: ![5G OTA Testbench](testbenches_doc_resources/5g-ota-bench.png) -[PDF version](testbenches_doc_resources/5g-ota-bench.pdf) | [LaTeX/TikZ version](testbenches_doc_resources/5g-ota-bench.tex) if you want to modify to reflect your setup +[LaTeX/TikZ version](testbenches_doc_resources/5g-ota-bench.tex) if you want to modify to reflect your setup ### 5G NSA/Faraday Cage Testbench diff --git a/doc/testbenches_doc_resources/5g-ota-bench.pdf b/doc/testbenches_doc_resources/5g-ota-bench.pdf deleted file mode 100644 index 3dc2e39e80..0000000000 Binary files a/doc/testbenches_doc_resources/5g-ota-bench.pdf and /dev/null differ diff --git a/doc/testbenches_doc_resources/5g-ota-bench.png b/doc/testbenches_doc_resources/5g-ota-bench.png index 1a84e4dd20..e72263629d 100644 Binary files a/doc/testbenches_doc_resources/5g-ota-bench.png and b/doc/testbenches_doc_resources/5g-ota-bench.png differ diff --git a/doc/testbenches_doc_resources/5g-ota-bench.tex b/doc/testbenches_doc_resources/5g-ota-bench.tex index 0ffd01fa63..818d10f0fe 100644 --- a/doc/testbenches_doc_resources/5g-ota-bench.tex +++ b/doc/testbenches_doc_resources/5g-ota-bench.tex @@ -16,9 +16,23 @@ \node[label=above:porcepix] (porcepix) {\includegraphics[width=1.2cm]{server}}; - \node[above right=-0.4cm and 2cm of porcepix, label=above:matix] (matix) + \node[above right=-0.8cm and 2cm of porcepix, label=above:aerial2] (aerial2) {\includegraphics[width=1.2cm]{server}} edge (porcepix); + \node[right=0.3cm of aerial2, label=above:Foxconn, draw, + minimum width=1.7cm, minimum height=0.8cm] (foxconn) + {O-RU} edge (aerial2); + \node[below right=+0.45cm and 0.35cm of foxconn.east] (antf1) + {\includegraphics[width=0.3cm]{antenna}} edge (foxconn.east); + \node[below right=-0.1cm and 0.35cm of foxconn.east] (antf2) + {\includegraphics[width=0.3cm]{antenna}} edge (foxconn.east); + \node[above right=-0.1cm and 0.35cm of foxconn.east] (antf3) + {\includegraphics[width=0.3cm]{antenna}} edge (foxconn.east); + \node[above right=+0.45cm and 0.35cm of foxconn.east] (antf4) + {\includegraphics[width=0.3cm]{antenna}} edge (foxconn.east); + + \node[above right=+1.3cm and 2cm of porcepix, label=above:matix] (matix) + {\includegraphics[width=1.2cm]{server}}; \node[right=0.3cm of matix, label=above:N310] (n310a) {\includegraphics[width=1.5cm]{n310}} edge (matix); \node[right=.2cm of n310a, duplexer] (b77o) {n77} edge (n310a); @@ -27,25 +41,35 @@ \node[above right=-0.1cm and 0.35cm of b77o.east] (anto2) {\includegraphics[width=0.3cm]{antenna}} edge (b77o); - \node[below right=-0.4cm and 2cm of porcepix, label=above:obelix] (obelix) + \node[below right=-0.6cm and 2cm of porcepix, label=above:obelix] (obelix) {\includegraphics[width=1.2cm]{server}} edge (porcepix); - \node[above right=-0.5cm and 0.3cm of obelix, label=above:N310] (n310o) + \node[right=0.3cm of obelix, label=above:N310] (n310o) {\includegraphics[width=1.5cm]{n310}} edge (obelix); \node[right=.2cm of n310o, duplexer] (b78o) {n40} edge (n310o); - \node[below right=-0.1cm and 0.35cm of b78o.east] (anto1) - {\includegraphics[width=0.3cm]{antenna}} edge (b78o); - \node[above right=-0.1cm and 0.35cm of b78o.east] (anto2) - {\includegraphics[width=0.3cm]{antenna}} edge (b78o); - \node[below right=-0.5cm and 0.3cm of obelix, label=above:X310] (x310o) - {\includegraphics[width=1.5cm]{x310}} edge (obelix); - \node[right=.2cm of x310o, duplexer] (b78o) {n78} edge (x310o); \node[below right=-0.1cm and 0.35cm of b78o.east] (anto1) {\includegraphics[width=0.3cm]{antenna}} edge (b78o); \node[above right=-0.1cm and 0.35cm of b78o.east] (anto2) {\includegraphics[width=0.3cm]{antenna}} edge (b78o); - \node[above right=-0.5cm and 5.0cm of n310o.east, label=above:RM520N-GL] (quectel) + \node[below=2cm of porcepix, label=above:Cluster] (cluster) + {\includegraphics[width=1.2cm]{server}}; + \node[right=2cm of cluster, label=above:cacofonix] (cacofonix) + {\includegraphics[width=1.2cm]{server}} + edge (cluster); + \node[right=0.3cm of cacofonix, label=above:VVDN, draw, + minimum width=1.7cm, minimum height=0.8cm] (vvdn) + {O-RU} edge (cacofonix); + \node[below right=+0.45cm and 0.35cm of vvdn.east] (antv1) + {\includegraphics[width=0.3cm]{antenna}} edge (vvdn.east); + \node[below right=-0.1cm and 0.35cm of vvdn.east] (antv2) + {\includegraphics[width=0.3cm]{antenna}} edge (vvdn.east); + \node[above right=-0.1cm and 0.35cm of vvdn.east] (antv3) + {\includegraphics[width=0.3cm]{antenna}} edge (vvdn.east); + \node[above right=+0.45cm and 0.35cm of vvdn.east] (antv4) + {\includegraphics[width=0.3cm]{antenna}} edge (vvdn.east); + + \node[above right=+0.0cm and 5.0cm of n310o.east, label=above:RM520N-GL] (quectel) {\includegraphics[height=1.2cm]{quectel}}; \node[above left=-0.1cm and 0.8cm of quectel.west] (aq2) {\includegraphics[width=0.3cm]{antenna}} edge (quectel);