summaryrefslogtreecommitdiff
path: root/quantum
diff options
context:
space:
mode:
authorIBNobody <protospherex@gmail.com>2016-03-22 20:39:05 -0500
committerIBNobody <protospherex@gmail.com>2016-03-22 20:39:05 -0500
commitec62d9e85cab5cf166241b0536120d005fa7c898 (patch)
tree5b2a544070d80833bb7668ffc34dc3143b62a3d5 /quantum
parent8a2457d7534ba082b52599e3af56f9e50e8dc38a (diff)
parent403d756ad56de18488e3d048e849c55e77a20b32 (diff)
Merge remote-tracking branch 'refs/remotes/jackhumbert/master'
# Conflicts: # quantum/template/template.c # quantum/template/template.h
Diffstat (limited to 'quantum')
-rw-r--r--quantum/matrix.c16
-rw-r--r--quantum/template/template.c27
-rw-r--r--quantum/template/template.h6
3 files changed, 18 insertions, 31 deletions
diff --git a/quantum/matrix.c b/quantum/matrix.c
index 95bf4c0973..2dab6ae941 100644
--- a/quantum/matrix.c
+++ b/quantum/matrix.c
@@ -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;
}
diff --git a/quantum/template/template.c b/quantum/template/template.c
index 016e113007..828afb18c1 100644
--- a/quantum/template/template.c
+++ b/quantum/template/template.c
@@ -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);
}; \ No newline at end of file
diff --git a/quantum/template/template.h b/quantum/template/template.h
index ed17ca0016..ba91abac3e 100644
--- a/quantum/template/template.h
+++ b/quantum/template/template.h
@@ -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 \ No newline at end of file