summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-01-14Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-01-13[Keymp] add gwillad's keymap for prime_e (#11477)Adam Gwilliam
* new keymap * Update keyboards/primekb/prime_e/keymaps/gwillad/keymap.c use a more concise pin setting method Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Adam Gwilliam <agwilliam@yaharasoftware.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-01-14Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-01-13[Keyboard] Add space space keyboard (#11425)qpockets
* add space_space keyboard * update space_space readme * fix space_space formatting issue * add layout readme, vid & pid * experiment * readme fix * readme fix * readme fix * readme formatting * readme formatting * readme formatting * Update keymap.c change I+O combo to O+P because of accidental activation * Update keymap.c change I+O combo to O+P because of accidental activation * Update readme.md change keymap readme to reflect keymap changes * Apply suggestions from code review remove deprecated "key count" from .json Co-authored-by: Drashna Jaelre <drashna@live.com> * Apply suggestions from code review -move combo and modtap defines to the keymap level -formatting issues Co-authored-by: Joel Challis <git@zvecr.com> * move combo defines to keymap level and update config.h * Apply suggestions from code review add lower resolution readme picture and sleep LED note Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Ryan <fauxpark@gmail.com>
2021-01-14Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-01-13[Keyboard] Adding new keyboard UD_40 ortho version (#11401)David Dejaeghere
* Adding keyboard UD_40 Ortho * Update keyboards/mechstudio/ud_40_ortho/info.json Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/mechstudio/ud_40_ortho/keymaps/default/keymap.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/mechstudio/ud_40_ortho/keymaps/default/keymap.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/mechstudio/ud_40_ortho/keymaps/default/keymap.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/mechstudio/ud_40_ortho/keymaps/via/keymap.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/mechstudio/ud_40_ortho/keymaps/via/keymap.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/mechstudio/ud_40_ortho/ud_40_ortho.h Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/mechstudio/ud_40_ortho/keymaps/via/keymap.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/mechstudio/ud_40_ortho/ud_40_ortho.h Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/mechstudio/ud_40_ortho/rules.mk Co-authored-by: Drashna Jaelre <drashna@live.com> * fixing syntax after merging suggestions * Update keyboards/mechstudio/ud_40_ortho/config.h Co-authored-by: Joel Challis <git@zvecr.com> * Update keyboards/mechstudio/ud_40_ortho/keymaps/default/keymap.c Co-authored-by: Joel Challis <git@zvecr.com> * Update keyboards/mechstudio/ud_40_ortho/keymaps/via/keymap.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/mechstudio/ud_40_ortho/rules.mk Co-authored-by: Joel Challis <git@zvecr.com> * Update keyboards/mechstudio/ud_40_ortho/ud_40_ortho.h Co-authored-by: Joel Challis <git@zvecr.com> * Update keyboards/mechstudio/ud_40_ortho/rules.mk Co-authored-by: Joel Challis <git@zvecr.com> * Update keyboards/mechstudio/ud_40_ortho/config.h Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: David <david@tarpit.be> Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Ryan <fauxpark@gmail.com>
2021-01-14Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-01-13[Keymap] own Lily58 keymap (#11395)Christian Eiden
* [Keymap] own Lily58 keymap Signed-off-by: Christian Eiden <christian@eiden.ch> * adjustments of personal keymap Signed-off-by: Christian Eiden <christian@eiden.ch>
2021-01-14Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-01-13[Keymap] urbanvanilla keymap for drop/alt (#11365)James
* added urbanvanilla keymap Urbanvanilla's keymap for massdrop/alt keyboard adds in an idle timer to turn off RGB after set amount of time. poor unsuccessful attempt at replicating a velocikey like functionality. Grave escape is enabled on ESC. * Update readme.md * updating documentation * Create readme.md * restoring default documentation * update with review changes implemented removed unnecessary lines and files. increased wait_us() parameter to 40 as was still getting chatter at 20. removed some code for the terrible rudimentary attempt at velocikey for rgb matrix * Update matrix.c * Revert "Merge pull request #3 from urbanvanilla/dev_branch" This reverts commit deb55d797a4629965c990ab507251489c578573d, reversing changes made to ba8817356f6c0881cf7f3214f7f1ebd31febceb5. * Update keymap.c * added urbanvanilla keymap Urbanvanilla's keymap for massdrop/alt keyboard adds in an idle timer to turn off RGB after set amount of time. poor unsuccessful attempt at replicating a velocikey like functionality. Grave escape is enabled on ESC. * Update readme.md * updating documentation * Create readme.md * restoring default documentation * update with review changes implemented removed unnecessary lines and files. increased wait_us() parameter to 40 as was still getting chatter at 20. removed some code for the terrible rudimentary attempt at velocikey for rgb matrix * Update matrix.c * Revert "Merge pull request #3 from urbanvanilla/dev_branch" This reverts commit deb55d797a4629965c990ab507251489c578573d, reversing changes made to ba8817356f6c0881cf7f3214f7f1ebd31febceb5. * Delete matrix.c * Update keyboards/massdrop/alt/keymaps/urbanvanilla/config.h Co-authored-by: Joel Challis <git@zvecr.com> * Update keymap.c * Update keymap.c * Update keyboards/massdrop/alt/keymaps/urbanvanilla/keymap.c Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Ryan <fauxpark@gmail.com>
2021-01-14Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-01-13[Keyboard] Improvements for the Torn keyboard (#11268)Richard Titmuss
* Add bongo cat animation * Map all keys on base layer ... to make it easier to test newly built keyboards. The encoders are optional and can be placed in different locations. * Fix Torn in QMK configurator This removes additional variables defined in the keymap.c file, so that the default firmware can be compiled by the configurator. Co-authored-by: Richard Titmuss <richardt@spotify.com>
2021-01-14Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-01-13[Keyboard] Add support for hp69 (#11339)Ananya Kirti
* init init * Update keyboards/hp69/config.h Co-authored-by: Joel Challis <git@zvecr.com> * Update keyboards/hp69/keymaps/via/rules.mk Co-authored-by: Joel Challis <git@zvecr.com> * Update keyboards/hp69/rules.mk Co-authored-by: Joel Challis <git@zvecr.com> * re-added audio support re-added audio support * Update keyboards/hp69/readme.md reduced the size of the default image Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/hp69/readme.md Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/hp69/info.json Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Ryan <fauxpark@gmail.com>
2021-01-14Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-01-14Uni660 refactor (#11526)Ryan
2021-01-14Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-01-14Fix documentation so UCIS example compiles. (#11541)Erovia
2021-01-13remove duplicate manufacturerZach White
2021-01-13move the info.json rules above userspaceZach White
2021-01-13Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-01-13Fix leafcutterlabs/bigknob compiles in configurator (#11531)Joel Challis
* Fix leafcutterlabs/bigknob compiles in configurator * Revert change
2021-01-13Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-01-13Exclude more keyboards from CI (#11436)Zach White
* exclude all of handwired * exclude more keyboards from CI
2021-01-13Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-01-13keymap_fr_ch: undef `CH_H` (#11537)Ryan
2021-01-13Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-01-12[Keymap] rjhilgefort's Ergodox Infinity (#11345)Rob Hilgefort
* initial commit- copy of default * beginnings of ergodox layout conversion * from scratch 2020 RJH ergodox layout! * remove extra line in keymap * only shift to layers, led work * Fleshed out readme * tweak alt placement * updated readme * PR feedback, updated default layer * Update keyboards/ergodox_infinity/keymaps/rjhilgefort/keymap.c Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Ryan <fauxpark@gmail.com>
2021-01-13Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-01-12[Keymap] Add dhertz' kanu layout (#11346)Dan Hertz
* Add dhertz' kanu layout * Fix delete button * Add weak user layer change
2021-01-13fix matrix_io_delay() timing in quantum/matrix.c (#9603)Takeshi ISHII
* fix matrix_io_delay() timing in quantum/matrix.c * Updated comments explaining the need for matrix_io_delay() in quantum/matrix.c * fix matrix_io_delay() timing in quantum/split_common/matrix.c * Update quantum/matrix.c Co-authored-by: Ryan <fauxpark@gmail.com> * Update quantum/split_common/matrix.c Co-authored-by: Ryan <fauxpark@gmail.com> * Update quantum/matrix.c Co-authored-by: Ryan <fauxpark@gmail.com> * Update quantum/split_common/matrix.c Co-authored-by: Ryan <fauxpark@gmail.com> * add waitOutputPinValid() and wait_cpuclock() into quantum/quantum.h and tmk_core/common/wait.h * add matrix_output_select_delay() and matrix_output_unselect_delay() * fix quantum/matrix_common.c, tmk_core/common/matrix.h * fix tmk_core/common/wait.h * fix quantum/quantum.h, tmk_core/common/wait.h * waitOutputPinValid() rename to waitInputPinDelay() in quantum/quantum.h. * waitOutputPinValid() rename to waitInputPinDelay() in quantum/matrix_common.c * update tmk_core/common/wait.h * update comment in quantum/matrix.c, quantum/split_common/matrix.c * update quantum/quantum.h: Make more margin in the GPIO_INPUT_PIN_DELAY default value. Co-authored-by: Ryan <fauxpark@gmail.com>
2021-01-13ChibiOS conf migrations... take 7 (#11529)Nick Brassel
* ChibiOS conf upgrade for alpine65 alpine65 - 91e88b87653234a9023f4ad98913a6ea52c8b3fb * ChibiOS conf upgrade for cannonkeys/onyx cannonkeys/onyx - 2adf507afd4e288761a675de9cfbb6e34c540e29 * ChibiOS conf upgrade for ck60i ck60i - 98be5d22a3cd1b38d92e080f32c4795260db181b * ChibiOS conf upgrade for cutie_club/borsdorf cutie_club/borsdorf - 81734ebf770ab731ca8dcfac6fce5574e948890e
2021-01-13Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-01-12Fix inverted indicator leds on kbdfans/kbd19x (#11532)Joel Challis
2021-01-12Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-01-12[Keymap] keymap/sascha: disable autoshift (#11525)Sascha Grunert
Signed-off-by: Sascha Grunert <sgrunert@suse.com>
2021-01-12Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-01-12[Keyboard] Fix printf calls in Moonlander matrix (#11511)Drashna Jaelre
2021-01-12Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-01-12Acheron Lasgewloth: layout macro rework (#11523)James Young
* Acheron Lasgewloth: layout macro rework Arrange the layout macro to match the assembled board. * rename layout macro The layout supported is equivalent to 60% ANSI with split Backspace and split Right Shift, and supports every extant switch position. Adds community layout support. * add LAYOUT_60_ansi support * add Configurator data * convert tabs to spaces in lasgweloth.h
2021-01-12Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-01-12Telophase: add info.json (#11524)Ryan
2021-01-12Keep track of last matrix activity (#10730)Nick Brassel
* Allow recording of the last matrix activity time, to simplify implementation of display timeouts and the like. * Add requested changes from code review. * Simplify split matrix last changed.
2021-01-11Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-01-11[Keymap] vladkvit keymap for keebio/bfo9000 (#10825)Vlad K
* layouts for bfo9000 * cleaning up layout * moved to a better layout name * Added readme * Removed zip, updated license * Removed layers.json * Update keyboards/keebio/bfo9000/keymaps/vladkvit/keymap.c removing trailing backslashes Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/keebio/bfo9000/keymaps/vladkvit/keymap.c Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Vlad Kvitnevskiy <vladkvit@outlook.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Joel Challis <git@zvecr.com>
2021-01-11Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-01-11Fix macOS buildSergey Shulepov
2021-01-11Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-01-11Fixup line endings.Nick Brassel
2021-01-11Remove unused `action_get_macro()` usages in user files (#11165)Ryan