summaryrefslogtreecommitdiffstats
path: root/keyboards/sixkeyboard
diff options
context:
space:
mode:
authorSuschman <Suschman@users.noreply.github.com>2021-07-20 02:30:09 +0200
committerGitHub <noreply@github.com>2021-07-19 17:30:09 -0700
commit7e698c71cd8b9d0cdef6c622cfdd88a13e2a6587 (patch)
treef94f7ba52479e650a90200095cb21f4e0c1a7846 /keyboards/sixkeyboard
parent046429fa87ab26bd131c262e590aa6cd03dd9f75 (diff)
Six Pack and ortho_ layout updates (#13587)
Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Suschman <suschman@gmail.com>
Diffstat (limited to 'keyboards/sixkeyboard')
-rw-r--r--keyboards/sixkeyboard/info.json2
-rw-r--r--keyboards/sixkeyboard/keymaps/default/keymap.c2
-rw-r--r--keyboards/sixkeyboard/keymaps/via/keymap.c8
-rw-r--r--keyboards/sixkeyboard/rules.mk3
-rw-r--r--keyboards/sixkeyboard/sixkeyboard.h2
5 files changed, 9 insertions, 8 deletions
diff --git a/keyboards/sixkeyboard/info.json b/keyboards/sixkeyboard/info.json
index 55239fc6cc..17815afa1b 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 3b39892a93..0c9b519353 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 fed341595c..39282b9b5a 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 889ea2fd10..0e0239af0f 100644
--- a/keyboards/sixkeyboard/rules.mk
+++ b/keyboards/sixkeyboard/rules.mk
@@ -28,4 +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
diff --git a/keyboards/sixkeyboard/sixkeyboard.h b/keyboards/sixkeyboard/sixkeyboard.h
index e0eb896ce4..353e2a78c8 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 \
) { \