From c946c9a3b8f1273f35867488c2b18eae89c815a2 Mon Sep 17 00:00:00 2001 From: Suschman Date: Sun, 18 Jul 2021 15:10:00 +0200 Subject: [PATCH 01/15] Six Pack: Add LED indicators --- keyboards/40percentclub/sixpack/config.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/keyboards/40percentclub/sixpack/config.h b/keyboards/40percentclub/sixpack/config.h index db91ca7b80de..2ec676018c92 100644 --- a/keyboards/40percentclub/sixpack/config.h +++ b/keyboards/40percentclub/sixpack/config.h @@ -40,8 +40,6 @@ along with this program. If not, see . * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) * */ -// #define MATRIX_ROW_PINS { B0 } // B0 equivalents the ground pin -// #define MATRIX_COL_PINS { E6, D7, C6, D4 } #define DIRECT_PINS { \ { D4, C6, D7 }, \ { E6, B4, B5 } \ @@ -56,6 +54,11 @@ along with this program. If not, see . #define BACKLIGHT_LEVELS 6 #define BACKLIGHT_PINS { F4, F5 } // Top Row, Bottom Row +/* LED Indicators */ +#define LED_PIN_ON_STATE 0 +#define LED_CAPS_LOCK_PIN B0 // RX Led +#define LED_NUM_LOCK_PIN D5 // TX Led + // #define RGB_DI_PIN B1 // PB1 on expansion connector // #ifdef RGB_DI_PIN // #define RGBLED_NUM 16 From 4c93dd6cf6637ac619b392cec91992e42597aa38 Mon Sep 17 00:00:00 2001 From: Suschman Date: Sun, 18 Jul 2021 15:10:48 +0200 Subject: [PATCH 02/15] Six Pack: Fix ortho_2x3 support --- keyboards/40percentclub/sixpack/info.json | 2 +- keyboards/40percentclub/sixpack/rules.mk | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/keyboards/40percentclub/sixpack/info.json b/keyboards/40percentclub/sixpack/info.json index 3c78e26fbc4b..0d85f092574a 100644 --- a/keyboards/40percentclub/sixpack/info.json +++ b/keyboards/40percentclub/sixpack/info.json @@ -1,5 +1,5 @@ { - "keyboard_name": "sixpack", + "keyboard_name": "Six Pack", "url": "https://www.40percent.club/2017/05/six-pack-11.html", "maintainer": "qmk", "width": 3, diff --git a/keyboards/40percentclub/sixpack/rules.mk b/keyboards/40percentclub/sixpack/rules.mk index 9d7d9a2cf0f5..84e3ea5ea057 100644 --- a/keyboards/40percentclub/sixpack/rules.mk +++ b/keyboards/40percentclub/sixpack/rules.mk @@ -20,3 +20,5 @@ BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow BLUETOOTH_ENABLE = no # Enable Bluetooth AUDIO_ENABLE = no # Audio output + +LAYOUTS = ortho_2x3 From f8cf18c4bd0834b89e0b2f11cb15e1d69a5c9f55 Mon Sep 17 00:00:00 2001 From: Suschman Date: Sun, 18 Jul 2021 15:11:42 +0200 Subject: [PATCH 03/15] SixKeyBoard: Add ortho_2x3 support --- .../boardsource/holiday/spooky/keymaps/default/keymap.c | 3 +-- keyboards/sixkeyboard/info.json | 2 +- keyboards/sixkeyboard/keymaps/default/keymap.c | 2 +- keyboards/sixkeyboard/keymaps/via/keymap.c | 8 ++++---- keyboards/sixkeyboard/rules.mk | 1 + keyboards/sixkeyboard/sixkeyboard.h | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/keyboards/boardsource/holiday/spooky/keymaps/default/keymap.c b/keyboards/boardsource/holiday/spooky/keymaps/default/keymap.c index b4fcfc1bc19b..63fbb1b94cef 100644 --- a/keyboards/boardsource/holiday/spooky/keymaps/default/keymap.c +++ b/keyboards/boardsource/holiday/spooky/keymaps/default/keymap.c @@ -24,7 +24,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Base */ [_BASE] = LAYOUT_ortho_2x3( KC_F1, KC_F2, KC_F3, - KC_F4, KC_F5,KC_F6 + KC_F4, KC_F5, KC_F6 ), }; - diff --git a/keyboards/sixkeyboard/info.json b/keyboards/sixkeyboard/info.json index 55239fc6cccf..17815afa1b0d 100644 --- a/keyboards/sixkeyboard/info.json +++ b/keyboards/sixkeyboard/info.json @@ -5,7 +5,7 @@ "width": 3, "height": 2, "layouts": { - "LAYOUT": { + "LAYOUT_ortho_2x3": { "layout": [{"label":"k00", "x":0, "y":0}, {"label":"k01", "x":1, "y":0}, {"label":"k02", "x":2, "y":0}, {"label":"k10", "x":0, "y":1}, {"label":"k11", "x":1, "y":1}, {"label":"k12", "x":2, "y":1}] } } diff --git a/keyboards/sixkeyboard/keymaps/default/keymap.c b/keyboards/sixkeyboard/keymaps/default/keymap.c index 3b39892a9319..0c9b519353cf 100644 --- a/keyboards/sixkeyboard/keymaps/default/keymap.c +++ b/keyboards/sixkeyboard/keymaps/default/keymap.c @@ -3,7 +3,7 @@ #include "matrix.h" const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT( + [0] = LAYOUT_ortho_2x3( KC_A, KC_B, KC_C, \ KC_D, KC_E, KC_F \ ) diff --git a/keyboards/sixkeyboard/keymaps/via/keymap.c b/keyboards/sixkeyboard/keymaps/via/keymap.c index fed341595c39..39282b9b5a50 100644 --- a/keyboards/sixkeyboard/keymaps/via/keymap.c +++ b/keyboards/sixkeyboard/keymaps/via/keymap.c @@ -17,22 +17,22 @@ #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT( + [0] = LAYOUT_ortho_2x3( KC_A, KC_B, KC_C, KC_D, KC_E, KC_F ), - [1] = LAYOUT( + [1] = LAYOUT_ortho_2x3( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ), - [2] = LAYOUT( + [2] = LAYOUT_ortho_2x3( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ), - [3] = LAYOUT( + [3] = LAYOUT_ortho_2x3( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ) diff --git a/keyboards/sixkeyboard/rules.mk b/keyboards/sixkeyboard/rules.mk index 889ea2fd10ee..22daee1b51f3 100644 --- a/keyboards/sixkeyboard/rules.mk +++ b/keyboards/sixkeyboard/rules.mk @@ -29,3 +29,4 @@ BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID CUSTOM_MATRIX = yes SRC = matrix.c +LAYOUTS = ortho_2x3 diff --git a/keyboards/sixkeyboard/sixkeyboard.h b/keyboards/sixkeyboard/sixkeyboard.h index e0eb896ce4dc..353e2a78c8bc 100644 --- a/keyboards/sixkeyboard/sixkeyboard.h +++ b/keyboards/sixkeyboard/sixkeyboard.h @@ -22,7 +22,7 @@ * │ D │ E │ F │ * └───┴───┴───┘ */ -#define LAYOUT( \ +#define LAYOUT_ortho_2x3( \ k00, k01, k02, \ k10, k11, k12 \ ) { \ From dee2373d47c8e966b811d58563c6faccc8114c71 Mon Sep 17 00:00:00 2001 From: Suschman Date: Sun, 18 Jul 2021 15:19:10 +0200 Subject: [PATCH 04/15] Six Pack: VIA: Reduce layers back to 4 as used in json committed to via --- keyboards/40percentclub/sixpack/keymaps/via/keymap.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/keyboards/40percentclub/sixpack/keymaps/via/keymap.c b/keyboards/40percentclub/sixpack/keymaps/via/keymap.c index f3268a22abba..e2eaaa1d0a45 100644 --- a/keyboards/40percentclub/sixpack/keymaps/via/keymap.c +++ b/keyboards/40percentclub/sixpack/keymaps/via/keymap.c @@ -33,9 +33,5 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_TRNS), [3] = LAYOUT_ortho_2x3(KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), - [4] = LAYOUT_ortho_2x3(KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS), - [5] = LAYOUT_ortho_2x3(KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS), }; From 5cd84c6cbb35d53c61425ee52d8f646fdbc84915 Mon Sep 17 00:00:00 2001 From: Suschman Date: Sun, 18 Jul 2021 16:22:56 +0200 Subject: [PATCH 05/15] Fix 40percentclub/5x5 name in json --- keyboards/40percentclub/5x5/info.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/40percentclub/5x5/info.json b/keyboards/40percentclub/5x5/info.json index 1c1df8eda986..1e7bac7a691a 100644 --- a/keyboards/40percentclub/5x5/info.json +++ b/keyboards/40percentclub/5x5/info.json @@ -1,5 +1,5 @@ { - "keyboard_name": "40percent.club 4x4", + "keyboard_name": "40percent.club 5x5", "url": "", "maintainer": "qmk", "height": 4, From 807cfc040f05b59a2ec83029f40e1ac21a36bfcb Mon Sep 17 00:00:00 2001 From: Suschman Date: Sun, 18 Jul 2021 16:55:56 +0200 Subject: [PATCH 06/15] Add ortho_2x3 to the layouts --- layouts/community/ortho_1x4/readme.md | 3 +++ layouts/community/ortho_2x3/layout.json | 2 ++ layouts/community/ortho_2x3/readme.md | 3 +++ .../default/ortho_2x3/default_ortho_2x3/keymap.c | 15 +++++++++++++++ layouts/default/ortho_2x3/info.json | 15 +++++++++++++++ layouts/default/ortho_2x3/layout.json | 2 ++ layouts/default/ortho_2x3/readme.md | 3 +++ 7 files changed, 43 insertions(+) create mode 100644 layouts/community/ortho_1x4/readme.md create mode 100644 layouts/community/ortho_2x3/layout.json create mode 100644 layouts/community/ortho_2x3/readme.md create mode 100644 layouts/default/ortho_2x3/default_ortho_2x3/keymap.c create mode 100644 layouts/default/ortho_2x3/info.json create mode 100644 layouts/default/ortho_2x3/layout.json create mode 100644 layouts/default/ortho_2x3/readme.md diff --git a/layouts/community/ortho_1x4/readme.md b/layouts/community/ortho_1x4/readme.md new file mode 100644 index 000000000000..6ef30dd0a694 --- /dev/null +++ b/layouts/community/ortho_1x4/readme.md @@ -0,0 +1,3 @@ +# ortho_1x4 + + LAYOUT_ortho_1x4 diff --git a/layouts/community/ortho_2x3/layout.json b/layouts/community/ortho_2x3/layout.json new file mode 100644 index 000000000000..255792193e7c --- /dev/null +++ b/layouts/community/ortho_2x3/layout.json @@ -0,0 +1,2 @@ +["","",""], +["","",""] diff --git a/layouts/community/ortho_2x3/readme.md b/layouts/community/ortho_2x3/readme.md new file mode 100644 index 000000000000..47ae0f68641c --- /dev/null +++ b/layouts/community/ortho_2x3/readme.md @@ -0,0 +1,3 @@ +# ortho_2x3 + + LAYOUT_ortho_2x3 diff --git a/layouts/default/ortho_2x3/default_ortho_2x3/keymap.c b/layouts/default/ortho_2x3/default_ortho_2x3/keymap.c new file mode 100644 index 000000000000..a38146d02034 --- /dev/null +++ b/layouts/default/ortho_2x3/default_ortho_2x3/keymap.c @@ -0,0 +1,15 @@ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + /* + * ┌───┬───┬───┐ + * │ A │ B │ C │ + * ├───┼───┼───┤ + * │ D │ E │ F │ + * └───┴───┴───┘ + */ + [0] = LAYOUT_ortho_2x3( + KC_A, KC_B, KC_C, + KC_D, KC_E, KC_F + ) +}; diff --git a/layouts/default/ortho_2x3/info.json b/layouts/default/ortho_2x3/info.json new file mode 100644 index 000000000000..688b213dbf28 --- /dev/null +++ b/layouts/default/ortho_2x3/info.json @@ -0,0 +1,15 @@ +{ + "keyboard_name": "2x3 ortholinear layout", + "url": "", + "maintainer": "qmk", + "width": 3, + "height": 2, + "layouts": { + "LAYOUT_ortho_2x3": { + "layout": [ + {"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, + {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1} + ] + } + } +} diff --git a/layouts/default/ortho_2x3/layout.json b/layouts/default/ortho_2x3/layout.json new file mode 100644 index 000000000000..255792193e7c --- /dev/null +++ b/layouts/default/ortho_2x3/layout.json @@ -0,0 +1,2 @@ +["","",""], +["","",""] diff --git a/layouts/default/ortho_2x3/readme.md b/layouts/default/ortho_2x3/readme.md new file mode 100644 index 000000000000..47ae0f68641c --- /dev/null +++ b/layouts/default/ortho_2x3/readme.md @@ -0,0 +1,3 @@ +# ortho_2x3 + + LAYOUT_ortho_2x3 From 0bd8d8d660f02d503f1eda4cfd77f0dfef33355d Mon Sep 17 00:00:00 2001 From: Suschman Date: Sun, 18 Jul 2021 17:22:50 +0200 Subject: [PATCH 07/15] Add ortho_2x3 LAYOUT define to rules.mk of 6lit, spooky, stream_cheap/2x3 --- keyboards/40percentclub/6lit/rules.mk | 2 ++ keyboards/boardsource/holiday/spooky/rules.mk | 2 ++ keyboards/handwired/stream_cheap/2x3/rules.mk | 2 ++ 3 files changed, 6 insertions(+) diff --git a/keyboards/40percentclub/6lit/rules.mk b/keyboards/40percentclub/6lit/rules.mk index 8d32d2c3fb7e..7ff281ecc6c8 100644 --- a/keyboards/40percentclub/6lit/rules.mk +++ b/keyboards/40percentclub/6lit/rules.mk @@ -32,3 +32,5 @@ AUDIO_ENABLE = no # Audio output on port C6 # Enable generic behavior for split boards SPLIT_KEYBOARD = yes + +LAYOUTS = ortho_2x3 ortho_2x6 diff --git a/keyboards/boardsource/holiday/spooky/rules.mk b/keyboards/boardsource/holiday/spooky/rules.mk index d23e95512672..2fd07c24159f 100644 --- a/keyboards/boardsource/holiday/spooky/rules.mk +++ b/keyboards/boardsource/holiday/spooky/rules.mk @@ -20,3 +20,5 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow BLUETOOTH_ENABLE = no # Enable Bluetooth AUDIO_ENABLE = no # Audio output + +LAYOUTS = ortho_2x3 diff --git a/keyboards/handwired/stream_cheap/2x3/rules.mk b/keyboards/handwired/stream_cheap/2x3/rules.mk index e4ffb10d0494..2d79fa435290 100644 --- a/keyboards/handwired/stream_cheap/2x3/rules.mk +++ b/keyboards/handwired/stream_cheap/2x3/rules.mk @@ -20,3 +20,5 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow BLUETOOTH_ENABLE = no # Enable Bluetooth AUDIO_ENABLE = no # Audio output + +LAYOUTS = ortho_2x3 From 028a81031e962f932f181058bf02905120e9ed13 Mon Sep 17 00:00:00 2001 From: Suschman Date: Sun, 18 Jul 2021 19:03:05 +0200 Subject: [PATCH 08/15] Add readme.md and more layout definitions (soothe the linter) --- keyboards/handwired/stream_cheap/2x3/readme.md | 3 +++ keyboards/handwired/stream_cheap/2x4/readme.md | 3 +++ keyboards/handwired/stream_cheap/2x5/readme.md | 3 +++ layouts/community/ortho_2x6/layout.json | 2 ++ layouts/community/ortho_2x6/readme.md | 3 +++ layouts/community/ortho_5x5/layout.json | 6 +++++- .../ortho_2x6/default_ortho_2x6/keymap.c | 15 +++++++++++++++ layouts/default/ortho_2x6/info.json | 15 +++++++++++++++ layouts/default/ortho_2x6/layout.json | 2 ++ layouts/default/ortho_2x6/readme.md | 3 +++ layouts/default/ortho_5x5/info.json | 18 ++++++++++++++++++ layouts/default/ortho_5x5/layout.json | 5 +++++ layouts/default/ortho_5x5/readme.md | 3 +++ 13 files changed, 80 insertions(+), 1 deletion(-) create mode 100644 keyboards/handwired/stream_cheap/2x3/readme.md create mode 100644 keyboards/handwired/stream_cheap/2x4/readme.md create mode 100644 keyboards/handwired/stream_cheap/2x5/readme.md create mode 100644 layouts/community/ortho_2x6/layout.json create mode 100644 layouts/community/ortho_2x6/readme.md create mode 100644 layouts/default/ortho_2x6/default_ortho_2x6/keymap.c create mode 100644 layouts/default/ortho_2x6/info.json create mode 100644 layouts/default/ortho_2x6/layout.json create mode 100644 layouts/default/ortho_2x6/readme.md create mode 100644 layouts/default/ortho_5x5/info.json create mode 100644 layouts/default/ortho_5x5/layout.json create mode 100644 layouts/default/ortho_5x5/readme.md diff --git a/keyboards/handwired/stream_cheap/2x3/readme.md b/keyboards/handwired/stream_cheap/2x3/readme.md new file mode 100644 index 000000000000..69ce022f6d8a --- /dev/null +++ b/keyboards/handwired/stream_cheap/2x3/readme.md @@ -0,0 +1,3 @@ +# Stream Cheap + +An ortholinear macropad, 2x3 configuration. diff --git a/keyboards/handwired/stream_cheap/2x4/readme.md b/keyboards/handwired/stream_cheap/2x4/readme.md new file mode 100644 index 000000000000..d15fcaeaf28b --- /dev/null +++ b/keyboards/handwired/stream_cheap/2x4/readme.md @@ -0,0 +1,3 @@ +# Stream Cheap + +An ortholinear macropad, 2x4 configuration. diff --git a/keyboards/handwired/stream_cheap/2x5/readme.md b/keyboards/handwired/stream_cheap/2x5/readme.md new file mode 100644 index 000000000000..99aab61e4be1 --- /dev/null +++ b/keyboards/handwired/stream_cheap/2x5/readme.md @@ -0,0 +1,3 @@ +# Stream Cheap + +An ortholinear macropad, 2x5 configuration. diff --git a/layouts/community/ortho_2x6/layout.json b/layouts/community/ortho_2x6/layout.json new file mode 100644 index 000000000000..ce609ee590bf --- /dev/null +++ b/layouts/community/ortho_2x6/layout.json @@ -0,0 +1,2 @@ +["","","","","",""], +["","","","","",""] diff --git a/layouts/community/ortho_2x6/readme.md b/layouts/community/ortho_2x6/readme.md new file mode 100644 index 000000000000..5e7c148a7245 --- /dev/null +++ b/layouts/community/ortho_2x6/readme.md @@ -0,0 +1,3 @@ +# ortho_2x6 + + LAYOUT_ortho_2x6 diff --git a/layouts/community/ortho_5x5/layout.json b/layouts/community/ortho_5x5/layout.json index ab4eef8e1bc1..71f77df6edfa 100644 --- a/layouts/community/ortho_5x5/layout.json +++ b/layouts/community/ortho_5x5/layout.json @@ -1 +1,5 @@ -["","","","",""],["","","","",""],["","","","",""],["","","","",""],["","","","",""] +["","","","",""], +["","","","",""], +["","","","",""], +["","","","",""], +["","","","",""] diff --git a/layouts/default/ortho_2x6/default_ortho_2x6/keymap.c b/layouts/default/ortho_2x6/default_ortho_2x6/keymap.c new file mode 100644 index 000000000000..1c8a6b7ef9ca --- /dev/null +++ b/layouts/default/ortho_2x6/default_ortho_2x6/keymap.c @@ -0,0 +1,15 @@ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + /* + * ┌───┬───┬───┬───┬───┬───┐ + * │ A │ B │ C │ D │ E │ F │ + * ├───┼───┼───┼───┼───┼───┤ + * │ G │ H │ I │ J │ K │ L │ + * └───┴───┴───┴───┴───┴───┘ + */ + [0] = LAYOUT_ortho_2x6( + KC_A, KC_B, KC_C, KC_D, KC_E, KC_F, + KC_G, KC_H, KC_I, KC_J, KC_K, KC_L + ) +}; diff --git a/layouts/default/ortho_2x6/info.json b/layouts/default/ortho_2x6/info.json new file mode 100644 index 000000000000..a8059a3c7140 --- /dev/null +++ b/layouts/default/ortho_2x6/info.json @@ -0,0 +1,15 @@ +{ + "keyboard_name": "2x6 ortholinear layout", + "url": "", + "maintainer": "qmk", + "width": 6, + "height": 2, + "layouts": { + "LAYOUT_ortho_2x6": { + "layout": [ + {"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, + {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1} + ] + } + } +} diff --git a/layouts/default/ortho_2x6/layout.json b/layouts/default/ortho_2x6/layout.json new file mode 100644 index 000000000000..ce609ee590bf --- /dev/null +++ b/layouts/default/ortho_2x6/layout.json @@ -0,0 +1,2 @@ +["","","","","",""], +["","","","","",""] diff --git a/layouts/default/ortho_2x6/readme.md b/layouts/default/ortho_2x6/readme.md new file mode 100644 index 000000000000..5e7c148a7245 --- /dev/null +++ b/layouts/default/ortho_2x6/readme.md @@ -0,0 +1,3 @@ +# ortho_2x6 + + LAYOUT_ortho_2x6 diff --git a/layouts/default/ortho_5x5/info.json b/layouts/default/ortho_5x5/info.json new file mode 100644 index 000000000000..db858e61b27b --- /dev/null +++ b/layouts/default/ortho_5x5/info.json @@ -0,0 +1,18 @@ +{ + "keyboard_name": "5x5 ortholinear layout", + "url": "", + "maintainer": "qmk", + "width": 5, + "height": 5, + "layouts": { + "LAYOUT_ortho_5x5": { + "layout": [ + {"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, + {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, + {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, + {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, + {"x":0, "y":4}, {"x":1, "y":4}, {"x":2, "y":4}, {"x":3, "y":4}, {"x":4, "y":4} + ] + } + } +} diff --git a/layouts/default/ortho_5x5/layout.json b/layouts/default/ortho_5x5/layout.json new file mode 100644 index 000000000000..71f77df6edfa --- /dev/null +++ b/layouts/default/ortho_5x5/layout.json @@ -0,0 +1,5 @@ +["","","","",""], +["","","","",""], +["","","","",""], +["","","","",""], +["","","","",""] diff --git a/layouts/default/ortho_5x5/readme.md b/layouts/default/ortho_5x5/readme.md new file mode 100644 index 000000000000..3dd75765d19e --- /dev/null +++ b/layouts/default/ortho_5x5/readme.md @@ -0,0 +1,3 @@ +# ortho_5x5 + + LAYOUT_ortho_5x5 \ No newline at end of file From 61ed0dea4a2067b81ac928b681fd04dc0be5ef67 Mon Sep 17 00:00:00 2001 From: Suschman Date: Sun, 18 Jul 2021 19:07:33 +0200 Subject: [PATCH 09/15] Update layouts/default/ortho_2x3/info.json Co-authored-by: Ryan --- layouts/default/ortho_2x3/info.json | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/layouts/default/ortho_2x3/info.json b/layouts/default/ortho_2x3/info.json index 688b213dbf28..d39e5cc8d486 100644 --- a/layouts/default/ortho_2x3/info.json +++ b/layouts/default/ortho_2x3/info.json @@ -6,10 +6,15 @@ "height": 2, "layouts": { "LAYOUT_ortho_2x3": { - "layout": [ - {"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, - {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1} - ] + "layout": [ + {"x":0, "y":0}, + {"x":1, "y":0}, + {"x":2, "y":0}, + + {"x":0, "y":1}, + {"x":1, "y":1}, + {"x":2, "y":1} + ] } } } From 7c1c114bef16d6bf6d384890b780b2d182c99361 Mon Sep 17 00:00:00 2001 From: Suschman Date: Sun, 18 Jul 2021 19:07:53 +0200 Subject: [PATCH 10/15] Update keyboards/sixkeyboard/rules.mk :D Co-authored-by: Ryan --- keyboards/sixkeyboard/rules.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/sixkeyboard/rules.mk b/keyboards/sixkeyboard/rules.mk index 22daee1b51f3..0e0239af0fea 100644 --- a/keyboards/sixkeyboard/rules.mk +++ b/keyboards/sixkeyboard/rules.mk @@ -28,5 +28,5 @@ UNICODE_ENABLE = no # Unicode BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID CUSTOM_MATRIX = yes -SRC = matrix.c +SRC += matrix.c LAYOUTS = ortho_2x3 From 710e3b09d37ee5d4c7758fc66c7124a7ab01deea Mon Sep 17 00:00:00 2001 From: Suschman Date: Sun, 18 Jul 2021 19:31:19 +0200 Subject: [PATCH 11/15] Add more layout definitions (soothe the linter) --- .../ortho_5x10/default_ortho_5x10/keymap.c | 24 +++++++ layouts/default/ortho_5x10/info.json | 67 +++++++++++++++++++ layouts/default/ortho_5x10/layout.json | 5 ++ layouts/default/ortho_5x10/readme.md | 3 + layouts/default/ortho_5x5/info.json | 36 ++++++++-- 5 files changed, 129 insertions(+), 6 deletions(-) create mode 100644 layouts/default/ortho_5x10/default_ortho_5x10/keymap.c create mode 100644 layouts/default/ortho_5x10/info.json create mode 100644 layouts/default/ortho_5x10/layout.json create mode 100644 layouts/default/ortho_5x10/readme.md diff --git a/layouts/default/ortho_5x10/default_ortho_5x10/keymap.c b/layouts/default/ortho_5x10/default_ortho_5x10/keymap.c new file mode 100644 index 000000000000..1f935473e2b0 --- /dev/null +++ b/layouts/default/ortho_5x10/default_ortho_5x10/keymap.c @@ -0,0 +1,24 @@ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + /* + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ + * │ A │ B │ C │ D │ E │ F │ G │ H │ I │ J │ + * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤ + * │ A │ B │ C │ D │ E │ F │ G │ H │ I │ J │ + * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤ + * │ A │ B │ C │ D │ E │ F │ G │ H │ I │ J │ + * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤ + * │ A │ B │ C │ D │ E │ F │ G │ H │ I │ J │ + * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤ + * │ A │ B │ C │ D │ E │ F │ G │ H │ I │ J │ + * └───┴───┴───┴───┴───┴───┴───┴───┴───┴───┘ + */ + [0] = LAYOUT_ortho_5x10( + KC_A, KC_B, KC_C, KC_D, KC_E, KC_F, KC_G, KC_H, KC_I, KC_J, + KC_A, KC_B, KC_C, KC_D, KC_E, KC_F, KC_G, KC_H, KC_I, KC_J, + KC_A, KC_B, KC_C, KC_D, KC_E, KC_F, KC_G, KC_H, KC_I, KC_J, + KC_A, KC_B, KC_C, KC_D, KC_E, KC_F, KC_G, KC_H, KC_I, KC_J, + KC_A, KC_B, KC_C, KC_D, KC_E, KC_F, KC_G, KC_H, KC_I, KC_J + ) +}; diff --git a/layouts/default/ortho_5x10/info.json b/layouts/default/ortho_5x10/info.json new file mode 100644 index 000000000000..bd79e6ad9129 --- /dev/null +++ b/layouts/default/ortho_5x10/info.json @@ -0,0 +1,67 @@ +{ + "keyboard_name": "5x10 ortholinear layout", + "url": "", + "maintainer": "qmk", + "width": 10, + "height": 5, + "layouts": { + "LAYOUT_ortho_5x10": { + "layout": [ + {"x":0, "y":0}, + {"x":1, "y":0}, + {"x":2, "y":0}, + {"x":3, "y":0}, + {"x":4, "y":0}, + {"x":5, "y":0}, + {"x":6, "y":0}, + {"x":7, "y":0}, + {"x":8, "y":0}, + {"x":9, "y":0}, + + {"x":0, "y":1}, + {"x":1, "y":1}, + {"x":2, "y":1}, + {"x":3, "y":1}, + {"x":4, "y":1}, + {"x":5, "y":1}, + {"x":6, "y":1}, + {"x":7, "y":1}, + {"x":8, "y":1}, + {"x":9, "y":1}, + + {"x":0, "y":2}, + {"x":1, "y":2}, + {"x":2, "y":2}, + {"x":3, "y":2}, + {"x":4, "y":2}, + {"x":5, "y":2}, + {"x":6, "y":2}, + {"x":7, "y":2}, + {"x":8, "y":2}, + {"x":9, "y":2}, + + {"x":0, "y":3}, + {"x":1, "y":3}, + {"x":2, "y":3}, + {"x":3, "y":3}, + {"x":4, "y":3}, + {"x":5, "y":3}, + {"x":6, "y":3}, + {"x":7, "y":3}, + {"x":8, "y":3}, + {"x":9, "y":3}, + + {"x":0, "y":4}, + {"x":1, "y":4}, + {"x":2, "y":4}, + {"x":3, "y":4}, + {"x":4, "y":4}, + {"x":5, "y":4}, + {"x":6, "y":4}, + {"x":7, "y":4}, + {"x":8, "y":4}, + {"x":9, "y":4}, + ] + } + } +} diff --git a/layouts/default/ortho_5x10/layout.json b/layouts/default/ortho_5x10/layout.json new file mode 100644 index 000000000000..c67e8470dfbd --- /dev/null +++ b/layouts/default/ortho_5x10/layout.json @@ -0,0 +1,5 @@ +[{a:7},"","","","","","","","","","","",""], +["","","","","","","","","","","",""], +["","","","","","","","","","","",""], +["","","","","","","","","","","",""], +["","","","","","","","","","","",""] diff --git a/layouts/default/ortho_5x10/readme.md b/layouts/default/ortho_5x10/readme.md new file mode 100644 index 000000000000..956f2b702323 --- /dev/null +++ b/layouts/default/ortho_5x10/readme.md @@ -0,0 +1,3 @@ +# ortho_5x12 + + LAYOUT_ortho_5x12 diff --git a/layouts/default/ortho_5x5/info.json b/layouts/default/ortho_5x5/info.json index db858e61b27b..d645bd6d3fb0 100644 --- a/layouts/default/ortho_5x5/info.json +++ b/layouts/default/ortho_5x5/info.json @@ -7,12 +7,36 @@ "layouts": { "LAYOUT_ortho_5x5": { "layout": [ - {"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, - {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, - {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, - {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, - {"x":0, "y":4}, {"x":1, "y":4}, {"x":2, "y":4}, {"x":3, "y":4}, {"x":4, "y":4} - ] + {"x":0, "y":0}, + {"x":1, "y":0}, + {"x":2, "y":0}, + {"x":3, "y":0}, + {"x":4, "y":0}, + + {"x":0, "y":1}, + {"x":1, "y":1}, + {"x":2, "y":1}, + {"x":3, "y":1}, + {"x":4, "y":1}, + + {"x":0, "y":2}, + {"x":1, "y":2}, + {"x":2, "y":2}, + {"x":3, "y":2}, + {"x":4, "y":2}, + + {"x":0, "y":3}, + {"x":1, "y":3}, + {"x":2, "y":3}, + {"x":3, "y":3}, + {"x":4, "y":3}, + + {"x":0, "y":4}, + {"x":1, "y":4}, + {"x":2, "y":4}, + {"x":3, "y":4}, + {"x":4, "y":4} + ] } } } From 1cc7d2dc84b692a959c15af2852be979e831e479 Mon Sep 17 00:00:00 2001 From: Suschman Date: Sun, 18 Jul 2021 19:32:50 +0200 Subject: [PATCH 12/15] Update layouts/default/ortho_2x6/info.json Co-authored-by: Ryan --- layouts/default/ortho_2x6/info.json | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/layouts/default/ortho_2x6/info.json b/layouts/default/ortho_2x6/info.json index a8059a3c7140..5a421ed9036b 100644 --- a/layouts/default/ortho_2x6/info.json +++ b/layouts/default/ortho_2x6/info.json @@ -6,10 +6,21 @@ "height": 2, "layouts": { "LAYOUT_ortho_2x6": { - "layout": [ - {"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, - {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1} - ] + "layout": [ + {"x":0, "y":0}, + {"x":1, "y":0}, + {"x":2, "y":0}, + {"x":3, "y":0}, + {"x":4, "y":0}, + {"x":5, "y":0}, + + {"x":0, "y":1}, + {"x":1, "y":1}, + {"x":2, "y":1}, + {"x":3, "y":1}, + {"x":4, "y":1}, + {"x":5, "y":1} + ] } } } From def7e6bca2856f89d2c947b57b688d5ae66e9571 Mon Sep 17 00:00:00 2001 From: Suschman Date: Sun, 18 Jul 2021 19:35:24 +0200 Subject: [PATCH 13/15] Fix copy/paste error in ortho_5x10 --- layouts/default/ortho_5x10/layout.json | 10 +++++----- layouts/default/ortho_5x10/readme.md | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/layouts/default/ortho_5x10/layout.json b/layouts/default/ortho_5x10/layout.json index c67e8470dfbd..79dde3e7421f 100644 --- a/layouts/default/ortho_5x10/layout.json +++ b/layouts/default/ortho_5x10/layout.json @@ -1,5 +1,5 @@ -[{a:7},"","","","","","","","","","","",""], -["","","","","","","","","","","",""], -["","","","","","","","","","","",""], -["","","","","","","","","","","",""], -["","","","","","","","","","","",""] +[{a:7},"","","","","","","","","",""], +["","","","","","","","","",""], +["","","","","","","","","",""], +["","","","","","","","","",""], +["","","","","","","","","",""] diff --git a/layouts/default/ortho_5x10/readme.md b/layouts/default/ortho_5x10/readme.md index 956f2b702323..5c94f8eca8b5 100644 --- a/layouts/default/ortho_5x10/readme.md +++ b/layouts/default/ortho_5x10/readme.md @@ -1,3 +1,3 @@ -# ortho_5x12 +# ortho_5x10 - LAYOUT_ortho_5x12 + LAYOUT_ortho_5x10 From 1e040cce5106d489503ed1dc882a6c2533c8cbaf Mon Sep 17 00:00:00 2001 From: Suschman Date: Sun, 18 Jul 2021 20:13:16 +0200 Subject: [PATCH 14/15] Update layouts/default/readme.md --- layouts/default/readme.md | 48 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/layouts/default/readme.md b/layouts/default/readme.md index eca77e693061..1acc16d94f89 100644 --- a/layouts/default/readme.md +++ b/layouts/default/readme.md @@ -660,6 +660,24 @@ LAYOUT_numpad_6x4 ### Ortholinear Layouts +``` +LAYOUT_ortho_2x3 +┌───┬───┬───┐ +│ │ │ │ +├───┼───┼───┤ +│ │ │ │ +└───┴───┴───┘ +``` + +``` +LAYOUT_ortho_2x6 +┌───┬───┬───┬───┬───┬───┐ +│ │ │ │ │ │ │ +├───┼───┼───┼───┼───┼───┤ +│ │ │ │ │ │ │ +└───┴───┴───┴───┴───┴───┘ +``` + ``` LAYOUT_ortho_3x10 ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ @@ -710,6 +728,36 @@ LAYOUT_ortho_4x4 └───┴───┴───┴───┘ ``` +``` +LAYOUT_ortho_5x5 +┌───┬───┬───┬───┬───┐ +│ │ │ │ │ │ +├───┼───┼───┼───┼───┤ +│ │ │ │ │ │ +├───┼───┼───┼───┼───┤ +│ │ │ │ │ │ +├───┼───┼───┼───┼───┤ +│ │ │ │ │ │ +├───┼───┼───┼───┼───┤ +│ │ │ │ │ │ +└───┴───┴───┴───┴───┘ +``` + +``` +LAYOUT_ortho_5x10 +┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ +│ │ │ │ │ │ │ │ │ │ │ +├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤ +│ │ │ │ │ │ │ │ │ │ │ +├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤ +│ │ │ │ │ │ │ │ │ │ │ +├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤ +│ │ │ │ │ │ │ │ │ │ │ +├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤ +│ │ │ │ │ │ │ │ │ │ │ +└───┴───┴───┴───┴───┴───┴───┴───┴───┴───┘ +``` + ``` LAYOUT_ortho_5x12 ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ From 18b9a72ccafedf24b22a41b4cdfa769188280ed5 Mon Sep 17 00:00:00 2001 From: Suschman Date: Sun, 18 Jul 2021 20:23:40 +0200 Subject: [PATCH 15/15] Update layouts/default/ortho_5x5/info.json Co-authored-by: Ryan --- layouts/default/ortho_5x5/info.json | 52 ++++++++++++++--------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/layouts/default/ortho_5x5/info.json b/layouts/default/ortho_5x5/info.json index d645bd6d3fb0..ecc41d9437d0 100644 --- a/layouts/default/ortho_5x5/info.json +++ b/layouts/default/ortho_5x5/info.json @@ -6,36 +6,36 @@ "height": 5, "layouts": { "LAYOUT_ortho_5x5": { - "layout": [ - {"x":0, "y":0}, - {"x":1, "y":0}, - {"x":2, "y":0}, - {"x":3, "y":0}, - {"x":4, "y":0}, + "layout": [ + {"x":0, "y":0}, + {"x":1, "y":0}, + {"x":2, "y":0}, + {"x":3, "y":0}, + {"x":4, "y":0}, - {"x":0, "y":1}, - {"x":1, "y":1}, - {"x":2, "y":1}, - {"x":3, "y":1}, - {"x":4, "y":1}, + {"x":0, "y":1}, + {"x":1, "y":1}, + {"x":2, "y":1}, + {"x":3, "y":1}, + {"x":4, "y":1}, - {"x":0, "y":2}, - {"x":1, "y":2}, - {"x":2, "y":2}, - {"x":3, "y":2}, - {"x":4, "y":2}, + {"x":0, "y":2}, + {"x":1, "y":2}, + {"x":2, "y":2}, + {"x":3, "y":2}, + {"x":4, "y":2}, - {"x":0, "y":3}, - {"x":1, "y":3}, - {"x":2, "y":3}, - {"x":3, "y":3}, - {"x":4, "y":3}, + {"x":0, "y":3}, + {"x":1, "y":3}, + {"x":2, "y":3}, + {"x":3, "y":3}, + {"x":4, "y":3}, - {"x":0, "y":4}, - {"x":1, "y":4}, - {"x":2, "y":4}, - {"x":3, "y":4}, - {"x":4, "y":4} + {"x":0, "y":4}, + {"x":1, "y":4}, + {"x":2, "y":4}, + {"x":3, "y":4}, + {"x":4, "y":4} ] } }