aboutsummaryrefslogtreecommitdiff
path: root/docs/feature_userspace.md
diff options
context:
space:
mode:
authorDrashna Jaelre <drashna@live.com>2019-10-29 13:15:03 -0700
committernoroadsleft <18669334+noroadsleft@users.noreply.github.com>2019-10-29 13:15:03 -0700
commit0e6f78547eca1e7bbb093265e79c26a301e6635a (patch)
tree9bd2ae7a3ffb6d18e098fed96deee1d3c1cee3b0 /docs/feature_userspace.md
parent476f5566132032af227a4fa95ceab56f4f3e06f7 (diff)
downloadqmk_firmware-0e6f78547eca1e7bbb093265e79c26a301e6635a.tar.gz
qmk_firmware-0e6f78547eca1e7bbb093265e79c26a301e6635a.zip
[Docs] Update flashing information to include :flash target (#6999)
* Update Newbs Flashing guide For the newbs that want to start flashing * Update flashing docs * Misc flashing * Attempt at flashing in french Lets hope I didn't butcher this too badly with machine transations * Update docs/feature_userspace.md * Apply language suggestions from code review * Apply suggestions from code review * Apply additional fr lang suggestions from code review * Apply suggestions from code review Co-Authored-By: fauxpark <fauxpark@gmail.com> Co-Authored-By: Noan Mousy <4sstylz@protonmail.ch> Co-Authored-By: Xavier Hahn <xavier.hahn@gmail.com> Co-Authored-By: Vincent LE GOFF <vince.legoff@gmail.com>
Diffstat (limited to 'docs/feature_userspace.md')
-rw-r--r--docs/feature_userspace.md12
1 files changed, 2 insertions, 10 deletions
diff --git a/docs/feature_userspace.md b/docs/feature_userspace.md
index 1cc8ca742..e162d423c 100644
--- a/docs/feature_userspace.md
+++ b/docs/feature_userspace.md
@@ -211,15 +211,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
211 if ( (temp_mod | temp_osm) & MOD_MASK_SHIFT ) 211 if ( (temp_mod | temp_osm) & MOD_MASK_SHIFT )
212 #endif 212 #endif
213 { // 213 { //
214 #if defined(__arm__) // only run for ARM boards 214 SEND_STRING(":flash");
215 SEND_STRING(":dfu-util");
216 #elif defined(BOOTLOADER_DFU) // only run for DFU boards
217 SEND_STRING(":dfu");
218 #elif defined(BOOTLOADER_HALFKAY) // only run for teensy boards
219 SEND_STRING(":teensy");
220 #elif defined(BOOTLOADER_CATERINA) // only run for Pro Micros
221 SEND_STRING(":avrdude");
222 #endif // bootloader options
223 } 215 }
224 if ( (temp_mod | temp_osm) & MOD_MASK_CTRL) { 216 if ( (temp_mod | temp_osm) & MOD_MASK_CTRL) {
225 SEND_STRING(" -j8 --output-sync"); 217 SEND_STRING(" -j8 --output-sync");
@@ -244,7 +236,7 @@ endif
244 236
245This will add a new `KC_MAKE` keycode that can be used in any of your keymaps. And this keycode will output `make <keyboard>:<keymap>`, making frequent compiling easier. And this will work with any keyboard and any keymap as it will output the current boards info, so that you don't have to type this out every time. 237This will add a new `KC_MAKE` keycode that can be used in any of your keymaps. And this keycode will output `make <keyboard>:<keymap>`, making frequent compiling easier. And this will work with any keyboard and any keymap as it will output the current boards info, so that you don't have to type this out every time.
246 238
247Also, holding `shift` will add the appropriate flashing command (`:dfu`, `:teensy`, `:avrdude`, `:dfu-util`) for a majority of keyboards. Holding `control` will add some commands that will speed up compiling time by processing multiple files at once. 239Also, holding Shift will add the flash target (`:flash`) to the command. Holding Control will add some commands that will speed up compiling time by processing multiple files at once.
248 240
249And for the boards that lack a shift key, or that you want to always attempt the flashing part, you can add `FLASH_BOOTLOADER = yes` to the `rules.mk` of that keymap. 241And for the boards that lack a shift key, or that you want to always attempt the flashing part, you can add `FLASH_BOOTLOADER = yes` to the `rules.mk` of that keymap.
250 242