From 0fcaa3b5e1b9ea98252b8e3903104f8ebb096c98 Mon Sep 17 00:00:00 2001 From: MechMerlin <30334081+mechmerlin@users.noreply.github.com> Date: Mon, 9 Jul 2018 08:28:38 -0700 Subject: Al1 Configurator compile fix redux (#3357) * move matrix routines to matrix.c * add init user and scan user routines --- keyboards/al1/al1.c | 10 ---------- keyboards/al1/matrix.c | 18 ++++++++++++++++++ 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/keyboards/al1/al1.c b/keyboards/al1/al1.c index 62d3a6363..e50a6373b 100644 --- a/keyboards/al1/al1.c +++ b/keyboards/al1/al1.c @@ -15,16 +15,6 @@ */ #include "al1.h" -__attribute__ ((weak)) -void matrix_init_kb(void) { - matrix_init_user(); -} - -__attribute__ ((weak)) -void matrix_scan_kb(void) { - matrix_scan_user(); -} - bool process_record_kb(uint16_t keycode, keyrecord_t *record) { return process_record_user(keycode, record); } diff --git a/keyboards/al1/matrix.c b/keyboards/al1/matrix.c index 9d51f64de..0b7ec2c8a 100644 --- a/keyboards/al1/matrix.c +++ b/keyboards/al1/matrix.c @@ -28,6 +28,24 @@ inline uint8_t matrix_cols(void) { return MATRIX_COLS; } +__attribute__ ((weak)) +void matrix_init_kb(void) { + matrix_init_user(); +} + +__attribute__ ((weak)) +void matrix_scan_kb(void) { + matrix_scan_user(); +} + +__attribute__ ((weak)) +void matrix_init_user(void) { +} + +__attribute__ ((weak)) +void matrix_scan_user(void) { +} + void matrix_init(void) { // initialize row and col unselect_cols(); -- cgit v1.2.3-24-g4f1b