Keyboard: Prime_O layout/matrix fix (#4205)

2 files changed, 30 insertions, 38 deletions

diff --git a/keyboards/primekb/prime_o/keymaps/default/keymap.c b/keyboards/primekb/prime_o/keymaps/default/keymap.c
index f48e9e51ae..a2d9e807cc 100644
--- a/keyboards/primekb/prime_o/keymaps/default/keymap.c
+++ b/keyboards/primekb/prime_o/keymaps/default/keymap.c
@@ -15,6 +15,8 @@
  */
 #include QMK_KEYBOARD_H
 
+#define L1BS LT(1, KC_BSPC)
+
 // Defines the keycodes used by our macros in process_record_user
 enum custom_keycodes {
   QMKBEST = SAFE_RANGE,
@@ -22,31 +24,21 @@ enum custom_keycodes {
 };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT(
-		KC_ENT, KC_P0, KC_LCTL, KC_LBRC, LT(1, KC_BSPC), KC_SPC, KC_MINS, KC_RGUI, 
-		KC_ENT, KC_P2, KC_LSFT, KC_X, KC_V, KC_N, KC_COMM, KC_SLSH, 
-		KC_PPLS, KC_P5, KC_TAB, KC_S, KC_F, KC_H, KC_K, KC_QUOT, 
-		KC_PPLS, KC_P8, KC_PSCR, KC_W, KC_R, KC_Y, KC_I, KC_P, 
-		KC_ESC, KC_PSLS, KC_NLCK, KC_2, KC_4, KC_6, KC_8, KC_0, 
-		KC_PMNS, KC_PAST, KC_1, KC_3, KC_5, KC_7, KC_9, KC_DEL, 
-		KC_P7, KC_P9, KC_Q, KC_E, KC_T, KC_U, KC_O, KC_BSLS, 
-		KC_P4, KC_P6, KC_A, KC_D, KC_G, KC_J, KC_L, KC_ENT, 
-		KC_P1, KC_P3, KC_Z, KC_C, KC_B, KC_M, KC_DOT, KC_LSFT, 
-		KC_PDOT, KC_P0, KC_LALT, KC_RBRC, LT(1, KC_BSPC), KC_SPC, KC_EQL, KC_RCTL
-    ),
+  [0] = LAYOUT(
+    KC_ESC,   KC_PMNS,  KC_PSLS,  KC_PAST,  KC_NLCK,  KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_9,   KC_DEL,
+    KC_PPLS,  KC_P7,    KC_P8,    KC_P9,    KC_PSCR,  KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,   KC_BSLS,
+    KC_PPLS,  KC_P4,    KC_P5,    KC_P6,    KC_TAB,   KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,   KC_QUOT,KC_ENT,
+    KC_ENT,   KC_P1,    KC_P2,    KC_P3,    KC_LSFT,  KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,KC_LSFT,
+    KC_ENT,   KC_PDOT,  KC_P0,    KC_P0,    KC_LCTL,  KC_LALT,KC_LBRC,KC_RBRC,L1BS,   L1BS,   KC_SPC, KC_SPC, KC_MINS,KC_EQL, KC_RGUI,KC_RCTL
+  ),
 
 	[1] = LAYOUT(
-		BL_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DEL, KC_VOLD, KC_MUTE, 
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-		KC_TRNS, KC_TRNS, KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DOWN, KC_SCLN, 
-		KC_TRNS, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, 
-		KC_GRV, KC_F2, KC_F4, KC_F2, KC_F4, KC_F6, KC_F8, KC_F10, 
-		KC_F1, KC_F3, KC_F1, KC_F3, KC_F5, KC_F7, KC_F9, KC_DEL, 
-		KC_F11, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, 
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_RGHT, KC_VOLU, 
-		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MUTE, 
-		BL_STEP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DEL, KC_VOLU, KC_MUTE
-    ),
+    KC_GRV,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10, KC_DEL,
+    KC_TRNS,  KC_F11,   KC_F12,   KC_TRNS,  KC_TRNS,  KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_UP,  KC_TRNS,KC_TRNS,KC_VOLU,
+    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_CAPS,  KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_LEFT,KC_DOWN,KC_RGHT,KC_SCLN,KC_VOLU,
+    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_MUTE,
+    BL_TOGG,  BL_STEP,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_DEL, KC_DEL, KC_VOLD,KC_VOLU,KC_MUTE,KC_MUTE
+  ),
 
 };
 
