[Keyboard] update m12og keymap to readable version (#7581)

* add m12og keyboards

* update readme.md

* update to latest code suggestions

* Update keyboards/matrix/m12og/readme.md

Co-Authored-By: fauxpark <fauxpark@gmail.com>
* Update keyboards/matrix/m12og/readme.md

Co-Authored-By: fauxpark <fauxpark@gmail.com>
* Update keyboards/matrix/m12og/readme.md

Co-Authored-By: fauxpark <fauxpark@gmail.com>
* Update keyboards/matrix/m12og/readme.md

Co-Authored-By: fauxpark <fauxpark@gmail.com>
* Update keyboards/matrix/m12og/readme.md

Co-Authored-By: fauxpark <fauxpark@gmail.com>
* Update keyboards/matrix/m12og/rules.mk

Co-Authored-By: fauxpark <fauxpark@gmail.com>
* update keymap to readable version

* fixed incosist of info.json and keymap

diff --git a/keyboards/matrix/m12og/keymaps/default/keymap.c b/keyboards/matrix/m12og/keymaps/default/keymap.c
index 6e227f5150a81c95e80e352ee55fecab7f29dbff..1444e4bff4741e86c2a5958dd1a39f69a5207107 100644 (file)
--- a/keyboards/matrix/m12og/keymaps/default/keymap.c
+++ b/keyboards/matrix/m12og/keymaps/default/keymap.c
@@ -6,20 +6,20 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        [0]=LAYOUT_tkl_ansi(
-               KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_BSPC,
-               KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_DEL,
-               KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS,
-               KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
-               KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1),
-               KC_PSCR, KC_SLCK, LT(1,KC_PAUS), KC_INS, KC_HOME, KC_PGUP, KC_DEL, KC_END, KC_PGDN,
-               KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_UP),
+               KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,   KC_PSCR, KC_SLCK, LT(1,KC_PAUS),
+    
+               KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL,  KC_BSPC,   KC_INS, KC_HOME, KC_PGUP,
+               KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS,   KC_DEL, KC_END, KC_PGDN,
+               KC_CAPS,   KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,     KC_ENT,
+               KC_LSFT,     KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH,      KC_RSFT,            KC_UP,
+               KC_LCTL, KC_LGUI, KC_LALT,                 KC_SPC,                    KC_RALT, MO(1), KC_RCTL,  KC_LEFT, KC_DOWN, KC_RGHT),
 
        [1]=LAYOUT_tkl_ansi(
-               KC_MUTE, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-               _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-               KC_NLCK, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______,
-               RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-               _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-               _______, _______, _______, _______, _______, _______, _______, _______, _______,
-               _______, _______, _______, KC_MPLY, _______, _______, _______, KC_MPRV, KC_VOLD, KC_MNXT, KC_VOLU),
+               KC_MUTE,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______,
+
+               _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, 
+               KC_NLCK, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______,          _______, _______, _______,
+               RESET,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+               _______,         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,           _______,                   KC_VOLU,
+               _______, _______, _______,                           KC_MPLY,                                       _______, _______, _______,          KC_MPRV, KC_VOLD, KC_MNXT),
 };

diff --git a/keyboards/matrix/m12og/keymaps/iso/keymap.c b/keyboards/matrix/m12og/keymaps/iso/keymap.c
index db18b9893a72d5bc82516d6361fd826530383c0f..70d0d7bc13b5b31afe1bd526e284c3db2ac1af68 100644 (file)
--- a/keyboards/matrix/m12og/keymaps/iso/keymap.c
+++ b/keyboards/matrix/m12og/keymaps/iso/keymap.c
@@ -6,20 +6,19 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        [0]=LAYOUT_tkl_iso(
-               KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_BSPC,
-               KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_DEL,
-               KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC,
+               KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11,    KC_F12,        KC_PSCR, KC_SLCK, LT(1,KC_PAUS),
+               KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL,     KC_BSPC,        KC_INS, KC_HOME, KC_PGUP,
+               KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC,                    KC_DEL,  KC_END, KC_PGDN,
                KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT,
-               KC_LSFT, KC_LGUI, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1),
-               KC_PSCR, KC_SLCK, LT(1,KC_PAUS), KC_INS, KC_HOME, KC_PGUP, KC_DEL, KC_END, KC_PGDN,
-               KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_UP),
+               KC_LSFT, KC_LGUI, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH,    KC_RSFT,                  KC_UP,
+               KC_LCTL, KC_LGUI, KC_LALT,              KC_SPC,                          KC_RALT, MO(1), KC_RCTL,       KC_LEFT, KC_DOWN, KC_RGHT),
 
        [1]=LAYOUT_tkl_iso(
-               KC_MUTE, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-               _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-               KC_NLCK, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______,
-               RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-               _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-               _______, _______, _______, _______, _______, _______, _______, _______, _______,
-               _______, _______, _______, KC_MPLY, _______, _______, _______, KC_MPRV, KC_VOLD, KC_MNXT, KC_VOLU),
+               KC_MUTE,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,     _______, _______, _______, 
+
+               _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,     _______, _______, _______,
+               KC_NLCK, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______,              _______, _______, _______, 
+               RESET,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,         
+               _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,              KC_VOLU,
+               _______, _______, _______,                                    KC_MPLY,                             _______, _______, _______,     KC_MPRV, KC_VOLD, KC_MNXT),
 };

