summaryrefslogtreecommitdiff
path: root/keyboard/ergodox_ez/ergodox_ez.c
diff options
context:
space:
mode:
authorNoah Andrews2016-03-28 18:37:39 -0400
committerNoah Andrews2016-03-28 18:37:39 -0400
commit535daad3cd812df58f4630df202a447836ac3084 (patch)
tree4591f47555acb1d88f08caa7ab3bbb40fd828637 /keyboard/ergodox_ez/ergodox_ez.c
parentccf848917b7e931327f6c4a469877e9d8ef238ea (diff)
parent4a43c5684476611370820bd9592712754c211c52 (diff)
Merge remote-tracking branch 'jackhumbert/master' into improve-buildguide
Diffstat (limited to 'keyboard/ergodox_ez/ergodox_ez.c')
-rw-r--r--keyboard/ergodox_ez/ergodox_ez.c33
1 files changed, 12 insertions, 21 deletions
diff --git a/keyboard/ergodox_ez/ergodox_ez.c b/keyboard/ergodox_ez/ergodox_ez.c
index d0eaf3392..97e6de1ee 100644
--- a/keyboard/ergodox_ez/ergodox_ez.c
+++ b/keyboard/ergodox_ez/ergodox_ez.c
@@ -5,16 +5,16 @@ bool i2c_initialized = 0;
uint8_t mcp23018_status = 0x20;
__attribute__ ((weak))
-void * matrix_init_user(void) {
- return NULL;
-};
+void matrix_init_user(void) {
+
+}
__attribute__ ((weak))
-void * matrix_scan_user(void) {
- return NULL;
-};
+void matrix_scan_user(void) {
+
+}
-void * matrix_init_kb(void) {
+void matrix_init_kb(void) {
// keyboard LEDs (see "PWM on ports OC1(A|B|C)" in "teensy-2-0.md")
TCCR1A = 0b10101001; // set and configure fast PWM
TCCR1B = 0b00001001; // set and configure fast PWM
@@ -34,21 +34,12 @@ void * matrix_init_kb(void) {
ergodox_blink_all_leds();
- if (matrix_init_user) {
- (*matrix_init_user)();
- }
-
- return NULL;
-};
-
-void * matrix_scan_kb(void) {
-
- if (matrix_scan_user) {
- (*matrix_scan_user)();
- }
+ matrix_init_user();
+}
- return NULL;
-};
+void matrix_scan_kb(void) {
+ matrix_scan_user();
+}
void ergodox_blink_all_leds(void)