aboutsummaryrefslogtreecommitdiffstats
path: root/keyboards/merge
Commit message (Expand)AuthorAgeFilesLines
* Migrate `g_led_config` to DD (M3) (#25620)Jack Sangdahl2025-09-092-77/+85
* Configure boards to use development_board - LM (#25341)Joel Challis2025-06-071-2/+1
* Remove `"command":false` from keyboards (#25193)Joel Challis2025-04-244-4/+0
* Remove `"console":false` from keyboards (#25190)Joel Challis2025-04-234-4/+0
* Remove empty `url` fields (#25181)Joel Challis2025-04-221-1/+0
* Remove all via-enabled keymaps, including `via`. (#24322)Nick Brassel2024-08-2512-503/+0
* Migrate split.soft_serial_pin to split.serial.pin H-O (#24185)Joel Challis2024-07-233-3/+9
* Merge remote-tracking branch 'origin/master' into developQMK Bot2024-07-221-0/+3
|\
| * `merge/um80`: reduce firmware size (#24177)Ryan2024-07-221-0/+3
* | Remove instances of MASTER_LEFT. (#24163)Dasky2024-07-212-28/+26
|/
* Data-Driven Keyboard Conversions: M, Part 2 (#23601)James Young2024-04-272-15/+12
* Miscellaneous keyboard.json migrations (#23486)Joel Challis2024-04-134-28/+22
* Move `SPLIT_KEYBOARD` to data driven (#21410)Duncan Sutherland2024-04-126-3/+3
* Merge remote-tracking branch 'origin/master' into developQMK Bot2024-04-021-26/+1
|\
| * merge/um80: remove pointless empty layers (#23398)Ryan2024-04-021-26/+1
* | Migrate features from rules.mk to data drive - LMN (#23277)Joel Challis2024-03-154-26/+20
|/
* Migrate RGB Matrix config to info.json - M (#22908)Joel Challis2024-01-163-10/+4
* Move RGBLight animations to data driven (#21635)Ryan2023-08-232-29/+13
* OLED: driver naming cleanups (#21710)Ryan2023-08-153-3/+0
* Move `RGBLIGHT_HUE/SAT/VAL_STEP` to data driven (#21292)Ryan2023-06-242-3/+3
* Move `RGBLED_NUM` to data driven (#21278)Ryan2023-06-186-5/+5
* Move `RGBLIGHT_SLEEP` to data driven (#21072)Ryan2023-06-166-3/+5
* Move `RGBLIGHT_SPLIT` to data driven (#21190)Ryan2023-06-152-2/+0
* Move `RGBLED_SPLIT` to data driven (#21113)Ryan2023-06-064-6/+6
* Move `RGBLIGHT_LIMIT_VAL` to data driven (#20974)Ryan2023-05-275-3/+6
* Add missing layout data for a handful of boards (#20931)Ryan2023-05-161-363/+448
* Move remaining `LAYOUT_all`s to data driven (#20463)Ryan2023-04-263-199/+745
* Move miscellaneous layouts to data driven (#20516)Ryan2023-04-246-147/+479
* Migrate `rgblight.pin` and `RGB_DI_PIN` to `ws2812.pin` (#20303)Ryan2023-04-066-3/+9
* Move small macropad-ish layouts to data driven (#20341)Ryan2023-04-054-70/+17
* Remove more empty headers (#20155)Ryan2023-03-172-34/+0
* Fix layout macro keys with no matrix position (#20033)Ryan2023-03-131-4/+4
* Move matrix config to info.json, part 7 (#20020)Ryan2023-03-1010-48/+25
* Move encoder config to data driven (#19923)Ryan2023-02-2510-18/+26
* Move backlight config to data driven (#19910)Ryan2023-02-254-3/+6
* Add some missing `#pragma once`s (#19902)Ryan2023-02-214-0/+4
* Move `SOFT_SERIAL_PIN` to data driven (#19863)Ryan2023-02-176-3/+9
* Remove matrix size defines (#19581)Ryan2023-02-175-17/+0
* Migrate `MCU` and `BOOTLOADER` to data-driven (#19529)Ryan2023-02-0810-30/+10
* Remove unused Bootmagic row/col defines from config.h (#19761)Ryan2023-02-073-9/+0
* Debounce defines cleanup (#19742)Ryan2023-02-033-6/+0
* Remove usages of config_common.h from config.h files. (#19714)Nick Brassel2023-01-305-5/+0
* Remove RGBLIGHT_ANIMATION and clean up effect defines for L-Q (#18727)Drashna Jaelre2022-10-151-15/+24
* Change `DRIVER_LED_COUNT` to `{LED,RGB}_MATRIX_LED_COUNT` (#18399)Ryan2022-09-232-2/+2
* Merge remote-tracking branch 'origin/master' into developDrashna Jael're2022-08-201-1/+1
|\
| * RESET -> QK_BOOT keyboard readme (#18110)Joel Challis2022-08-201-1/+1
* | Remove `UNUSED_PINS` (#17931)Nick Brassel2022-08-065-5/+0
|/
* Move keyboard USB IDs and strings to data driven: M (#17859)Ryan2022-08-0310-30/+30
* merge/um80 - Fix WPM issues in configurator builds (#17608)Joel Challis2022-07-091-3/+4
* Add keyboard 'UM-80' (#17035)duoshock2022-07-0312-0/+459