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

2 files changed, 3 insertions, 28 deletions

diff --git a/keyboards/handwired/tritium_numpad/config.h b/keyboards/handwired/tritium_numpad/config.h
index a53c27d43b..1424c6b491 100644
--- a/keyboards/handwired/tritium_numpad/config.h
+++ b/keyboards/handwired/tritium_numpad/config.h
@@ -36,6 +36,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_COL_PINS { F4, F6, B1, B2 }
 #define UNUSED_PINS
 
+#define LED_NUM_LOCK_PIN D5
+#define LED_PIN_ON_STATE 0
+
 #define BACKLIGHT_PIN B6
 
 /* COL2ROW or ROW2COL */
diff --git a/keyboards/handwired/tritium_numpad/tritium_numpad.c b/keyboards/handwired/tritium_numpad/tritium_numpad.c
index 7193a934d6..c9f86eda7e 100644
--- a/keyboards/handwired/tritium_numpad/tritium_numpad.c
+++ b/keyboards/handwired/tritium_numpad/tritium_numpad.c
@@ -1,29 +1 @@
 #include "tritium_numpad.h"
-#include "led.h"
-
-void keyboard_pre_init_kb(void) {
-	// put your keyboard start-up code here
-	// runs once when the firmware starts up
-	keyboard_pre_init_user();
-	led_init_ports();
-};
-
-void matrix_scan_kb(void) {
-	// put your looping keyboard code here
-	// runs every cycle (a lot)
-	matrix_scan_user();
-};
-
-void led_init_ports(void) {
-    // * Set our LED pins as output
-    // Numlock LED
-    setPinOutput(D5);
-}
-
-void led_set_kb(uint8_t usb_led) {
-    if (IS_LED_ON(usb_led, USB_LED_NUM_LOCK)) {
-        writePinLow(D5);
-    } else {
-        writePinHigh(D5);
-    }
-}