summaryrefslogtreecommitdiff
path: root/keyboards/melgeek
Commit message (Collapse)AuthorAge
* Move keyboard USB IDs and strings to data driven: M (#17859)Ryan2022-08-03
|
* [Keyboard] Add tegic for melgeek! (#17400)bomb2022-06-20
| | | Co-authored-by: Drashna Jaelre <drashna@live.com>
* Merge remote-tracking branch 'origin/master' into developQMK Bot2022-05-23
|\
| * [Keyboard] mj64 Increase LED count (#17194)Albert Y2022-05-22
| |
* | RESET -> QK_BOOT default keymaps (#17037)Joel Challis2022-05-15
|/
* Remove `NO_ACTION_MACRO` and `NO_ACTION_FUNCTION` from keyboard config.h ↵Ryan2022-03-15
| | | | (#16655)
* [Keyboard] MelGeek Mach80 rev2 (#15610)bomb2022-02-08
|
* Correct matrix effect name (#15816)Albert Y2022-01-11
|
* Tidy up NKRO_ENABLE rules (#15382)Ryan2021-12-09
|
* Tidy up `SLEEP_LED_ENABLE` rules (#15362)Ryan2021-12-01
|
* Remove use of __flash due to LTO issues (#15268)Joel Challis2021-11-24
|
* [Keyboard] Fix handful of boards compiling too large due to RGB matrix ↵Drashna Jaelre2021-11-16
| | | | changes (#15184)
* Require explicit enabling of RGB Matrix modes (#15018)Drashna Jaelre2021-11-15
|
* Remove `BOOTMAGIC_ENABLE = lite` option (#15002)James Young2021-11-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remove BOOTMAGIC_ENABLE=lite setting * change keyboard BOOTMAGIC_ENABLE rules Edits keyboard-level instances of `BOOTMAGIC_ENABLE = lite` to `BOOTMAGIC_ENABLE = yes`. * change keyboard BOOTMAGIC_ENABLE inline comments Edits keyboard-level BOOTMAGIC_ENABLE inline comments to "Enable Bootmagic Lite". * change keymap BOOTMAGIC_ENABLE rules Edits keymap-level instances of `BOOTMAGIC_ENABLE = lite` to `BOOTMAGIC_ENABLE = yes`. * change keymap BOOTMAGIC_ENABLE inline comments Edits/adds keymap-level BOOTMAGIC_ENABLE inline comments to read "Enable Bootmagic Lite". * change layout/user BOOTMAGIC_ENABLE rules/comments Edits instances of `BOOTMAGIC_ENABLE = lite` to `BOOTMAGIC_ENABLE = yes`. Edits/adds keymap-level BOOTMAGIC_ENABLE inline comments to read "Enable Bootmagic Lite". * update non-rules.mk BOOTMAGIC_ENABLE references in keyboards/ * remove docs references to Full Bootmagic * convert data-driven Bootmagic Lite instances * remove Bootmagic Lite bodge from data-driven generation * Merge remote-tracking branch 'upstream/develop' into rm/bootmagic-full_q4a * update docs/ja/config_options.md per mtei * update docs/faq_misc.md per mtei Remove remaining Full Bootmagic reference.
* [Keyboard] Reduce compile size for melgeek mach80 (#15034)Drashna Jaelre2021-11-03
|
* Clean up LED/RGB Matrix driver config (#14760)Ryan2021-10-10
|
* Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-06
|\
| * MelGeek Mach80: correct Configurator layout (#14716)James Young2021-10-05
| | | | | | Adds a 0.5u gap between the top two rows.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-15
|\|
| * [Keyboard] Add Mach80 for Melgeek (#14076)bomb2021-09-14
| | | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-12
|\|
| * Remove BLUETOOTH_ENABLE from keyboard-level rules.mk (#14379)Ryan2021-09-12
| |
* | Merge remote-tracking branch 'upstream/master' into developfauxpark2021-09-12
|\|
| * Remove width, height and key_count from info.json (#14274)Ryan2021-09-12
| |
* | Fix number of elements in info.json does not match errors (#14213)Zach White2021-09-09
|/ | | | | | | | | | | | | | | | | | | | | | | * evyd13/atom47/rev3: best guess at fixing info.json * evyd13/atom47: best guess at fixing info.json * eyeohdesigns/sprh: best guess at fixing info.json * handwired/unicomp_mini_m: best guess at fixing info.json * lazydesigners/the60/rev2: best guess at fixing info.json * melgeek/mj6xy: best guess at fixing info.json * pizzakeyboards/pizza65: best guess at fixing info.json * plx: best guess at fixing info.json * rojectcain/vault45: best guess at fixing info.json * sidderskb/majbritt/rev2: best guess at fixing info.json * spacey: best guess at fixing info.json
* Clean up remaining RGB_DISABLE_WHEN_USB_SUSPENDED defines Part 2 (#13912)Drashna Jaelre2021-08-07
|
* Remove Full Bootmagic (#13846)James Young2021-08-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * disambiguate Bootmagic rules in keymaps The files edited by this commit were added at a point in time where `BOOTMAGIC_ENABLE = yes` enabled full Bootmagic. This commit edits the files to specify that full Bootmagic is intended. * remove BOOTMAGIC_ENABLE=full setting * unify commented BOOTMAGIC_ENABLE rules in keyboards Explicitly sets `BOOTMAGIC_ENABLE = no` in keyboards where the rule was commented out. Command: ``` find keyboards/ -type f -name 'rules.mk' -and -not -path '*/keymaps/*' -exec sed -i -e 's;#[ \t]*\(BOOTMAGIC_ENABLE\)[ \t=]\+\([a-zA-Z]\+\).*;\1 = no # Virtual DIP switch configuration;g' {} + ``` * remove commented Bootmagic rules from keymap/user level Command: ``` find keyboards/ layouts/ users/ -type f -name 'rules.mk' -exec sed -i -e '/#.*\(BOOTMAGIC_ENABLE\)[ \t=]\+\([a-z]\+\).*/d' {} + ``` * update keyboard BOOTMAGIC_ENABLE rule formatting Sets the formatting of BOOTMAGIC_ENABLE rules to `BOOTMAGIC_ENABLE = [value]`, without the inline comments (which will be replaced later). Command: ``` find keyboards/ -type f -name 'rules.mk' -and -not -path '*/keymaps/*' -exec sed -i -e 's;\(BOOTMAGIC_ENABLE\)[ \t=]\+\([a-z]\+\).*;\1 = \2;g' '{}' + ``` * update keyboards' BOOTMAGIC_ENABLE settings Updates keyboard `rules.mk` files to use `BOOTMAGIC_ENABLE = lite` where `BOOTMAGIC_ENABLE = full` was being used. Command: ``` find keyboards/ -type f -name 'rules.mk' -and -not -path '*/keymaps/*' -exec sed -i -e 's;\(BOOTMAGIC_ENABLE = \)full;\1lite;g' '{}' + ``` * update keymap/user BOOTMAGIC_ENABLE settings Updates keymap/user `rules.mk` files to use `BOOTMAGIC_ENABLE = lite` where `BOOTMAGIC_ENABLE = full` was being used. Commands: ``` find keyboards/ -type f -name 'rules.mk' -and -path '*/keymaps/*' -exec sed -i -e 's;\(BOOTMAGIC_ENABLE[ \t=]\+\)full;\1lite;g' '{}' + find layouts/community/ users/ -type f -name 'rules.mk' -exec sed -i -e 's;\(BOOTMAGIC_ENABLE[ \t=]\+\)full;\1lite;g' '{}' + ``` * remove and replace inline comments in keyboards and keymap/user files Removes and replaces the inline comments, which have been updated to read `Enable Bootmagic Lite`. Commands: ``` find keyboards/ -type f -name 'rules.mk' -and -path '*/keymaps/*' -exec sed -i -e 's;\(BOOTMAGIC_ENABLE\)[ \t=]\+\([a-z]\+\).*;\1 = \2;g' '{}' + find layouts/community/ users/ -type f -name 'rules.mk' -exec sed -i -e 's;\(BOOTMAGIC_ENABLE\)[ \t=]\+\([a-z]\+\).*;\1 = \2;g' '{}' + find keyboards/ layouts/community/ users/ -type f -name 'rules.mk' -exec sed -i -e 's;\(BOOTMAGIC_ENABLE = lite\);\1 # Enable Bootmagic Lite;g' '{}' + find keyboards/ layouts/community/ users/ -type f -name 'rules.mk' -exec sed -i -e 's;\(BOOTMAGIC_ENABLE = yes\);\1 # Enable Bootmagic Lite;g' '{}' + find keyboards/ layouts/community/ users/ -type f -name 'rules.mk' -exec sed -i -e 's;\(BOOTMAGIC_ENABLE = no\);\1 # Enable Bootmagic Lite;g' '{}' + ``` * rename improperly named makefiles Some files intended to be used as makefiles had improper names causing them to not be used as intended when building. This commit corrects the filenames of the affected files. * update renamed file with new rule formatting * update QMK's template files Updates QMK's `rules.mk` templates to use the new inline comment. * update QMK Docs - remove documentation of full Bootmagic - update links to Bootmagic Lite doc - add doc for Magic Keycodes * rules.mk patch for coarse/ixora and coarse/vinta
* Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-07
|\
| * [Keyboard] Modify key drive pins for mojo68 (#13863)bomb2021-08-06
| |
* | Fix compile issues due to LED changes (#13821)Drashna Jaelre2021-07-31
| |
* | __flash? (#13799)Joel Challis2021-07-31
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-29
|\|
| * [Keyboard] Add Mojo68 for Melgeek (#13578)bomb2021-07-29
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'upstream/master' into developNick Brassel2021-07-27
|\|
| * [Keyboard] Change RGB light defaults for melgeek/mj6xy (#13657)bomb2021-07-25
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-20
|\|
| * [Keyboard] Repaired melgeek/mj63/ RGB lamp driver problem (#13579)bomb2021-07-19
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-15
|\|
| * [Keyboard] correct the info.json for qmk configurator and add two empty ↵bomb2021-07-15
| | | | | | | | layers for via (#13552)
* | Merge remote-tracking branch 'origin/master' into developZach White2021-07-14
|\| | | | | | | | | Resolved Conflicts: keyboards/checkerboards/nop60/info.json
| * [Keyboard] Add MelGeek MJ6xy which is a 60% keyboard that support mul… ↵bomb2021-07-14
| | | | | | | | | | (#13494) Co-authored-by: Ryan <fauxpark@gmail.com>
* | Fix RGB/LED Suspend defines (#13146)Drashna Jaelre2021-06-09
|/
* Set `BOOTLOADER = stm32-dfu` for all applicable STM32 boards (#12956)Ryan2021-06-08
| | | | | | | | | | | | | | | | | * Set bootloader to stm32-dfu for STM32F303 * Set bootloader to stm32-dfu for STM32F0x2 * Set bootloader to stm32-dfu for STM32F4x1 * Set bootloader to stm32duino for sowbug * Delete redundant bootloader_defs headers * Add some missing MCU name comments * Move APM32 dfu-suffix overrides underneath bootloader * Remove redundant STM32_BOOTLOADER_ADDRESS defines/rules
* fix configs (#12631)Xelus222021-04-26
|
* [Keyboard] Update MJ61 architecture to support multi version (#11787)MelGeek2021-04-18
| | | | | Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
* Fix up build failures for melgeek boards after Feb27 develop merge. (#12043)Nick Brassel2021-02-28
|
* Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-21
|\
| * [Keyboard] Support MJ64 REV3 - a 60% RGB Hotswap with arrow (#11785)MelGeek2021-02-20
| | | | | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-21
|\|
| * [Keyboard] Update MJ63 architecture to support multi version (#11788)MelGeek2021-02-20
| | | | | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-29 19:13:05 +0000