Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-04-19 | 3 | -5/+60 | |
|\| | ||||||
| * | [Keyboard] VIA Support for LCK75 (#12402) | jack | 2021-04-19 | 3 | -5/+60 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-04-19 | 4 | -102/+10 | |
|\| | ||||||
| * | [Keyboard] Update RAMA WORKS M50-A (#12459) | Wilba | 2021-04-19 | 4 | -102/+10 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-04-19 | 1 | -8/+1 | |
|\| | ||||||
| * | [Keyboard] Update dz60rgb default keymap (#12488) | Benedict Tan | 2021-04-19 | 1 | -8/+1 | |
| | | | | | | | | | | The keymap for this PCB as of April 5, 2020 has a 4rth, largely superfluous layer, creating a total of 5 layers. When ported to VIA, this results in a layer that users can access but cannot edit. I propose removing this layer completely along with it's access from the default. | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-04-19 | 3 | -0/+99 | |
|\| | ||||||
| * | [Keymap] add kinesis/keymaps/stapelberg (#12430) | Michael Stapelberg | 2021-04-18 | 3 | -0/+99 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-04-19 | 7 | -4/+157 | |
|\| | ||||||
| * | New keyboard keymap, small keymap updates to mm2 keymap (#12310) | Alexander Kagno | 2021-04-18 | 7 | -4/+157 | |
| | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Alex <alex@turncommerce.com> | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-04-19 | 9 | -0/+213 | |
|\| | ||||||
| * | [Keyboard] Add wilba.tech WT60-G2 (#12395) | Wilba | 2021-04-18 | 9 | -0/+213 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-04-19 | 18 | -0/+426 | |
|\| | ||||||
| * | [Keyboard] Add wilba.tech WT65-FX (#12394) | Wilba | 2021-04-18 | 9 | -0/+213 | |
| | | ||||||
| * | [Keyboard] Add wilba.tech WT65-F (#12393) | Wilba | 2021-04-18 | 9 | -0/+213 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-04-19 | 8 | -0/+322 | |
|\| | ||||||
| * | [Keyboard] Add handwired/frankie_macropad (#12349) | Eric Wood | 2021-04-18 | 8 | -0/+322 | |
| | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-04-19 | 6 | -155/+565 | |
|\| | ||||||
| * | [Keyboard] Updates for 0xCB 1337 (#12336) | Conor Burns | 2021-04-18 | 6 | -155/+565 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-04-19 | 3 | -0/+105 | |
|\| | ||||||
| * | [Keymap] add my quefrency layout (#12104) | Ben Fiedler | 2021-04-18 | 3 | -0/+105 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-04-19 | 9 | -0/+248 | |
|\| | ||||||
| * | [Keyboard] Add G1_65 keyboard (#12140) | Angel Rojas | 2021-04-18 | 9 | -0/+248 | |
| | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-04-19 | 40 | -1111/+436 | |
|\| | ||||||
| * | [Keyboard] Capsunlocked CU80 Squish and Refactor (#12193) | maz0r | 2021-04-18 | 40 | -1111/+436 | |
| | | | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Erovia <Erovia@users.noreply.github.com> | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-04-19 | 2 | -3/+3 | |
|\| | ||||||
| * | [Keyboard] Helen80 matrix fixes (#11969) | LIParadise | 2021-04-18 | 2 | -3/+3 | |
| | | | | | | Co-authored-by: LIParadise <a58524andy> | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-04-19 | 9 | -0/+230 | |
|\| | ||||||
| * | [Keyboard] Add Dystopia keyboard (#11997) | Sanctified-git | 2021-04-18 | 9 | -0/+230 | |
| | | | | | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Erovia <Erovia@users.noreply.github.com> Co-authored-by: Sanctified <Sanctified@users.noreply.github.com> | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-04-19 | 8 | -138/+354 | |
|\| | ||||||
| * | [Keyboard] Update MJ61 architecture to support multi version (#11787) | MelGeek | 2021-04-18 | 8 | -138/+354 | |
| | | | | | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> Co-authored-by: Drashna Jaelre <drashna@live.com> | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-04-19 | 11 | -0/+411 | |
|\| | ||||||
| * | [Keyboard] Adding of Monarch keyboard (#11769) | RinoSolutions | 2021-04-18 | 11 | -0/+411 | |
| | | | | | | | | | | Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Ramon Imbao <ramonimbao@gmail.com> | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-04-19 | 10 | -0/+289 | |
|\| | ||||||
| * | [Keyboard] Added Koolertron AMAG23 (#11725) | Ian McLinden | 2021-04-18 | 10 | -0/+289 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-04-19 | 8 | -0/+421 | |
|\| | ||||||
| * | [Keyboard] Add Tau4 keyboard (#11361) | Oliver Gaskell | 2021-04-18 | 8 | -0/+421 | |
| | | | | | | | | | | | | with default and i2cscanner keymaps 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 develop | QMK Bot | 2021-04-19 | 3 | -125/+13 | |
|\| | ||||||
| * | Fixup Satisfaction75 bootprocess. (#12621) | Nick Brassel | 2021-04-19 | 3 | -125/+13 | |
| | | | | | | | | | | | | | | | | | | | | - Use normal ChibiOS I2C driver. - Move drawing code to housekeeping -- previously it was during matrix scan, which gets executed during bootmagic checks. However, bootmagic is invoked before QWIIC subsystem is enabled, which means I2C isn't configured yet. All I2C calls to the OLED fail with timeouts while bootmagic is being checked. Housekeeping ensures this is executed once the system has initialised and settled. - QWIIC OLED driver: properly clear out OLED buffer when clearing screen. | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-04-18 | 1 | -2/+2 | |
|\| | ||||||
| * | Add RGB controls to picture; label Layer 3 correctly (#12337) | Richard Dawe | 2021-04-18 | 1 | -2/+2 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-04-18 | 3 | -0/+63 | |
|\| | ||||||
| * | Keymap: Orthocarpus keymap for idobo (#12462) | Giorgi Chavchanidze | 2021-04-18 | 3 | -0/+63 | |
| | | | | | | | | | | | | | | | | | | | | * Keymap: Orthocarpus keymap for idobo * Update keyboards/idobo/keymaps/gkbd_75/config.h Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Giorgi Chavchanidze <giorgi@vivaldi.com> Co-authored-by: Drashna Jaelre <drashna@live.com> | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-04-18 | 2 | -0/+155 | |
|\| | ||||||
| * | keyboardio/atreus: Add ardumont keymap (#12479) | Antoine R. Dumont | 2021-04-18 | 2 | -0/+155 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-04-18 | 17 | -55/+644 | |
|\| | ||||||
| * | Add ferris 0.2 (#12133) | Pierre Chevalier | 2021-04-18 | 17 | -55/+644 | |
| | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-04-17 | 8 | -0/+790 | |
|\| | ||||||
| * | mcrown crkbd new keymap (#12092) | MarioCorona | 2021-04-17 | 8 | -0/+790 | |
| | | | | | | Co-authored-by: Erovia <Erovia@users.noreply.github.com> | |||||
* | | Merge remote-tracking branch 'origin/master' into develop | QMK Bot | 2021-04-16 | 5 | -2/+223 | |
|\| |