diff options
| author | Priyadi Iman Nurcahyo <priyadi@priyadi.net> | 2017-02-15 05:19:31 +0700 |
|---|---|---|
| committer | Priyadi Iman Nurcahyo <priyadi@priyadi.net> | 2017-02-15 05:20:15 +0700 |
| commit | d96175937bfa9f700d9ee54c20e5d963c12d02df (patch) | |
| tree | b4f6dae200aeb59398790ef40fb85d92a9f225e1 /tmk_core | |
| parent | d369bfb83a74d94ed0fbb13f8ee3a8a1146da770 (diff) | |
| download | qmk_firmware-d96175937bfa9f700d9ee54c20e5d963c12d02df.tar.gz qmk_firmware-d96175937bfa9f700d9ee54c20e5d963c12d02df.zip | |
Bug fix & added default_layer_state_set_kb
Diffstat (limited to 'tmk_core')
| -rw-r--r-- | tmk_core/common/action_layer.c | 6 | ||||
| -rw-r--r-- | tmk_core/common/action_layer.h | 7 |
2 files changed, 11 insertions, 2 deletions
diff --git a/tmk_core/common/action_layer.c b/tmk_core/common/action_layer.c index 3363a2e53..58d919a04 100644 --- a/tmk_core/common/action_layer.c +++ b/tmk_core/common/action_layer.c | |||
| @@ -16,8 +16,14 @@ | |||
| 16 | */ | 16 | */ |
| 17 | uint32_t default_layer_state = 0; | 17 | uint32_t default_layer_state = 0; |
| 18 | 18 | ||
| 19 | __attribute__((weak)) | ||
| 20 | uint32_t default_layer_state_set_kb(uint32_t state) { | ||
| 21 | return state; | ||
| 22 | } | ||
| 23 | |||
| 19 | static void default_layer_state_set(uint32_t state) | 24 | static void default_layer_state_set(uint32_t state) |
| 20 | { | 25 | { |
| 26 | state = default_layer_state_set_kb(state); | ||
| 21 | debug("default_layer_state: "); | 27 | debug("default_layer_state: "); |
| 22 | default_layer_debug(); debug(" to "); | 28 | default_layer_debug(); debug(" to "); |
| 23 | default_layer_state = state; | 29 | default_layer_state = state; |
diff --git a/tmk_core/common/action_layer.h b/tmk_core/common/action_layer.h index fc714700d..785bb5be4 100644 --- a/tmk_core/common/action_layer.h +++ b/tmk_core/common/action_layer.h | |||
| @@ -27,7 +27,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 27 | */ | 27 | */ |
| 28 | extern uint32_t default_layer_state; | 28 | extern uint32_t default_layer_state; |
| 29 | void default_layer_debug(void); | 29 | void default_layer_debug(void); |
| 30 | void default_layer_set(uint32_t state); | 30 | uint32_t default_layer_set(uint32_t state); |
| 31 | |||
| 32 | __attribute__((weak)) | ||
| 33 | void default_layer_state_set_kb(uint32_t state); | ||
| 31 | 34 | ||
| 32 | #ifndef NO_ACTION_LAYER | 35 | #ifndef NO_ACTION_LAYER |
| 33 | /* bitwise operation */ | 36 | /* bitwise operation */ |
| @@ -70,7 +73,7 @@ void layer_xor(uint32_t state); | |||
| 70 | #define layer_debug() | 73 | #define layer_debug() |
| 71 | 74 | ||
| 72 | __attribute__((weak)) | 75 | __attribute__((weak)) |
| 73 | void layer_state_set_kb(uint32_t oldstate, uint32_t newstate); | 76 | uint32_t layer_state_set_kb(uint32_t state); |
| 74 | #endif | 77 | #endif |
| 75 | 78 | ||
| 76 | /* pressed actions cache */ | 79 | /* pressed actions cache */ |
