diff options
| author | Albert Y <76888457+filterpaper@users.noreply.github.com> | 2022-01-14 01:15:01 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-13 09:15:01 -0800 |
| commit | e2d1547f31c0ceda27b68e26e79224b49cadaa97 (patch) | |
| tree | ca9914f4d2d7f4dea3b0c2161c777f76a564a3be /keyboards/ferris | |
| parent | d0c8f2f822f320bc26a744ad05debf7effe76f3d (diff) | |
| download | qmk_firmware-e2d1547f31c0ceda27b68e26e79224b49cadaa97.tar.gz qmk_firmware-e2d1547f31c0ceda27b68e26e79224b49cadaa97.zip | |
[Keyboard] Switch a_dux, cradio and ferris to split_3x5_2 (#15850)
Diffstat (limited to 'keyboards/ferris')
| -rw-r--r-- | keyboards/ferris/0_1/0_1.h | 3 | ||||
| -rw-r--r-- | keyboards/ferris/0_2/0_2.h | 3 | ||||
| -rw-r--r-- | keyboards/ferris/info.json | 2 | ||||
| -rw-r--r-- | keyboards/ferris/keymaps/default/keymap.json | 2 | ||||
| -rw-r--r-- | keyboards/ferris/sweep/sweep.h | 3 |
5 files changed, 8 insertions, 5 deletions
diff --git a/keyboards/ferris/0_1/0_1.h b/keyboards/ferris/0_1/0_1.h index 4602637ca6..2f58831df7 100644 --- a/keyboards/ferris/0_1/0_1.h +++ b/keyboards/ferris/0_1/0_1.h @@ -22,7 +22,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. // clang-format off /* left hand right hand */ -#define LAYOUT(\ +#define LAYOUT_split_3x5_2(\ K0_0, K0_1, K0_2, K0_3, K0_4, K0_5, K0_6, K0_7, K0_8, K0_9,\ K1_0, K1_1, K1_2, K1_3, K1_4, K1_5, K1_6, K1_7, K1_8, K1_9,\ K2_0, K2_1, K2_2, K2_3, K2_4, K2_5, K2_6, K2_7, K2_8, K2_9,\ @@ -41,3 +41,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. } // clang-format on +#define LAYOUT LAYOUT_split_3x5_2 diff --git a/keyboards/ferris/0_2/0_2.h b/keyboards/ferris/0_2/0_2.h index 4602637ca6..2f58831df7 100644 --- a/keyboards/ferris/0_2/0_2.h +++ b/keyboards/ferris/0_2/0_2.h @@ -22,7 +22,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. // clang-format off /* left hand right hand */ -#define LAYOUT(\ +#define LAYOUT_split_3x5_2(\ K0_0, K0_1, K0_2, K0_3, K0_4, K0_5, K0_6, K0_7, K0_8, K0_9,\ K1_0, K1_1, K1_2, K1_3, K1_4, K1_5, K1_6, K1_7, K1_8, K1_9,\ K2_0, K2_1, K2_2, K2_3, K2_4, K2_5, K2_6, K2_7, K2_8, K2_9,\ @@ -41,3 +41,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. } // clang-format on +#define LAYOUT LAYOUT_split_3x5_2 diff --git a/keyboards/ferris/info.json b/keyboards/ferris/info.json index d167bc3f37..93470c7253 100644 --- a/keyboards/ferris/info.json +++ b/keyboards/ferris/info.json @@ -3,7 +3,7 @@ "url": "https://github.com/pierrechevalier83/ferris/", "maintainer": "@pierrec83", "layouts": { - "LAYOUT": { + "LAYOUT_split_3x5_2": { "layout": [ {"x": 0, "y": 0.93}, {"x": 1, "y": 0.31}, diff --git a/keyboards/ferris/keymaps/default/keymap.json b/keyboards/ferris/keymaps/default/keymap.json index f651b2d8c8..b7f635b758 100644 --- a/keyboards/ferris/keymaps/default/keymap.json +++ b/keyboards/ferris/keymaps/default/keymap.json @@ -3,7 +3,7 @@ "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": "ferris/0_1", "keymap": "default", - "layout": "LAYOUT", + "layout": "LAYOUT_split_3x5_2", "layers": [ ["KC_Q" , "KC_W" , "KC_E" , "KC_R" , "KC_T", "KC_Y" , "KC_U" , "KC_I" , "KC_O" , "KC_P", diff --git a/keyboards/ferris/sweep/sweep.h b/keyboards/ferris/sweep/sweep.h index e8d66ebc67..ebfa4ede1d 100644 --- a/keyboards/ferris/sweep/sweep.h +++ b/keyboards/ferris/sweep/sweep.h @@ -28,7 +28,7 @@ // readability #define ___ KC_NO -#define LAYOUT( \ +#define LAYOUT_split_3x5_2( \ L01, L02, L03, L04, L05, R01, R02, R03, R04, R05, \ L06, L07, L08, L09, L10, R06, R07, R08, R09, R10, \ L11, L12, L13, L14, L15, R11, R12, R13, R14, R15, \ @@ -45,3 +45,4 @@ { R16, R17, ___, ___, ___ } \ } +#define LAYOUT LAYOUT_split_3x5_2 |