diff options
| author |  Drashna Jaelre <drashna@live.com> | 2019-10-29 13:15:03 -0700 |
|---|---|---|
| committer |  noroadsleft <18669334+noroadsleft@users.noreply.github.com> | 2019-10-29 13:15:03 -0700 |
| commit | 0e6f78547eca1e7bbb093265e79c26a301e6635a (patch) | |
| tree | 9bd2ae7a3ffb6d18e098fed96deee1d3c1cee3b0 /docs/feature_userspace.md | |
| parent | 476f5566132032af227a4fa95ceab56f4f3e06f7 (diff) | |
| download | qmk_firmware-0e6f78547eca1e7bbb093265e79c26a301e6635a.tar.gz | |
[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.md | 12 |
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) { if ( (temp_mod | temp_osm) & MOD_MASK_SHIFT ) #endif { // - #if defined(__arm__) // only run for ARM boards - SEND_STRING(":dfu-util"); - #elif defined(BOOTLOADER_DFU) // only run for DFU boards - SEND_STRING(":dfu"); - #elif defined(BOOTLOADER_HALFKAY) // only run for teensy boards - SEND_STRING(":teensy"); - #elif defined(BOOTLOADER_CATERINA) // only run for Pro Micros - SEND_STRING(":avrdude"); - #endif // bootloader options + SEND_STRING(":flash"); } if ( (temp_mod | temp_osm) & MOD_MASK_CTRL) { SEND_STRING(" -j8 --output-sync"); @@ -244,7 +236,7 @@ endif This 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. -Also, 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. +Also, 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. And 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. |