From de57799530d3184722532f93d156364067d8fcd5 Mon Sep 17 00:00:00 2001 From: Jack Humbert Date: Sat, 28 May 2016 11:56:06 -0400 Subject: brings alps64 up-to-date (needs testing) --- quantum/quantum.h | 1 + 1 file changed, 1 insertion(+) (limited to 'quantum/quantum.h') diff --git a/quantum/quantum.h b/quantum/quantum.h index 69a0d8126a..71533f48b9 100644 --- a/quantum/quantum.h +++ b/quantum/quantum.h @@ -23,6 +23,7 @@ #include "eeconfig.h" #include #include +#include extern uint32_t default_layer_state; -- cgit v1.2.3 From 17977a7e24ddab6ca101341b33c8fe7ad13e68f5 Mon Sep 17 00:00:00 2001 From: Jack Humbert Date: Sat, 28 May 2016 15:22:30 -0400 Subject: process_record implementation (non-breaking for process_action ATM) --- quantum/quantum.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'quantum/quantum.h') diff --git a/quantum/quantum.h b/quantum/quantum.h index 71533f48b9..3ce940895d 100644 --- a/quantum/quantum.h +++ b/quantum/quantum.h @@ -62,6 +62,9 @@ extern uint32_t default_layer_state; void matrix_init_kb(void); void matrix_scan_kb(void); bool process_action_kb(keyrecord_t *record); +bool process_record_kb(uint16_t keycode, keyrecord_t *record); +bool process_record_user(uint16_t keycode, keyrecord_t *record); + bool is_music_on(void); void music_toggle(void); -- cgit v1.2.3 From 1c9f33c06a6ef18c9c21e5841180af5ae554c34b Mon Sep 17 00:00:00 2001 From: Jack Humbert Date: Wed, 1 Jun 2016 22:49:55 -0400 Subject: adds send_string functionality (string macros) --- quantum/quantum.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'quantum/quantum.h') diff --git a/quantum/quantum.h b/quantum/quantum.h index 3ce940895d..786bcb2383 100644 --- a/quantum/quantum.h +++ b/quantum/quantum.h @@ -59,6 +59,8 @@ extern uint32_t default_layer_state; #define LEADER_DICTIONARY() if (leading && timer_elapsed(leader_time) > LEADER_TIMEOUT) #endif +void send_string(char str[]); + void matrix_init_kb(void); void matrix_scan_kb(void); bool process_action_kb(keyrecord_t *record); -- cgit v1.2.3 From 794aed37a0da5a277a07e7fa86263e0852fa9f6d Mon Sep 17 00:00:00 2001 From: Eric Tang Date: Fri, 3 Jun 2016 12:48:40 -0700 Subject: Improve string sending (#376) --- quantum/quantum.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'quantum/quantum.h') diff --git a/quantum/quantum.h b/quantum/quantum.h index 786bcb2383..69277b9e32 100644 --- a/quantum/quantum.h +++ b/quantum/quantum.h @@ -1,6 +1,7 @@ #ifndef QUANTUM_H #define QUANTUM_H +#include #include "matrix.h" #include "keymap_common.h" #ifdef BACKLIGHT_ENABLE @@ -25,6 +26,8 @@ #include #include +#define SEND_STRING(str) send_string(PSTR(str)) + extern uint32_t default_layer_state; #ifndef NO_ACTION_LAYER @@ -59,7 +62,7 @@ extern uint32_t default_layer_state; #define LEADER_DICTIONARY() if (leading && timer_elapsed(leader_time) > LEADER_TIMEOUT) #endif -void send_string(char str[]); +void send_string(const char *str); void matrix_init_kb(void); void matrix_scan_kb(void); @@ -79,4 +82,4 @@ void audio_on_user(void); void music_on_user(void); void music_scale_user(void); -#endif \ No newline at end of file +#endif -- cgit v1.2.3