summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-054-1/+291
|\
| * [Keymap] add ghidalgo93 for kyria (#11663)Gerardo L Hidalgo-Cuellar2021-02-044-1/+291
| | | | | | | | | | | | | | | | | | | | * adding kyria/rev1 keymap * adding both hand config * Apply suggestions from code review * Apply suggestions from code review
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-0418-0/+781
|\|
| * [Keyboard] KBDfans Bella RGB ANSI and Bella RGB ISO (#11438)moyi46812021-02-0418-0/+781
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * add bella rgb keyboards * Update rgb_iso.c * fix error * Update rgb_iso.h * Update keyboards/kbdfans/bella/rgb/rules.mk * Update keyboards/kbdfans/bella/rgb_iso/rules.mk * Update keymap.c * Update keyboards/kbdfans/bella/rgb/info.json * Update keyboards/kbdfans/bella/rgb_iso/info.json * Update keyboards/kbdfans/bella/rgb_iso/config.h * Update keyboards/kbdfans/bella/rgb/config.h * Update keyboards/kbdfans/bella/rgb_iso/rules.mk * Update keyboards/kbdfans/bella/rgb_iso/rules.mk * Update keyboards/kbdfans/bella/rgb_iso/rules.mk * Update keyboards/kbdfans/bella/rgb/rules.mk * Update keyboards/kbdfans/bella/rgb/rules.mk * Update keyboards/kbdfans/bella/rgb/rules.mk * Update rgb_iso.c * Update rgb.c * Update rgb_iso.c * Update rgb_iso.h * Update keyboards/kbdfans/bella/rgb/config.h * Update keyboards/kbdfans/bella/rgb/rgb.h * Update keyboards/kbdfans/bella/rgb/info.json * Update keyboards/kbdfans/bella/rgb/info.json * Update keyboards/kbdfans/bella/rgb/keymaps/default/keymap.c * Update keyboards/kbdfans/bella/rgb_iso/keymaps/via/keymap.c * Update keyboards/kbdfans/bella/rgb_iso/keymaps/via/keymap.c * Update keyboards/kbdfans/bella/rgb_iso/readme.md * Update keyboards/kbdfans/bella/rgb_iso/readme.md * Update keyboards/kbdfans/bella/rgb_iso/readme.md * Apply suggestions from code review kbdfans/bella/rgb: Change remaining instances of LAYOUT_all to LAYOUT * Apply suggestions from code review kbdfans/bella/rgb: update readme - update keyboard name - include flashing and bootloader instructions * Apply suggestions from code review kbdfans/bella/rgb_iso: update keyboard name Changes remaining instances of "BELLA_RGB_ISO" to "BELLA RGB ISO". * Apply suggestions from code review kbdfans/bella/rgb_iso: Change LAYOUT_all to LAYOUT * Apply suggestions from code review kbdfans/bella/rgb_iso: Move ISO Enter's keycode to home row per QMK standard
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-049-0/+446
|\|
| * [Keyboard] Add KL-90 (#11494)Brandon Claveria2021-02-049-0/+446
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * add kikoslab kl90 * fix info.json * Update keyboards/kikoslab/kl90/rules.mk Co-authored-by: Joel Challis <git@zvecr.com> * Update keyboards/kikoslab/kl90/info.json Co-authored-by: Joel Challis <git@zvecr.com> * update info.json * fix layout macro * add support for hotswap space Co-authored-by: Swiftrax <swiftrax@gmail.com> Co-authored-by: Joel Challis <git@zvecr.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-049-0/+257
|\|
| * [Keyboard] add primus75 keyboard (#11440)moyi46812021-02-049-0/+257
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * add primus75 keyboard * Update keyboards/iLumkb/primus75/info.json Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/iLumkb/primus75/keymaps/default/keymap.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/iLumkb/primus75/keymaps/via/keymap.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/iLumkb/primus75/keymaps/default/keymap.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/iLumkb/primus75/keymaps/via/keymap.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/iLumkb/primus75/primus75.h Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keymap.c * Update keyboards/iLumkb/primus75/rules.mk Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/iLumkb/primus75/rules.mk Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/iLumkb/primus75/readme.md Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/iLumkb/primus75/config.h Co-authored-by: Ryan <fauxpark@gmail.com> * Update keymap.c * Update keymap.c * Update keyboards/iLumkb/primus75/keymaps/default/keymap.c Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/iLumkb/primus75/readme.md Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> * Rename keyboards/iLumkb/primus75/config.h to keyboards/ilumkbprimus75config.h * Rename keyboards/ilumkbprimus75config.h to keyboards/ilumkbprimus75/config.h * Rename keyboards/ilumkbprimus75/config.h to keyboards/ilumkb/primus75/config.h * Rename keyboards/iLumkb/primus75/info.json to keyboards/ilumkb/primus75/info.json * Rename keyboards/iLumkb/primus75/primus75.c to keyboards/ilumkb/primus75/primus75.c * Rename keyboards/iLumkb/primus75/primus75.h to keyboards/ilumkb/primus75/primus75.h * Rename keyboards/iLumkb/primus75/readme.md to keyboards/ilumkb/primus75/readme.md * Rename keyboards/iLumkb/primus75/rules.mk to keyboards/ilumkb/primus75/rules.mk * Rename keyboards/iLumkb/primus75/keymaps/default/keymap.c to keyboards/ilumkb/primus75/keymaps/default/keymap.c * Rename keyboards/iLumkb/primus75/keymaps/via/rules.mk to keyboards/ilumkb/primus75/keymaps/via/rules.mk * Rename keyboards/iLumkb/primus75/keymaps/via/keymap.c to keyboards/ilumkb/primus75/keymaps/via/keymap.c * Update keyboards/ilumkb/primus75/keymaps/default/keymap.c Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/ilumkb/primus75/info.json Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/ilumkb/primus75/keymaps/via/keymap.c Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/ilumkb/primus75/info.json Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-045-7/+162
|\|
| * Xyverz bastyl (#11662)Xyverz2021-02-045-7/+162
| | | | | | Co-authored-by: Ian Sterling <503326@MC02YT9K9LVCF.tld>
| * Fix line endings for LCK75 kb files (#11784)Drashna Jaelre2021-02-037-389/+389
| |
* | Fixup lck75 line endings.Nick Brassel2021-02-047-389/+389
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-043-1/+20
|\|
| * Improve Pointing Device report sending (#11064)Drashna Jaelre2021-02-033-1/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Improve Pointing Device report sending * Hide old report behind preprocessors too * put host_mouse_send() in curly brackets * Remove POINTING_DEVICE_ALWAYS_SEND_REPORT functionality * Fix typo * fix function ref in docs Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-048-0/+423
|\|
| * [Keyboard] Add LCK75 keyboard (#11493)im a can what do you think lmao?2021-02-038-0/+423
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add lck75 keyboard A 75% THT keyboard with an OLED and rotary encoder * added info.json * fixed rules.mk * changed vendor id * Update keyboards/lck75/config.h Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/lck75/config.h Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/lck75/keymaps/default/keymap.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/lck75/keymaps/default/keymap.c moved code to the rules.mk folder Co-authored-by: Drashna Jaelre <drashna@live.com> * Update rules.mk moved oled driver enable to rules.mk code * Update keyboards/lck75/config.h Co-authored-by: Drashna Jaelre <drashna@live.com> * Update oled.c id like to keep the copyright there as it's my friend that helped me with the OLED specifically. also updated the old_task_user * Update keyboards/lck75/oled.c Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/lck75/rules.mk Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/lck75/rules.mk Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/lck75/rules.mk Co-authored-by: Ryan <fauxpark@gmail.com> * Update rules.mk * merged oled.c code into keymap.c file tested and works correctly on my board * merged code from this file into the keymap.c file this file is no longer needed Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-031-1/+1
|\|
| * Use num lock instead of caps lock for KBDPAD MKII LED (#11781)Andre DeMarre2021-02-041-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-032-1/+16
|\|
| * Update iNETT Studio Square.X RGB Light (#11723)Matrix Zou2021-02-032-1/+16
| | | | | | | | * Add Caps Lock indicators support * Fix 'a' flag error for RGB Light Mode
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-039-0/+409
|\|
| * [Keyboard] add koalafications (#11628)Brandon Claveria2021-02-039-0/+409
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * add koalafications * fix keymap * add oled * oled stuff * fix oled stuff * add animation * more oled stuff * update rules.mk * oled annimation * change PID * Update keyboards/handwired/swiftrax/koalafications/info.json * Update keyboards/handwired/swiftrax/koalafications/readme.md
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-031-1/+1
|\|
| * Fixing layer order for Breeze default keymap (#11779)Eithan Shavit2021-02-031-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-031-1/+1
|\|
| * Fix DEBUG_MATRIX_SCAN_RATE on chibiOS when console is enabled (#11776)Drashna Jaelre2021-02-031-1/+1
| | | | | | | | | | | | | | | | | | * Fix DEBUG_MATRIX_SCAN_RATE on chibiOS when console is enabled * update type in dprintf Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-026-180/+7
|\|
| * Clean up KBD8X keyboard (#11565)Drashna Jaelre2021-02-026-180/+7
| | | | | | | | | | | | * Clean up KBD8X keyboard * remove unneeded rules
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-023-79/+88
|\|
| * Knobgoblin info file fix (#11697)mrT1ddl3s2021-02-023-79/+88
| | | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-024-0/+629
|\|
| * add orthodeluxe keymap for Planck keyboard (#11077)erikbakker-dev2021-02-024-0/+629
| | | | | | | | | | | | | | | | | | * add orthodeluxe keymap for Planck keyboard * add licence header to config.h * fix indentation * add bootmagic lite and simplify code
* | Address wake from sleep instability (#11450)Joshua Diamond2021-02-025-5/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * resolve race condition between suspend and wake in LUFA * avoid multiple calls to suspend_power_down() / suspend_wakeup_init() * Remove duplicate suspend_power_down_kb() call * pause on wakeup to wait for USB state to settle * need the repeated suspend_power_down() (that's where the sleep is) * more efficient implementation * fine tune the pause after sending wakeup * speculative chibios version of pause-after-wake * make wakeup delay configurable, and adjust value * better location for wakeup delay
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-012-3/+6
|\|
| * CLI: Fix json flashing (#11765)Erovia2021-02-012-3/+6
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-011-2/+2
|\|
| * Fix Ergosaurus default RGB_DI_PIN (#11634)Carlos2021-02-011-2/+2
| | | | | | | | | | * Update RGB_DI_PIN to match breakout on pcb * Wrap in safer define check
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-0112-0/+413
|\|
| * [Keyboard] Add nullbitsco SCRAMBLE (#11078)Jay Greco2021-02-0112-0/+413
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add SCRAMBLE * Make requested changes to PR * Add all layers to VIA keymap Implement drashna's PR feedback in order to avoid random data within the layers in VIA. * Make requested changes to PR Implement fauxpark's PR feedback to clean up readme.md and rules.mk. * Make changes based on PR feedback -Changed VIA layers to enum -Added info on how to enter the bootloader to readme
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-011-0/+2
|\|
| * added limit to RGB brightness (#11759)cole smith2021-02-011-0/+2
| |
* | Move transport.c to QUANTUM_LIB_SRC (#11751)Drashna Jaelre2021-02-012-4/+4
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-016-0/+633
|\|
| * [Docs] Japanese translation of internals_*.md (#10316)umi2021-02-016-0/+633
| | | | | | | | | | | | | | * add git checkout internals_related.md translation * update based on comment * unify the end of sentence
* | Stop sounds when suspended (#11553)Joshua Diamond2021-02-017-4/+56
| | | | | | | | | | |