summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2022-05-30 22:06:28 +0000
committerQMK Bot <hello@qmk.fm>2022-05-30 22:06:28 +0000
commit6e4e50d5aaef48284baefd71836b0ac821ea232d (patch)
tree7ac1a34d39ffc2953a2f4fa2d6988c86d70a8c5b
parent2de70e6f2d5c7217ec0a0f318e999a0644d9db0d (diff)
parent25ec68c4085e0661ccb086ae9e887654d2e983fb (diff)
Merge remote-tracking branch 'origin/master' into develop
-rw-r--r--docs/flashing.md2
-rw-r--r--docs/zh-cn/flashing.md2
2 files changed, 2 insertions, 2 deletions
diff --git a/docs/flashing.md b/docs/flashing.md
index a4610cae8c..dfb255f2dc 100644
--- a/docs/flashing.md
+++ b/docs/flashing.md
@@ -266,7 +266,7 @@ Flashing sequence:
### `make` Targets
* `:dfu-util`: Waits until an STM32 bootloader device is available, and then flashes the firmware.
-* `:dfu-util-split-left` and `:dfu-util-split-right`: Flashes the firmware as with `:avrdude`, but also sets the handedness setting in EEPROM. This is ideal for Proton-C-based split keyboards.
+* `:dfu-util-split-left` and `:dfu-util-split-right`: Flashes the firmware as with `:dfu-util`, but also sets the handedness setting in EEPROM. This is ideal for Proton-C-based split keyboards.
* `:st-link-cli`: Allows you to flash the firmware via the ST-Link CLI utility, rather than dfu-util. Requires an ST-Link dongle.
* `:st-flash`: Allows you to flash the firmware via the `st-flash` utility from [STLink Tools](https://github.com/stlink-org/stlink), rather than dfu-util. Requires an ST-Link dongle.
diff --git a/docs/zh-cn/flashing.md b/docs/zh-cn/flashing.md
index da3ceefc32..5833cd38fa 100644
--- a/docs/zh-cn/flashing.md
+++ b/docs/zh-cn/flashing.md
@@ -252,7 +252,7 @@ BOOTLOADER = stm32-dfu
### `make` 构建目标
* `:dfu-util`: 每5秒检测一次直到发现可用的STM32 bootloader设备,然后进行固件刷写。
-* `:dfu-util-split-left` 和 `:dfu-util-split-right`: 同 `:avrdude` 一样会刷写固件,但额外地会设置手性设置到EEPROM中,对于基于Proton-C的分体式键盘这是理想的方法。
+* `:dfu-util-split-left` 和 `:dfu-util-split-right`: 同 `:dfu-util` 一样会刷写固件,但额外地会设置手性设置到EEPROM中,对于基于Proton-C的分体式键盘这是理想的方法。
* `:st-link-cli`: 通过ST-Link CLI工具集而非dfu-util进行刷写,需要有ST-Link电子狗。
* `:st-flash`: 通过[STLink工具](https://github.com/stlink-org/stlink)内的 `st-flash` 工具而非dfu-util进行刷写,需要有ST-Link电子狗。