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

18 files changed, 213 insertions, 38 deletions

diff --git a/keyboards/sidderskb/majbritt/keymaps/via/keymap.c b/keyboards/sidderskb/majbritt/keymaps/via/keymap.c
deleted file mode 100644
index 21cdd04ed4..0000000000
--- a/keyboards/sidderskb/majbritt/keymaps/via/keymap.c
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Copyright 2020 MechMerlin
- *
- * 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(
-              KC_ESC,  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_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_ENT,      KC_PGUP,
-          KC_LCTL,        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_PGDN,
-        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,          KC_UP,
-        KC_LCTL,                         KC_LALT,      KC_SPC,           MO(1),     KC_BSPC,                 KC_RALT,                              KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-    [1] = LAYOUT(
-              _______, _______, _______,    _______, _______, _______, _______,       _______, _______, _______, _______,    _______, _______, _______,            RESET,
-            _______,      _______,   _______, _______, _______, _______,            _______, _______, _______, _______, _______,   _______, _______,    _______,     _______,
-          _______,        _______,     _______, _______, _______, _______,            _______, _______, _______, _______,    _______, _______, _______,                _______,
-        _______,   _______, _______,     _______, _______, _______, _______,             _______, _______, _______, _______,     _______, _______,          _______,
-        _______,                         _______,      _______,          _______,   _______,                 _______,                              _______, _______, _______
-    ),
-
-};
diff --git a/keyboards/sidderskb/majbritt/keymaps/via/rules.mk b/keyboards/sidderskb/majbritt/keymaps/via/rules.mk
deleted file mode 100644
index 36b7ba9cbc..0000000000
--- a/keyboards/sidderskb/majbritt/keymaps/via/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-VIA_ENABLE = yes
-LTO_ENABLE = yes
diff --git a/keyboards/sidderskb/majbritt/config.h b/keyboards/sidderskb/majbritt/rev1/config.h
index a6ccb2221b..a6ccb2221b 100644
--- a/keyboards/sidderskb/majbritt/config.h
+++ b/keyboards/sidderskb/majbritt/rev1/config.h
diff --git a/keyboards/sidderskb/majbritt/info.json b/keyboards/sidderskb/majbritt/rev1/info.json
index 316e17b818..316e17b818 100644
--- a/keyboards/sidderskb/majbritt/info.json
+++ b/keyboards/sidderskb/majbritt/rev1/info.json
diff --git a/keyboards/sidderskb/majbritt/keymaps/default/keymap.c b/keyboards/sidderskb/majbritt/rev1/keymaps/default/keymap.c
index 21cdd04ed4..21cdd04ed4 100644
--- a/keyboards/sidderskb/majbritt/keymaps/default/keymap.c
+++ b/keyboards/sidderskb/majbritt/rev1/keymaps/default/keymap.c
diff --git a/keyboards/sidderskb/majbritt/keymaps/default/readme.md b/keyboards/sidderskb/majbritt/rev1/keymaps/default/readme.md
index 7b51ddcd2d..7b51ddcd2d 100644
--- a/keyboards/sidderskb/majbritt/keymaps/default/readme.md
+++ b/keyboards/sidderskb/majbritt/rev1/keymaps/default/readme.md
diff --git a/keyboards/sidderskb/majbritt/readme.md b/keyboards/sidderskb/majbritt/rev1/readme.md
index b1445c681c..8d976df4a4 100644
--- a/keyboards/sidderskb/majbritt/readme.md
+++ b/keyboards/sidderskb/majbritt/rev1/readme.md
@@ -8,6 +8,6 @@ An Alice style keyboard with arrow keys.
 
 Make example for this keyboard (after setting up your build environment):
 
-    make sidderskb/majbritt:default
+    make sidderskb/majbritt/rev1:default
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/sidderskb/majbritt/majbritt.c b/keyboards/sidderskb/majbritt/rev1/rev1.c
index e0fe370b84..79b2c9e601 100644
--- a/keyboards/sidderskb/majbritt/majbritt.c
+++ b/keyboards/sidderskb/majbritt/rev1/rev1.c
@@ -13,7 +13,7 @@
  * 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 "majbritt.h"