diff --git a/keyboards/primekb/prime_o/prime_o.h b/keyboards/primekb/prime_o/prime_o.h
index 1ec7277b04..99a8054522 100644
--- a/keyboards/primekb/prime_o/prime_o.h
+++ b/keyboards/primekb/prime_o/prime_o.h
@@ -19,22 +19,22 @@
 #include "quantum.h"
 
 #define LAYOUT( \
-	K000, K001, K002, K003, K004, K005, K006, K007, K010, K011, K012, K013, K014, K015, K016, K017, \
-	K020, K021, K022, K023, K024, K025, K026, K027, K030, K031, K032, K033, K034, K035, K036, K037, \
-	K040, K041, K042, K043, K044, K045, K046, K047, K050, K051, K052, K053, K054, K055, K056, K057, \
-	K060, K061, K062, K063, K064, K065, K066, K067, K070, K071, K072, K073, K074, K075, K076, K077, \
-	K080, K081, K082, K083, K084, K085, K086, K087, K090, K091, K092, K093, K094, K095, K096, K097  \
+	K001, K008, K013, K018, K023, K029, K035, K041, K046, K052, K058, K064, K071, K076, K081, K086, \
+	K002, K009, K014, K019, K024, K030, K036, K042, K047, K053, K059, K065, K072, K077, K082, K087, \
+	K004, K010, K015, K020, K025, K031, K037, K043, K048, K054, K060, K066, K073, K078, K083, K089, \
+	K005, K011, K016, K021, K026, K032, K038, K044, K049, K055, K061, K067, K074, K079, K084, K090, \
+	K007, K012, K017, K022, K028, K034, K040, K045, K051, K057, K063, K069, K075, K080, K085, K092  \
 ) { \
-	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007 }, \
-	{ K010,  K011,  K012,  K013,  K014,  K015,  K016,  K017 }, \
-	{ K020,  K021,  K022,  K023,  K024,  K025,  K026,  K027 }, \
-	{ K030,  K031,  K032,  K033,  K034,  K035,  K036,  K037 }, \
-	{ K040,  K041,  K042,  K043,  K044,  K045,  K046,  K047 }, \
-	{ K050,  K051,  K052,  K053,  K054,  K055,  K056,  K057 }, \
-	{ K060,  K061,  K062,  K063,  K064,  K065,  K066,  K067 }, \
-	{ K070,  K071,  K072,  K073,  K074,  K075,  K076,  K077 }, \
-	{ K080,  K081,  K082,  K083,  K084,  K085,  K086,  K087 }, \
-	{ K090,  K091,  K092,  K093,  K094,  K095,  K096,  K097 }  \
+	{ K007,  K017,  K028,  K040,  K051,  K063,  K075,  K085 }, \
+	{ K005,  K016,  K026,  K038,  K049,  K061,  K074,  K084 }, \
+	{ K004,  K015,  K025,  K037,  K048,  K060,  K073,  K083 }, \
+	{ K002,  K014,  K024,  K036,  K047,  K059,  K072,  K082 }, \
+	{ K001,  K013,  K023,  K035,  K046,  K058,  K071,  K081 }, \
+	{ K008,  K018,  K029,  K041,  K052,  K064,  K076,  K086 }, \
+	{ K009,  K019,  K030,  K042,  K053,  K065,  K077,  K087 }, \
+	{ K010,  K020,  K031,  K043,  K054,  K066,  K078,  K089 }, \
+	{ K011,  K021,  K032,  K044,  K055,  K067,  K079,  K090 }, \
+	{ K012,  K022,  K034,  K045,  K057,  K069,  K080,  K092 }  \
 }
 
 #endif