summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into developQMK Bot2022-07-139-280/+168
|\
| * boardsource/technik_o data driven (#17635)jack2022-07-139-280/+168
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-07-138-234/+128
|\|
| * boardsource/5x12 data driven (#17630)jack2022-07-138-234/+128
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-07-138-197/+103
|\|
| * boardsource/4x12 data driven (#17629)jack2022-07-138-197/+103
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-07-131-8/+88
|\|
| * ID75 v2: update info.json (#17653)James Young2022-07-121-8/+88
| |
* | [Keyboard] boardsource/lulu data driven (#17638)jack2022-07-127-358/+380
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-07-1312-714/+470
|\|
| * [Keyboard] boardsource/the_mark data driven (#17637)jack2022-07-1212-714/+470
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-07-1318-539/+241
|\|
| * [Keyboard] boardsource/technik_s data driven (#17636)jack2022-07-129-290/+160
| |
| * [Keyboard] boardsource/beiwagon data driven (#17631)jack2022-07-129-249/+81
| |
* | Update LED/RGB Matrix flag function behavior (#17651)Drashna Jaelre2022-07-124-3/+25
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-07-1318-167/+452
|\|
| * [Keyboard] Add Runes Skjoldr (#17305)Vicktor Hutama2022-07-1210-0/+385
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
| * [Keyboard] boardsource/3x4 data driven (#17628)jack2022-07-128-167/+67
| | | | | | | | | | | | | | * initial * change to development board * replaced KC_TRNS & use rules.mk template
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-07-133-0/+253
|\|
| * [Keymap] Add RAOEUS keymap for the XD75 (#17456)Zach Rice2022-07-123-0/+253
| | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com>
* | [Keyboard] boardsource/holiday/spooky data driven (#17632)jack2022-07-128-317/+124
| |
* | Allow MCU-specific overrides for SPI flags. (#17650)Nick Brassel2022-07-132-3/+18
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-07-134-6/+179
|\|
| * KBDfans KBD67 rev2 Layout Patch (#17649)James Young2022-07-124-6/+179
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-07-139-0/+682
|\|
| * [Keyboard] Add Kallos keyboard (#17461)Cipulot2022-07-129-0/+682
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Cirque trackpad features: circular scroll, inertial cursor (#17482)Daniel Kao2022-07-1211-149/+1123
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-07-139-0/+466
|\|
| * [Keyboard] Kprepublic bm80v2 iso revised (#17571)Yizhen Liu2022-07-129-0/+466
| | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-07-138-16/+16
|\|
| * [Keyboard] Update layout for MechBrewery series (#17570)AnthonyNguyen1682022-07-128-16/+16
| |
* | Grammar fixes for docs/feature_converters.md (#17652)James Young2022-07-131-2/+2
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-07-131-0/+3
|\|
| * [Docs] Add Encoder requirements to PR Checklist doc (#17634)Drashna Jaelre2022-07-121-0/+3
| | | | | | Co-authored-by: Nick Brassel <nick@tzarc.org>
* | Merge remote-tracking branch 'origin/master' into developzvecr2022-07-133-0/+77
|\|
| * Add basic secure docs (#17577)Joel Challis2022-07-133-0/+77
| |
* | Include stdint.h in avr/i2c_master.h (#17639)jack2022-07-121-0/+2
| |
* | [Fix] Make ChibiOS `_wait.h` independent of `quantum.h` (#17645)Stefan Kerkmann2022-07-121-0/+1
| |
* | GMMK 2 WBG7 MCU compatibility (#16436)GloriousThrall2022-07-1227-0/+1612
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * GMMK V2 QMK Compatibility * fix problems * Update keyboards/gmmk/gmmk2/config.h Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/gmmk/gmmk2/config.h Co-authored-by: Drashna Jaelre <drashna@live.com> * Fix a minor problem * Optimize the code * Update config.h * Update * Update config.h * Update keyboards/gmmk/gmmk2/p96/ansi/keymaps/via/config.h Co-authored-by: Drashna Jaelre <drashna@live.com> * Update config.h * Update keyboards/gmmk/gmmk2/p96/iso/keymaps/via/config.h Co-authored-by: Drashna Jaelre <drashna@live.com> * Update config.h * Update keyboards/gmmk/gmmk2/p65/ansi/rules.mk Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/gmmk/gmmk2/p96/ansi/keymaps/default/keymap.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/gmmk/gmmk2/p96/ansi/keymaps/via/keymap.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/gmmk/gmmk2/p96/ansi/rules.mk Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/gmmk/gmmk2/p96/iso/rules.mk Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/gmmk/gmmk2/p65/iso/rules.mk Co-authored-by: Drashna Jaelre <drashna@live.com> * Update config.h * Update config.h * Update config.h * Modify device pid * Add gmmk2_p96 keyboard. * Add gmmk2_p96 keyboard. * Update led matrix. * Update led matrix. * Delete eeprom_flash.c * Update keyboards/gmmk/gmmk2/p96/ansi/rules.mk Co-authored-by: Nick Brassel <nick@tzarc.org> * Update from qmk develop branch * Increased compatibility with wear_leveling. * Update config.h Co-authored-by: Joy <chang.li@westberrytech.com> Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Nick Brassel <nick@tzarc.org>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-07-111-6/+4
|\|
| * Fix layout macro for nightly_boards/paraluman (#17633)Joel Challis2022-07-111-6/+4
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-07-1114-615/+694
|\|
| * [Keyboard] Add Quefrency Rev. 5 (#17503)Danny2022-07-1114-615/+694
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-07-119-0/+306
|\|
| * [Keyboard] Add Swordfish keyboard (#17567)Felix Jen2022-07-119-0/+306
| |
* | Added Delay time dynamic keymap's macro feature (#16810)FREEWING.JP2022-07-111-1/+5
| | | | | | | | Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-07-1113-10/+353
|\|
| * [Keyboard] add kinesis/kintlc (#17301)Alex Băluț2022-07-1113-10/+353
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-07-1112-0/+279
|\|
| * [Keyboard] TR90PM (#17060)balloondogcaps2022-07-116-0/+140
| | | | | | | | | | Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>