aboutsummaryrefslogtreecommitdiffstats
path: root/keyboards/merge
Commit message (Collapse)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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Move RGBLight animations to data driven, 0-9 * Move RGBLight animations to data driven, A * Move RGBLight animations to data driven, B * Move RGBLight animations to data driven, C * Move RGBLight animations to data driven, D * Move RGBLight animations to data driven, E * Move RGBLight animations to data driven, F * Move RGBLight animations to data driven, G * Move RGBLight animations to data driven, H * Move RGBLight animations to data driven, handwired * Move RGBLight animations to data driven, I * Move RGBLight animations to data driven, J * Move RGBLight animations to data driven, K * Move RGBLight animations to data driven, L * Move RGBLight animations to data driven, M * Move RGBLight animations to data driven, N * Move RGBLight animations to data driven, O * Move RGBLight animations to data driven, P * Move RGBLight animations to data driven, Q * Move RGBLight animations to data driven, R * Move RGBLight animations to data driven, S * Move RGBLight animations to data driven, T * Move RGBLight animations to data driven, U * Move RGBLight animations to data driven, V * Move RGBLight animations to data driven, W * Move RGBLight animations to data driven, X * Move RGBLight animations to data driven, Y * Move RGBLight animations to data driven, Z * Fix incorrect placement * Fix build failures and mismatches
* 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
| | | | Co-authored-by: Nick Brassel <nick@tzarc.org>
* 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 `RGBLIGHT_SPLIT` to data driven * Remove where `split_count` is already set
* Move `RGBLED_SPLIT` to data driven (#21113)Ryan2023-06-064-6/+6
| | | | Co-authored-by: Joel Challis <git@zvecr.com>
* Move `RGBLIGHT_LIMIT_VAL` to data driven (#20974)Ryan2023-05-275-3/+6
| | | | Co-authored-by: Nick Brassel <nick@tzarc.org>
* Add missing layout data for a handful of boards (#20931)Ryan2023-05-161-363/+448
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add missing layout data for a handful of boards * typo * Add missing layouts for stoutgat * Add missing layout for j80 * Replace missing layout with alias for wraith * Add missing layout for matrix/me * Add missing layout for satisfaction75/prototype * Apply suggestions from code review * Rename wt80-a layouts * Rename rosa layouts * Add missing layouts for naked48 * Add missing layouts for naked60 * Add missing layouts for uma * Remove unused and pointless `LAYOUT_stack` for buzzard * Add missing layout for keyboardio/model01 * Add missing layout for smk65 revf * Fix via keymap for h60 * Add missing layout for jabberwocky/v1 * Apply suggestions from code review * Add missing layout for m3n3van * Add missing layout for giabalanai * Add missing layouts for treadstone48/rev1 * Add missing layouts for squiggle * Update keyboards/marksard/treadstone48/rev1/info.json
* 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
| | | | Co-authored-by: Nick Brassel <nick@tzarc.org>
* 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Clean up `DEBOUNCE` in config.h, 0-9 * Clean up `DEBOUNCE` in config.h, A * Clean up `DEBOUNCE` in config.h, B * Clean up `DEBOUNCE` in config.h, C * Clean up `DEBOUNCE` in config.h, D * Clean up `DEBOUNCE` in config.h, E * Clean up `DEBOUNCE` in config.h, F * Clean up `DEBOUNCE` in config.h, G * Clean up `DEBOUNCE` in config.h, H * Clean up `DEBOUNCE` in config.h, handwired * Clean up `DEBOUNCE` in config.h, I * Clean up `DEBOUNCE` in config.h, J * Clean up `DEBOUNCE` in config.h, K * Clean up `DEBOUNCE` in config.h, L * Clean up `DEBOUNCE` in config.h, M * Clean up `DEBOUNCE` in config.h, N * Clean up `DEBOUNCE` in config.h, O * Clean up `DEBOUNCE` in config.h, P * Clean up `DEBOUNCE` in config.h, Q * Clean up `DEBOUNCE` in config.h, R * Clean up `DEBOUNCE` in config.h, S * Clean up `DEBOUNCE` in config.h, T * Clean up `DEBOUNCE` in config.h, U * Clean up `DEBOUNCE` in config.h, V * Clean up `DEBOUNCE` in config.h, W * Clean up `DEBOUNCE` in config.h, X * Clean up `DEBOUNCE` in config.h, Y * Clean up `DEBOUNCE` in config.h, Z * Remove default debounce from info.json * Migrate non-default debounce to info.json
* 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
|
generated by cgit v1.2.3 (git 2.39.1) at 2026-04-17 15:54:15 +0200