summaryrefslogtreecommitdiffstats
path: root/keyboards/keychron
Commit message (Collapse)AuthorAgeFilesLines
* Fixup keychron/q3 (#18687)jack2022-10-1319-49/+51
| | | Co-authored-by: Ryan <fauxpark@gmail.com>
* Merge remote-tracking branch 'origin/master' into developQMK Bot2022-10-1278-0/+4014
|\
| * Keychron q3 (#16912)lalalademaxiya12022-10-1378-0/+4014
| | | | | | | | | | | | | | | | | | | | | | Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Nick Brassel <nick@tzarc.org> Co-authored-by: Cesar Rojas <cesar.fieoner@gmail.com> Co-authored-by: lokher <lokher@gmail.com> Co-authored-by: Adam Karim <adam@akarsoft.com> Co-authored-by: bootstrapper <ido.samuelson@gmail.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* | Remove legacy keycodes, part 2 (#18660)Ryan2022-10-102-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * `KC_SYSREQ` -> `KC_SYRQ` And one `KC_ALT_ERASE` -> `KC_ERAS` * `KC_NONUS_BSLASH` -> `KC_NUBS` * `KC_NUMLOCK` -> `KC_NUM` * `KC_CLCK` -> `KC_CAPS` * `KC_SCROLLLOCK` -> `KC_SCRL` * `KC_LBRACKET` -> `KC_LBRC` * `KC_RBRACKET` -> `KC_RBRC` * `KC_CAPSLOCK` -> `KC_CAPS`
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-10-0710-80/+46
|\|
| * Add encoder map support for Keychron Q1v1 and Q2 (#18598)adophoxia2022-10-0610-80/+46
| |
* | Fix Per Key LED Indicator Callbacks (#18450)Drashna Jaelre2022-10-048-16/+27
| | | | | | | | Co-authored-by: Dasky <32983009+daskygit@users.noreply.github.com> Co-authored-by: Nick Brassel <nick@tzarc.org>
* | Merge remote-tracking branch 'upstream/master' into developfauxpark2022-09-307-19/+21
|\|
| * Fix keychron q2 iso default keymaps (#18501)Daniel Bast2022-09-294-4/+4
| |
| * Update q0 for keychron (#18522)lalalademaxiya12022-09-293-15/+17
| |
* | Remove lingering `DRIVER_LED_TOTAL` references (#18475)jack2022-09-252-2/+2
| |
* | Merge remote-tracking branch 'origin/master' into developDrashna Jael're2022-09-2415-0/+555
|\|
| * [Keyboard] Add Keychron Q0 (#18348)adophoxia2022-09-2415-0/+555
| |
* | Change `DRIVER_LED_COUNT` to `{LED,RGB}_MATRIX_LED_COUNT` (#18399)Ryan2022-09-2320-20/+20
|/
* RESET -> QK_BOOT user keymaps (#17940)Joel Challis2022-08-211-2/+2
|
* Merge remote-tracking branch 'upstream/master' into developfauxpark2022-08-2016-47/+49
|\
| * Move keyboard USB IDs and strings to data driven, pass 2: J-L (#18080)Ryan2022-08-2016-47/+49
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-07-1714-0/+579
|\|
| * [Keymap] teimor keymap for Keychron Q1 (#16396)Teimor Epstein2022-07-1614-0/+579
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * teimor keymap * quickfix and cleanup * update readme * quickfix and cleanup before pr * clang * clean layout * add reset * pr fix * fix pr * Rename README.md to readme.md
* | (develop)Keychron Q2: Enable support for WL EEPROM Driver (#17507)jpe2302022-06-305-5/+10
|/
* Keychron Q2 add Caps Lock indicator and layer RGB (#16641)Ladduro2022-04-227-0/+279
|
* [Keymap] Add dhertz keychron map v0 (#16571)Dan Hertz2022-03-233-1/+96
|
* Merge remote-tracking branch 'upstream/master' into developNick Brassel2022-02-092-139/+2
|\
| * Add support for driving unselected row/col. (#16278)Nick Brassel2022-02-092-139/+2
| |
* | Add missing `BOOTLOADER` for a handful of boards (#16225)Ryan2022-02-054-0/+12
|/
* Keychron QMK Configurator Refactor (#16034)James Young2022-01-2617-702/+682
|
* Update readme.md (#15989)dnlsmy2022-01-221-2/+2
| | | Spelling correction
* Add rgb matrix support for q2 of keychron. (#15946)lalalademaxiya12022-01-2216-75/+527
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add new keyboard keychron_q1_rev_0101 for Keychron. * Update keymaps of keychron_q1_rev_0100 and keychron_q1_rev_0102. * Update keyboards/keychron/q1/rev_0101/rev_0101.h Co-authored-by: Joel Challis <git@zvecr.com> * Update keymap.c * Add new info.json. * Update info.json * Update keyboards/keychron/q1/rev_0101/keymaps/default/keymap.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/keychron/q1/rev_0101/rev_0101.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/keychron/q1/rev_0101/keymaps/via/keymap.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/keychron/q1/rev_0101/rev_0101.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keymap.c * Update info.json * Update all via keymaps keymaps of q1 series. KC_TASK and KC_FLXP are now defined using the VIA user keycodes range so they can be renamed "TASK" and "TILE" as a shortName in VIA. * Add keyboards keychron_q2 series. * Update default keymaps of keychron_q2 series. * Update rules.mk and MCU_LDSCRIPT specified as STM32L432xB. * Update keyboards/keychron/q1/rev_0101/rev_0101.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Update config.h * Update config.h * Update config.h * removed duplicated ifdef * Update keyboards/keychron/q1/rev_0101/rules.mk Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/keychron/q2/rev_0110/rules.mk Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/keychron/q2/rev_0110/rules.mk Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/keychron/q2/rev_0113/rules.mk Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/keychron/q2/rev_0111/rules.mk Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/keychron/q2/rev_0111/rules.mk Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/keychron/q2/rev_0112/rules.mk Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/keychron/q2/rev_0112/rules.mk Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/keychron/q2/rev_0113/rules.mk Co-authored-by: Ryan <fauxpark@gmail.com> * Update rev_0101.c * Update rev_0101. * Enable support for edit RGB lighting in VIA. The updated design file at https://git.io/JyE0K includes only the enabled RGB_MATRIX modes. * Update q1. * Add rgb matrix support for q2 of keychron. * Update rule.mk. * Delete comment block which is unwanted. Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Cesar Rojas <cesar.fieoner@gmail.com> Co-authored-by: lokher <lokher@gmail.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Adam Karim <adam@akarsoft.com>
* [Keyboard] Add Keychron_q1 rev_0101 and Keychron q2 series (#15025)lalalademaxiya12022-01-1463-136/+3255
| | | | | | | | Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Cesar Rojas <cesar.fieoner@gmail.com> Co-authored-by: lokher <lokher@gmail.com> Co-authored-by: Adam Karim <adam@akarsoft.com>
* [Keyboard] Keychron Q1: Turn off RGB during PC suspend (#15685)ripdog2022-01-021-0/+3
|
* Addd victorsavu3's Keychron Q1 keymap (ISO) (#15517)Victor Savu Gabriel2021-12-274-0/+228
| | | Co-authored-by: Savu Victor-Gabriel <dev@victorsavu.com>
* [Keymap] Add keymap for the Keychron Q1 ISO layout (#14853)Jakub HorĂ¡k2021-12-277-0/+240
| | | | | | | | | | | | | | | | * Add keymap for the Keychron Q1 ISO layout - The rightest key column is: Ins, Home, PgUp, PgDn, which differs from the default. - RGB lighting turns off when the computer sleeps - Caps Lock and alpha keys turn red to indicate when Caps Lock is on - When the Fn layer is active, RGB lighting turns off for keys that are not assigned * Update keyboards/keychron/q1/rev_0102/keymaps/kubahorak/rgb_matrix_user.c Suggestion from review Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
* Tidy up NKRO_ENABLE rules (#15382)Ryan2021-12-092-4/+2
|
* Tidy up `SLEEP_LED_ENABLE` rules (#15362)Ryan2021-12-012-4/+0
|
* Remove use of __flash due to LTO issues (#15268)Joel Challis2021-11-242-2/+2
|
* Require explicit enabling of RGB Matrix modes (#15018)Drashna Jaelre2021-11-151-15/+48
|
* Remove `BOOTMAGIC_ENABLE = lite` option (#15002)James Young2021-11-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remove BOOTMAGIC_ENABLE=lite setting * change keyboard BOOTMAGIC_ENABLE rules Edits keyboard-level instances of `BOOTMAGIC_ENABLE = lite` to `BOOTMAGIC_ENABLE = yes`. * change keyboard BOOTMAGIC_ENABLE inline comments Edits keyboard-level BOOTMAGIC_ENABLE inline comments to "Enable Bootmagic Lite". * change keymap BOOTMAGIC_ENABLE rules Edits keymap-level instances of `BOOTMAGIC_ENABLE = lite` to `BOOTMAGIC_ENABLE = yes`. * change keymap BOOTMAGIC_ENABLE inline comments Edits/adds keymap-level BOOTMAGIC_ENABLE inline comments to read "Enable Bootmagic Lite". * change layout/user BOOTMAGIC_ENABLE rules/comments Edits instances of `BOOTMAGIC_ENABLE = lite` to `BOOTMAGIC_ENABLE = yes`. Edits/adds keymap-level BOOTMAGIC_ENABLE inline comments to read "Enable Bootmagic Lite". * update non-rules.mk BOOTMAGIC_ENABLE references in keyboards/ * remove docs references to Full Bootmagic * convert data-driven Bootmagic Lite instances * remove Bootmagic Lite bodge from data-driven generation * Merge remote-tracking branch 'upstream/develop' into rm/bootmagic-full_q4a * update docs/ja/config_options.md per mtei * update docs/faq_misc.md per mtei Remove remaining Full Bootmagic reference.
* [Keymap] added caps lock indicator for Keychron Q1 rev_0100 (#14653)Mike Killewald2021-11-0314-0/+800
|
* Updated Keychron Q1 user keymap (#14666)Grayson Carr2021-10-067-11/+169
| | | | | | | | | | | | | | | | | * Updated Keychron Q1 user keymap - Added Caps Lock indicator - Mission Control and Launchpad custom keycodes are now defined using the VIA user keycodes range so they can be labeled properly in VIA * Only use VIA keycode range if VIA is enabled * Reformatted led_indexes enum to match layout * Feature: When the Fn layer is active, RGB lighting turns off for keys that are not assigned * Fixes * Cleanup: Updated method signature of rgb_matrix_set_color_by_keycode to more closely match rgb_matrix_set_color * Fixed int sizing for keycodes
* [Keymap] Keychron Q1 user keymap (#14636)Grayson Carr2021-09-284-0/+119
|
* Remove BLUETOOTH_ENABLE from keyboard-level rules.mk (#14379)Ryan2021-09-122-2/+0
|
* Remove width, height and key_count from info.json (#14274)Ryan2021-09-122-4/+0
|
* Merge remote-tracking branch 'origin/master' into developDrashna Jael're2021-08-2420-168/+650
|\
| * [Keyboard] Add new keyboard version: keychron/q1/rev_0102 (#14029)lalalademaxiya12021-08-2320-171/+653
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add keyboard Q1 * Update keyboards/keychron/q1/readme.md * Update keyboards/keychron/q1/rev_0100/rules.mk * Update keyboards/keychron/q1/readme.md * Change layer switch function to "default_layout_set" * Update keyboards/keychron/q1/rev_0100/info.json * Update keyboards/keychron/q1/q1.c * Mask out the DIP switch to fix sleeping issue when switch is ON * Added and changed readme.md Added keyboards\q1\rev_0100\readme.md Changed keyboards\q1\readme.md since different MCU may used in other version. * update * update keymap name * update keymap for keychron/q1/rev_0102 * Update info.json
* | Remove Full Bootmagic (#13846)James Young2021-08-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * disambiguate Bootmagic rules in keymaps The files edited by this commit were added at a point in time where `BOOTMAGIC_ENABLE = yes` enabled full Bootmagic. This commit edits the files to specify that full Bootmagic is intended. * remove BOOTMAGIC_ENABLE=full setting * unify commented BOOTMAGIC_ENABLE rules in keyboards Explicitly sets `BOOTMAGIC_ENABLE = no` in keyboards where the rule was commented out. Command: ``` find keyboards/ -type f -name 'rules.mk' -and -not -path '*/keymaps/*' -exec sed -i -e 's;#[ \t]*\(BOOTMAGIC_ENABLE\)[ \t=]\+\([a-zA-Z]\+\).*;\1 = no # Virtual DIP switch configuration;g' {} + ``` * remove commented Bootmagic rules from keymap/user level Command: ``` find keyboards/ layouts/ users/ -type f -name 'rules.mk' -exec sed -i -e '/#.*\(BOOTMAGIC_ENABLE\)[ \t=]\+\([a-z]\+\).*/d' {} + ``` * update keyboard BOOTMAGIC_ENABLE rule formatting Sets the formatting of BOOTMAGIC_ENABLE rules to `BOOTMAGIC_ENABLE = [value]`, without the inline comments (which will be replaced later). Command: ``` find keyboards/ -type f -name 'rules.mk' -and -not -path '*/keymaps/*' -exec sed -i -e 's;\(BOOTMAGIC_ENABLE\)[ \t=]\+\([a-z]\+\).*;\1 = \2;g' '{}' + ``` * update keyboards' BOOTMAGIC_ENABLE settings Updates keyboard `rules.mk` files to use `BOOTMAGIC_ENABLE = lite` where `BOOTMAGIC_ENABLE = full` was being used. Command: ``` find keyboards/ -type f -name 'rules.mk' -and -not -path '*/keymaps/*' -exec sed -i -e 's;\(BOOTMAGIC_ENABLE = \)full;\1lite;g' '{}' + ``` * update keymap/user BOOTMAGIC_ENABLE settings Updates keymap/user `rules.mk` files to use `BOOTMAGIC_ENABLE = lite` where `BOOTMAGIC_ENABLE = full` was being used. Commands: ``` find keyboards/ -type f -name 'rules.mk' -and -path '*/keymaps/*' -exec sed -i -e 's;\(BOOTMAGIC_ENABLE[ \t=]\+\)full;\1lite;g' '{}' + find layouts/community/ users/ -type f -name 'rules.mk' -exec sed -i -e 's;\(BOOTMAGIC_ENABLE[ \t=]\+\)full;\1lite;g' '{}' + ``` * remove and replace inline comments in keyboards and keymap/user files Removes and replaces the inline comments, which have been updated to read `Enable Bootmagic Lite`. Commands: ``` find keyboards/ -type f -name 'rules.mk' -and -path '*/keymaps/*' -exec sed -i -e 's;\(BOOTMAGIC_ENABLE\)[ \t=]\+\([a-z]\+\).*;\1 = \2;g' '{}' + find layouts/community/ users/ -type f -name 'rules.mk' -exec sed -i -e 's;\(BOOTMAGIC_ENABLE\)[ \t=]\+\([a-z]\+\).*;\1 = \2;g' '{}' + find keyboards/ layouts/community/ users/ -type f -name 'rules.mk' -exec sed -i -e 's;\(BOOTMAGIC_ENABLE = lite\);\1 # Enable Bootmagic Lite;g' '{}' + find keyboards/ layouts/community/ users/ -type f -name 'rules.mk' -exec sed -i -e 's;\(BOOTMAGIC_ENABLE = yes\);\1 # Enable Bootmagic Lite;g' '{}' + find keyboards/ layouts/community/ users/ -type f -name 'rules.mk' -exec sed -i -e 's;\(BOOTMAGIC_ENABLE = no\);\1 # Enable Bootmagic Lite;g' '{}' + ``` * rename improperly named makefiles Some files intended to be used as makefiles had improper names causing them to not be used as intended when building. This commit corrects the filenames of the affected files. * update renamed file with new rule formatting * update QMK's template files Updates QMK's `rules.mk` templates to use the new inline comment. * update QMK Docs - remove documentation of full Bootmagic - update links to Bootmagic Lite doc - add doc for Magic Keycodes * rules.mk patch for coarse/ixora and coarse/vinta
* | __flash? (#13799)Joel Challis2021-07-311-1/+1
| |
* | [Keyboard] Fix Q1 change dip switch to bool (#13687)Dasky2021-07-241-12/+13
|/
* [Keyboard] Add Keychron Q1 (#13397)lokher2021-07-2412-0/+590
Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> Co-authored-by: Drashna Jaelre <drashna@live.com>