Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Corrected layout #14096

Merged
merged 14 commits into from
Aug 29, 2021
43 changes: 38 additions & 5 deletions keyboards/ymdk/np24/u4rgb6/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,37 +37,70 @@
{"x": 3, "y": 5.25}
]
},
"LAYOUT_ortho_4x6": {
"LAYOUT_ortho_4x6_right": {
"layout": [
{"x": 0, "y": 0},
{"x": 1, "y": 0},
{"x": 2, "y": 0},
{"x": 3, "y": 0},
{"x": 4, "y": 0},
{"x": 5.25, "y": 0},
{"x": 5, "y": 0, "w": 1.5},

{"x": 0, "y": 1},
{"x": 1, "y": 1},
{"x": 2, "y": 1},
{"x": 3, "y": 1},
{"x": 4, "y": 1},
{"x": 5.25, "y": 1},
{"x": 5, "y": 1, "w": 1.5},

{"x": 0, "y": 2},
{"x": 1, "y": 2},
{"x": 2, "y": 2},
{"x": 3, "y": 2},
{"x": 4, "y": 2},
{"x": 5.25, "y": 2},
{"x": 5, "y": 2, "w": 1.5},

{"x": 0, "y": 3},
{"x": 1, "y": 3},
{"x": 2, "y": 3},
{"x": 3, "y": 3},
{"x": 4, "y": 3},
{"x": 5.25, "y": 3}
{"x": 5, "y": 3, "w": 1.5}
]
},

"LAYOUT_ortho_4x6_left": {
"layout": [
{"x": 0, "y": 0, "w": 1.5},
{"x": 1.5, "y": 0},
{"x": 2.5, "y": 0},
{"x": 3.5, "y": 0},
{"x": 4.5, "y": 0},
{"x": 5.5, "y": 0},

{"x": 0, "y": 1, "w": 1.5},
{"x": 1.5, "y": 1},
{"x": 2.5, "y": 1},
{"x": 3.5, "y": 1},
{"x": 4.5, "y": 1},
{"x": 5.5, "y": 1,},

{"x": 0, "y": 2, "w": 1.5},
{"x": 1.5, "y": 2},
{"x": 2.5, "y": 2},
{"x": 3.5, "y": 2},
{"x": 4.5, "y": 2},
{"x": 5.5, "y": 2},

{"x": 0, "y": 3, "w": 1.5},
{"x": 1.5, "y": 3},
{"x": 2.5, "y": 3},
{"x": 3.5, "y": 3},
{"x": 4.5, "y": 3},
{"x": 5.5, "y": 3}
]
},

"LAYOUT_numpad_6x4": {
"layout": [
{"x": 0, "y": 0},
Expand Down
2 changes: 1 addition & 1 deletion keyboards/ymdk/np24/u4rgb6/rules.mk
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@ RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
BLUETOOTH_ENABLE = no # Enable Bluetooth
AUDIO_ENABLE = no # Audio output

LAYOUTS = ortho_6x4 numpad_6x4 ortho_4x6
LAYOUTS = ortho_6x4 numpad_6x4
26 changes: 20 additions & 6 deletions keyboards/ymdk/np24/u4rgb6/u4rgb6.h
Original file line number Diff line number Diff line change
Expand Up @@ -36,18 +36,32 @@
{ k05, k15, k25, k35 } \
}

#define LAYOUT_ortho_4x6( \
#define LAYOUT_ortho_4x6_right( \
k00, k01, k02, k03, k04, k05, \
k10, k11, k12, k13, k14, k15, \
k20, k21, k22, k23, k24, k25, \
k30, k31, k32, k33, k34, k35 \
) { \
{ k00, k10, k20, k30 }, \
{ k01, k11, k21, k31 }, \
{ k02, k12, k22, k32 }, \
{ k03, k13, k23, k33 }, \
{ k05, k15, k25, k35 }, \
{ k04, k14, k24, k34 }, \
{ k05, k15, k25, k35 } \
{ k03, k13, k23, k33 }, \
{ k02, k12, k22, k32 }, \
{ k01, k11, k21, k31 }, \
{ k00, k10, k20, k30 } \
}

#define LAYOUT_ortho_4x6_left( \
k00, k01, k02, k03, k04, k05, \
k10, k11, k12, k13, k14, k15, \
k20, k21, k22, k23, k24, k25, \
k30, k31, k32, k33, k34, k35 \
) { \
{ k30, k20, k10, k00 }, \
{ k31, k21, k11, k01 }, \
{ k32, k22, k12, k02 }, \
{ k33, k23, k13, k03 }, \
{ k34, k24, k14, k04 }, \
{ k35, k25, k15, k05 } \
}

trenthoh marked this conversation as resolved.
Show resolved Hide resolved
#define LAYOUT_numpad_6x4( \
Expand Down
21 changes: 21 additions & 0 deletions layouts/default/ortho_4x6/default_ortho_4x6/keymap.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
#include QMK_KEYBOARD_H

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/*
* ┌───┬───┬───┬───┬───┬───┐
* │Tab│ Q │ W │ E │ R │ T │
* ├───┼───┼───┼───┼───┼───┤
* │Bsp│ A │ S │ D │ F │ G │
* ├───┼───┼───┼───┼───┼───┤
* │Sft│ Z │ X │ C │ V │ B │
* ├───┼───┼───┼───┼───┼───┤
* │Ctl│App│GUI│Alt│Spc│Spc│
* └───┴───┴───┴───┴───┴───┘
*/
[0] = LAYOUT_ortho_4x6(
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T,
KC_BKSP, KC_A, KC_S, KC_D, KC_F, KC_G,
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B,
KC_LCTL, KC_MENU, KC_LGUI, KC_LALT, KC_SPC, KC_SPC
)
};
40 changes: 40 additions & 0 deletions layouts/default/ortho_4x6/info.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
{
"keyboard_name": "4x6 ortholinear layout",
"url": "",
"maintainer": "qmk",
"width": 4,
"height": 4,
"layouts": {
"LAYOUT_ortho_4x6": {
"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},

{"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":0, "y":3},
{"x":1, "y":3},
{"x":2, "y":3},
{"x":3, "y":3},
{"x":4, "y":3},
{"x":5, "y":3}
]
}
}
}
4 changes: 4 additions & 0 deletions layouts/default/ortho_4x6/layout.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
[{a:7},"","","","","",""],
["","","","","",""],
["","","","","",""],
["","","","","",""]
3 changes: 3 additions & 0 deletions layouts/default/ortho_4x6/readme.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# ortho_4x6

LAYOUT_ortho_4x6