summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMechMerlin <30334081+mechmerlin@users.noreply.github.com>2018-07-09 16:47:29 +0200
committerDrashna Jaelre <drashna@live.com>2018-07-09 16:47:29 +0200
commit5ef50256d85569cf404cc1b5aea534832bc89089 (patch)
treeac3e1e280e28796072e1a99e9bf41235fe7ed780
parent56b5e9f23d2e363404fa68af4fd73f8dd21beea1 (diff)
downloadqmk_firmware-5ef50256d85569cf404cc1b5aea534832bc89089.tar.gz
qmk_firmware-5ef50256d85569cf404cc1b5aea534832bc89089.tar.xz
AL1 Unable to Compile on Configurator (#3339)
* use QMK_KEYBOARD_H * init_kb and scan_kb need to be in matrix.c to make use of the matrix.h include * Make the routines weak as suggested by Drashna
-rw-r--r--keyboards/al1/al1.c4
-rw-r--r--keyboards/al1/keymaps/splitbs/keymap.c4
-rw-r--r--keyboards/al1/matrix.c5
3 files changed, 7 insertions, 6 deletions
diff --git a/keyboards/al1/al1.c b/keyboards/al1/al1.c
index ae24c981f..62d3a6363 100644
--- a/keyboards/al1/al1.c
+++ b/keyboards/al1/al1.c
@@ -15,10 +15,12 @@
*/
#include "al1.h"
+__attribute__ ((weak))
void matrix_init_kb(void) {
matrix_init_user();
}
+__attribute__ ((weak))
void matrix_scan_kb(void) {
matrix_scan_user();
}
@@ -45,4 +47,4 @@ void led_set_kb(uint8_t usb_led) {
else
PORTD |= (1<<1);
led_set_user(usb_led);
-} \ No newline at end of file
+}
diff --git a/keyboards/al1/keymaps/splitbs/keymap.c b/keyboards/al1/keymaps/splitbs/keymap.c
index da1ba3b8e..1d752aef5 100644
--- a/keyboards/al1/keymaps/splitbs/keymap.c
+++ b/keyboards/al1/keymaps/splitbs/keymap.c
@@ -1,4 +1,4 @@
-#include "al1.h"
+#include QMK_KEYBOARD_H
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT_split_bs(\
@@ -49,4 +49,4 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
void led_set_user(uint8_t usb_led) {
-} \ No newline at end of file
+}
diff --git a/keyboards/al1/matrix.c b/keyboards/al1/matrix.c
index f7ed7fbb0..9d51f64de 100644
--- a/keyboards/al1/matrix.c
+++ b/keyboards/al1/matrix.c
@@ -28,7 +28,6 @@ inline uint8_t matrix_cols(void) {
return MATRIX_COLS;
}
-
void matrix_init(void) {
// initialize row and col
unselect_cols();
@@ -104,7 +103,7 @@ uint8_t matrix_key_count(void) {
/* Row pin configuration
*
- * row: 0 1 2 3 4 5
+ * row: 0 1 2 3 4 5
* pin: C7 B1 B2 C6 B4 B5
*
*/
@@ -181,4 +180,4 @@ static void select_col(uint8_t col) {
else {
PORTD &= ~(1<<PD7);
}
-} \ No newline at end of file
+}