summaryrefslogtreecommitdiffstats
path: root/keyboards/melgeek
Commit message (Expand)AuthorAgeFilesLines
* Remove `BOOTMAGIC_ENABLE = lite` option (#15002)James Young2021-11-0513-13/+13
* [Keyboard] Reduce compile size for melgeek mach80 (#15034)Drashna Jaelre2021-11-032-1/+2
* Clean up LED/RGB Matrix driver config (#14760)Ryan2021-10-1018-31/+12
* Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-061-175/+175
|\
| * MelGeek Mach80: correct Configurator layout (#14716)James Young2021-10-051-175/+175
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-1513-0/+764
|\|
| * [Keyboard] Add Mach80 for Melgeek (#14076)bomb2021-09-1413-0/+764
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-1212-13/+0
|\|
| * Remove BLUETOOTH_ENABLE from keyboard-level rules.mk (#14379)Ryan2021-09-1212-13/+0
* | Merge remote-tracking branch 'upstream/master' into developfauxpark2021-09-128-17/+0
|\|
| * Remove width, height and key_count from info.json (#14274)Ryan2021-09-128-17/+0
* | Fix number of elements in info.json does not match errors (#14213)Zach White2021-09-091-2/+0
|/
* Clean up remaining RGB_DISABLE_WHEN_USB_SUSPENDED defines Part 2 (#13912)Drashna Jaelre2021-08-071-2/+1
* Remove Full Bootmagic (#13846)James Young2021-08-0612-12/+12
* Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-071-1/+1
|\
| * [Keyboard] Modify key drive pins for mojo68 (#13863)bomb2021-08-061-1/+1
* | Fix compile issues due to LED changes (#13821)Drashna Jaelre2021-07-311-20/+19
* | __flash? (#13799)Joel Challis2021-07-3110-10/+10
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-2911-0/+516
|\|
| * [Keyboard] Add Mojo68 for Melgeek (#13578)bomb2021-07-2911-0/+516
* | Merge remote-tracking branch 'upstream/master' into developNick Brassel2021-07-271-0/+2
|\|
| * [Keyboard] Change RGB light defaults for melgeek/mj6xy (#13657)bomb2021-07-251-0/+2
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-201-3/+3
|\|
| * [Keyboard] Repaired melgeek/mj63/ RGB lamp driver problem (#13579)bomb2021-07-191-3/+3
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-152-56/+59
|\|
| * [Keyboard] correct the info.json for qmk configurator and add two empty layer...bomb2021-07-152-56/+59
* | Merge remote-tracking branch 'origin/master' into developZach White2021-07-1459-0/+6118
|\|
| * [Keyboard] Add MelGeek MJ6xy which is a 60% keyboard that support mul… (#13...bomb2021-07-1459-0/+6118
* | Fix RGB/LED Suspend defines (#13146)Drashna Jaelre2021-06-096-6/+6
|/
* Set `BOOTLOADER = stm32-dfu` for all applicable STM32 boards (#12956)Ryan2021-06-0810-0/+30
* fix configs (#12631)Xelus222021-04-261-0/+1
* [Keyboard] Update MJ61 architecture to support multi version (#11787)MelGeek2021-04-188-138/+354
* Fix up build failures for melgeek boards after Feb27 develop merge. (#12043)Nick Brassel2021-02-283-0/+3
* Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-213-0/+196
|\
| * [Keyboard] Support MJ64 REV3 - a 60% RGB Hotswap with arrow (#11785)MelGeek2021-02-203-0/+196
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-215-31/+228
|\|
| * [Keyboard] Update MJ63 architecture to support multi version (#11788)MelGeek2021-02-205-31/+228
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-134-84/+88
|\|
| * [Keyboard] Update MOJO75 to support multi version (#11790)MelGeek2021-02-124-84/+88
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-1211-0/+493
|\|
| * [Keyboard] Support MJ65 - a 65% RGB Hotswap keyboard (#11764)MelGeek2021-02-1111-0/+493
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-051-1/+1
|\|
| * [Keyboard] Fix the LED's ID of ISSI for MJ64 REV2 (#11760)MelGeek2021-02-041-1/+1
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2020-12-212-0/+0
|\|
| * Initial list of keyboards to exclude from CI (#11213)Zach White2020-12-212-0/+0
* | Add board specific to Proton-C, with usual defaults turned on. (#10976)Nick Brassel2020-12-036-0/+6
|/
* 2020 November 28 Breaking Changes Update (#11053)James Young2020-11-286-6/+12
* [Keyboard] Fix IIC stall bug (#10700)MelGeek2020-11-011-3/+0
* [Keyboard] Melgeek Mojo75 (#10426)MelGeek2020-10-1811-0/+535
* [Keyboard] Melgeek MJ64 (#10425)MelGeek2020-10-1614-0/+664