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

1 files changed, 1 insertions, 29 deletions

diff --git a/keyboards/adpenrose/kintsugi/kintsugi.c b/keyboards/adpenrose/kintsugi/kintsugi.c
index ff62858377..59e7d79b55 100644
--- a/keyboards/adpenrose/kintsugi/kintsugi.c
+++ b/keyboards/adpenrose/kintsugi/kintsugi.c
@@ -1,4 +1,4 @@
-/* Copyright 2021 adpenrose
+/* Copyright 2022 adpenrose
  *
  * 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
@@ -16,34 +16,6 @@
 
 #include "kintsugi.h"
 
-/* Encoder */
-#ifdef ENCODER_ENABLE
-bool encoder_update_kb(uint8_t index, bool clockwise) {
-    if (!encoder_update_user(index, clockwise)) { 
-        return false; 
-    } else {
-/* The switch case allows for different encoder mappings on different layers, "default" map gets applied for all unspecified layers */
-        switch(get_highest_layer(layer_state)){
-            case 1:
-                if (clockwise) {
-                    tap_code(KC_MNXT);
-                } else {
-                    tap_code(KC_MPRV);
-                }
-                break;
-            default:
-                if (clockwise){
-                    tap_code(KC_VOLU);
-                } else{
-                    tap_code(KC_VOLD);
-                }
-                break;
-        }
-    }
-    return true;
-}
-#endif
-
 #ifdef OLED_ENABLE
 oled_rotation_t oled_init_kb(oled_rotation_t rotation) {
     return OLED_ROTATION_270;