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

6 files changed, 8 insertions, 52 deletions

diff --git a/keyboards/percent/canoe/canoe.c b/keyboards/percent/canoe/canoe.c
index dd31640e6d..572ff50b01 100644
--- a/keyboards/percent/canoe/canoe.c
+++ b/keyboards/percent/canoe/canoe.c
@@ -16,19 +16,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "canoe.h"
-
-void keyboard_pre_init_kb(void) {
-    led_init_ports();
-    keyboard_pre_init_user();
-}
-
-void led_init_ports(void) {
-    setPinOutput(D1);
-}
-
-bool led_update_kb(led_t led_state) {
-    if (led_update_user(led_state)) {
-        writePin(D1, led_state.caps_lock);
-    }
-    return true;
-}
diff --git a/keyboards/percent/canoe/config.h b/keyboards/percent/canoe/config.h
index b8a306b7e1..c349c1106c 100644
--- a/keyboards/percent/canoe/config.h
+++ b/keyboards/percent/canoe/config.h
@@ -38,6 +38,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DIODE_DIRECTION COL2ROW
 #define DEBOUNCE 5
 
+#define LED_CAPS_LOCK_PIN D1
+
 #define BACKLIGHT_PIN D4
 #define BACKLIGHT_LEVELS 3
 
diff --git a/keyboards/percent/skog/config.h b/keyboards/percent/skog/config.h
index 047bac02e8..524fdc5ccf 100644
--- a/keyboards/percent/skog/config.h
+++ b/keyboards/percent/skog/config.h
@@ -32,6 +32,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, C7, C6, C5, C4, C3, C2 }
 #define DIODE_DIRECTION COL2ROW
 
+#define LED_CAPS_LOCK_PIN D1
+#define LED_SCROLL_LOCK_PIN D6
+
 #define RGBLED_NUM 2
 #define RGBLIGHT_ANIMATIONS
 
diff --git a/keyboards/percent/skog/skog.c b/keyboards/percent/skog/skog.c
index 152fc56845..c44f0373fb 100644
--- a/keyboards/percent/skog/skog.c
+++ b/keyboards/percent/skog/skog.c
@@ -18,21 +18,3 @@ ps2avrGB support code by Kenneth A. (bminiex/.[ch])
 */
 
 #include "skog.h"
-
-void keyboard_pre_init_kb(void) {
-    led_init_ports();
-    keyboard_pre_init_user();
-}
-
-void led_init_ports(void) {
-    setPinOutput(D1);
-    setPinOutput(D6);
-}
-
-bool led_update_kb(led_t led_state) {
-    if (led_update_user(led_state)) {
-        writePin(D1, led_state.caps_lock);
-        writePin(D6, led_state.scroll_lock);
-    }
-    return true;
-}
diff --git a/keyboards/percent/skog_lite/config.h b/keyboards/percent/skog_lite/config.h
index e28dcfcd2f..15de9bbb89 100644
--- a/keyboards/percent/skog_lite/config.h
+++ b/keyboards/percent/skog_lite/config.h
@@ -38,6 +38,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DIODE_DIRECTION COL2ROW
 #define DEBOUNCE 5
 
+#define LED_CAPS_LOCK_PIN D1
+#define LED_SCROLL_LOCK_PIN D6
+
 #define BACKLIGHT_PIN D4
 #define BACKLIGHT_LEVELS 3
 
diff --git a/keyboards/percent/skog_lite/skog_lite.c b/keyboards/percent/skog_lite/skog_lite.c
index 95d3982113..c69843e617 100644
--- a/keyboards/percent/skog_lite/skog_lite.c
+++ b/keyboards/percent/skog_lite/skog_lite.c
@@ -15,21 +15,3 @@
  */
 
 #include "skog_lite.h"
-
-void keyboard_pre_init_kb(void) {
-    led_init_ports();
-    keyboard_pre_init_user();
-}
-
-void led_init_ports(void) {
-    setPinOutput(D1);
-    setPinOutput(D6);
-}
-
-bool led_update_kb(led_t led_state) {
-    if (led_update_user(led_state)) {
-        writePin(D1, led_state.caps_lock);
-        writePin(D6, led_state.scroll_lock);
-    }
-    return true;
-}