summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-2652-711/+639
|\
| * Krush60 Solder Refactor (#16029)James Young2022-01-2652-711/+639
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * solder.h: add matrix diagram * solder.h: remove unnecessary comments * rework LAYOUT_60_iso to LAYOUT_60_isoenter_split_bs True ISO layouts are not supported on this keyboard because the PCB lacks support for split Left Shift. Renames the `iso` to `isoenter` to specify this. - denotes use of Split Backspace - move Backslash keycode to home row * info.json: remove trailing whitespace * info.json: clean up Sort the layout trees into the same order as `solder.h`, and remove the `LAYOUT_60_all` tree (doesn't exist in source). * solder.h: align positional arguments Helps me proof-read the layouts at a glance. No logic change. * fix syntax errors in keymaps * remove ISO layouts As previously noted, ISO layouts are not supported due to the PCB's lack of support for split Left Shift. * rename LAYOUT_60_ansi_tsangan_split_bs to LAYOUT_60_tsangan_hhkb Also renames `60_tsangan_splt_bs` keymap to `60_tsangan_hhkb`. * rename LAYOUT_60_ansi_tsangan to LAYOUT_60_ansi_tsangan_split_rshift Also renames `60_tsangan` keymap to `60_ansi_tsangan_split_rshift`. * rename LAYOUT_60_ansi_arrow_split_bs_7u_spc to LAYOUT_60_ansi_arrow_tsangan_split_bs Also rename `60_ansi_arrow_splt_bs_7u` to `60_ansi_arrow_tsangan_split_bs`. * rename LAYOUT_60_ansi_arrow_7u_spc to LAYOUT_60_ansi_arrow_tsangan Also renames `60_ansi_arrow_7u` keymap to `60_ansi_arrow_tsangan`. * rename keymaps based on layout macro used Making this easier to track in my head while I work on it. * info.json: fix syntax errors * rename LAYOUT_60_ansi_split_bs_7u_spc to LAYOUT_60_ansi_tsangan_split_bs - renames `60_ansi_split_bs_7u_spc` keymap to `60_ansi_tsangan_split_bs` - removes `layout_aliases` entry from `info.json` (creates incompatible data conflict) * rename LAYOUT_60_ansi_7u_spc to LAYOUT_60_ansi_tsangan - renames `60_ansi_7u_spc` keymap to `60_ansi_tsangan` * info.json: remove LAYOUT_60_ansi_tsangan layout_aliases entry Causes an incompatible data conflict. * add second layer to 60_ansi keymap * update via keymap Now matches the behaviour of the default keymap. * fix syntax errors in keymaps, take 2 * add RGB and Navigation keycodes Adds RGB and Navigation keycodes to the `60_isoenter_split_bs`, `default` and `via` keymaps.
* | More keyboard rules.mk cleanups (#16044)Ryan2022-01-2521-59/+28
| | | | | | | | | | * More keyboard rules.mk cleanups * Found a couple more
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-252-2/+2
|\|
| * [Keyboard] Fix orientation issues for Ploopy pointing devices (#16035)Drashna Jaelre2022-01-252-2/+2
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-251-2/+3
|\|
| * Fix joystick button off-by-one error (#16037)Ryan2022-01-251-2/+3
| |
* | Fix handwired/ms_sculpt_mobile default keymap (#16032)Joel Challis2022-01-255-3/+3
| |
* | Workaround in Makefile for recursive rule matching (#15988)Joel Challis2022-01-251-42/+9
| | | | | | | | | | | | | | * Bodge for recursive rule matching * Bodge for recursive rule matching - force python3 * Tidy up
* | Add a script that simplifies running commands under docker. (#16028)Nick Brassel2022-01-241-0/+59
| |
* | Various Makefile optimisations (#16015)Joel Challis2022-01-242-51/+36
| |
* | Fix bootloader_jump for certain CTRL boards (#16026)Ryan2022-01-251-12/+5
| |
* | Fix up issue with PROGMEM and hand_swap_config (#16027)Joel Challis2022-01-241-0/+1
| |
* | Rip out old macro and action_function system (#16025)Ryan2022-01-2421-538/+8
| | | | | | | | | | | | | | * Rip out old macro and action_function system * Update quantum/action_util.c Co-authored-by: Joel Challis <git@zvecr.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-242-6/+6
|\|
| * [Keyboard] Fix frosty_flake LED pin assignment (#16000)tofurky2022-01-242-6/+6
| | | | | | | | | | | | 4c080be seemed to swap the LED pins for the 20130602 and 20140521 variants. 20140521 is fine now, 20130602 untested but per the schematics at https://deskthority.net/wiki/Costar_replacement_controllers it seems correct.
* | Default EEPROM implementation should be transient when not implemented. ↵Nick Brassel2022-01-242-60/+17
| | | | | | | | Removed the equivalent eeprom_teensy fallback. (#16020)
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-243-45/+45
|\|
| * RGB matrix effects definiton fix (#15930)fOmey2022-01-243-45/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * RGB matrix effects definiton fix * Move LTO to board rules & add some comments * Whitespace fix * Whitespace fix 2 Co-authored-by: Ryan <fauxpark@gmail.com> * Whitespace fix 3 Co-authored-by: Ryan <fauxpark@gmail.com> * Comment fix Co-authored-by: Dasky <32983009+daskygit@users.noreply.github.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Dasky <32983009+daskygit@users.noreply.github.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-241-0/+72
|\|
| * DZ60 - QMK Configurator fix for ISO DE Arrow layout (#15941)Tobias Minn2022-01-241-0/+72
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-231-1/+3
|\|
| * Add some clarity regarding new board definitions (#16018)Nick Brassel2022-01-231-1/+3
| |
* | Add L432, L442. (#16016)Nick Brassel2022-01-2410-2/+358
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-236-400/+3
|\|
| * [Keymap] Remove Ergodox community layout “coderkun_neo2” (#16011)Olli2022-01-233-397/+0
| |
| * [Keyboard] Fixed RGB number for Devil68 Pro (#16003)HorrorTroll2022-01-233-3/+3
| |
* | [Keyboard] Fix erroneous SRC for Clueboard 66 hotswap (#16007)Drashna Jaelre2022-01-231-2/+0
| |
* | Relocate matrix_init_quantum content (#15953)Joel Challis2022-01-234-41/+45
| | | | | | | | | | | | | | * Relocate matrix_init_quantum content * Update include order * Fix cherry pick from 15722
* | [Bug] Fix compilation issues for led indicators (#16001)Drashna Jaelre2022-01-221-0/+1
| |
* | Fix BACKLIGHT_CAPS_LOCK warning (#15999)Joel Challis2022-01-221-6/+8
| | | | | | | | | | * Fix BACKLIGHT_CAPS_LOCK warning * align defs
* | Align location of some host led logic (#15954)Joel Challis2022-01-228-46/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | * Align location of host led logic * Move more * align ifdefs * Fix up includes * Move callback defs * Convert comment to build message
* | `rocketboard_16`: Fix mismatched LUT sizes (#15997)Ryan2022-01-231-1/+1
| |
* | Remove `action_function()` from LFKeyboards boards (#15993)Ryan2022-01-2226-1265/+724
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-221-2/+2
|\|
| * Update readme.md (#15989)dnlsmy2022-01-221-2/+2
| | | | | | Spelling correction
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-2216-75/+527
|\|
| * 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>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-2214-6/+738
|\|
| * [Keyboard] Add M63 RGB keyboard (#15887)HorrorTroll2022-01-2113-5/+738
| |
| * [Keyboard] Amend SuperLyra readme (#15942)Domanic Calleja2022-01-211-1/+0
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Fix build failures for `mschwingen/modelm` (#15987)Ryan2022-01-221-9/+5
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-220-0/+0
|\|
| * Format code according to conventions (#15986)QMK Bot2022-01-227-309/+309
| |
* | fixed typo in orange HSV colors decalartion (#15976)Ryan Hausen2022-01-221-1/+1
| |
* | Adjust mouse key defaults (#15883)Albert Y2022-01-212-18/+18
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-229-0/+289
|\|
| * [Keyboard] add Yuri (#15874)Rifaa Subekti2022-01-219-0/+289
| | | | | | Co-authored-by: Joel Challis <git@zvecr.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-225-28/+40
|\|
| * [Keyboard] Code consistency updates for CRKBD (#15779)Albert Y2022-01-215-28/+40
| | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com>