[Keyboard] Corrected layout for np24 by YMDK (qmk#14096)

Co-authored-by: Drashna Jaelre <[email protected]> Co-authored-by: Ryan <[email protected]>
Oh-My-Mechanical-Keyboard · Aug 29, 2021 · f87cd8e · f87cd8e
1 parent 94d7635
commit f87cd8e
Show file tree

Hide file tree

Showing 6 changed files with 126 additions and 11 deletions.
diff --git a/keyboards/ymdk/np24/u4rgb6/info.json b/keyboards/ymdk/np24/u4rgb6/info.json
@@ -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},

diff --git a/keyboards/ymdk/np24/u4rgb6/u4rgb6.h b/keyboards/ymdk/np24/u4rgb6/u4rgb6.h
@@ -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 } \
 }
 
 #define LAYOUT_numpad_6x4( \

diff --git a/layouts/default/ortho_4x6/default_ortho_4x6/keymap.c b/layouts/default/ortho_4x6/default_ortho_4x6/keymap.c
@@ -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
+ )
+};
diff --git a/layouts/default/ortho_4x6/info.json b/layouts/default/ortho_4x6/info.json
@@ -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}
+ ]
+ }
+ }
+}
diff --git a/layouts/default/ortho_4x6/layout.json b/layouts/default/ortho_4x6/layout.json
@@ -0,0 +1,4 @@
+[{a:7},"","","","","",""],
+["","","","","",""],
+["","","","","",""],
+["","","","","",""]
diff --git a/layouts/default/ortho_4x6/readme.md b/layouts/default/ortho_4x6/readme.md
@@ -0,0 +1,3 @@
+# ortho_4x6
+
+ LAYOUT_ortho_4x6