summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into developQMK Bot2022-12-1313-0/+631
|\
| * [Keyboard] Add Convolution Rev. 1 PCB (#19283)Danny2022-12-1213-0/+631
| | | | | | Co-authored-by: Joel Challis <git@zvecr.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-12-1332-0/+1229
|\|
| * [Keyboard] Add Daily60 keyboard (#19116)DeskDaily2022-12-129-0/+339
| | | | | | | | Co-authored-by: Neil Brian Ramirez <nightlykeyboards@gmail.com> Co-authored-by: Neil Brian Ramirez <nightlyboards@gmail.com>
| * [Keyboard] add tofu_ii keyboard (#19118)dztech2022-12-1213-0/+528
| | | | | | | | Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Ryan <fauxpark@gmail.com>
| * [Keyboard] Add Olly Orion to QMK (#19134)mechlovin2022-12-1210-0/+362
| | | | | | | | Co-authored-by: jack <0x6a73@protonmail.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-12-1315-186/+1063
|\|
| * [Keyboard] Add the Gone Hacking Studio XLS (#19185)Ramon Imbao2022-12-127-0/+374
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
| * [Keymap] superfell's custom keymap for the 0xc pad (#19196)Simon Fell2022-12-122-0/+93
| |
| * [Keyboard] moved E80-1800 to data driven configuration (#19199)ebastler2022-12-126-186/+596
| | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-12-129-0/+352
|\|
| * [Keyboard] add mw80 (#19223)TW594202022-12-129-0/+352
| | | | | | Co-authored-by: jack <0x6a73@protonmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-12-1217-0/+1033
|\|
| * [Keyboard] Add Jisoo pcb (#19238)DeskDaily2022-12-129-0/+314
| | | | | | | | Co-authored-by: Neil Brian Ramirez <nightlykeyboards@gmail.com> Co-authored-by: Neil Brian Ramirez <nightlyboards@gmail.com>
| * [Keyboard] Add Lagom keyboard (#19240)Moses Hoyt2022-12-128-0/+719
| | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com>
* | [Keyboard] Add Rama Works M60-B (#19248)Wolf Van Herreweghe2022-12-127-0/+354
| | | | | | Co-authored-by: jack <0x6a73@protonmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-12-1219-0/+530
|\|
| * [Keyboard] Add Navi60 (#19253)DeskDaily2022-12-126-0/+213
| | | | | | | | Co-authored-by: Neil Brian Ramirez <nightlykeyboards@gmail.com> Co-authored-by: Neil Brian Ramirez <nightlyboards@gmail.com>
| * [Keyboard] Crypt Macro (#19279)yiancar2022-12-1213-0/+317
| | | | | | Co-authored-by: yiancar <yiancar@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-12-126-0/+171
|\|
| * [Keyboard] add d45 lite keyboard (#19288)dztech2022-12-126-0/+171
| | | | | | Co-authored-by: Joel Challis <git@zvecr.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-12-1254-12/+738
|\|
| * [Keyboard] Add Zed65-monoLED and Zed65-Cor65 (#18872)mechlovin2022-12-1254-12/+738
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-12-1216-0/+960
|\|
| * Keyboard rura66 (#15853)T.Shinohara2022-12-1216-0/+960
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * add : BlackMask60 and MayShi.No30 * fix:spell miss * change:keyboard name area * change: default keymap * 配列を自分用に変更 * MyKemap Update * 構成変更 * Add RURA66 new keyboard * remove additional files * fix file * fix info.json from rura66 * fix KC_LANG to KC_LNG from rura66 * Fix readme - fix purchase URL - adjust to the recent standard * Fix rules.mk - no backlight - remove DIP switch/Bluetooth - OLED_DRIVER_ENABLE -> OLED_ENABLE * Fix rura66.h: add LICENSE * Fix config.h - UNUSED_PINS is deprecated - accept suggestion on PR * Fix oled_display.c - remove snprintf() - OLED_DRIVER_ENABLE->OLED_ENABLE - oled_task_user() returns false * Fix config.h - no SPLIT_HAND_MATRIX_GRID - no RGB Matrix * move default keymap readme * add VIA keymap * Fix info.json - Fix keyboard URL - Change VID/PID * Fix comments in rules.mk * fix info.json keyboard url Co-authored-by: yswallow <1426202+yswallow@users.noreply.github.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-12-126-0/+266
|\|
| * [Keyboard] add ydpm40 keyboard (#19294)xofyarg2022-12-126-0/+266
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-12-122-80/+205
|\|
| * [Keyboard] Switch heliotrope from rgblight to rgb matrix (#19296)MJM2022-12-122-80/+205
| |
* | Tests that caps word stays active after use of OSL (#19303)precondition2022-12-121-1/+52
| |
* | Cleanup pmw3389.c (#19301)Alabastard-642022-12-121-2/+0
| |
* | [Core] Quantum Painter - LVGL Integration (#18499)jpe2302022-12-1324-3/+1139
| | | | | | Co-authored-by: Nick Brassel <nick@tzarc.org>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-12-1231-0/+1683
|\|
| * Add Keychron Q10 (#19127)lalalademaxiya12022-12-1331-0/+1683
| | | | | | Co-authored-by: Nick Brassel <nick@tzarc.org>
* | Format code according to conventions (#19305)QMK Bot2022-12-121-4/+3
| |
* | [Core] Replace Tapping Force Hold feature with Quick Tap Term (#17007)Albert Y2022-12-12226-376/+458
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Replace Tapping Force Hold feature with Quick Tap Term * Replace keyboard level TAPPING_FORCE_HOLD with QUICK_TAP_TERM 0 * Deprecate force hold in info_config.json * Before and after quick tap term unit tests * Quick tap unit tests iteration * Keymap config.h correction * Remove TAPPING_FORCE_HOLD_PER_KEY macros that were missed * Add two more test cases for quick tap * Replace TAPPING_FORCE_HOLD with QUICK_TAP_TERM in configs #2 * Replace TAPPING_FORCE_HOLD_PER_KEY with QUICK_TAP_TERM_PER_KEY in configs #2 * Add function declaration for get_quick_tap_term Co-authored-by: Stefan Kerkmann <karlk90@pm.me>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-12-129-507/+853
|\|
| * [Keymap] user dvorak_42_key ergodox_ez and crkbd keymaps (#19154)Luc2022-12-119-507/+853
| | | | | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: luc wastiaux <luc.wastiaux@airpost.net> Co-authored-by: Luc W <lucw@airpost.net>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-12-121-0/+113
|\|
| * [Keymap] lets_split: add mypetyak map (#19205)Christopher Bunn2022-12-111-0/+113
| |
* | [RP2040] update i2c drivers to reflect peripheral number (#19277)Stefan Kerkmann2022-12-1111-13/+13
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-12-110-0/+0
|\|
| * [CI] Format code according to conventions (#19292)QMK Bot2022-12-112-2/+2
| |
* | [CI] Format code according to conventions (#19293)QMK Bot2022-12-112-2/+2
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-12-111-60/+60
|\|
| * `sthlmkb/litl`: fix layout macros (#19244)Ryan2022-12-111-60/+60
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-12-111-1/+1
|\|
| * Update KC_BKSP->KCBSPC for default Ortho4x6 layout (#19290)Wolf Van Herreweghe2022-12-111-1/+1
| | | | | | Co-authored-by: Wolf <contact@vwolf.be>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-12-116-0/+249
|\|
| * [Keyboard] Add heliotrope Keyboard (#19170)MJM2022-12-106-0/+249
| |