summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * Added a custom keymap for XD60 (#12736)Suryan Isaac2021-06-242-0/+45
| | | | | | | | | | | | | | | | | | | | | | * Added custom Keymap * Added Images to README * Added Layer 1 Keys for RGB control * Added GPL2+ License to keymap.c * Removed extra json files and added a few lines to README
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-248-2/+573
|\|
| * keymap/ardumont: Fix substitute keycode reset step (#12675)Antoine R. Dumont2021-06-241-2/+7
| | | | | | | | | | | | | | | | It so happens that when releasing the control key prior to the main key (C-h, C-i, C-n, ...), the substituted keycode was continuously sent in a loop after that (even when releasing said key). The workaround so far was to type any other key to stop the loop. This commit fixes such behavior by resetting the substitution keycode sent when the ctrl released situation conditional is detected (and that the substitution keycode was on).
| * [keymap] Added new `oled_status` keymap to `nullbitsco/nibble` keyboard (#12824)Jose Luis Adelantado Torres2021-06-247-0/+566
| | | | | | | | | | * Added new oled_status keymap to nullbitsco/nibble keyboard * rm: Removed font from src imports
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-245-47/+80
|\|
| * [Keymap] Feature/extend keymap (#12778)Robert Verst2021-06-245-47/+80
| | | | | | | | | | | | | | | | | | * Add F13-F24 * Add nvim macros * Add debug switch * Switch mode every time, add debug print
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-242-26/+130
|\|
| * [Keymap] fix key code. numpad to numkey (#12808)T.Shinohara2021-06-241-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * add keyboard new macro pad "Kuro" * change main readme.md * remove not used code from default/keymap.c * Remove unnecessary code * Supports info.json * removed back slash and not used functions. * update at product link. add japanese messages. * Merge All * [Shiro]Add MacKeymap * Change key code. Numpad→Numkey
| * Update oled_bongocat to match VIA keymap (#12875)Jay Greco2021-06-241-22/+126
| | | | | | | | | | * Update to match VIA keymap * Update with feedback from PR
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-2417-1/+1919
|\|
| * Switch default layout to standard TKL; add custom (#12818)Mike Tsao2021-06-242-1/+49
| |
| * snowe keymap/userspace and Ocean Dream animation (#12477)Tyler Thrailkill2021-06-2415-0/+1870
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add snowe keymap/userspace & Ocean Dream animation * Add snowe userspace with keymap wrappers and two animations * Add crkbd keymap * Add Ocean Dream animation, a cool full screen animation with: * * twinkling stars * * meteor showers * * ocean waves * * island with palm tree * * moon with phases * Disable Luna so travis build succeeds. * Add more copyrights * Add pragma once to keycode_aliases.h Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Allow settable SPI divisor for AW20216 driver, set default to 4 (#13309)Gigahawk2021-06-232-1/+6
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-231-11/+16
|\|
| * Optional OLED splash screen and fixed OLED i2c execution time saving (#12294)David Hoelscher2021-06-231-11/+16
| | | | | | | | | | * Made OLED splash screen optional to reduce memory and fixed OLED i2c execution time saving * moved OLED address updates into their respective conditional checks
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-233-4/+4
|\|
| * Fix zero condition of reactive runners that will suspend RGB animation (#12710)Albert Y2021-06-233-4/+4
| | | | | | | | | | | | | | | | | | * Avoid zero or overflow from user's rgb_matrix_config.speed * Avoid zero tick for reactive splash. * Avoid zero time for animation runner. Co-authored-by: filterpaper <filterpaper@localhost>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-232-148/+126
|\|
| * [Keyboard][Bug] Makrosu VIA compile fix encoder and formatting (#13306)Xelus222021-06-222-148/+126
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * fix encoder and formatting * remove redundant breaks * Update keyboards/makrosu/keymaps/default/keymap.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/makrosu/keymaps/via/keymap.c Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Fix linker error when rgblight and RGB Matrix are both enabled (#13304)Ryan2021-06-231-6/+6
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-231-1/+1
|\|
| * [Docs] pr_checklist: fix capitalization of Vial (#13301)xyzz2021-06-221-1/+1
| |
* | Remove rgblight stubs (#13302)Ryan2021-06-232-40/+0
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-229-0/+431
|\|
| * adding my custom keypad to qmk repository (#12150)Muhammad Rivaldi2021-06-239-0/+431
| | | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Nick Brassel <nick@tzarc.org>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-221-0/+71
|\|
| * Technika: add sample info.json data (#13292)James Young2021-06-231-0/+71
| | | | | | Adds a placeholder file with sample data, as the layout hasn't been published yet.
* | Remove the redundant pin name validation (#13251)Zach White2021-06-221-7/+1
| | | | | | | | | | * remove the redundant pin name validation * fix submodules
* | Refactor doctor.py into a directory (#13298)Zach White2021-06-226-49/+70
| |
* | Move LED/RGB Matrix code into their own directories (#13257)Ryan2021-06-2280-100/+108
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-221-18/+21
|\|
| * Additional documentation for GUI mod combo (#13266)Albert Y2021-06-221-18/+21
| | | | | | Co-authored-by: filterpaper <filterpaper@localhost>
* | eeprom_i2c driver: added EXTERNAL_EEPROM_WP_PIN configuration option. (#12617)Purdea Andrei2021-06-212-1/+25
| |
* | Skip EEPROM writes once done. (#13293)Nick Brassel2021-06-222-0/+2
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-2113-0/+531
|\|
| * Adding "Eagle Viper Rep", open sourced Eagle/Viper V2/V3 PCB (#13020)4pplet2021-06-2213-0/+531
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * adding revision A * Update keyboards/4pplet/eagle_viper_rep/rev_a/rev_a.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/4pplet/eagle_viper_rep/rev_a/rev_a.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/4pplet/eagle_viper_rep/rev_a/rev_a.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/4pplet/eagle_viper_rep/rev_a/rev_a.h Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/4pplet/eagle_viper_rep/rev_a/rev_a.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Update readme.md Adding instruction on how to enter bootloader * adding instruction on how to enter bootloader (DFU) adding instruction on how to enter bootloader (DFU) * updated description * Update keyboards/4pplet/eagle_viper_rep/rev_a/halconf.h Co-authored-by: Nick Brassel <nick@tzarc.org> * Update keyboards/4pplet/eagle_viper_rep/rev_a/rev_a.c Co-authored-by: Nick Brassel <nick@tzarc.org> * Update keyboards/4pplet/eagle_viper_rep/rev_a/config.h Co-authored-by: Nick Brassel <nick@tzarc.org> * Update keyboards/4pplet/eagle_viper_rep/rev_a/chconf.h Co-authored-by: Nick Brassel <nick@tzarc.org> * Update keyboards/4pplet/eagle_viper_rep/rev_a/chconf.h Co-authored-by: Nick Brassel <nick@tzarc.org> * Update keyboards/4pplet/eagle_viper_rep/keymaps/default/keymap.c Co-authored-by: Nick Brassel <nick@tzarc.org> * Restoring palSetLineMode for working underglow I was experiencing the same issue as this: https://github.com/qmk/qmk_firmware/issues/12655#issuecomment-844104659 sigprof helped me resolve this issue. * Update rev_a.c removing palSetLineMode again, works great after rebase. Thanks! Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Nick Brassel <nick@tzarc.org>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-215-104/+125
|\|
| * Geminate60 Codebase Touch-up (#13275)James Young2021-06-215-104/+125
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * grid-align keycodes in keymaps * rename LAYOUT to LAYOUT_all * update LAYOUT_all macro - use 3-character K<row><column> notation - fix malformed electrical mapping * update info.json - correct maintainer - update label fields - remove meta key * update readme - update board description - update keyboard maintainer
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-215-8/+13
|\|
| * Swiftrax Nodu handwired: Layout Macro rename and Community Layout support ↵James Young2021-06-215-8/+13
| | | | | | | | | | | | | | (#13276) * rename LAYOUT to LAYOUT_60_ansi_split_bs_rshift * enable Community Layout support
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-2110-33/+111
|\|
| * Fixes for Ploopy devices (#13144)ploopyco2021-06-2110-33/+111
| | | | | | Co-authored-by: Drashna Jael're <drashna@live.com>
* | Move optical sensor code to drivers folder (#13044)Drashna Jaelre2021-06-2132-890/+60
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-211-51/+136
|\|
| * ID80: fix LAYOUT_iso data (#13274)James Young2021-06-211-51/+136
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-211-5/+6
|\|
| * mech.studio Dawn: correct key sizes and positioning (#13277)James Young2021-06-211-5/+6
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-211-0/+2
|\|
| * [Keyboard] le_chiffre.c conditional led_config (#13285)Nathan2021-06-211-0/+2
| | | | | | disabling RGB_MATRIX_ENABLE causes led_config to fail during compile. Setting this conditional allows you to turn off RGB
* | Merge remote-tracking branch 'upstream/master' into developfauxpark2021-06-2114-112/+112
|\|
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-18 13:38:05 +0000