Merge pull request #210 from n0bs/master
Edited Bantam44 to work with jackhumbert/qmk_firmware pull #190
This commit is contained in:
commit
ba058f8b81
2 changed files with 12 additions and 16 deletions
|
@ -1,29 +1,25 @@
|
||||||
#include "Bantam44.h"
|
#include "Bantam44.h"
|
||||||
|
|
||||||
__attribute__ ((weak))
|
__attribute__ ((weak))
|
||||||
void * matrix_init_user(void) {
|
void matrix_init_user(void) {
|
||||||
// leave these blank
|
// leave these blank
|
||||||
};
|
}
|
||||||
|
|
||||||
__attribute__ ((weak))
|
__attribute__ ((weak))
|
||||||
void * matrix_scan_user(void) {
|
void matrix_scan_user(void) {
|
||||||
// leave these blank
|
// leave these blank
|
||||||
};
|
}
|
||||||
|
|
||||||
void * matrix_init_kb(void) {
|
void matrix_init_kb(void) {
|
||||||
// put your keyboard start-up code here
|
// put your keyboard start-up code here
|
||||||
// runs once when the firmware starts up
|
// runs once when the firmware starts up
|
||||||
|
|
||||||
if (matrix_init_user) {
|
matrix_init_user();
|
||||||
(*matrix_init_user)();
|
}
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
void * matrix_scan_kb(void) {
|
void matrix_scan_kb(void) {
|
||||||
// put your looping keyboard code here
|
// put your looping keyboard code here
|
||||||
// runs every cycle (a lot)
|
// runs every cycle (a lot)
|
||||||
|
|
||||||
if (matrix_scan_user) {
|
matrix_scan_user();
|
||||||
(*matrix_scan_user)();
|
}
|
||||||
}
|
|
||||||
};
|
|
|
@ -23,7 +23,7 @@
|
||||||
{ K30, K31, K32, KC_NO, K33, KC_NO, K34, KC_NO, K35, K36, K37, K38 }, \
|
{ K30, K31, K32, KC_NO, K33, KC_NO, K34, KC_NO, K35, K36, K37, K38 }, \
|
||||||
}
|
}
|
||||||
|
|
||||||
void * matrix_init_user(void);
|
void matrix_init_user(void);
|
||||||
void * matrix_scan_user(void);
|
void matrix_scan_user(void);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in a new issue