Browse Source

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
MechMerlin 7 years ago
parent
commit
5ef50256d8
3 changed files with 7 additions and 6 deletions
  1. 3 1
      keyboards/al1/al1.c
  2. 2 2
      keyboards/al1/keymaps/splitbs/keymap.c
  3. 2 3
      keyboards/al1/matrix.c

+ 3 - 1
keyboards/al1/al1.c

@@ -15,10 +15,12 @@
  */
  */
 #include "al1.h"
 #include "al1.h"
 
 
+__attribute__ ((weak))
 void matrix_init_kb(void) {
 void matrix_init_kb(void) {
 	matrix_init_user();
 	matrix_init_user();
 }
 }
 
 
+__attribute__ ((weak))
 void matrix_scan_kb(void) {
 void matrix_scan_kb(void) {
     matrix_scan_user();
     matrix_scan_user();
 }
 }
@@ -45,4 +47,4 @@ void led_set_kb(uint8_t usb_led) {
     else
     else
         PORTD |=  (1<<1);
         PORTD |=  (1<<1);
 	led_set_user(usb_led);
 	led_set_user(usb_led);
-}
+}

+ 2 - 2
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] = {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[0] = LAYOUT_split_bs(\
 	[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) {
 void led_set_user(uint8_t usb_led) {
 
 
-}
+}

+ 2 - 3
keyboards/al1/matrix.c

@@ -28,7 +28,6 @@ inline uint8_t matrix_cols(void) {
   return MATRIX_COLS;
   return MATRIX_COLS;
 }
 }
 
 
-
 void matrix_init(void) {
 void matrix_init(void) {
   // initialize row and col
   // initialize row and col
     unselect_cols();
     unselect_cols();
@@ -104,7 +103,7 @@ uint8_t matrix_key_count(void) {
 
 
 /* Row pin configuration
 /* Row pin configuration
  *
  *
- * row: 0    1    2    3    4    5 
+ * row: 0    1    2    3    4    5
  * pin: C7   B1   B2   C6   B4   B5
  * pin: C7   B1   B2   C6   B4   B5
  *
  *
  */
  */
@@ -181,4 +180,4 @@ static void select_col(uint8_t col) {
   else {
   else {
     PORTD &= ~(1<<PD7);
     PORTD &= ~(1<<PD7);
   }
   }
-}
+}