summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-191-1/+1
|\
| * Fix F303 audio output on A4 with the dac_basic driver (#12480)Sergey Vlasov2021-04-191-1/+1
| | | | | | | | | | | | | | The dac_basic driver did not work properly with `#define AUDIO_PIN A4` (instead of configuring the A4 pin, the driver actually was switching the A5 pin to analog mode, breaking any other usage of that pin in addition to emitting a distorted signal on the improperly configured A4 pin). Fix the code to configure the A4 pin as intended.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-193-0/+99
|\|
| * [Keymap] add kinesis/keymaps/stapelberg (#12430)Michael Stapelberg2021-04-183-0/+99
| |
* | Enhancement of WPM feature (#11727)Drashna Jaelre2021-04-183-20/+95
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-1911-70/+272
|\|
| * New keyboard keymap, small keymap updates to mm2 keymap (#12310)Alexander Kagno2021-04-1811-70/+272
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Alex <alex@turncommerce.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-199-0/+213
|\|
| * [Keyboard] Add wilba.tech WT60-G2 (#12395)Wilba2021-04-189-0/+213
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-1918-0/+426
|\|
| * [Keyboard] Add wilba.tech WT65-FX (#12394)Wilba2021-04-189-0/+213
| |
| * [Keyboard] Add wilba.tech WT65-F (#12393)Wilba2021-04-189-0/+213
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-198-0/+322
|\|
| * [Keyboard] Add handwired/frankie_macropad (#12349)Eric Wood2021-04-188-0/+322
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-196-155/+565
|\|
| * [Keyboard] Updates for 0xCB 1337 (#12336)Conor Burns2021-04-186-155/+565
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-193-0/+105
|\|
| * [Keymap] add my quefrency layout (#12104)Ben Fiedler2021-04-183-0/+105
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-199-0/+248
|\|
| * [Keyboard] Add G1_65 keyboard (#12140)Angel Rojas2021-04-189-0/+248
| | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-1940-1111/+436
|\|
| * [Keyboard] Capsunlocked CU80 Squish and Refactor (#12193)maz0r2021-04-1840-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 developQMK Bot2021-04-192-3/+3
|\|
| * [Keyboard] Helen80 matrix fixes (#11969)LIParadise2021-04-182-3/+3
| | | | | | Co-authored-by: LIParadise <a58524andy>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-199-0/+230
|\|
| * [Keyboard] Add Dystopia keyboard (#11997)Sanctified-git2021-04-189-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 developQMK Bot2021-04-198-138/+354
|\|
| * [Keyboard] Update MJ61 architecture to support multi version (#11787)MelGeek2021-04-188-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 developQMK Bot2021-04-1911-0/+411
|\|
| * [Keyboard] Adding of Monarch keyboard (#11769)RinoSolutions2021-04-1811-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 developQMK Bot2021-04-1910-0/+289
|\|
| * [Keyboard] Added Koolertron AMAG23 (#11725)Ian McLinden2021-04-1810-0/+289
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-198-0/+421
|\|
| * [Keyboard] Add Tau4 keyboard (#11361)Oliver Gaskell2021-04-188-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 developQMK Bot2021-04-194-125/+15
|\|
| * Fixup Satisfaction75 bootprocess. (#12621)Nick Brassel2021-04-194-125/+15
| | | | | | | | | | | | | | | | | | | | - 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 developQMK Bot2021-04-181-2/+2
|\|
| * Add RGB controls to picture; label Layer 3 correctly (#12337)Richard Dawe2021-04-181-2/+2
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-183-0/+63
|\|
| * Keymap: Orthocarpus keymap for idobo (#12462)Giorgi Chavchanidze2021-04-183-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 developQMK Bot2021-04-182-0/+155
|\|
| * keyboardio/atreus: Add ardumont keymap (#12479)Antoine R. Dumont2021-04-182-0/+155
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-1817-55/+644
|\|
| * Add ferris 0.2 (#12133)Pierre Chevalier2021-04-1817-55/+644
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-178-0/+790
|\|
| * mcrown crkbd new keymap (#12092)MarioCorona2021-04-178-0/+790
| | | | | | Co-authored-by: Erovia <Erovia@users.noreply.github.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-165-2/+223
|\|
| * Ergodone via support (#11618)Harshit Goel2021-04-165-2/+223
| | | | | | Co-authored-by: Erovia <Erovia@users.noreply.github.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-161-0/+2
|\|
| * Bug in beautifier script, compound modifiers not correctly parsed (#12595)sendmmsg2021-04-161-0/+2
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-01 00:21:42 +0000