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

keyboards/makrosu/keymaps/default/keymap.c

@@ -71,26 +71,18 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
         case L1:
             if (record->event.pressed) {
                 set_single_persistent_default_layer(_1);
-	
-
             }
             return false;
-      break;
         case L2:
             if (record->event.pressed) {
                 set_single_persistent_default_layer(_2);
-	
             }
             return false;
-      break;
         case L3:
             if (record->event.pressed) {
                 set_single_persistent_default_layer(_3);
-	
             }
             return false;
-      break;
-    
     }
     return true;
 }
@@ -106,28 +98,25 @@ void matrix_init_user(void) {
     writePinHigh(IND_3);
 }
 
-void encoder_update_user(uint8_t index, bool clockwise) {
+bool encoder_update_user(uint8_t index, bool clockwise) {
     if (layer_state_is(_1)) {
         if (clockwise) {
             tap_code(KC_UP);
         } else {
         tap_code(KC_DOWN);
         }
-   }
-
-    else if (layer_state_is(_2)) {
+    } else if (layer_state_is(_2)) {
         if (clockwise) {
             tap_code(KC_RGHT);
         } else {
             tap_code(KC_LEFT);
         }
-   }
-
-    else if (layer_state_is(_3)) {
+    } else if (layer_state_is(_3)) {
         if (clockwise) {
             tap_code(KC_VOLU);
         } else {
             tap_code(KC_VOLD);
         }
     }
+    return true;
 }

keyboards/makrosu/keymaps/via/keymap.c

@@ -71,26 +71,18 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
         case L1:
             if (record->event.pressed) {
                 set_single_persistent_default_layer(_1);
-	
-
             }
             return false;
-      break;
         case L2:
             if (record->event.pressed) {
                 set_single_persistent_default_layer(_2);
-	
             }
             return false;
-      break;
         case L3:
             if (record->event.pressed) {
                 set_single_persistent_default_layer(_3);
-	
             }
             return false;
-      break;
-    
     }
     return true;
 }
@@ -106,28 +98,25 @@ void matrix_init_user(void) {
     writePinHigh(IND_3);
 }
 
-void encoder_update_user(uint8_t index, bool clockwise) {
+bool encoder_update_user(uint8_t index, bool clockwise) {
     if (layer_state_is(_1)) {
         if (clockwise) {
             tap_code(KC_UP);
         } else {
         tap_code(KC_DOWN);
         }
-   }
-
-    else if (layer_state_is(_2)) {
+    } else if (layer_state_is(_2)) {
         if (clockwise) {
             tap_code(KC_RGHT);
         } else {
             tap_code(KC_LEFT);
         }
-   }
-
-    else if (layer_state_is(_3)) {
+    } else if (layer_state_is(_3)) {
         if (clockwise) {
             tap_code(KC_VOLU);
         } else {
             tap_code(KC_VOLD);
         }
     }
+    return true;
 }