diff --git a/arara/rules/remove.yaml b/arara/rules/remove.yaml index 3da6724..1f7500a 100644 --- a/arara/rules/remove.yaml +++ b/arara/rules/remove.yaml @@ -12,18 +12,17 @@ commands: patterns, rec); prefix = []; - if (isUnix()) { - prefix = [ 'rm', '-f' ]; - } - else { - prefix = [ 'cmd', '/c', 'del' ]; - } - removals = []; - for (entry : entries) { - removals.add(getCommand(prefix, - entry.getCanonicalPath())); - } - return removals; + if (isUnix()) { + prefix = [ 'rm', '-f' ]; + } + else { + prefix = [ 'cmd', '/c', 'del' ]; + } + removals = []; + for (entry : entries) { + removals.add(getCommand(prefix, entry)) + } + return removals; } arguments: - identifier: directory diff --git a/pdf/rk3588_guide.pdf b/pdf/rk3588_guide.pdf index db81610..03fdf05 100644 Binary files a/pdf/rk3588_guide.pdf and b/pdf/rk3588_guide.pdf differ diff --git a/rk3588_guide.tex b/rk3588_guide.tex index 2c73a59..2ef920a 100644 --- a/rk3588_guide.tex +++ b/rk3588_guide.tex @@ -1,7 +1,7 @@ %!TEX program = latexmk -% arara: lualatex: { shell: yes, synctex: yes, options: ['--output-directory=output' ]} -% arara: lualatex: { shell: yes, synctex: yes, options: ['--output-directory=output' ]} -% arara: lualatex: { shell: yes, synctex: yes, options: ['--output-directory=output' ]} +% arara: xelatex: { shell: yes, synctex: yes, options: ['--output-directory=output' ]} +% arara: xelatex: { shell: yes, synctex: yes, options: ['--output-directory=output' ]} +% arara: xelatex: { shell: yes, synctex: yes, options: ['--output-directory=output' ]} % arara: remove: { % arara: --> directory: output, % arara: --> recursive: true, @@ -62,6 +62,7 @@ %\usepackage{emoji} \usepackage{circuitikz} \usepackage{comment} +\usepackage{tablefootnote} \usepackage{makecell} % \usepackage{xdufont} \usepackage[owncaptions,tablegrid]{vhistory} @@ -235,6 +236,6 @@ % Local Variables: % mode: latex -% TeX-engine: luatex +% TeX-engine: xelatex % TeX-master: t % End: \ No newline at end of file diff --git a/tex/build.tex b/tex/build.tex index 544f005..476dcfe 100644 --- a/tex/build.tex +++ b/tex/build.tex @@ -4,9 +4,9 @@ 主机系统推荐使用 Ubuntu >= 20.04 的版本。 \subsection{编译器和下载工具} -从公司共享目录获取 RK3588 的编译工具:\\ +从公司共享目录获取 RK3588 的编译工具: \texttt { -\small +\footnotesize \textbackslash{}\textbackslash{}192.168.1.202\textbackslash{}常用工具\textbackslash{}2.开发工具\textbackslash{}RK3588\textbackslash{}gcc-arm-9.2-2019.12-x86\_64-aarch64-none-linux-gnu.tar.xz。 } \\ 下载后用放在 linux 系统下,用命令解压: @@ -266,8 +266,8 @@ U-Boot 和 Kernel 使用的都是 boot.img 里面的 DTB 文件。设备树文 \end{tikzpicture} \caption{dts 入口文件} \end{figure} -开始查看,它会通过 \verb+include+ 指令引入别的文件。新项目建议从 \verb+rk3588-sytc-evb.dtsi+ 复制 -并从命令一个文件,然后 \verb+include+ 如注释掉的 \verb+rk3588-sytc-hrgz.dtsi+ 一样。 +开始查看,它会通过 \verb+include+ 指令引入别的文件。新项目开始的时候建议从 +\verb+rk3588-sytc-evb.dtsi+ 复制并重命名一个新文件,然后 \verb+include+ 它。 如注释掉的 \verb+rk3588-sytc-hrgz.dtsi+ 一样。 \section{rootfs.img 修改} diff --git a/tex/resource.tex b/tex/resource.tex index 2de375f..9cf5bef 100644 --- a/tex/resource.tex +++ b/tex/resource.tex @@ -9,7 +9,7 @@ eth0 和 eth1。其对应关系如下表所示: \toprule 网络接口 & 驱动 & 默认地址 \\ \midrule - \texttt{eth0} & \texttt{\small st\_gmac} & \texttt{\small 192.168.1.80} \\ + \texttt{eth0} & \texttt{\small st\_gmac} \tablefootnote{用命令 \tikz[baseline=(cmd.base)]\node [fill=black!8,font=\scriptsize\ttfamily] (cmd){ethtool -i eth0 | grep driver};查看。} & \texttt{\small 192.168.1.80} \\ \texttt{eth1} & \texttt{\small r8168} & \texttt{\small 192.168.2.80} \\ \bottomrule \end{tabular} @@ -122,17 +122,17 @@ RK3588 VICAP支持输入输出规格: \begin{table}[H] \centering - \begin{tabular}{llcl} + \small + \begin{tabular}{llm{6cm}m{3cm}} \toprule 接口 & 数量 & 输入 & 输出 \\ \midrule - {\scriptsize VICAP} & {\scriptsize 1} & \makecell[l]{ - {\scriptsize BT601 YCbCr 422 8bit} \\ - {\scriptsize RAW8/10/12BT656 YCbCr 422 8bit 逐行/隔行}\\ - {\scriptsize BT1120 YCbCr 422 16bit 逐行/隔行,单/双边沿采样} \\ - {\scriptsize 2/4 通道交错 BT656/BT1120 YCbCr 422 8/16bit 逐行/隔行} \\ - {\scriptsize MIPI CSI 4路IDs虚拟通道} \\ - {\scriptsize MIPI CSI RAW8/10/12/14, YUV422} } & \makecell[l]{\scriptsize NV16/NV12/YUV400/YUYV \\\scriptsize 紧凑/非紧凑 RAW} \\ + {\scriptsize VICAP} & {\scriptsize 1} & { \scriptsize BT601 YCbCr 422 8bit + {\scriptsize RAW8/10/12BT656 YCbCr 422 8bit 逐行/隔行} + {\scriptsize BT1120 YCbCr 422 16bit 逐行/隔行,单/双边沿采样} + {\scriptsize 2/4 通道交错 BT656/BT1120 YCbCr 422 8/16bit 逐行/隔行} + {\scriptsize MIPI CSI 4路IDs虚拟通道} + {\scriptsize MIPI CSI RAW8/10/12/14, YUV422} } & {\scriptsize NV16/NV12/YUV400/YUYV 紧凑/非紧凑 RAW} \\ \bottomrule \end{tabular} \end{table} @@ -141,6 +141,7 @@ RK3588 VICAP支持输入输出规格: RK3588 的ISP属于RK ISP v3.0版本,拥有2个ISP。 \begin{table}[H] \centering + \small \begin{tabular}{lccl} \toprule 工作模式 & 吞吐率 & 最大分辨率 & 输入格式 \\ @@ -148,7 +149,8 @@ RK3588 的ISP属于RK ISP v3.0版本,拥有2个ISP。 {\scriptsize 单ISP 单CSI} &{\scriptsize 16M@30fps }& {\scriptsize 4672x3504 } & {\scriptsize VICAP: raw8/raw10/raw12} \\ {\scriptsize 单ISP 2CSI } &{\scriptsize 8M@30FPS }& {\scriptsize 3840x2160/3264x2448 } & {\scriptsize VICAP: raw8/raw10/raw12} \\ {\scriptsize 单ISP 4CSI } &{\scriptsize 4M@30FPS }& {\scriptsize 2560x1536 } & {\scriptsize VICAP: raw8/raw10/raw12} \\ - {\scriptsize 双ISP 2合1单CSI} &\makecell{\scriptsize 32M@30fps \\ \scriptsize 48M@15fps }& {\scriptsize 8064x6048 } & {\scriptsize VICAP: raw8/raw10/raw12} \\ + \multirow{2}{*}{\scriptsize 双ISP 2合1单CSI} & {\scriptsize 32M@30fps} & \multirow{2}{*}{\scriptsize 8064x6048 } & \multirow{2}{*}{\scriptsize VICAP: raw8/raw10/raw12} \\ + & {\scriptsize 48M@15fps} & & \\ \bottomrule \end{tabular} \end{table}