summaryrefslogtreecommitdiffstats
path: root/keyboards/merge
Commit message (Expand)AuthorAgeFilesLines
* Move encoder config to data driven (#19923)Ryan2023-02-2610-18/+26
* Move backlight config to data driven (#19910)Ryan2023-02-264-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-315-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
* merge/uma - Resolve configurator issues (#16551)Joel Challis2022-03-061-2/+2
* [Keyboard] Add UM-A Keyboard (#15584)duoshock2022-01-1311-0/+548
* Tidy up NKRO_ENABLE rules (#15382)Ryan2021-12-093-6/+3
* Tidy up `SLEEP_LED_ENABLE` rules (#15362)Ryan2021-12-013-6/+0
* Remove `BOOTMAGIC_ENABLE = lite` option (#15002)James Young2021-11-051-1/+1
* [Core] Change OLED task function to be boolean (#14864)Drashna Jaelre2021-11-022-2/+4
* Remove BLUETOOTH_ENABLE from keyboard-level rules.mk (#14379)Ryan2021-09-123-3/+0
* Remove width, height and key_count from info.json (#14274)Ryan2021-09-123-6/+0
* [Core] Refactor OLED to allow easy addition of other types (#13454)Xelus222021-08-243-3/+4
* Remove Full Bootmagic (#13846)James Young2021-08-063-3/+3
* [Keyboard] Fix compile size for the Merge UM70 via keymap (#13690)Drashna Jaelre2021-07-251-1/+4
* merge/um70:via: Avoid sprintf() to make the code fit into flash (#12919)Sergey Vlasov2021-05-301-5/+9
* 2021 May 29 Breaking Changes Update (#13034)James Young2021-05-296-113/+119
* [Keyboard] Add UM-70 (#12556)duoshock2021-05-1412-0/+691
* [Keyboard] Update ISO Macro vendor ID to meet VIA requirement (#12564)duoshock2021-04-201-1/+1
* Add UC-1 keypad (#11926)duoshock2021-03-2410-0/+245
* Add missing info.json files for keyboards (#12239)James Young2021-03-151-0/+23
* [Keyboard] Add ISO Macro keyboard (#11517)duoshock2021-01-139-0/+245
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-05 14:29:04 +0000