From 6a3d12681763e6f090435ef81e9aab7cdbe9b3d1 Mon Sep 17 00:00:00 2001 From: mechmerlin Date: Fri, 20 Sep 2019 21:15:13 -0700 Subject: [PATCH 1/3] initial commit --- .../default/65_blocker_ansi/default_65_ansi/keymap.c | 11 +++++++++++ layouts/default/65_blocker_ansi/layout.json | 5 +++++ layouts/default/65_blocker_ansi/readme.md | 5 +++++ 3 files changed, 21 insertions(+) create mode 100644 layouts/default/65_blocker_ansi/default_65_ansi/keymap.c create mode 100644 layouts/default/65_blocker_ansi/layout.json create mode 100644 layouts/default/65_blocker_ansi/readme.md diff --git a/layouts/default/65_blocker_ansi/default_65_ansi/keymap.c b/layouts/default/65_blocker_ansi/default_65_ansi/keymap.c new file mode 100644 index 000000000000..69fcccd63270 --- /dev/null +++ b/layouts/default/65_blocker_ansi/default_65_ansi/keymap.c @@ -0,0 +1,11 @@ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + /* layer 0: qwerty */ + [0] = LAYOUT_65_ansi(\ + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_HOME, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT) + }; \ No newline at end of file diff --git a/layouts/default/65_blocker_ansi/layout.json b/layouts/default/65_blocker_ansi/layout.json new file mode 100644 index 000000000000..0fa92b0f2e06 --- /dev/null +++ b/layouts/default/65_blocker_ansi/layout.json @@ -0,0 +1,5 @@ +["","","","","","","","","","","","","",{w:2},"",""], +[{w:1.5},"","","","","","","","","","","","","",{w:1.5},"",""], +[{w:1.75},"","","","","","","","","","","","",{w:2.25},"",""], +[{w:2.25},"","","","","","","","","","","",{w:1.75},"","",""], +[{w:1.25},"",{w:1.25},"",{w:1.25},"",{w:6.25},"","","","","","",""] diff --git a/layouts/default/65_blocker_ansi/readme.md b/layouts/default/65_blocker_ansi/readme.md new file mode 100644 index 000000000000..0cde8e727e55 --- /dev/null +++ b/layouts/default/65_blocker_ansi/readme.md @@ -0,0 +1,5 @@ +# 65_ansi + + LAYOUT_65_ansi + +This is the 65% ANSI layout made popular by boards such as the [Input Club Whitefox](https://github.com/qmk/qmk_firmware/tree/master/keyboards/whitefox) and [RAMA M65-A](https://github.com/qmk/qmk_firmware/tree/master/keyboards/jc65). \ No newline at end of file From d976561476dced4d91425147a069b077e9151352 Mon Sep 17 00:00:00 2001 From: mechmerlin Date: Fri, 20 Sep 2019 21:18:27 -0700 Subject: [PATCH 2/3] rename 65_ansi to 65_blocker_ansi --- .../{default_65_ansi => default_65_blocker_ansi}/keymap.c | 2 +- layouts/default/65_blocker_ansi/readme.md | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) rename layouts/default/65_blocker_ansi/{default_65_ansi => default_65_blocker_ansi}/keymap.c (95%) diff --git a/layouts/default/65_blocker_ansi/default_65_ansi/keymap.c b/layouts/default/65_blocker_ansi/default_65_blocker_ansi/keymap.c similarity index 95% rename from layouts/default/65_blocker_ansi/default_65_ansi/keymap.c rename to layouts/default/65_blocker_ansi/default_65_blocker_ansi/keymap.c index 69fcccd63270..e4e4c52b2167 100644 --- a/layouts/default/65_blocker_ansi/default_65_ansi/keymap.c +++ b/layouts/default/65_blocker_ansi/default_65_blocker_ansi/keymap.c @@ -2,7 +2,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* layer 0: qwerty */ - [0] = LAYOUT_65_ansi(\ + [0] = LAYOUT_65_blocker_ansi(\ KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_HOME, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN, diff --git a/layouts/default/65_blocker_ansi/readme.md b/layouts/default/65_blocker_ansi/readme.md index 0cde8e727e55..9e9a5f454119 100644 --- a/layouts/default/65_blocker_ansi/readme.md +++ b/layouts/default/65_blocker_ansi/readme.md @@ -1,5 +1,5 @@ -# 65_ansi +# 65_blocker_ansi - LAYOUT_65_ansi + LAYOUT_65_blocker_ansi -This is the 65% ANSI layout made popular by boards such as the [Input Club Whitefox](https://github.com/qmk/qmk_firmware/tree/master/keyboards/whitefox) and [RAMA M65-A](https://github.com/qmk/qmk_firmware/tree/master/keyboards/jc65). \ No newline at end of file +This is the 65% ANSI layout made popular by boards such as the Percent Canoe. \ No newline at end of file From bfacba6e4d14170b0d3c2fad338158307a40fdd7 Mon Sep 17 00:00:00 2001 From: mechmerlin Date: Fri, 20 Sep 2019 21:23:26 -0700 Subject: [PATCH 3/3] remove one key to account for blocker --- .../default/65_blocker_ansi/default_65_blocker_ansi/keymap.c | 2 +- layouts/default/65_blocker_ansi/layout.json | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/layouts/default/65_blocker_ansi/default_65_blocker_ansi/keymap.c b/layouts/default/65_blocker_ansi/default_65_blocker_ansi/keymap.c index e4e4c52b2167..37a2270a3f1d 100644 --- a/layouts/default/65_blocker_ansi/default_65_blocker_ansi/keymap.c +++ b/layouts/default/65_blocker_ansi/default_65_blocker_ansi/keymap.c @@ -7,5 +7,5 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT) + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT) }; \ No newline at end of file diff --git a/layouts/default/65_blocker_ansi/layout.json b/layouts/default/65_blocker_ansi/layout.json index 0fa92b0f2e06..312ce188a7c4 100644 --- a/layouts/default/65_blocker_ansi/layout.json +++ b/layouts/default/65_blocker_ansi/layout.json @@ -1,5 +1,6 @@ -["","","","","","","","","","","","","",{w:2},"",""], +[{a:7},"","","","","","","","","","","","","",{w:2},"",""], [{w:1.5},"","","","","","","","","","","","","",{w:1.5},"",""], [{w:1.75},"","","","","","","","","","","","",{w:2.25},"",""], [{w:2.25},"","","","","","","","","","","",{w:1.75},"","",""], -[{w:1.25},"",{w:1.25},"",{w:1.25},"",{w:6.25},"","","","","","",""] +[{w:1.25},"",{w:1.25},"",{w:1.25},"",{w:6.25},"",{w:1.25},"",{w:1.25},"",{x:0.5},"","",""] + \ No newline at end of file