diff options
| author | QMK Bot <hello@qmk.fm> | 2022-12-08 16:44:03 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2022-12-08 16:44:03 +0000 |
| commit | e06f50c489e02068465dfb3e5b3c7473006e6273 (patch) | |
| tree | 91401c338f2e8567c01c28221250de1107ba40cb | |
| parent | 5a2ed77a086386dae7c10eed7bda54253dc8177e (diff) | |
| parent | 1215fc2a782100bfd6577e1826f8c7e46be137ca (diff) | |
Merge remote-tracking branch 'origin/master' into develop
| -rw-r--r-- | keyboards/keychron/common/keychron_common.h | 7 | ||||
| -rw-r--r-- | keyboards/keychron/q1/ansi/ansi.c (renamed from keyboards/keychron/q1/rev_0100/rev_0100.c) | 49 | ||||
| -rw-r--r-- | keyboards/keychron/q1/ansi/ansi.h | 19 | ||||
| -rw-r--r-- | keyboards/keychron/q1/ansi/config.h (renamed from keyboards/keychron/q1/rev_0100/config.h) | 0 | ||||
| -rw-r--r-- | keyboards/keychron/q1/ansi/info.json | 104 | ||||
| -rw-r--r-- | keyboards/keychron/q1/ansi/keymaps/default/keymap.c | 61 | ||||
| -rw-r--r-- | keyboards/keychron/q1/ansi/keymaps/gtg465x/README.md (renamed from keyboards/keychron/q1/rev_0100/keymaps/gtg465x/README.md) | 0 | ||||
| -rw-r--r-- | keyboards/keychron/q1/ansi/keymaps/gtg465x/config.h (renamed from keyboards/keychron/q1/rev_0100/keymaps/gtg465x/config.h) | 0 | ||||
| -rw-r--r-- | keyboards/keychron/q1/ansi/keymaps/gtg465x/keymap.c (renamed from keyboards/keychron/q1/rev_0100/keymaps/gtg465x/keymap.c) | 0 | ||||
| -rw-r--r-- | keyboards/keychron/q1/ansi/keymaps/gtg465x/keymap_user.h (renamed from keyboards/keychron/q1/rev_0100/keymaps/gtg465x/keymap_user.h) | 0 | ||||
| -rw-r--r-- | keyboards/keychron/q1/ansi/keymaps/gtg465x/rgb_matrix_user.c (renamed from keyboards/keychron/q1/rev_0100/keymaps/gtg465x/rgb_matrix_user.c) | 0 | ||||
| -rw-r--r-- | keyboards/keychron/q1/ansi/keymaps/gtg465x/rgb_matrix_user.h (renamed from keyboards/keychron/q1/rev_0100/keymaps/gtg465x/rgb_matrix_user.h) | 0 | ||||
| -rw-r--r-- | keyboards/keychron/q1/ansi/keymaps/gtg465x/rules.mk (renamed from keyboards/keychron/q1/rev_0100/keymaps/gtg465x/rules.mk) | 0 | ||||
| -rw-r--r-- | keyboards/keychron/q1/ansi/keymaps/keychron/keymap.c (renamed from keyboards/keychron/q1/rev_0100/keymaps/default/keymap.c) | 68 | ||||
| -rw-r--r-- | keyboards/keychron/q1/ansi/keymaps/keychron/rules.mk | 4 | ||||
| -rw-r--r-- | keyboards/keychron/q1/ansi/keymaps/mkillewald/config.h (renamed from keyboards/keychron/q1/rev_0100/keymaps/mkillewald/config.h) | 0 | ||||
| -rw-r--r-- | keyboards/keychron/q1/ansi/keymaps/mkillewald/keymap.c (renamed from keyboards/keychron/q1/rev_0100/keymaps/mkillewald/keymap.c) | 0 | ||||
| -rw-r--r-- | keyboards/keychron/q1/ansi/keymaps/mkillewald/keymap_user.h (renamed from keyboards/keychron/q1/rev_0100/keymaps/mkillewald/keymap_user.h) | 0 | ||||
| -rw-r--r-- | keyboards/keychron/q1/ansi/keymaps/mkillewald/readme.md (renamed from keyboards/keychron/q1/rev_0100/keymaps/mkillewald/readme.md) | 0 | ||||
| -rw-r--r-- | keyboards/keychron/q1/ansi/keymaps/mkillewald/rgb_matrix_user.c (renamed from keyboards/keychron/q1/rev_0100/keymaps/mkillewald/rgb_matrix_user.c) | 0 | ||||
| -rw-r--r-- | keyboards/keychron/q1/ansi/keymaps/mkillewald/rgb_matrix_user.h (renamed from keyboards/keychron/q1/rev_0100/keymaps/mkillewald/rgb_matrix_user.h) | 0 | ||||
| -rw-r--r-- | keyboards/keychron/q1/ansi/keymaps/mkillewald/rules.mk (renamed from keyboards/keychron/q1/rev_0100/keymaps/mkillewald/rules.mk) | 0 | ||||
| -rw-r--r-- | keyboards/keychron/q1/ansi/keymaps/teimor/config.h (renamed from keyboards/keychron/q1/rev_0100/keymaps/teimor/config.h) | 0 | ||||
| -rw-r--r-- | keyboards/keychron/q1/ansi/keymaps/teimor/keymap.c (renamed from keyboards/keychron/q1/rev_0100/keymaps/teimor/keymap.c) | 0 | ||||
| -rw-r--r-- | keyboards/keychron/q1/ansi/keymaps/teimor/keymap_user.h (renamed from keyboards/keychron/q1/rev_0100/keymaps/teimor/keymap_user.h) | 0 | ||||
| -rw-r--r-- | keyboards/keychron/q1/ansi/keymaps/teimor/readme.md (renamed from keyboards/keychron/q1/rev_0100/keymaps/teimor/readme.md) | 0 | ||||
| -rw-r--r-- | keyboards/keychron/q1/ansi/keymaps/teimor/rgb_matrix_user.c (renamed from keyboards/keychron/q1/rev_0100/keymaps/teimor/rgb_matrix_user.c) | 0 | ||||
| -rw-r--r-- | keyboards/keychron/q1/ansi/keymaps/teimor/rgb_matrix_user.h (renamed from keyboards/keychron/q1/rev_0100/keymaps/teimor/rgb_matrix_user.h) | 0 | ||||
| -rw-r--r-- | keyboards/keychron/q1/ansi/keymaps/teimor/rules.mk (renamed from keyboards/keychron/q1/rev_0100/keymaps/teimor/rules.mk) | 0 | ||||
| -rw-r--r-- | keyboards/keychron/q1/ansi/keymaps/teimor/tap_dance_mac_caps.c (renamed from keyboards/keychron/q1/rev_0100/keymaps/teimor/tap_dance_mac_caps.c) | 0 | ||||
| -rw-r--r-- | keyboards/keychron/q1/ansi/keymaps/teimor/tap_dance_mac_caps.h (renamed from keyboards/keychron/q1/rev_0100/keymaps/teimor/tap_dance_mac_caps.h) | 0 | ||||
| -rw-r--r-- | keyboards/keychron/q1/ansi/keymaps/teimor/tap_dance_setup.c (renamed from keyboards/keychron/q1/rev_0100/keymaps/teimor/tap_dance_setup.c) | 0 | ||||
| -rw-r--r-- | keyboards/keychron/q1/ansi/keymaps/teimor/tap_dance_setup.h (renamed from keyboards/keychron/q1/rev_0100/keymaps/teimor/tap_dance_setup.h) | 0 | ||||
| -rw-r--r-- | keyboards/keychron/q1/ansi/keymaps/teimor/tap_dance_user.c (renamed from keyboards/keychron/q1/rev_0100/keymaps/teimor/tap_dance_user.c) | 0 | ||||
| -rw-r--r-- | keyboards/keychron/q1/ansi/keymaps/teimor/tap_dance_win_caps.c (renamed from keyboards/keychron/q1/rev_0100/keymaps/teimor/tap_dance_win_caps.c) | 0 | ||||
| -rw-r--r-- | keyboards/keychron/q1/ansi/keymaps/teimor/tap_dance_win_caps.h (renamed from keyboards/keychron/q1/rev_0100/keymaps/teimor/tap_dance_win_caps.h) | 0 | ||||
| -rw-r--r-- | keyboards/keychron/q1/ansi/keymaps/via/keymap.c | 61 | ||||
| -rw-r--r-- | keyboards/keychron/q1/ansi/keymaps/via/rules.mk | 1 | ||||
| -rw-r--r-- | keyboards/keychron/q1/ansi/readme.md (renamed from keyboards/keychron/q1/rev_0100/readme.md) | 0 | ||||
| -rw-r--r-- | keyboards/keychron/q1/ansi/rules.mk (renamed from keyboards/keychron/q1/rev_0100/rules.mk) | 1 | ||||
| -rw-r--r-- | keyboards/keychron/q1/ansi_encoder/ansi_encoder.c (renamed from keyboards/keychron/q1/rev_0101/rev_0101.c) | 68 | ||||
| -rw-r--r-- | keyboards/keychron/q1/ansi_encoder/ansi_encoder.h | 19 | ||||
| -rw-r--r-- | keyboards/keychron/q1/ansi_encoder/config.h (renamed from keyboards/keychron/q1/rev_0101/config.h) | 0 | ||||
| -rw-r--r-- | keyboards/keychron/q1/ansi_encoder/info.json | 104 | ||||
| -rw-r--r-- | keyboards/keychron/q1/ansi_encoder/keymaps/default/keymap.c | 67 | ||||
| -rw-r--r-- | keyboards/keychron/q1/ansi_encoder/keymaps/default/rules.mk (renamed from keyboards/keychron/q1/rev_0101/keymaps/default/rules.mk) | 0 | ||||
| -rw-r--r-- | keyboards/keychron/q1/ansi_encoder/keymaps/keychron/keymap.c (renamed from keyboards/keychron/q1/rev_0101/keymaps/default/keymap.c) | 60 | ||||
| -rw-r--r-- | keyboards/keychron/q1/ansi_encoder/keymaps/keychron/rules.mk | 5 | ||||
| -rw-r--r-- | keyboards/keychron/q1/ansi_encoder/keymaps/via/keymap.c | 67 | ||||
| -rw-r--r-- | keyboards/keychron/q1/ansi_encoder/keymaps/via/rules.mk | 2 | ||||
| -rw-r--r-- | keyboards/keychron/q1/ansi_encoder/readme.md (renamed from keyboards/keychron/q1/rev_0101/readme.md) | 0 | ||||
| -rw-r--r-- | keyboards/keychron/q1/ansi_encoder/rules.mk (renamed from keyboards/keychron/q1/rev_0101/rules.mk) | 3 | ||||
| -rw-r--r-- | keyboards/keychron/q1/config.h | 20 | ||||
| -rw-r--r-- | keyboards/keychron/q1/iso/config.h (renamed from keyboards/keychron/q1/rev_0102/config.h) | 0 | ||||
| -rw-r--r-- | keyboards/keychron/q1/iso/info.json | 105 | ||||
| -rw-r--r-- | keyboards/keychron/q1/iso/iso.c (renamed from keyboards/keychron/q1/rev_0102/rev_0102.c) | 47 | ||||
| -rw-r--r-- | keyboards/keychron/q1/iso/iso.h | 19 | ||||
| -rw-r--r-- | keyboards/keychron/q1/iso/keymaps/default/keymap.c | 61 | ||||
| -rw-r--r-- | keyboards/keychron/q1/iso/keymaps/keychron/keymap.c (renamed from keyboards/keychron/q1/rev_0102/keymaps/default/keymap.c) | 64 | ||||
| -rw-r--r-- | keyboards/keychron/q1/iso/keymaps/keychron/rules.mk | 4 | ||||
| -rw-r--r-- | keyboards/keychron/q1/iso/keymaps/kubahorak/README.md (renamed from keyboards/keychron/q1/rev_0102/keymaps/kubahorak/README.md) | 0 | ||||
| -rw-r--r-- | keyboards/keychron/q1/iso/keymaps/kubahorak/config.h (renamed from keyboards/keychron/q1/rev_0102/keymaps/kubahorak/config.h) | 0 | ||||
| -rw-r--r-- | keyboards/keychron/q1/iso/keymaps/kubahorak/keymap.c (renamed from keyboards/keychron/q1/rev_0102/keymaps/kubahorak/keymap.c) | 0 | ||||
| -rw-r--r-- | keyboards/keychron/q1/iso/keymaps/kubahorak/keymap_user.h (renamed from keyboards/keychron/q1/rev_0102/keymaps/kubahorak/keymap_user.h) | 0 | ||||
| -rw-r--r-- | keyboards/keychron/q1/iso/keymaps/kubahorak/rgb_matrix_user.c (renamed from keyboards/keychron/q1/rev_0102/keymaps/kubahorak/rgb_matrix_user.c) | 0 | ||||
| -rw-r--r-- | keyboards/keychron/q1/iso/keymaps/kubahorak/rgb_matrix_user.h (renamed from keyboards/keychron/q1/rev_0102/keymaps/kubahorak/rgb_matrix_user.h) | 0 | ||||
| -rw-r--r-- | keyboards/keychron/q1/iso/keymaps/kubahorak/rules.mk (renamed from keyboards/keychron/q1/rev_0102/keymaps/kubahorak/rules.mk) | 0 | ||||
| -rw-r--r-- | keyboards/keychron/q1/iso/keymaps/mkillewald_iso/config.h (renamed from keyboards/keychron/q1/rev_0102/keymaps/mkillewald_iso/config.h) | 0 | ||||
| -rw-r--r-- | keyboards/keychron/q1/iso/keymaps/mkillewald_iso/keymap.c (renamed from keyboards/keychron/q1/rev_0102/keymaps/mkillewald_iso/keymap.c) | 0 | ||||
| -rw-r--r-- | keyboards/keychron/q1/iso/keymaps/mkillewald_iso/keymap_user.h (renamed from keyboards/keychron/q1/rev_0102/keymaps/mkillewald_iso/keymap_user.h) | 0 | ||||
| -rw-r--r-- | keyboards/keychron/q1/iso/keymaps/mkillewald_iso/readme.md (renamed from keyboards/keychron/q1/rev_0102/keymaps/mkillewald_iso/readme.md) | 0 | ||||
| -rw-r--r-- | keyboards/keychron/q1/iso/keymaps/mkillewald_iso/rgb_matrix_user.c (renamed from keyboards/keychron/q1/rev_0102/keymaps/mkillewald_iso/rgb_matrix_user.c) | 0 | ||||
| -rw-r--r-- | keyboards/keychron/q1/iso/keymaps/mkillewald_iso/rgb_matrix_user.h (renamed from keyboards/keychron/q1/rev_0102/keymaps/mkillewald_iso/rgb_matrix_user.h) | 0 | ||||
| -rw-r--r-- | keyboards/keychron/q1/iso/keymaps/mkillewald_iso/rules.mk (renamed from keyboards/keychron/q1/rev_0102/keymaps/mkillewald_iso/rules.mk) | 0 | ||||
| -rw-r--r-- | keyboards/keychron/q1/iso/keymaps/via/keymap.c | 61 | ||||
| -rw-r--r-- | keyboards/keychron/q1/iso/keymaps/via/rules.mk | 1 | ||||
| -rw-r--r-- | keyboards/keychron/q1/iso/keymaps/victorsavu3/config.h (renamed from keyboards/keychron/q1/rev_0102/keymaps/victorsavu3/config.h) | 0 | ||||
| -rw-r--r-- | keyboards/keychron/q1/iso/keymaps/victorsavu3/keymap.c (renamed from keyboards/keychron/q1/rev_0102/keymaps/victorsavu3/keymap.c) | 0 | ||||
| -rw-r--r-- | keyboards/keychron/q1/iso/keymaps/victorsavu3/readme.md (renamed from keyboards/keychron/q1/rev_0102/keymaps/victorsavu3/readme.md) | 0 | ||||
| -rw-r--r-- | keyboards/keychron/q1/iso/keymaps/victorsavu3/rules.mk (renamed from keyboards/keychron/q1/rev_0102/keymaps/victorsavu3/rules.mk) | 0 | ||||
| -rw-r--r-- | keyboards/keychron/q1/iso/readme.md (renamed from keyboards/keychron/q1/rev_0102/readme.md) | 0 | ||||
| -rw-r--r-- | keyboards/keychron/q1/iso/rules.mk (renamed from keyboards/keychron/q1/rev_0102/rules.mk) | 3 | ||||
| -rw-r--r-- | keyboards/keychron/q1/q1.c | 5 | ||||
| -rw-r--r-- | keyboards/keychron/q1/q1.h | 12 | ||||
| -rw-r--r-- | keyboards/keychron/q1/readme.md | 4 | ||||
| -rw-r--r-- | keyboards/keychron/q1/rev_0100/info.json | 97 | ||||
| -rw-r--r-- | keyboards/keychron/q1/rev_0100/keymaps/via/keymap.c | 107 | ||||
| -rw-r--r-- | keyboards/keychron/q1/rev_0100/keymaps/via/rules.mk | 2 | ||||
| -rw-r--r-- | keyboards/keychron/q1/rev_0100/rev_0100.h | 37 | ||||
| -rw-r--r-- | keyboards/keychron/q1/rev_0101/info.json | 197 | ||||
| -rw-r--r-- | keyboards/keychron/q1/rev_0101/keymaps/via/keymap.c | 98 | ||||
| -rw-r--r-- | keyboards/keychron/q1/rev_0101/rev_0101.h | 52 | ||||
| -rw-r--r-- | keyboards/keychron/q1/rev_0102/info.json | 105 | ||||
| -rw-r--r-- | keyboards/keychron/q1/rev_0102/keymaps/via/keymap.c | 107 | ||||
| -rw-r--r-- | keyboards/keychron/q1/rev_0102/keymaps/via/rules.mk | 2 | ||||
| -rw-r--r-- | keyboards/keychron/q1/rev_0102/rev_0102.h | 37 | ||||
| -rw-r--r-- | keyboards/keychron/q2/ansi/ansi.c (renamed from keyboards/keychron/q2/rev_0110/rev_0110.c) | 42 | ||||
| -rw-r--r-- | keyboards/keychron/q2/ansi/ansi.h | 19 | ||||
| -rw-r--r-- | keyboards/keychron/q2/ansi/config.h (renamed from keyboards/keychron/q2/rev_0110/config.h) | 0 | ||||
| -rw-r--r-- | keyboards/keychron/q2/ansi/info.json | 88 | ||||
| -rw-r--r-- | keyboards/keychron/q2/ansi/keymaps/default/keymap.c | 65 | ||||
| -rw-r--r-- | keyboards/keychron/q2/ansi/keymaps/keychron/keymap.c | 71 | ||||
| -rw-r--r-- | keyboards/keychron/q2/ansi/keymaps/keychron/rules.mk | 4 | ||||
| -rw-r--r-- | keyboards/keychron/q2/ansi/keymaps/ladduro/config.h (renamed from keyboards/keychron/q2/rev_0110/keymaps/ladduro/config.h) | 0 | ||||
| -rw-r--r-- | keyboards/keychron/q2/ansi/keymaps/ladduro/keymap.c (renamed from keyboards/keychron/q2/rev_0110/keymaps/ladduro/keymap.c) | 0 | ||||
| -rw-r--r-- | keyboards/keychron/q2/ansi/keymaps/ladduro/keymap_user.h (renamed from keyboards/keychron/q2/rev_0110/keymaps/ladduro/keymap_user.h) | 0 | ||||
| -rw-r--r-- | keyboards/keychron/q2/ansi/keymaps/ladduro/readme.md (renamed from keyboards/keychron/q2/rev_0110/keymaps/ladduro/readme.md) | 0 | ||||
| -rw-r--r-- | keyboards/keychron/q2/ansi/keymaps/ladduro/rgb_matrix_user.c (renamed from keyboards/keychron/q2/rev_0110/keymaps/ladduro/rgb_matrix_user.c) | 0 | ||||
| -rw-r--r-- | keyboards/keychron/q2/ansi/keymaps/ladduro/rgb_matrix_user.h (renamed from keyboards/keychron/q2/rev_0110/keymaps/ladduro/rgb_matrix_user.h) | 0 | ||||
| -rw-r--r-- | keyboards/keychron/q2/ansi/keymaps/ladduro/rules.mk (renamed from keyboards/keychron/q2/rev_0110/keymaps/ladduro/rules.mk) | 0 | ||||
| -rw-r--r-- | keyboards/keychron/q2/ansi/keymaps/via/keymap.c | 72 | ||||
| -rw-r--r-- | keyboards/keychron/q2/ansi/keymaps/via/rules.mk | 1 | ||||
| -rw-r--r-- | keyboards/keychron/q2/ansi/readme.md (renamed from keyboards/keychron/q2/rev_0110/readme.md) | 0 | ||||
| -rw-r--r-- | keyboards/keychron/q2/ansi/rules.mk (renamed from keyboards/keychron/q2/rev_0112/rules.mk) | 2 | ||||
| -rw-r--r-- | keyboards/keychron/q2/ansi_encoder/ansi_encoder.c (renamed from keyboards/keychron/q2/rev_0111/rev_0111.c) | 54 | ||||
| -rw-r--r-- | keyboards/keychron/q2/ansi_encoder/ansi_encoder.h | 19 | ||||
| -rw-r--r-- | keyboards/keychron/q2/ansi_encoder/config.h (renamed from keyboards/keychron/q2/rev_0111/config.h) | 3 | ||||
| -rw-r--r-- | keyboards/keychron/q2/ansi_encoder/info.json | 88 | ||||
| -rw-r--r-- |