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

2 files changed, 26 insertions, 9 deletions

diff --git a/keyboards/peej/lumberjack/keymaps/via/keymap.c b/keyboards/peej/lumberjack/keymaps/via/keymap.c
index a1981cd5be..018f284a4f 100644
--- a/keyboards/peej/lumberjack/keymaps/via/keymap.c
+++ b/keyboards/peej/lumberjack/keymaps/via/keymap.c
@@ -48,3 +48,25 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 )
 
 };
+
+void keyboard_pre_init_user() {
+    writePin(LED1, true);
+    writePin(LED2, true);
+}
+
+void keyboard_post_init_user() {
+    writePin(LED1, false);
+    writePin(LED2, false);
+}
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    writePin(LED1, record->event.pressed);
+
+    return true;
+}
+
+layer_state_t layer_state_set_user(layer_state_t state) {
+    writePin(LED2, state);
+
+    return state;
+}
diff --git a/keyboards/peej/lumberjack/lumberjack.c b/keyboards/peej/lumberjack/lumberjack.c
index 2bdb49f6e3..111092d579 100644
--- a/keyboards/peej/lumberjack/lumberjack.c
+++ b/keyboards/peej/lumberjack/lumberjack.c
@@ -16,14 +16,9 @@
 
 #include "lumberjack.h"
 
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-    writePin(LED1, record->event.pressed);
+void keyboard_pre_init_kb() {
+    setPinOutput(LED1);
+    setPinOutput(LED2);
 
-    return process_record_user(keycode, record);
-}
-
-layer_state_t layer_state_set_kb(layer_state_t state) {
-    writePin(LED2, state);
-
-    return layer_state_set_user(state);
+    keyboard_pre_init_user();
 }