diff options
author | MakotoKurauchi <pluis@me.com> | 2020-03-10 17:33:46 +0900 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-03-10 01:33:46 -0700 |
commit | 2d14d12c7409e8de3f8d465635be115e06ba26f7 (patch) | |
tree | 7e16f8a48b5f1d2fcc400869cc02244c6c2cc167 /keyboards/helix/pico/matrix.c | |
parent | 0ba352356deaa741064acc770fa5a8bc57fa8904 (diff) | |
download | qmk_firmware-2d14d12c7409e8de3f8d465635be115e06ba26f7.tar.gz qmk_firmware-2d14d12c7409e8de3f8d465635be115e06ba26f7.zip |
[Keyboard] Helix add split common option (#7718)
* is_master, has_usb() move to rev2.[hc]
* Do recent helix/rev2 changes to helix/pico as well.
helix/pico/matrix.c: remove 'is_master'
helix/pico/pico.c: add 'is_master'
helix/pico/pico.h: add 'has_usb()' macro
helix/pico/split_util.c: remove 'setup_handedness()' 'has_usb()', add 'is_helix_master()' etc
* add HELIX=scan option into {rev2/pico}/local_features.mk
Made DEBUG_MATRIX_SCAN_RATE easy to use.
* Changed rules.mk to link "helix/local_drivers/ssd1306.c" only when OLED_ENABLE = yes.
* Added option to use split_common for helix/rev2, helix/pico keyboard.
how to build:
### build helix/pico (HelixPico) with helix current codes
$ make helix/pico:KEY_MAP
$ make helix/pico/back:KEY_MAP
### build helix/rev2 (Helix or Helix beta) with helix current codes
$ make helix:KEY_MAP
$ make helix/rev2/back:KEY_MAP
$ make helix/rev2/under:KEY_MAP
$ make helix/rev2/oled:KEY_MAP
$ make helix/rev2/oled/back:KEY_MAP
$ make helix/rev2/oled/under:KEY_MAP
### build helix/pico (HelixPico) with split_common codes
$ make helix/pico/sc:KEY_MAP
$ make helix/pico/sc/back:KEY_MAP
$ make helix/pico/sc/under:KEY_MAP
### build helix/rev2 (Helix) with split_common codes
$ make helix/rev2/sc:KEY_MAP
$ make helix/rev2/sc/back:KEY_MAP
$ make helix/rev2/sc/under:KEY_MAP
$ make helix/rev2/sc/oled:KEY_MAP
$ make helix/rev2/sc/oledback:KEY_MAP
$ make helix/rev2/sc/oledunder:KEY_MAP
* add matrix_slave_scan_user() to helix/rev2/rev2.c, helix/pico/pico.h
* Changed 'helix:xulkal' to always use split_common and removed ad hoc code.
Added the following line to 'helix/rev2/keymaps/xulkal/rules.mk':
SPLIT_KEYBOARD = yes
Removed the following ad hoc code from 'users/xulkal/custom_oled.c':
#if KEYBOARD_helix_rev2
extern uint8_t is_master;
bool is_keyboard_master(void) { return is_master; }
#endif
* add '#define DIODE_DIRECTION COL2ROW' into helix/{rev2|pico}/config.h
This commit does not change the build result.
* update helix readme
* keyboards/helix/readme.md
* keyboards/helix/pico/keymaps/default/readme.md
* keyboards/helix/rev2/keymaps/default/readme.md
Co-authored-by: mtei <2170248+mtei@users.noreply.github.com>
Diffstat (limited to 'keyboards/helix/pico/matrix.c')
-rw-r--r-- | keyboards/helix/pico/matrix.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/keyboards/helix/pico/matrix.c b/keyboards/helix/pico/matrix.c index c2940e3b3..a537ef03c 100644 --- a/keyboards/helix/pico/matrix.c +++ b/keyboards/helix/pico/matrix.c | |||
@@ -46,7 +46,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
46 | static uint8_t debouncing = DEBOUNCE; | 46 | static uint8_t debouncing = DEBOUNCE; |
47 | static const int ROWS_PER_HAND = MATRIX_ROWS/2; | 47 | static const int ROWS_PER_HAND = MATRIX_ROWS/2; |
48 | static uint8_t error_count = 0; | 48 | static uint8_t error_count = 0; |
49 | uint8_t is_master = 0 ; | ||
50 | 49 | ||
51 | static const uint8_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS; | 50 | static const uint8_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS; |
52 | static const uint8_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS; | 51 | static const uint8_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS; |
@@ -94,9 +93,8 @@ uint8_t matrix_cols(void) | |||
94 | 93 | ||
95 | void matrix_init(void) | 94 | void matrix_init(void) |
96 | { | 95 | { |
97 | debug_enable = true; | 96 | split_keyboard_setup(); |
98 | debug_matrix = true; | 97 | |
99 | debug_mouse = true; | ||
100 | // initialize row and col | 98 | // initialize row and col |
101 | unselect_rows(); | 99 | unselect_rows(); |
102 | init_cols(); | 100 | init_cols(); |
@@ -111,8 +109,6 @@ void matrix_init(void) | |||
111 | matrix_debouncing[i] = 0; | 109 | matrix_debouncing[i] = 0; |
112 | } | 110 | } |
113 | 111 | ||
114 | is_master = has_usb(); | ||
115 | |||
116 | matrix_init_quantum(); | 112 | matrix_init_quantum(); |
117 | } | 113 | } |
118 | 114 | ||
@@ -197,7 +193,7 @@ int serial_transaction(void) { | |||
197 | 193 | ||
198 | uint8_t matrix_scan(void) | 194 | uint8_t matrix_scan(void) |
199 | { | 195 | { |
200 | if (is_master) { | 196 | if (is_helix_master()) { |
201 | matrix_master_scan(); | 197 | matrix_master_scan(); |
202 | }else{ | 198 | }else{ |
203 | matrix_slave_scan(); | 199 | matrix_slave_scan(); |