~ruther/qmk_firmware

ba058f8b81132bf64b1aa263779629b8a6c18c23 — Jack Humbert 9 years ago 95b0032 + a5a40a0
Merge pull request #210 from n0bs/master

Edited Bantam44 to work with jackhumbert/qmk_firmware pull #190
2 files changed, 12 insertions(+), 16 deletions(-)

M keyboard/Bantam44/Bantam44.c
M keyboard/Bantam44/Bantam44.h
M keyboard/Bantam44/Bantam44.c => keyboard/Bantam44/Bantam44.c +10 -14
@@ 1,29 1,25 @@
#include "Bantam44.h"

__attribute__ ((weak))
void * matrix_init_user(void) {
void matrix_init_user(void) {
	// leave these blank
};
}

__attribute__ ((weak))
void * matrix_scan_user(void) {
void matrix_scan_user(void) {
	// leave these blank
};
}

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)();
	}
};
	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)();
	}
};
\ No newline at end of file
	matrix_scan_user();
}
\ No newline at end of file

M keyboard/Bantam44/Bantam44.h => keyboard/Bantam44/Bantam44.h +2 -2
@@ 23,7 23,7 @@
	{ K30, K31, K32, KC_NO, K33, KC_NO, K34, KC_NO, K35, K36, K37,   K38   }, \
}

void * matrix_init_user(void);
void * matrix_scan_user(void);
void matrix_init_user(void);
void matrix_scan_user(void);

#endif