diff options
| author | Priyadi Iman Nurcahyo <priyadi@priyadi.net> | 2017-02-15 05:25:45 +0700 |
|---|---|---|
| committer | Priyadi Iman Nurcahyo <priyadi@priyadi.net> | 2017-02-15 05:25:45 +0700 |
| commit | d0ee5292b6ea7593ac4e2248deb33103e9936887 (patch) | |
| tree | 435f087287cafb999d833e2734e25e0110dc3f40 /tmk_core | |
| parent | 369b3dc72329d730ef608e7a1f69327bf4ce1c41 (diff) | |
| parent | bd8d717f1ff2eef42dfef490374a8cee61be5d87 (diff) | |
| download | qmk_firmware-d0ee5292b6ea7593ac4e2248deb33103e9936887.tar.gz qmk_firmware-d0ee5292b6ea7593ac4e2248deb33103e9936887.zip | |
Merge branch 'layer_state_set_kb' into promethium
Diffstat (limited to 'tmk_core')
| -rw-r--r-- | tmk_core/common/action_layer.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tmk_core/common/action_layer.h b/tmk_core/common/action_layer.h index 785bb5be44..d89ed6e5ce 100644 --- a/tmk_core/common/action_layer.h +++ b/tmk_core/common/action_layer.h @@ -27,10 +27,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ extern uint32_t default_layer_state; void default_layer_debug(void); -uint32_t default_layer_set(uint32_t state); +void default_layer_set(uint32_t state); __attribute__((weak)) -void default_layer_state_set_kb(uint32_t state); +uint32_t default_layer_state_set_kb(uint32_t state); #ifndef NO_ACTION_LAYER /* bitwise operation */ |