1
0
Fork 0

Merge remote-tracking branch 'refs/remotes/jackhumbert/master'

# Conflicts:
#	quantum/template/template.c
#	quantum/template/template.h
This commit is contained in:
IBNobody 2016-03-22 20:39:05 -05:00
commit ec62d9e85c
88 changed files with 34428 additions and 41597 deletions

View file

@ -48,14 +48,14 @@ static void unselect_rows(void);
static void select_row(uint8_t row);
__attribute__ ((weak))
void * matrix_init_kb(void) {
void matrix_init_kb(void) {
};
}
__attribute__ ((weak))
void * matrix_scan_kb(void) {
void matrix_scan_kb(void) {
};
}
inline
uint8_t matrix_rows(void)
@ -86,9 +86,7 @@ void matrix_init(void)
matrix_debouncing[i] = 0;
}
if (matrix_init_kb) {
(*matrix_init_kb)();
}
matrix_init_kb();
}
@ -152,9 +150,7 @@ uint8_t matrix_scan(void)
}
#endif
if (matrix_scan_kb) {
(*matrix_scan_kb)();
}
matrix_scan_kb();
return 1;
}

View file

@ -1,48 +1,39 @@
#include "%KEYBOARD%.h"
__attribute__ ((weak))
void * matrix_init_user(void) {
void matrix_init_user(void) {
// leave this function blank - it can be defined in a keymap file
return NULL;
};
__attribute__ ((weak))
void * matrix_scan_user(void) {
void matrix_scan_user(void) {
// leave this function blank - it can be defined in a keymap file
return NULL;
};
__attribute__ ((weak))
void * led_set_user(uint8_t usb_led) {
void led_set_user(uint8_t usb_led) {
// leave this function blank - it can be defined in a keymap file
return NULL;
};
void * matrix_init_kb(void) {
void matrix_init_kb(void) {
// put your keyboard start-up code here
// runs once when the firmware starts up
if (matrix_init_user) {
(*matrix_init_user)();
}
return NULL;
matrix_init_user();
};
void * matrix_scan_kb(void) {
void matrix_scan_kb(void) {
// put your looping keyboard code here
// runs every cycle (a lot)
if (matrix_scan_user) {
(*matrix_scan_user)();
}
return NULL;
matrix_scan_user();
};
void * led_set_kb(uint8_t usb_led) {
void led_set_kb(uint8_t usb_led) {
// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
if (led_set_user) {
(*led_set_user)(usb_led);
}
return NULL;
led_set_user(usb_led);
};

View file

@ -19,8 +19,8 @@
{ k10, KC_NO, k11 }, \
}
void * matrix_init_user(void);
void * matrix_scan_user(void);
void * led_set_user(uint8_t usb_led);
void matrix_init_user(void);
void matrix_scan_user(void);
void led_set_user(uint8_t usb_led);
#endif