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/pico.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/pico.c')
-rw-r--r-- | keyboards/helix/pico/pico.c | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/keyboards/helix/pico/pico.c b/keyboards/helix/pico/pico.c index bb8ba9ca2..12b8ae9ef 100644 --- a/keyboards/helix/pico/pico.c +++ b/keyboards/helix/pico/pico.c | |||
@@ -1,5 +1,9 @@ | |||
1 | #include "helix.h" | 1 | #include "helix.h" |
2 | 2 | ||
3 | // Each keymap.c should use is_keyboard_master() instead of 'is_master'. | ||
4 | // But keep 'is_master' for a while for backwards compatibility | ||
5 | // for the old keymap.c. | ||
6 | uint8_t is_master = false; | ||
3 | 7 | ||
4 | #ifdef SSD1306OLED | 8 | #ifdef SSD1306OLED |
5 | #include "ssd1306.h" | 9 | #include "ssd1306.h" |
@@ -15,6 +19,23 @@ void led_set_kb(uint8_t usb_led) { | |||
15 | #endif | 19 | #endif |
16 | 20 | ||
17 | void matrix_init_kb(void) { | 21 | void matrix_init_kb(void) { |
22 | // Each keymap.c should use is_keyboard_master() instead of is_master. | ||
23 | // But keep is_master for a while for backwards compatibility | ||
24 | // for the old keymap.c. | ||
25 | is_master = is_keyboard_master(); | ||
18 | 26 | ||
19 | matrix_init_user(); | 27 | matrix_init_user(); |
20 | }; | 28 | }; |
29 | |||
30 | void keyboard_post_init_kb(void) { | ||
31 | #if defined(DEBUG_MATRIX_SCAN_RATE) | ||
32 | debug_enable = true; | ||
33 | #endif | ||
34 | keyboard_post_init_user(); | ||
35 | } | ||
36 | |||
37 | #if defined(SPLIT_KEYBOARD) && defined(SSD1306OLED) | ||
38 | void matrix_slave_scan_user(void) { | ||
39 | matrix_scan_user(); | ||
40 | } | ||
41 | #endif | ||