aboutsummaryrefslogtreecommitdiff
path: root/keyboards/helix/rev2/matrix.c
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/helix/rev2/matrix.c')
-rw-r--r--keyboards/helix/rev2/matrix.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/keyboards/helix/rev2/matrix.c b/keyboards/helix/rev2/matrix.c
index 70a6cb0a5..050dcac2d 100644
--- a/keyboards/helix/rev2/matrix.c
+++ b/keyboards/helix/rev2/matrix.c
@@ -47,7 +47,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
47static uint8_t debouncing = DEBOUNCE; 47static uint8_t debouncing = DEBOUNCE;
48static const int ROWS_PER_HAND = MATRIX_ROWS/2; 48static const int ROWS_PER_HAND = MATRIX_ROWS/2;
49static uint8_t error_count = 0; 49static uint8_t error_count = 0;
50uint8_t is_master = 0 ;
51 50
52static const uint8_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS; 51static const uint8_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS;
53static const uint8_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS; 52static const uint8_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS;
@@ -111,8 +110,6 @@ void matrix_init(void)
111 matrix_debouncing[i] = 0; 110 matrix_debouncing[i] = 0;
112 } 111 }
113 112
114 is_master = has_usb();
115
116 matrix_init_quantum(); 113 matrix_init_quantum();
117} 114}
118 115
@@ -200,7 +197,7 @@ int serial_transaction(int master_changed) {
200 197
201uint8_t matrix_scan(void) 198uint8_t matrix_scan(void)
202{ 199{
203 if (is_master) { 200 if (is_helix_master()) {
204 matrix_master_scan(); 201 matrix_master_scan();
205 }else{ 202 }else{
206 matrix_slave_scan(); 203 matrix_slave_scan();