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

2 files changed, 5 insertions, 4 deletions

diff --git a/keyboard/gh60_rev_c/gh60.c b/keyboard/gh60_rev_c/gh60.c
index 8e7219bfe8..6da4d8ee3e 100644
--- a/keyboard/gh60_rev_c/gh60.c
+++ b/keyboard/gh60_rev_c/gh60.c
@@ -12,8 +12,9 @@ void matrix_scan_user(void) {
 }

 

 __attribute__ ((weak))

-void process_action_user(keyrecord_t *record) {

+bool process_action_user(keyrecord_t *record) {

 	// leave this function blank - it can be defined in a keymap file

+	return true;

 }

 

 __attribute__ ((weak))

@@ -35,11 +36,11 @@ void matrix_scan_kb(void) {
 	matrix_scan_user();

 }

 

-void process_action_kb(keyrecord_t *record) {

+bool process_action_kb(keyrecord_t *record) {

 	// put your per-action keyboard code here

 	// runs for every action, just before processing by the firmware

 

-	process_action_user(record);

+	return process_action_user(record);

 }

 

 void led_set_kb(uint8_t usb_led) {

diff --git a/keyboard/gh60_rev_c/gh60.h b/keyboard/gh60_rev_c/gh60.h
index 2373ad333c..95e5e1ebc7 100644
--- a/keyboard/gh60_rev_c/gh60.h
+++ b/keyboard/gh60_rev_c/gh60.h
@@ -75,7 +75,7 @@ inline void gh60_wasd_leds_off(void)   	{ DDRF &= ~(1<<7); PORTF &= ~(1<<7); }
 

 void matrix_init_user(void);

 void matrix_scan_user(void);

-void process_action_user(keyrecord_t *record);

+bool process_action_user(keyrecord_t *record);

 void led_set_user(uint8_t usb_led);

 

 #endif