varl/qmk_firmware
1
0
Fork 0
forked from forks/qmk_firmware
Code Pull requests Activity

Merge remote-tracking branch 'origin/master' into develop

Browse source
This commit is contained in:
QMK Bot 2021-03-07 05:22:57 +00:00
parent d170a1c0e2 01b8ef39f5
commit 5fb16e3442
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
keyboards/ferris/keymaps/default/keymap.json
View file

@ -1,7 +1,7 @@
{ "version": 1, { "version": 1,
"notes": "My awesome keymap", "notes": "My awesome keymap",
"documentation": "\"This file is a QMK Configurator export. You can import this at <https://config.qmk.fm>. It can also be used directly with QMK's source code.\n\nTo setup your QMK environment check out the tutorial: <https://docs.qmk.fm/#/newbs>\n\nYou can convert this file to a keymap.c using this command: `qmk json2c {keymap}`\n\nYou can compile this keymap using this command: `qmk compile {keymap}`\"\n", "documentation": "\"This file is a QMK Configurator export. You can import this at <https://config.qmk.fm>. It can also be used directly with QMK's source code.\n\nTo setup your QMK environment check out the tutorial: <https://docs.qmk.fm/#/newbs>\n\nYou can convert this file to a keymap.c using this command: `qmk json2c {keymap}`\n\nYou can compile this keymap using this command: `qmk compile {keymap}`\"\n",
"keyboard": "handwired/ferris", "keyboard": "ferris/0_1",
"keymap": "default", "keymap": "default",
"layout": "LAYOUT", "layout": "LAYOUT",
"layers": [ "layers": [

2
keyboards/ferris/keymaps/default/readme.md
View file

@ -111,7 +111,7 @@ To edit it, you may:
If you decide to use the latter workflow, here are the steps to follow: If you decide to use the latter workflow, here are the steps to follow:
* From the qmk configurator, hit the "import QMK keymap json file" button (it has a drawing with an up arrow on it). * From the qmk configurator, hit the "import QMK keymap json file" button (it has a drawing with an up arrow on it).
* Browse to the location of your keymap (for example, `<your qmk repo>/keyboards/handwired/ferris/keymaps/default/keymap.json`) * Browse to the location of your keymap (for example, `<your qmk repo>/keyboards/ferris/keymaps/default/keymap.json`)
* Perform any modification to the keymap in the web UI * Perform any modification to the keymap in the web UI
* Export the keymap to your downloads folder, by hitting the "Export QMK keymap json file" button (it has a drawing with a down arrow on it) * Export the keymap to your downloads folder, by hitting the "Export QMK keymap json file" button (it has a drawing with a down arrow on it)
* Override your original keymap with the output of formatting the exported keymap by running a command such as this one from the root of your qmk repo: * Override your original keymap with the output of formatting the exported keymap by running a command such as this one from the root of your qmk repo:

2
keyboards/ferris/keymaps/pierrec83/keymap.json
View file

@ -1,7 +1,7 @@
{ "version": 1, { "version": 1,
"notes": "My awesome keymap", "notes": "My awesome keymap",
"documentation": "\"This file is a QMK Configurator export. You can import this at <https://config.qmk.fm>. It can also be used directly with QMK's source code.\n\nTo setup your QMK environment check out the tutorial: <https://docs.qmk.fm/#/newbs>\n\nYou can convert this file to a keymap.c using this command: `qmk json2c {keymap}`\n\nYou can compile this keymap using this command: `qmk compile {keymap}`\"\n", "documentation": "\"This file is a QMK Configurator export. You can import this at <https://config.qmk.fm>. It can also be used directly with QMK's source code.\n\nTo setup your QMK environment check out the tutorial: <https://docs.qmk.fm/#/newbs>\n\nYou can convert this file to a keymap.c using this command: `qmk json2c {keymap}`\n\nYou can compile this keymap using this command: `qmk compile {keymap}`\"\n",
"keyboard": "handwired/ferris", "keyboard": "ferris/0_1",
"keymap": "pierrec83", "keymap": "pierrec83",
"layout": "LAYOUT", "layout": "LAYOUT",
"layers": [ "layers": [