summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2021-08-04 00:23:25 +0000
committerQMK Bot <hello@qmk.fm>2021-08-04 00:23:25 +0000
commit600faab707e188bd6dc0c9a202f8308f6c82556e (patch)
tree3f3c940a9caa58d240bb16049173ab8bdd76e680
parent4ffc9d8288fcfaec957a8eafc28af7d8d22e7c6c (diff)
parenta0f2be18a40b157fc22720d127da9b312b1232bf (diff)
Merge remote-tracking branch 'origin/master' into develop
-rw-r--r--docs/other_vscode.md17
-rw-r--r--quantum/template/avr/readme.md8
-rw-r--r--quantum/template/ps2avrgb/readme.md11
3 files changed, 27 insertions, 9 deletions
diff --git a/docs/other_vscode.md b/docs/other_vscode.md
index 823f8b4982..2de3c8cb45 100644
--- a/docs/other_vscode.md
+++ b/docs/other_vscode.md
@@ -65,14 +65,17 @@ Now, we will set up the MSYS2 window to show up in VSCode as the integrated term
```json
{
- "terminal.integrated.shell.windows": "C:\\msys64\\usr\\bin\\bash.exe",
- "terminal.integrated.env.windows": {
- "MSYSTEM": "MINGW64",
- "CHERE_INVOKING": "1"
+ "terminal.integrated.profiles.windows": {
+ "QMK_MSYS": {
+ "path": "C:/QMK_MSYS/usr/bin/bash.exe",
+ "env": {
+ "MSYSTEM": "MINGW64",
+ "CHERE_INVOKING": "1"
+ },
+ "args": ["--login"]
+ }
},
- "terminal.integrated.shellArgs.windows": [
- "--login"
- ],
+
"terminal.integrated.cursorStyle": "line"
}
```
diff --git a/quantum/template/avr/readme.md b/quantum/template/avr/readme.md
index fd14558420..b099ed726d 100644
--- a/quantum/template/avr/readme.md
+++ b/quantum/template/avr/readme.md
@@ -17,3 +17,11 @@ Flashing example for this keyboard:
make %KEYBOARD%:default:flash
See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available
diff --git a/quantum/template/ps2avrgb/readme.md b/quantum/template/ps2avrgb/readme.md
index f19743a163..94063f9ebc 100644
--- a/quantum/template/ps2avrgb/readme.md
+++ b/quantum/template/ps2avrgb/readme.md
@@ -16,6 +16,13 @@ Flashing example for this keyboard ([after setting up the bootloadHID flashing e
make %KEYBOARD%:default:flash
-**Reset Key**: Hold down the key located at *LOCATION*, commonly programmed as *KEY* while plugging in the keyboard.
-
See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **BootloadHID reset**: Hold down the key connected to the `A0` and `B0` pins on the MCU if it is known (often top left or bottom left) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available