+#include "rev1.h"
 
 
 
diff --git a/keyboards/sidderskb/majbritt/majbritt.h b/keyboards/sidderskb/majbritt/rev1/rev1.h
index 5d49640efc..5d49640efc 100644
--- a/keyboards/sidderskb/majbritt/majbritt.h
+++ b/keyboards/sidderskb/majbritt/rev1/rev1.h
diff --git a/keyboards/sidderskb/majbritt/rules.mk b/keyboards/sidderskb/majbritt/rev1/rules.mk
index 812c710645..812c710645 100644
--- a/keyboards/sidderskb/majbritt/rules.mk
+++ b/keyboards/sidderskb/majbritt/rev1/rules.mk
diff --git a/keyboards/sidderskb/majbritt/rev2/config.h b/keyboards/sidderskb/majbritt/rev2/config.h
new file mode 100644
index 0000000000..06049727cb
--- /dev/null
+++ b/keyboards/sidderskb/majbritt/rev2/config.h
@@ -0,0 +1,48 @@
+/*
+Copyright 2021 Sleepdealer
+
+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/>.
+*/
+
+#pragma once
+
+#include "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0x534B // SB
+#define PRODUCT_ID      0x0001
+#define DEVICE_VER      0x0002
+#define MANUFACTURER    SiddersKb
+#define PRODUCT         Majbritt
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 16
+                        //0 , 1 , 2 , 3 , 4 , 5 , 6 , 7 , 8 , 9 , 10, 11, 12, 13, 14 ,15
+#define MATRIX_ROW_PINS { B0, B1, F7, C6, B5}
+#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, C7, B6, D6, B4, D4, D7, D5 ,D3, D2, D1, D0}
+
+#define ENCODERS_PAD_A { B3 }
+#define ENCODERS_PAD_B { B7 }
+
+/* COL2ROW, ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
+#define LOCKING_SUPPORT_ENABLE
+/* Locking resynchronize hack */
+#define LOCKING_RESYNC_ENABLE
+
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
diff --git a/keyboards/sidderskb/majbritt/rev2/info.json b/keyboards/sidderskb/majbritt/rev2/info.json
new file mode 100644
index 0000000000..2863ceee4e
--- /dev/null
+++ b/keyboards/sidderskb/majbritt/rev2/info.json
@@ -0,0 +1,12 @@
+{
+    "keyboard_name": "Majbritt Rev2",
+    "url": "https://sidderskb.co.uk/",
+    "maintainer": "Sleepdealr",
+    "width": 17.5,
+    "height": 5,
+    "layouts": {
+        "LAYOUT": {
+            "layout": [{"label":"Esc", "x":0.75, "y":0}, {"label":"!", "x":1.75, "y":0}, {"label":"\"", "x":2.75, "y":0}, {"label":"\u00a3", "x":3.75, "y":0}, {"label":"$", "x":4.75, "y":0}, {"label":"%", "x":5.75, "y":0}, {"label":"^", "x":6.75, "y":0}, {"label":"&", "x":8.5, "y":0}, {"label":"*", "x":9.5, "y":0}, {"label":"(", "x":10.5, "y":0}, {"label":")", "x":11.5, "y":0}, {"label":"_", "x":12.5, "y":0}, {"label":"+", "x":13.5, "y":0}, {"label":"|", "x":14.5, "y":0}, {"label":"~", "x":15.5, "y":0}, {"label":"Del", "x":16.5, "y":0}, {"label":"Tab", "x":0.5, "y":1, "w":1.5}, {"label":"Q", "x":2, "y":1}, {"label":"W", "x":3, "y":1}, {"label":"E", "x":4, "y":1}, {"label":"R", "x":5, "y":1}, {"label":"T", "x":6, "y":1}, {"label":"Y", "x":8, "y":1}, {"label":"U", "x":9, "y":1}, {"label":"I", "x":10, "y":1}, {"label":"O", "x":11, "y":1}, {"label":"P", "x":12, "y":1}, {"label":"{", "x":13, "y":1}, {"label":"}", "x":14, "y":1}, {"label":"Enter", "x":15.25, "y":1, "w":1.25, "h":2}, {"label":"Pgup", "x":16.5, "y":1}, {"label":"Caps Lock", "x":0.25, "y":2, "w":1.75}, {"label":"A", "x":2, "y":2}, {"label":"S", "x":3, "y":2}, {"label":"D", "x":4, "y":2}, {"label":"F", "x":5, "y":2}, {"label":"G", "x":6, "y":2}, {"label":"H", "x":8.25, "y":2}, {"label":"J", "x":9.25, "y":2}, {"label":"K", "x":10.25, "y":2}, {"label":"L", "x":11.25, "y":2}, {"label":":", "x":12.25, "y":2}, {"label":"@", "x":13.25, "y":2}, {"label":"~", "x":14.25, "y":2}, {"label":"Pgdn", "x":16.5, "y":2}, {"label":"Shift", "x":0, "y":3, "w":1.25}, {"label":"|", "x":1.25, "y":3}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":8.75, "y":3}, {"label":"M", "x":9.75, "y":3}, {"label":"<", "x":10.75, "y":3}, {"label":">", "x":11.75, "y":3}, {"label":"?", "x":12.75, "y":3}, {"label":"Shift", "x":13.75, "y":3, "w":1.75}, {"label":"Up", "x":15.5, "y":3}, {"label":"Fn", "x":16.5, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.5}, {"label":"Alt", "x":3, "y":4, "w":1.5}, {"label":"LSpace", "x":4.5, "y":4, "w":2.25}, {"label":"Fn", "x":6.75, "y":4}, {"label":"RSpace", "x":8.25, "y":4, "w":2.75}, {"label":"AltGr", "x":11, "y":4, "w":1.5}, {"label":"Left", "x":14.5, "y":4}, {"label":"Down", "x":15.5, "y":4}, {"label":"Right", "x":16.5, "y":4}]
+        }
+    }
+}
diff --git a/keyboards/sidderskb/majbritt/rev2/keymaps/default/keymap.c b/keyboards/sidderskb/majbritt/rev2/keymaps/default/keymap.c
new file mode 100644
index 0000000000..a91945646e
--- /dev/null
+++ b/keyboards/sidderskb/majbritt/rev2/keymaps/default/keymap.c
@@ -0,0 +1,55 @@
+/* Copyright 2021 Sleepdealer
+ *
+ * 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( //Default layout (currently ISO)
+		KC_ESC,  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_BSLS,  KC_GRV,  KC_HOME,
+		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_ENT,  KC_PGUP,
+		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_PGDN,
+		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_LSFT,  KC_UP,   KC_END,
+		KC_LCTL,                    KC_LALT, KC_SPC,           MO(1),            KC_SPC,           KC_RALT,                   KC_LEFT,  KC_DOWN, KC_RGHT),
+
+[1] = LAYOUT(
+		KC_GRV,  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_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_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_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_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS,                    KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS,          KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS),
+[2] = LAYOUT(
+		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_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_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_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_TRNS,
+		KC_TRNS,                    KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS,          KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS),
+[3] = LAYOUT(
+		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_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_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_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_TRNS,
+		KC_TRNS,                    KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS,          KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS)
+};
+
+void encoder_update_user(uint8_t index, bool clockwise) {
+    if (clockwise) {
+        tap_code(KC_PGDN);
+    } else {
+        tap_code(KC_PGUP);
+    }
+
+}
diff --git a/keyboards/sidderskb/majbritt/rev2/keymaps/default/readme.md b/keyboards/sidderskb/majbritt/rev2/keymaps/default/readme.md
new file mode 100644
index 0000000000..8485b90d8e
--- /dev/null
+++ b/keyboards/sidderskb/majbritt/rev2/keymaps/default/readme.md
@@ -0,0 +1 @@
+# The default keymap for Majbritt
diff --git a/keyboards/sidderskb/majbritt/rev2/readme.md b/keyboards/sidderskb/majbritt/rev2/readme.md
new file mode 100644
index 0000000000..55453df643
--- /dev/null
+++ b/keyboards/sidderskb/majbritt/rev2/readme.md
@@ -0,0 +1,13 @@
+# Majbritt Rev2
+
+An Alice style keyboard with arrow keys. 
+
+* Keyboard Maintainer: [Sleepdealer](https://github.com/Sleepdealr)
+* Hardware Supported: Majbritt Rev2 PCB
+* Hardware Availability: https://sidderskb.co.uk/
+
+Make example for this keyboard (after setting up your build environment):
+
+    make sidderskb/majbritt/rev2:default
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/sidderskb/majbritt/rev2/rev2.c b/keyboards/sidderskb/majbritt/rev2/rev2.c
new file mode 100644
index 0000000000..f9120ab2a1
--- /dev/null
+++ b/keyboards/sidderskb/majbritt/rev2/rev2.c
@@ -0,0 +1,17 @@
+/* Copyright 2021 Sleepdealer
+ *
+ * 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 "rev2.h"
diff --git a/keyboards/sidderskb/majbritt/rev2/rev2.h b/keyboards/sidderskb/majbritt/rev2/rev2.h
new file mode 100644
index 0000000000..a03a2ff105
--- /dev/null
+++ b/keyboards/sidderskb/majbritt/rev2/rev2.h
@@ -0,0 +1,41 @@
+/* Copyright 2021 Sleepdealer
+ *
+ * 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/>.
+ */
+
+#pragma once
+
+#include "quantum.h"
+
+/* This is a shortcut to help you visually see your layout.
+ *
+ * The first section contains all of the arguments representing the physical
+ * layout of the board and position of the keys.
+ *
+ * The second converts the arguments into a two-dimensional array which
+ * represents the switch matrix.
+ */
+#define LAYOUT( \
+	  K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  K014,  K015, \
+	  K100,  K101,  K102,  K103,  K104,  K105,         K107,  K108,  K109,  K110,  K111,  K112,  K113,  K114,  K115, \
+	  K200,  K201,  K202,  K203,  K204,  K205,         K207,  K208,  K209,  K210,  K211,  K212,  K213,  K214,  K215, \
+	  K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,         K313,  K314,  K315, \
+	  K400,                K403,         K404,  K405,         K408,         K410,                K413,  K414,  K415  \
+) {\
+	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  K014,  K015 }, \
+	{ K100,  K101,  K102,  K103,  K104,  K105,  KC_NO, K107,  K108,  K109,  K110,  K111,  K112,  K113,  K114,  K115 }, \
+	{ K200,  K201,  K202,  K203,  K204,  K205,  KC_NO, K207,  K208,  K209,  K210,  K211,  K212,  K213,  K214,  K215 }, \
+	{ K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  KC_NO, K313,  K314,  K315 }, \
+	{ K400,  KC_NO, KC_NO, K403,  K404,  K405,  KC_NO, KC_NO, K408,  KC_NO, K410,  KC_NO, KC_NO, K413,  K414,  K415 }  \
+}
diff --git a/keyboards/sidderskb/majbritt/rev2/rules.mk b/keyboards/sidderskb/majbritt/rev2/rules.mk
new file mode 100644
index 0000000000..d98e302b36
--- /dev/null
+++ b/keyboards/sidderskb/majbritt/rev2/rules.mk
@@ -0,0 +1,24 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = lite     # Virtual DIP switch configuration
+MOUSEKEY_ENABLE = no       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
+SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
+# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
+NKRO_ENABLE = no            # USB Nkey Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no       # Enable Bluetooth
+AUDIO_ENABLE = no           # Audio output
+
+ENCODER_ENABLE = yes		# Encoders