drashna/qmk_firmware
1
0
Fork 0
Code Activity Actions

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

Browse source 
# 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
Download patch file Download diff file Expand all files Collapse all files

27
quantum/template/template.c
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);
};