diff --git a/keyboards/matrix/m12og/m12og.h b/keyboards/matrix/m12og/m12og.h
index 9948d6b6d11eb291c4715deda0bc22816e9f46fd..f632016f125bd586e0ebaf1b6188c0cdb324c070 100644 (file)
--- a/keyboards/matrix/m12og/m12og.h
+++ b/keyboards/matrix/m12og/m12og.h
@@ -6,37 +6,37 @@
 #include "quantum.h"
 
 #define LAYOUT_tkl_iso( \
-    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, \
-       K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, \
-       K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212,\
+  K000,       K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012,          K500, K501, K502, \
+  \
+       K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K013,          K503, K504, K505, \
+       K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212,                K506, K507, K508, \
        K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, \
-       K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413, \
-       K500, K501, K502, K503, K504, K505, K506, K507, K508,                               \
-       K600, K601, K602, K603, K604, K605, K606, K607, K608, K609, K610  \
+       K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412,                      K610, \
+       K600, K601, K602,                         K603,                   K604, K605, K606,          K607, K608, K609  \
 ) { \
        { K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013 }, \
-       { K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113 }, \
+       { K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  KC_NO }, \
        { K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  KC_NO}, \
        { K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  K313 }, \
-       { K400,  K401,  K402,  K403,  K404,  K405,  K406,  K407,  K408,  K409,  K410,  K411,  K412,  K413 }, \
+       { K400,  K401,  K402,  K403,  K404,  K405,  K406,  K407,  K408,  K409,  K410,  K411,  K412,  KC_NO}, \
        { K500,  K501,  K502,  K503,  K504,  K505,  K506,  K507,  K508,  KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
        { K600,  K601,  K602,  K603,  K604,  K605,  K606,  K607,  K608,  K609,  K610,  KC_NO, KC_NO, KC_NO }  \
 }
 
 #define LAYOUT_tkl_ansi( \
-    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, \
-       K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, \
-       K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, \
-       K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K313, \
-       K400, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413, \
-       K500, K501, K502, K503, K504, K505, K506, K507, K508,                               \
-       K600, K601, K602, K603, K604, K605, K606, K607, K608, K609, K610  \
+  K000,       K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012,    K500, K501, K502,\
+  \
+       K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K013,    K503, K504, K505,\
+       K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213,    K506, K507, K508,\
+       K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311,       K313, \
+       K400,       K402, K403, K404, K405, K406, K407, K408, K409, K410, K411,       K412,          K610,\
+       K600, K601, K602,                   K603,                         K604, K605, K606,   K607, K608, K609\
 ) { \
        { K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013 }, \
-       { K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113 }, \
+       { K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  KC_NO }, \
        { K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213 }, \
        { K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311, KC_NO,  K313 }, \
-       { K400, KC_NO,  K402,  K403,  K404,  K405,  K406,  K407,  K408,  K409,  K410,  K411,  K412,  K413 }, \
+       { K400, KC_NO,  K402,  K403,  K404,  K405,  K406,  K407,  K408,  K409,  K410,  K411,  K412,  KC_NO }, \
        { K500,  K501,  K502,  K503,  K504,  K505,  K506,  K507,  K508,  KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
        { K600,  K601,  K602,  K603,  K604,  K605,  K606,  K607,  K608,  K609,  K610,  KC_NO, KC_NO, KC_NO }  \
 }