aboutsummaryrefslogtreecommitdiff
path: root/keyboards/al1
diff options
context:
space:
mode:
authorMechMerlin <30334081+mechmerlin@users.noreply.github.com>2018-07-09 07:47:29 -0700
committerDrashna Jaelre <drashna@live.com>2018-07-09 07:47:29 -0700
commit5ef50256d85569cf404cc1b5aea534832bc89089 (patch)
treeac3e1e280e28796072e1a99e9bf41235fe7ed780 /keyboards/al1
parent56b5e9f23d2e363404fa68af4fd73f8dd21beea1 (diff)
downloadqmk_firmware-5ef50256d85569cf404cc1b5aea534832bc89089.tar.gz
qmk_firmware-5ef50256d85569cf404cc1b5aea534832bc89089.zip
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
Diffstat (limited to 'keyboards/al1')
-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 @@
15 */ 15 */
16#include "al1.h" 16#include "al1.h"
17 17
18__attribute__ ((weak))
18void matrix_init_kb(void) { 19void matrix_init_kb(void) {
19 matrix_init_user(); 20 matrix_init_user();
20} 21}
21 22
23__attribute__ ((weak))
22void matrix_scan_kb(void) { 24void matrix_scan_kb(void) {
23 matrix_scan_user(); 25 matrix_scan_user();
24} 26}
@@ -45,4 +47,4 @@ void led_set_kb(uint8_t usb_led) {
45 else 47 else
46 PORTD |= (1<<1); 48 PORTD |= (1<<1);
47 led_set_user(usb_led); 49 led_set_user(usb_led);
48} \ No newline at end of file 50}
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 @@
1#include "al1.h" 1#include QMK_KEYBOARD_H
2 2
3const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 3const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
4 [0] = LAYOUT_split_bs(\ 4 [0] = LAYOUT_split_bs(\
@@ -49,4 +49,4 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
49 49
50void led_set_user(uint8_t usb_led) { 50void led_set_user(uint8_t usb_led) {
51 51
52} \ No newline at end of file 52}
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) {
28 return MATRIX_COLS; 28 return MATRIX_COLS;
29} 29}
30 30
31
32void matrix_init(void) { 31void matrix_init(void) {
33 // initialize row and col 32 // initialize row and col
34 unselect_cols(); 33 unselect_cols();
@@ -104,7 +103,7 @@ uint8_t matrix_key_count(void) {
104 103
105/* Row pin configuration 104/* Row pin configuration
106 * 105 *
107 * row: 0 1 2 3 4 5 106 * row: 0 1 2 3 4 5
108 * pin: C7 B1 B2 C6 B4 B5 107 * pin: C7 B1 B2 C6 B4 B5
109 * 108 *
110 */ 109 */
@@ -181,4 +180,4 @@ static void select_col(uint8_t col) {
181 else { 180 else {
182 PORTD &= ~(1<<PD7); 181 PORTD &= ~(1<<PD7);
183 } 182 }
184} \ No newline at end of file 183}