diff options
| author |  Joe Wasson <jwasson+github@gmail.com> | 2018-03-11 14:07:02 -0700 |
|---|---|---|
| committer |  Jack Humbert <jack.humb@gmail.com> | 2018-03-16 16:33:43 -0400 |
| commit | 7230923b051bdb32bea19c3d732fa1fbc4883a68 (patch) | |
| tree | cb2ebffc0c730d6e34ffd8cf33d3d361309d5a2e /tmk_core | |
| parent | 687c7070a14108f69623bc925496444c4eadcf6a (diff) | |
| download | qmk_firmware-7230923b051bdb32bea19c3d732fa1fbc4883a68.tar.gz | |
Rename ONEHAND_ENABLE to SWAP_HANDS_ENABLE for consistency
Diffstat (limited to 'tmk_core')
| -rw-r--r-- | tmk_core/common.mk | 7 | ||||
| -rw-r--r-- | tmk_core/common/action.c | 6 | ||||
| -rw-r--r-- | tmk_core/common/action.h | 2 |
3 files changed, 9 insertions, 6 deletions
diff --git a/tmk_core/common.mk b/tmk_core/common.mk index 75b810d98..f12073525 100644 --- a/tmk_core/common.mk +++ b/tmk_core/common.mk @@ -25,7 +25,7 @@ TMK_COMMON_SRC += $(COMMON_DIR)/host.c \ ifeq ($(PLATFORM),AVR) TMK_COMMON_SRC += $(PLATFORM_COMMON_DIR)/xprintf.S -endif +endif ifeq ($(PLATFORM),CHIBIOS) TMK_COMMON_SRC += $(PLATFORM_COMMON_DIR)/printf.c @@ -124,7 +124,10 @@ ifeq ($(strip $(BLUETOOTH)), RN42) endif ifeq ($(strip $(ONEHAND_ENABLE)), yes) - TMK_COMMON_DEFS += -DONEHAND_ENABLE + SWAP_HANDS_ENABLE = yes # backwards compatibility +endif +ifeq ($(strip $(SWAP_HANDS_ENABLE)), yes) + TMK_COMMON_DEFS += -DSWAP_HANDS_ENABLE endif ifeq ($(strip $(NO_USB_STARTUP_CHECK)), yes) diff --git a/tmk_core/common/action.c b/tmk_core/common/action.c index dd3a5b3ee..947e5118f 100644 --- a/tmk_core/common/action.c +++ b/tmk_core/common/action.c @@ -64,7 +64,7 @@ void action_exec(keyevent_t event) fauxclicky_check(); #endif -#ifdef ONEHAND_ENABLE +#ifdef SWAP_HANDS_ENABLE if (!IS_NOEVENT(event)) { process_hand_swap(&event); } @@ -91,7 +91,7 @@ void action_exec(keyevent_t event) #endif } -#ifdef ONEHAND_ENABLE +#ifdef SWAP_HANDS_ENABLE bool swap_hands = false; void process_hand_swap(keyevent_t *event) { @@ -524,7 +524,7 @@ void process_action(keyrecord_t *record, action_t action) #endif case ACT_COMMAND: break; -#ifdef ONEHAND_ENABLE +#ifdef SWAP_HANDS_ENABLE case ACT_SWAP_HANDS: switch (action.swap.code) { case OP_SH_TOGGLE: diff --git a/tmk_core/common/action.h b/tmk_core/common/action.h index b9bdfe642..87027dede 100644 --- a/tmk_core/common/action.h +++ b/tmk_core/common/action.h @@ -67,7 +67,7 @@ extern bool disable_action_cache; #endif /* Code for handling one-handed key modifiers. */ -#ifdef ONEHAND_ENABLE +#ifdef SWAP_HANDS_ENABLE extern bool swap_hands; extern const keypos_t hand_swap_config[MATRIX_ROWS][MATRIX_COLS]; #if (MATRIX_COLS <= 8) |