Skip to content

Commit

Permalink
Merge pull request #2 from AgainstWar/master
Browse files Browse the repository at this point in the history
补充部分翻译
  • Loading branch information
XxChang authored Jan 26, 2023
2 parents 8eb9ff4 + 16792ae commit 8dfa242
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 19 deletions.
8 changes: 4 additions & 4 deletions src/intro/install/macos.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# macOS

All the tools can be install using [Homebrew]:
所有的工具都可以用[Homebrew]来安装:

[Homebrew]: http://brew.sh/

Expand All @@ -15,11 +15,11 @@ $ # QEMU
$ brew install qemu
```

> **NOTE** If OpenOCD crashes you may need to install the latest version using:
> **注意** 如果OpenOCD崩溃了,你可能需要用以下方法安装最新版本:
```text
$ brew install --HEAD openocd
```

That's all! Go to the [next section].
以上是全部内容!转到 [下个章节]

[next section]: verify.md
[下个章节]: verify.md
26 changes: 11 additions & 15 deletions src/intro/install/windows.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

## `arm-none-eabi-gdb`

ARM provides `.exe` installers for Windows. Grab one from [here][gcc], and follow the instructions.
Just before the installation process finishes tick/select the "Add path to environment variable"
option. Then verify that the tools are in your `%PATH%`:
ARM提供了用于Windows的`.exe`安装程序。从[这里][gcc]获取, 然后按照说明操作。
在完成安装之前,勾选/选择"Add path to environment variable"选项。
然后验证环境变量是否添加到 `%PATH%`:

``` text
$ arm-none-eabi-gdb -v
Expand All @@ -16,15 +16,12 @@ GNU gdb (GNU Tools for Arm Embedded Processors 7-2018-q2-update) 8.1.0.20180315-

## OpenOCD

There's no official binary release of OpenOCD for Windows but if you're not in the mood to compile
it yourself, the xPack project provides a binary distribution, [here][openocd]. Follow the
provided installation instructions. Then update your `%PATH%` environment variable to
include the path where the binaries were installed. (`C:\Users\USERNAME\AppData\Roaming\xPacks\@xpack-dev-tools\openocd\0.10.0-13.1\.content\bin\`,
if you've been using the easy install)
OpenOCD 官方没有提供Windows的二进制版本, 若你没有心情去折腾编译,[这里][openocd]有xPack提供的一个二进制发布.。按照说明进行安装。然后更新你的`%PATH%` 环境变量,将安装目录包括进去。 (`C:\Users\USERNAME\AppData\Roaming\xPacks\@xpack-dev-tools\openocd\0.10.0-13.1\.content\bin\`,
如果使用简易安装)

[openocd]: https://xpack.github.io/openocd/

Verify that OpenOCD is in your `%PATH%` with:
使用以下命令验证OpenOCD是否在你的`%PATH%`环境变量中 :

``` text
$ openocd -v
Expand All @@ -34,17 +31,16 @@ Open On-Chip Debugger 0.10.0

## QEMU

Grab QEMU from [the official website][qemu].
[官网][qemu]获取QEMU。

[qemu]: https://www.qemu.org/download/#windows

## ST-LINK USB driver

You'll also need to install [this USB driver] or OpenOCD won't work. Follow the installer
instructions and make sure you install the right version (32-bit or 64-bit) of the driver.
你还需要安装这个 [USB驱动] 否则OpenOCD将无法工作。按照安装程序的说明,确保你安装了正确版本(32位或64位)的驱动程序。

[this USB driver]: http://www.st.com/en/embedded-software/stsw-link009.html
[USB驱动]: http://www.st.com/en/embedded-software/stsw-link009.html

That's all! Go to the [next section].
以上是全部内容!转到 [下个章节]

[next section]: verify.md
[下个章节]: verify.md

0 comments on commit 8dfa242

Please sign in to comment.