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

5 files changed, 11 insertions, 7 deletions

diff --git a/keyboards/mb44/info.json b/keyboards/mb44/info.json
index d18a0b0142..49c795260c 100644
--- a/keyboards/mb44/info.json
+++ b/keyboards/mb44/info.json
@@ -52,7 +52,7 @@
                 {"x":11.75, "y":3}
             ]
         },
-        "LAYOUT_2u_split": {
+        "LAYOUT_2u_space": {
             "layout": [
                 {"x":0, "y":0},
                 {"x":1, "y":0},
@@ -101,7 +101,7 @@
                 {"x":11.75, "y":3}
             ]
         },
-        "LAYOUT_2u1u_split": {
+        "LAYOUT_2u1u_space": {
             "layout": [
                 {"x":0, "y":0},
                 {"x":1, "y":0},
@@ -150,7 +150,7 @@
                 {"x":11.75, "y":3}
             ]
         },
-        "LAYOUT_3u_split": {
+        "LAYOUT_3u_space": {
             "layout": [
                 {"x":0, "y":0},
                 {"x":1, "y":0},
diff --git a/keyboards/mb44/keymaps/2u1u_space/keymap.c b/keyboards/mb44/keymaps/2u1u_space/keymap.c
index 437a90c7b3..d231d63301 100644
--- a/keyboards/mb44/keymaps/2u1u_space/keymap.c
+++ b/keyboards/mb44/keymaps/2u1u_space/keymap.c
@@ -48,7 +48,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 };
 
 // Rotary Encoder Functions
-void encoder_update_user(uint8_t index, bool clockwise) {
+bool encoder_update_user(uint8_t index, bool clockwise) {
     if (index == 0) { /* First encoder */
         if (clockwise) {
             tap_code(KC_VOLD);
@@ -56,4 +56,5 @@ void encoder_update_user(uint8_t index, bool clockwise) {
             tap_code(KC_VOLU);
         }
     }
+    return true;
 }
diff --git a/keyboards/mb44/keymaps/2u_space/keymap.c b/keyboards/mb44/keymaps/2u_space/keymap.c
index b2f1fb64b6..c3f654337a 100644
--- a/keyboards/mb44/keymaps/2u_space/keymap.c
+++ b/keyboards/mb44/keymaps/2u_space/keymap.c
@@ -48,7 +48,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 };
 
 // Rotary Encoder Functions
-void encoder_update_user(uint8_t index, bool clockwise) {
+bool encoder_update_user(uint8_t index, bool clockwise) {
     if (index == 0) { /* First encoder */
         if (clockwise) {
             tap_code(KC_VOLD);
@@ -56,4 +56,5 @@ void encoder_update_user(uint8_t index, bool clockwise) {
             tap_code(KC_VOLU);
         }
     }
+    return true;
 }
diff --git a/keyboards/mb44/keymaps/3u_space/keymap.c b/keyboards/mb44/keymaps/3u_space/keymap.c
index bfd01c6ea2..924b3f4abb 100644
--- a/keyboards/mb44/keymaps/3u_space/keymap.c
+++ b/keyboards/mb44/keymaps/3u_space/keymap.c
@@ -56,7 +56,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 };
 
 // Rotary Encoder Functions
-void encoder_update_user(uint8_t index, bool clockwise) {
+bool encoder_update_user(uint8_t index, bool clockwise) {
     if (index == 0) { /* First encoder */
         if (clockwise) {
             tap_code(KC_VOLD);
@@ -64,4 +64,5 @@ void encoder_update_user(uint8_t index, bool clockwise) {
             tap_code(KC_VOLU);
         }
     }
+    return true;
 }
\ No newline at end of file
diff --git a/keyboards/mb44/keymaps/default/keymap.c b/keyboards/mb44/keymaps/default/keymap.c
index 1659661f3b..5eac54e07e 100644
--- a/keyboards/mb44/keymaps/default/keymap.c
+++ b/keyboards/mb44/keymaps/default/keymap.c
@@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 
 // Rotary Encoder Functions
-void encoder_update_user(uint8_t index, bool clockwise) {
+bool encoder_update_user(uint8_t index, bool clockwise) {
     if (index == 0) { /* First encoder */
         if (clockwise) {
             tap_code(KC_VOLD);
@@ -58,4 +58,5 @@ void encoder_update_user(uint8_t index, bool clockwise) {
             tap_code(KC_VOLU);
         }
     }
+    return true;
 }