From 9c69db47000c84671abd9e567c124b6f1893cba5 Mon Sep 17 00:00:00 2001 From: Changsu Park <19ds10718@dshs.kr> Date: Wed, 4 Aug 2021 09:22:40 +0900 Subject: [PATCH 1/2] Updated settings.json file to fit VSC's docs (#13829) This change fixes the warning caused by deprecated way of configuring terminal profiles. The warning caused by old settings.json is the following: This is deprecated, the new recommended way to configure your default shell is by creating a terminal profile in `#terminal.integrated.profiles.windows#` and setting its profile name as the default in `#terminal.integrated.defaultProfile.windows#`. This will currently take priority over the new profiles settings but that will change in the future. Refer to the link below for more information: https://code.visualstudio.com/docs/editor/integrated-terminal#_configuration --- docs/other_vscode.md | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 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" } ``` From a0f2be18a40b157fc22720d127da9b312b1232bf Mon Sep 17 00:00:00 2001 From: Drashna Jaelre Date: Tue, 3 Aug 2021 17:23:18 -0700 Subject: [PATCH 2/2] Add bootloader section to keyboard template (#13774) * Add bootloader section to keyboard template * Apply suggestions from code review Co-authored-by: Ryan Co-authored-by: Ryan --- quantum/template/avr/readme.md | 8 ++++++++ quantum/template/ps2avrgb/readme.md | 11 +++++++++-- 2 files changed, 17 insertions(+), 2 deletions(-) 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