Merge remote-tracking branch 'origin/master' into develop

4 files changed, 92 insertions, 18 deletions

diff --git a/keyboards/matrix/m12og/config.h b/keyboards/matrix/m12og/config.h
index 7cd82e05b6..fae5192a33 100644
--- a/keyboards/matrix/m12og/config.h
+++ b/keyboards/matrix/m12og/config.h
@@ -26,12 +26,13 @@
 #define DIODE_DIRECTION COL2ROW
 
 #define RGB_DI_PIN B3
+
 #ifdef RGB_DI_PIN
 #define RGBLIGHT_ANIMATIONS
-
 #define RGBLED_NUM 16
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
 #define RGBLIGHT_SLEEP
+#define WS2812_BYTE_ORDER WS2812_BYTE_ORDER_RGB
 #endif
diff --git a/keyboards/matrix/m12og/keymaps/via/keymap.c b/keyboards/matrix/m12og/keymaps/via/keymap.c
new file mode 100644
index 0000000000..1ae1400fe9
--- /dev/null
+++ b/keyboards/matrix/m12og/keymaps/via/keymap.c
@@ -0,0 +1,57 @@
+/* Copyright 2021 kb-elmo<mail@elmo.space>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+	[0]=LAYOUT_all(
+		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, 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_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_NUHS, KC_ENT,
+		KC_LSFT, KC_NUBS, 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_UP,
+		KC_LCTL, KC_LGUI, KC_LALT,                 KC_SPC,                    KC_RALT, MO(1), KC_RCTL,            KC_LEFT, KC_DOWN, KC_RGHT
+	),
+
+	[1]=LAYOUT_all(
+		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
+	),
+	[2]=LAYOUT_all(
+		_______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            _______, _______, _______,
+
+		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______, 
+		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            _______, _______, _______,
+		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                     _______,
+		_______, _______, _______,                           _______,                                      _______, _______, _______,            _______, _______, _______
+	),
+	[3]=LAYOUT_all(
+		_______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            _______, _______, _______,
+
+		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______, 
+		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            _______, _______, _______,
+		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                     _______,
+		_______, _______, _______,                           _______,                                      _______, _______, _______,            _______, _______, _______
+	)
+};
diff --git a/keyboards/matrix/m12og/keymaps/via/rules.mk b/keyboards/matrix/m12og/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/matrix/m12og/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/matrix/m12og/m12og.h b/keyboards/matrix/m12og/m12og.h
index f632016f12..17ab151da1 100644
--- a/keyboards/matrix/m12og/m12og.h
+++ b/keyboards/matrix/m12og/m12og.h
@@ -5,38 +5,53 @@
 
 #include "quantum.h"
 
+#define LAYOUT_all( \
+    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, K113, 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, K312, K313,                         \
+    K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413,              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  }, \
+    { 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,  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,  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_iso( \
-  K000,       K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012,          K500, K501, K502, \
-  \
+    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,                      K610, \
+	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,                      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 }, \
+	{ 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,  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,  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,  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,    K500, K501, K502,\
-  \
+    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\
+	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 }, \
+	{ 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,  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,  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,  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 }  \
 }