diff options
| author | QMK Bot <hello@qmk.fm> | 2021-03-07 05:22:57 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2021-03-07 05:22:57 +0000 |
| commit | 5fb16e3442382c64777810eb3a8e6d4145233de2 (patch) | |
| tree | cce19f9496f978d47933f2a1cd55a31f9c5afb77 | |
| parent | d170a1c0e261e276ca053bf258c5d21bc17f038e (diff) | |
| parent | 01b8ef39f5b7bee6ffe8188c46aa3836a8270022 (diff) | |
| download | qmk_firmware-5fb16e3442382c64777810eb3a8e6d4145233de2.tar.gz qmk_firmware-5fb16e3442382c64777810eb3a8e6d4145233de2.zip | |
Merge remote-tracking branch 'origin/master' into develop
| -rw-r--r-- | keyboards/ferris/keymaps/default/keymap.json | 2 | ||||
| -rw-r--r-- | keyboards/ferris/keymaps/default/readme.md | 2 | ||||
| -rw-r--r-- | keyboards/ferris/keymaps/pierrec83/keymap.json | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/keyboards/ferris/keymaps/default/keymap.json b/keyboards/ferris/keymaps/default/keymap.json index 7f7d614e20..5fe1b9e00a 100644 --- a/keyboards/ferris/keymaps/default/keymap.json +++ b/keyboards/ferris/keymaps/default/keymap.json @@ -1,7 +1,7 @@ { "version": 1, "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", - "keyboard": "handwired/ferris", + "keyboard": "ferris/0_1", "keymap": "default", "layout": "LAYOUT", "layers": [ diff --git a/keyboards/ferris/keymaps/default/readme.md b/keyboards/ferris/keymaps/default/readme.md index 252f886f52..aa7ba6d13b 100644 --- a/keyboards/ferris/keymaps/default/readme.md +++ b/keyboards/ferris/keymaps/default/readme.md @@ -111,7 +111,7 @@ To edit it, you may: 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). -* 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 * 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: diff --git a/keyboards/ferris/keymaps/pierrec83/keymap.json b/keyboards/ferris/keymaps/pierrec83/keymap.json index 2372e7e372..1f2c166b9c 100644 --- a/keyboards/ferris/keymaps/pierrec83/keymap.json +++ b/keyboards/ferris/keymaps/pierrec83/keymap.json @@ -1,7 +1,7 @@ { "version": 1, "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", - "keyboard": "handwired/ferris", + "keyboard": "ferris/0_1", "keymap": "pierrec83", "layout": "LAYOUT", "layers": [ |