summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | Custom matrix lite support for split keyboards (#14674)Jay Greco2021-12-273-39/+72
| | | | | | | | | | | | | | * Custom matrix lite support for split keyboards * WIP: matrix -> matrix_common refactor * Move matrix_post_scan() to matrix_common.c
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-12-274-0/+275
|\|
| * [Keymap] Adding 'super alt' keymap for Wuque ikki68 Aurora (#14838)Paul Ewers2021-12-274-0/+275
| | | | | | | | | | | | | | | | | | * [Keymap] Adding personal keymap for ikki68 Aurora * Add license headers * Added support to toggle LED modes * Added a toggleable layer for macOS (which swaps the GUI/ALT positions)
* | More GPIO compilation fixes. (#15592)Nick Brassel2021-12-261-0/+1
| |
* | Merge remote-tracking branch 'upstream/master' into developNick Brassel2021-12-272-2/+2
|\|
| * fixed "Your Name" in header (#15591)br2021-12-272-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * cleaned up for pr * Update keyboards/massdrop/alt/keymaps/b/config.h Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/massdrop/alt/keymaps/b/config.h Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/massdrop/alt/keymaps/b/config.h Co-authored-by: Drashna Jaelre <drashna@live.com> * SPDX copyright header * renamed keymap folder to b_ * Your Name Co-authored-by: Drashna Jaelre <drashna@live.com>
| * Fixup line endingsNick Brassel2021-12-272-45/+45
| |
* | Fixup line endingsNick Brassel2021-12-272-45/+45
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-12-272-0/+171
|\|
| * add my keymap (#15211)br2021-12-272-0/+171
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * cleaned up for pr * Update keyboards/massdrop/alt/keymaps/b/config.h Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/massdrop/alt/keymaps/b/config.h Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/massdrop/alt/keymaps/b/config.h Co-authored-by: Drashna Jaelre <drashna@live.com> * SPDX copyright header * renamed keymap folder to b_ Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-12-2745-134/+1360
|\|
| * [Keyboard] Add keyboard reviung53 (#15390)gtips2021-12-2711-0/+401
| | | | | | | | | | | | | | | | | | | | | | * add keyboards/reviung53/ * modified: keyboards/reviung53/rules.mk * modified: keyboards/reviung53/keymaps/default/keymap.c, keyboards/reviung53/keymaps/via/keymap.c * modified: keyboards/reviung53/readme.md * modified: keyboards/reviung53/config.h
| * [Keymap] Update bcat's keymaps/userspace to share logic, add OLED ↵Jonathan Rascher2021-12-2734-134/+959
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | functionality, and set up one of my macropads for WFH (#14702) * Add script to build all bcat keymaps at once * Move userspace RGB to separate source file * Move layer handling logic into userspace * Move keycap aliases into userspace * Add OLED userspace library and Lily58 OLED setup * Add Luna keyboard pet, generic OLED pet framework Luna artwork and original implementation by HellSingCoder, licensed under GPL v2.0. See also: https://github.com/qmk/qmk_firmware/blob/6dfe915e26d7147e6c2bed495d3b01cf5b21e6ec/keyboards/sofle/keymaps/helltm/keymap.c * Use OLED on bcat's Crkbd I had to turn off a few unused features to address firmware size limits. * Remove vestigial NK_TOGG keybindings * Add post-render hook to OLED pet API This enables OLED pets to draw custom widgets (e.g., LED indicator status) on top of their animation frames. * Add Isda keyboard pet For future use on my Unicorne keyboard. Unicorn artwork by sparrow666, licensed under GPL v2.0. See also: https://opengameart.org/content/unicorn-2 * Replace OLED timeout implementation with custom The default implementation never lets the OLED turn off if a continuous animation is in progress. The custom one does. * Move keyboard state for OLED functions into struct No change in firmware size, but makes keymaps read a little nicer and enables more functionality in OLED pets. * Enable continuously running OLED pet (for Luna) * Sync OLED state; enable Bootmagic only when needed The new extensible split transport for Split Common finally allows OLED on/off status to be synced between halves of the keyboard. :) Unfortunately, this required disabling Bootmagic Lite to keep my Crkbd under the firmware size limit. (I now after 28 bytes free on avr-gcc version 8.5.0.) So now I'll enable Bootmagic only on keyboards that actually require it, i.e., ones lacking an accessible reset button. * Update 9-Key macropad keymap for working from home * Remove includes redundant with quantum.h Co-authored-by: Drashna Jaelre <drashna@live.com> * Simplify BCAT_OLED_PET makefile logic * Swap some keys on my 9-Key macropad around * Inline spurious variable in OLED code * Remove max brightness that's now set by default The default max brightness is only 120 rather than 150, but that might actually fix some weirdness I've seen with bright white LED settings. * Enable specific RGBLIGHT modes instead of default The general trend these days seems to be enabling only the modes you want, so I'm manually expanding the ones currently enabled by RGBLIGHT_ANIMATIONS. I'd like to try out the TWINKLE mode too, but it seems not to work at all on ARM right now, and all my usable RGBLIGHT keebs are ARM boards. * Reenable RGB_MATRIX animations after #15018 My Crkbd still has a reasonable amount of free space with these: 27974/28672 (97%, 698 bytes free). The RGB_MATRIX_KEYPRESSES effects would put it over the firmware size limit, but I really don't ever use those anyway. * Use new get_u8_str function for WPM display Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-12-273-130/+36
|\|
| * Orthocode update default keymap, and fix encoder function for keymaps built ↵Jordan Blackbourn2021-12-273-130/+36
| | | | | | | | | | | | | | | | | | | | | | | | in configurator (#15161) * Updated default keymap to match one shipping with the boards * Fix encoder function so it works for users of the online configurator * Updated Info.json to match default keymap * Changes as per review
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-12-2728-35/+755
|\|
| * K.O.Y and German layout for several boards (#14991)Paul Scheikl2021-12-2728-35/+755
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Added accent. * Added keymap for 5x6 dactyl manuform on KOY layout * Added xd75 folder that is not in the main repo anymore? * Added keymap for naked48 on KOY layout * Added keymap for splitreus62 on KOY layout * Added keymap for Dactyl Manuform 4x6 with RGB LEDs and K.O,Y layout * Fixed error where handedness was not correctly determined because of combining vbus pins of both controllers. * Replaced dynamic macros bith backspace and delete. * Changed detecting handedness from detecting usb communication to checking a wired pin. This avoids problems when booting the PC, where VBUS is already high, but no communication is happening -> both halves think they are not master. * Update keyboards/handwired/dactyl_manuform/4x6/keymaps/scheiklp/rules.mk Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/naked48/keymaps/scheiklp/keymap.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/naked48/keymaps/scheiklp/keymap.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/naked48/keymaps/scheiklp/keymap.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keymap.c Added copyright * Update config.h * Update rules.mk * Updated files according to PR requests. * Update keyboards/xd75/config.h Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/xd75/config.h Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/xd75/keymaps/default/keymap.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/xd75/config.h Co-authored-by: Drashna Jaelre <drashna@live.com> * Removed duplicate code. Updated copyright info. * Restored readme Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-12-271-17/+62
|\|
| * Enable encoder settings VIA. (#14599)rate2021-12-271-17/+62
| | | | | | | | | | | | | | | | | | | | | | | | * Enable encoder settings VIA. * Apply suggestions from code review Co-authored-by: Drashna Jaelre <drashna@live.com> * Modified to use action_exec. Change keymap. Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Format code according to conventions (#15590)QMK Bot2021-12-271-15/+30
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-12-2711-22/+270
|\|
| * add 5-row support for an existing board, Quark^2 (#15188)npspears2021-12-2711-22/+270
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * add support for 5-row Quark^2 * add support for 5-row Quark^2 * add support for 5-row Quark^2 * add support for 5-row Quark^2 * Update keymap.c * Update keymap.c * Update keymap.c * add 5-row Quark^2 keymaps * add 5-row Quark^2 keymaps * Apply suggestions from code review Co-authored-by: Drashna Jaelre <drashna@live.com> * Update info.json * Fix typo 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-12-275-0/+5
|\|
| * Atom47 led fix (#15272)Evelien Dekkers2021-12-275-0/+5
| | | | | | | | | | * Define pin states for leds * Enable backlight in rules.mk
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-12-271-17/+55
|\|
| * Enable encoder settings VIA. (#15065)rate2021-12-271-17/+55
| | | | | | | | | | * Enable encoder settings VIA. * Fixed review points.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-12-2713-0/+348
|\|
| * RGB Matrix layer key indicator (#14626)Albert Y2021-12-271-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add layer key indicator example * Update description * Deobfuscate with index variable * Add missing layer variable * Correct color name and indicator function * Function typo * Place layer variable outside loops to save firmware space Co-authored-by: filterpaper <filterpaper@localhost>
| * Added RGB compatible FC660C keymaps. Added VIA support and fixed indicators ↵rooski152021-12-2712-0/+328
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | on Cajal keymaps (#15087) * Added RGB compatible keymaps Added two keymaps, both replacing insert LED with RGB control. One keymap VIA enabled and updated VIA json included. * Fixed Indicators Added code to fix LED indicator brightness. * Fixed Indicator LEDs Added code to fix indicator LED brightness * Update README.md * Update README.md * Delete fc660c_via_RGB.json * Update rules.mk Added VIA_ENABLE * Update keyboards/walletburner/cajal/rules.mk Co-authored-by: Drashna Jaelre <drashna@live.com> * Added VIA enabled Cajal stagger and ortho layouts * Rename README.md to readme.md * Removed Second via keymap. * Rename README.md to readme.md Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-12-2713-0/+767
|\|
| * Add personal handwired Planck clone (#13299)BifbofII2021-12-2710-0/+653
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add personal handwired Planck clone * remove references to planck * requested changes - small changes to defines - licence headers * Clean up rules.mk Co-authored-by: Drashna Jaelre <drashna@live.com> * Change function return type to bool Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
| * Hex 4b LED Layer Indicater (#15160)nazerim2021-12-273-0/+114
| | | | | | | | | | * Hex 4b VIA Keymap to use scroll lock and num lock LED's to indicate active layer (0,1,2,3) * Added readme.md file
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-12-271-1/+1
|\|
| * Link Macro example for COMBO_ACTION documentation (#15164)Albert Y2021-12-271-1/+1
| | | | | | | | | | | | | | * Link Macro example for COMBO_ACTION documentation * Restructure Co-authored-by: filterpaper <filterpaper@localhost>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-12-2720-3/+938
|\|
| * Addition of a keypad (#14896)Richard Snijder2021-12-277-0/+373
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add files via upload * Update readme.md * Update readme.md * Add files via upload * Add files via upload * Update keymap.c * Update config.h * Delete config.h * Update readme.md * Update readme.md * Delete readme.md * Delete info.json.bak
| * Add wings42 rev2 (#13702)yfuku2021-12-2713-3/+565
| | | | | | | | | | | | | | * add rev2 * add encoder settings * add license header
* | Durgod: Increase scan rate by using wait_us GPT timer (#14091)Simon Arlott2021-12-276-2/+13
| | | | | | | | | | | | Lower the tick rate from 10kHz to 1kHz (otherwise all the extra interrupts reduce the achievable scan rate). Enable the WAIT_US_TIMER using GPT TIM3. Observed scan rate on the K320 is increased from 625Hz to 2090-2120Hz.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-12-271-0/+2
|\|
| * Update feature_macros.md (#15026)Buttenup2021-12-271-0/+2
| | | | | | | | | | | | | | | | | | * Update feature_macros.md Added a link to the usage of SAFE_RANGE as this wasn't clear to me when I visited this page in isolation. * Fix typo Co-authored-by: Nick Brassel <nick@tzarc.org>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-12-271-6/+2
|\|
| * fix RGB_DISABLE_TIMEOUT flicker on split keyboards (#14954)Erik Berthold2021-12-271-6/+2
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-12-272-3/+413
|\|
| * Add Gondolindrim's keymap for Evolv: addition of "encoder modes" (#14943)Álvaro A. Volpato2021-12-272-3/+413
| | | | | | | | | | |