diff options
author | MechMerlin <30334081+mechmerlin@users.noreply.github.com> | 2018-07-09 08:28:38 -0700 |
---|---|---|
committer | Drashna Jaelre <drashna@live.com> | 2018-07-09 08:28:38 -0700 |
commit | 0fcaa3b5e1b9ea98252b8e3903104f8ebb096c98 (patch) | |
tree | d91dfbdb56a1c398ca296b61b47fc1790fcfe2d5 /keyboards/al1 | |
parent | 5b7ac47b1a415525d70b2f71ed4ee1bf9aec2507 (diff) | |
download | qmk_firmware-0fcaa3b5e1b9ea98252b8e3903104f8ebb096c98.tar.gz qmk_firmware-0fcaa3b5e1b9ea98252b8e3903104f8ebb096c98.zip |
Al1 Configurator compile fix redux (#3357)
* move matrix routines to matrix.c
* add init user and scan user routines
Diffstat (limited to 'keyboards/al1')
-rw-r--r-- | keyboards/al1/al1.c | 10 | ||||
-rw-r--r-- | 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 @@ | |||
15 | */ | 15 | */ |
16 | #include "al1.h" | 16 | #include "al1.h" |
17 | 17 | ||
18 | __attribute__ ((weak)) | ||
19 | void matrix_init_kb(void) { | ||
20 | matrix_init_user(); | ||
21 | } | ||
22 | |||
23 | __attribute__ ((weak)) | ||
24 | void matrix_scan_kb(void) { | ||
25 | matrix_scan_user(); | ||
26 | } | ||
27 | |||
28 | bool process_record_kb(uint16_t keycode, keyrecord_t *record) { | 18 | bool process_record_kb(uint16_t keycode, keyrecord_t *record) { |
29 | return process_record_user(keycode, record); | 19 | return process_record_user(keycode, record); |
30 | } | 20 | } |
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) { | |||
28 | return MATRIX_COLS; | 28 | return MATRIX_COLS; |
29 | } | 29 | } |
30 | 30 | ||
31 | __attribute__ ((weak)) | ||
32 | void matrix_init_kb(void) { | ||
33 | matrix_init_user(); | ||
34 | } | ||
35 | |||
36 | __attribute__ ((weak)) | ||
37 | void matrix_scan_kb(void) { | ||
38 | matrix_scan_user(); | ||
39 | } | ||
40 | |||
41 | __attribute__ ((weak)) | ||
42 | void matrix_init_user(void) { | ||
43 | } | ||
44 | |||
45 | __attribute__ ((weak)) | ||
46 | void matrix_scan_user(void) { | ||
47 | } | ||
48 | |||
31 | void matrix_init(void) { | 49 | void matrix_init(void) { |
32 | // initialize row and col | 50 | // initialize row and col |
33 | unselect_cols(); | 51 | unselect_cols(); |