summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMechMerlin <30334081+mechmerlin@users.noreply.github.com>2018-07-09 08:28:38 -0700
committerDrashna Jaelre <drashna@live.com>2018-07-09 08:28:38 -0700
commit0fcaa3b5e1b9ea98252b8e3903104f8ebb096c98 (patch)
treed91dfbdb56a1c398ca296b61b47fc1790fcfe2d5
parent5b7ac47b1a415525d70b2f71ed4ee1bf9aec2507 (diff)
Al1 Configurator compile fix redux (#3357)
* move matrix routines to matrix.c * add init user and scan user routines
-rw-r--r--keyboards/al1/al1.c10
-rw-r--r--keyboards/al1/matrix.c18
2 files changed, 18 insertions, 10 deletions
diff --git a/keyboards/al1/al1.c b/keyboards/al1/al1.c
index 62d3a63631..e50a6373b4 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 9d51f64dee..0b7ec2c8a6 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();