Merge branch 'master' into taamas

5 files changed, 77 insertions, 15 deletions

diff --git a/keyboards/sidderskb/majbritt/rev1/keymaps/default/keymap.c b/keyboards/sidderskb/majbritt/rev1/keymaps/default/keymap.c
index 21cdd04ed4..529299e456 100644
--- a/keyboards/sidderskb/majbritt/rev1/keymaps/default/keymap.c
+++ b/keyboards/sidderskb/majbritt/rev1/keymaps/default/keymap.c
@@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LCTL,                         KC_LALT,      KC_SPC,           MO(1),     KC_BSPC,                 KC_RALT,                              KC_LEFT, KC_DOWN, KC_RGHT
     ),
     [1] = LAYOUT(
-              _______, _______, _______,    _______, _______, _______, _______,       _______, _______, _______, _______,    _______, _______, _______,            RESET,
+              _______, _______, _______,    _______, _______, _______, _______,       _______, _______, _______, _______,    _______, _______, _______,            QK_BOOT,
             _______,      _______,   _______, _______, _______, _______,            _______, _______, _______, _______, _______,   _______, _______,    _______,     _______,
           _______,        _______,     _______, _______, _______, _______,            _______, _______, _______, _______,    _______, _______, _______,                _______,
         _______,   _______, _______,     _______, _______, _______, _______,             _______, _______, _______, _______,     _______, _______,          _______,
diff --git a/keyboards/sidderskb/majbritt/rev1/rules.mk b/keyboards/sidderskb/majbritt/rev1/rules.mk
index 71e5c41e74..a2a5932cdc 100644
--- a/keyboards/sidderskb/majbritt/rev1/rules.mk
+++ b/keyboards/sidderskb/majbritt/rev1/rules.mk
@@ -12,10 +12,7 @@ MOUSEKEY_ENABLE = yes       # Mouse keys
 EXTRAKEY_ENABLE = yes       # Audio control and System control
 CONSOLE_ENABLE = yes        # Console for debug
 COMMAND_ENABLE = yes        # 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
+NKRO_ENABLE = no            # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/sidderskb/majbritt/rev2/config.h b/keyboards/sidderskb/majbritt/rev2/config.h
index 06049727cb..6bee0fa6bf 100644
--- a/keyboards/sidderskb/majbritt/rev2/config.h
+++ b/keyboards/sidderskb/majbritt/rev2/config.h
@@ -43,6 +43,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #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
index 788657f3bc..3e2aa450ad 100644
--- a/keyboards/sidderskb/majbritt/rev2/info.json
+++ b/keyboards/sidderskb/majbritt/rev2/info.json
@@ -1,10 +1,81 @@
 {
     "keyboard_name": "Majbritt Rev2",
-    "url": "https://sidderskb.co.uk/",
     "maintainer": "Sleepdealr",
+    "url": "https://sidderskb.co.uk/",
     "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}]
+            "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", "w": 1.5, "x": 0.5, "y": 1 },
+                { "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", "w": 1.5, "x": 15, "y": 1 },
+                { "label": "Pgup", "x": 16.5, "y": 1 },
+                { "label": "Caps Lock", "w": 1.75, "x": 0.25, "y": 2 },
+                { "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": "Enter", "w": 1.25, "x": 15.25, "y": 2 },
+                { "label": "Pgdn", "x": 16.5, "y": 2 },
+                { "label": "Shift", "w": 1.25, "x": 0, "y": 3 },
+                { "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", "w": 1.75, "x": 13.75, "y": 3 },
+                { "label": "Up", "x": 15.5, "y": 3 },
+                { "label": "Fn", "x": 16.5, "y": 3 },
+                { "label": "Ctrl", "w": 1.5, "x": 0, "y": 4 },
+                { "label": "Alt", "w": 1.5, "x": 3, "y": 4 },
+                { "label": "LSpace", "w": 2.25, "x": 4.5, "y": 4 },
+                { "label": "Fn", "x": 6.75, "y": 4 },
+                { "label": "RSpace", "w": 2.75, "x": 8.25, "y": 4 },
+                { "label": "AltGr", "w": 1.5, "x": 11, "y": 4 },
+                { "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/rules.mk b/keyboards/sidderskb/majbritt/rev2/rules.mk
index 6d215c545e..a8f1418466 100644
--- a/keyboards/sidderskb/majbritt/rev2/rules.mk
+++ b/keyboards/sidderskb/majbritt/rev2/rules.mk
@@ -7,15 +7,12 @@ BOOTLOADER = atmel-dfu
 # Build Options
 #   change yes to no to disable
 #
-BOOTMAGIC_ENABLE = lite     # Enable Bootmagic Lite
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
 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
+NKRO_ENABLE = no            # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output