Align SPLIT_HAND_MATRIX_GRID left/right logic with SPLIT_HAND_PIN (#22775)
This commit is contained in:
@@ -97,11 +97,11 @@ static enum { UNKNOWN, LEFT, RIGHT } hand_side = UNKNOWN;
|
||||
hand_side = readPin(SPLIT_HAND_PIN) ? LEFT : RIGHT;
|
||||
return (hand_side == LEFT);
|
||||
#elif defined(SPLIT_HAND_MATRIX_GRID)
|
||||
# ifdef SPLIT_HAND_MATRIX_GRID_LOW_IS_RIGHT
|
||||
hand_side = peek_matrix_intersection(SPLIT_HAND_MATRIX_GRID) ? LEFT : RIGHT;
|
||||
# ifdef SPLIT_HAND_MATRIX_GRID_LOW_IS_LEFT
|
||||
hand_side = peek_matrix_intersection(SPLIT_HAND_MATRIX_GRID) ? RIGHT : LEFT;
|
||||
return (hand_side == LEFT);
|
||||
# else
|
||||
hand_side = peek_matrix_intersection(SPLIT_HAND_MATRIX_GRID) ? RIGHT : LEFT;
|
||||
hand_side = peek_matrix_intersection(SPLIT_HAND_MATRIX_GRID) ? LEFT : RIGHT;
|
||||
return (hand_side == LEFT);
|
||||
# endif
|
||||
#elif defined(EE_HANDS)
|
||||
|
||||
@@ -19,6 +19,7 @@
|
||||
#ifndef MASTER_RIGHT
|
||||
// SPLIT_HAND_MATRIX_GRID was initially designed to use with left hand side diode D35 mounted and not pressing K7 on the right hand side during boot. However when a USB cable is reconnected immediately, it fails. Decided to use "MASTER_RIGHT" to make it more reliable.
|
||||
# define SPLIT_HAND_MATRIX_GRID B5, D0
|
||||
# define SPLIT_HAND_MATRIX_GRID_LOW_IS_LEFT
|
||||
#endif
|
||||
|
||||
#define SPLIT_USB_DETECT
|
||||
|
||||
@@ -39,7 +39,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
/* Split hand configration */
|
||||
#define SPLIT_HAND_MATRIX_GRID D7,B2
|
||||
#define SPLIT_HAND_MATRIX_GRID_LOW_IS_RIGHT
|
||||
|
||||
/* Custom font */
|
||||
#define OLED_FONT_H "keyboards/helix/common/glcdfont.c"
|
||||
|
||||
@@ -39,7 +39,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
/* Split hand configration */
|
||||
#define SPLIT_HAND_MATRIX_GRID D7,B2
|
||||
#define SPLIT_HAND_MATRIX_GRID_LOW_IS_RIGHT
|
||||
|
||||
/* Custom font */
|
||||
#define OLED_FONT_H "keyboards/helix/common/glcdfont.c"
|
||||
|
||||
@@ -6,6 +6,7 @@
|
||||
|
||||
/* Split */
|
||||
#define SPLIT_HAND_MATRIX_GRID B5, F6
|
||||
#define SPLIT_HAND_MATRIX_GRID_LOW_IS_LEFT
|
||||
#define MATRIX_MASKED
|
||||
|
||||
/* Haptic hardware */
|
||||
|
||||
@@ -6,6 +6,7 @@
|
||||
|
||||
/* Split */
|
||||
#define SPLIT_HAND_MATRIX_GRID B5, F6
|
||||
#define SPLIT_HAND_MATRIX_GRID_LOW_IS_LEFT
|
||||
#define MATRIX_MASKED
|
||||
|
||||
/* Haptic hardware */
|
||||
|
||||
@@ -22,7 +22,6 @@
|
||||
|
||||
/* handedness */
|
||||
#define SPLIT_HAND_MATRIX_GRID A2, A15
|
||||
#define SPLIT_HAND_MATRIX_GRID_LOW_IS_RIGHT
|
||||
|
||||
#define MATRIX_MASKED // actual mask is defined by `matrix_mask` in `q11.c`
|
||||
|
||||
|
||||
@@ -18,6 +18,8 @@
|
||||
|
||||
/* Select hand configuration */
|
||||
#define SPLIT_HAND_MATRIX_GRID B0,B7
|
||||
#define SPLIT_HAND_MATRIX_GRID_LOW_IS_LEFT
|
||||
|
||||
#define MATRIX_MASKED
|
||||
#define SPLIT_USB_DETECT
|
||||
|
||||
|
||||
@@ -21,6 +21,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
/* Split hand configration */
|
||||
#define SPLIT_HAND_MATRIX_GRID D4,D3
|
||||
#define SPLIT_HAND_MATRIX_GRID_LOW_IS_LEFT
|
||||
|
||||
#define RGBLIGHT_LAYERS
|
||||
|
||||
|
||||
@@ -20,7 +20,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
// Side detection
|
||||
// col 4 row 3 on right-hand-side
|
||||
#define SPLIT_HAND_MATRIX_GRID E6, B3 // row first because the board is col2row
|
||||
#define SPLIT_HAND_MATRIX_GRID_LOW_IS_RIGHT
|
||||
#define MATRIX_MASKED // actual mask is defined by `matrix_mask` in `rev2.c`
|
||||
|
||||
/*
|
||||
|
||||
Reference in New Issue
Block a user