diff options
author | fauxpark <fauxpark@gmail.com> | 2020-12-18 02:15:28 +1100 |
---|---|---|
committer | fauxpark <fauxpark@gmail.com> | 2020-12-18 02:15:28 +1100 |
commit | 7797070b376ff18a5d540ccc2a95033fc548c611 (patch) | |
tree | e3092fed02c154ed104c5fa541a604c9ed8643cb /quantum/split_common/split_util.c | |
parent | 973057cfe4ac0ddc23b7ed1016245e6fc939c456 (diff) | |
parent | 6ea4b06f9fc19825605477cdc27f5bec0f3dc0a9 (diff) |
Merge remote-tracking branch 'upstream/master' into develop
Diffstat (limited to 'quantum/split_common/split_util.c')
-rw-r--r-- | quantum/split_common/split_util.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/quantum/split_common/split_util.c b/quantum/split_common/split_util.c index 97d49961dc..2ae44e6e15 100644 --- a/quantum/split_common/split_util.c +++ b/quantum/split_common/split_util.c @@ -95,7 +95,7 @@ static uint8_t peek_matrix_intersection(pin_t out_pin, pin_t in_pin) { uint8_t pin_state = readPin(in_pin); // Set out_pin to a setting that is less susceptible to noise. setPinInputHigh(out_pin); - matrix_io_delay(); // Wait for the pull-up to go HIGH. + matrix_io_delay(); // Wait for the pull-up to go HIGH. return pin_state; } #endif @@ -106,11 +106,11 @@ __attribute__((weak)) bool is_keyboard_left(void) { setPinInput(SPLIT_HAND_PIN); return readPin(SPLIT_HAND_PIN); #elif defined(SPLIT_HAND_MATRIX_GRID) -# ifdef SPLIT_HAND_MATRIX_GRID_LOW_IS_RIGHT +# ifdef SPLIT_HAND_MATRIX_GRID_LOW_IS_RIGHT return peek_matrix_intersection(SPLIT_HAND_MATRIX_GRID); -# else +# else return !peek_matrix_intersection(SPLIT_HAND_MATRIX_GRID); -# endif +# endif #elif defined(EE_HANDS) return eeconfig_read_handedness(); #elif defined(MASTER_RIGHT) |