summaryrefslogtreecommitdiffstats
path: root/keyboards/melgeek
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | | | | | | | 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-271-0/+2
|\|
| * [Keyboard] Change RGB light defaults for melgeek/mj6xy (#13657)bomb2021-07-251-0/+2
| | | | | | | | 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-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 ↵bomb2021-07-152-56/+59
| | | | | | | | layers for via (#13552)
* | Merge remote-tracking branch 'origin/master' into developZach White2021-07-1459-0/+6118
|\| | | | | | | | | Resolved Conflicts: keyboards/checkerboards/nop60/info.json
| * [Keyboard] Add MelGeek MJ6xy which is a 60% keyboard that support mul… ↵bomb2021-07-1459-0/+6118
| | | | | | | | | | (#13494) Co-authored-by: Ryan <fauxpark@gmail.com>
* | 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
| | | | | | | | | | | | | | | | | * 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-261-0/+1
|
* [Keyboard] Update MJ61 architecture to support multi version (#11787)MelGeek2021-04-188-138/+354
| | | | | 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-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
| | | | | | | | | | 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-215-31/+228
|\|
| * [Keyboard] Update MJ63 architecture to support multi version (#11788)MelGeek2021-02-205-31/+228
| | | | | | | | | | 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-134-84/+88
|\|
| * [Keyboard] Update MOJO75 to support multi version (#11790)MelGeek2021-02-124-84/+88
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add Z70Ultra which is a Hotsawp RGB 65% keyboard * Update keyboards/melgeek/z70ultra/z70ultra.h Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/melgeek/z70ultra/keymaps/default/keymap.c Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/melgeek/z70ultra/keymaps/via/keymap.c Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/melgeek/z70ultra/z70ultra.c Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/melgeek/z70ultra/readme.md Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/melgeek/z70ultra/rev1/rules.mk Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/melgeek/z70ultra/z70ultra.c Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/melgeek/z70ultra/z70ultra.c Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/melgeek/z70ultra/z70ultra.c Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/melgeek/z70ultra/z70ultra.h Co-authored-by: Ryan <fauxpark@gmail.com> * Update readme.md * Update info.json update the name of layout to consistent the keyboard. * Update keyboards/melgeek/z70ultra/z70ultra.c Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/melgeek/z70ultra/z70ultra.c Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/melgeek/z70ultra/info.json Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/melgeek/z70ultra/keymaps/default/keymap.c Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/melgeek/z70ultra/keymaps/via/keymap.c Co-authored-by: Ryan <fauxpark@gmail.com> * Add Z70Ultra * Support Z70Ultra [Modified] info.json to support two different layouts [Add] rules.mk to support default folder * Update keyboards/melgeek/z70ultra/rev1/rules.mk Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/melgeek/z70ultra/config.h Co-authored-by: Ryan <fauxpark@gmail.com> * remove excessive arguments from LAYOUT_split_space * Update keyboards/melgeek/z70ultra/info.json Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/melgeek/z70ultra/info.json Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/melgeek/z70ultra/keymaps/default/keymap.c Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/melgeek/z70ultra/z70ultra.h Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/melgeek/z70ultra/z70ultra.h Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/melgeek/z70ultra/keymaps/via/keymap.c Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/melgeek/z70ultra/keymaps/default/keymap.c Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/melgeek/z70ultra/rev1/rules.mk Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/melgeek/z70ultra/keymaps/via/keymap.c Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/melgeek/z70ultra/keymaps/default/keymap.c Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/melgeek/z70ultra/keymaps/via/keymap.c Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/melgeek/z70ultra/keymaps/via/keymap.c Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> * Use macro replace with the literal for CS & SW * Update keyboards/melgeek/z70ultra/z70ultra.c Co-authored-by: Drashna Jaelre <drashna@live.com> * [Keyboard] Support MJ61 which is a 60% ANSI STD Hotswap RGB keyboard * Update keyboards/melgeek/mj61/mj61.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/melgeek/mj61/mj61.c Co-authored-by: Drashna Jaelre <drashna@live.com> * [Keyboard] MJ61 Add license header for files and the link for readme * Update keyboards/melgeek/mj61/readme.md Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/melgeek/mj61/rev1/config.h Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/melgeek/mj61/rev1/rules.mk Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/melgeek/mj61/mj61.c Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/melgeek/mj61/mj61.c Co-authored-by: Ryan <fauxpark@gmail.com> * Add GPL for files * Update keymaps/default/keymap.c * Update keymaps/via/keymap.c * Update keyboards/melgeek/z70ultra/z70ultra.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/melgeek/z70ultra/z70ultra.c Co-authored-by: Drashna Jaelre <drashna@live.com> * [Keyboard] Update MOJO75 to support multi version and Update the LED's ID of RGB Matrix 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-1211-0/+493
|\|
| * [Keyboard] Support MJ65 - a 65% RGB Hotswap keyboard (#11764)MelGeek2021-02-1111-0/+493
| | | | | | | | | | 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-051-1/+1
|\|
| * [Keyboard] Fix the LED's ID of ISSI for MJ64 REV2 (#11760)MelGeek2021-02-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add Z70Ultra which is a Hotsawp RGB 65% keyboard * Update keyboards/melgeek/z70ultra/z70ultra.h Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/melgeek/z70ultra/keymaps/default/keymap.c Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/melgeek/z70ultra/keymaps/via/keymap.c Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/melgeek/z70ultra/z70ultra.c Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/melgeek/z70ultra/readme.md Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/melgeek/z70ultra/rev1/rules.mk Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/melgeek/z70ultra/z70ultra.c Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/melgeek/z70ultra/z70ultra.c Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/melgeek/z70ultra/z70ultra.c Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/melgeek/z70ultra/z70ultra.h Co-authored-by: Ryan <fauxpark@gmail.com> * Update readme.md * Update info.json update the name of layout to consistent the keyboard. * Update keyboards/melgeek/z70ultra/z70ultra.c Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/melgeek/z70ultra/z70ultra.c Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/melgeek/z70ultra/info.json Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/melgeek/z70ultra/keymaps/default/keymap.c Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/melgeek/z70ultra/keymaps/via/keymap.c Co-authored-by: Ryan <fauxpark@gmail.com> * Add Z70Ultra * Support Z70Ultra [Modified] info.json to support two different layouts [Add] rules.mk to support default folder * Update keyboards/melgeek/z70ultra/rev1/rules.mk Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/melgeek/z70ultra/config.h Co-authored-by: Ryan <fauxpark@gmail.com> * remove excessive arguments from LAYOUT_split_space * Update keyboards/melgeek/z70ultra/info.json Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/melgeek/z70ultra/info.json Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/melgeek/z70ultra/keymaps/default/keymap.c Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/melgeek/z70ultra/z70ultra.h Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/melgeek/z70ultra/z70ultra.h Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/melgeek/z70ultra/keymaps/via/keymap.c Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/melgeek/z70ultra/keymaps/default/keymap.c Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/melgeek/z70ultra/rev1/rules.mk Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/melgeek/z70ultra/keymaps/via/keymap.c Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/melgeek/z70ultra/keymaps/default/keymap.c Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/melgeek/z70ultra/keymaps/via/keymap.c Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/melgeek/z70ultra/keymaps/via/keymap.c Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> * Use macro replace with the literal for CS & SW * Update keyboards/melgeek/z70ultra/z70ultra.c Co-authored-by: Drashna Jaelre <drashna@live.com> * [Keyboard] Support MJ61 which is a 60% ANSI STD Hotswap RGB keyboard * Update keyboards/melgeek/mj61/mj61.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/melgeek/mj61/mj61.c Co-authored-by: Drashna Jaelre <drashna@live.com> * [Keyboard] MJ61 Add license header for files and the link for readme * Update keyboards/melgeek/mj61/readme.md Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/melgeek/mj61/rev1/config.h Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/melgeek/mj61/rev1/rules.mk Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/melgeek/mj61/mj61.c Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/melgeek/mj61/mj61.c Co-authored-by: Ryan <fauxpark@gmail.com> * Add GPL for files * Update keymaps/default/keymap.c * Update keymaps/via/keymap.c * Update keyboards/melgeek/z70ultra/z70ultra.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/melgeek/z70ultra/z70ultra.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Fix the LED's ID of ISSI for MJ64 REV2 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 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
|/ | | | | - Set all other ChibiOS defaults to 'off', when not targeting Proton-C - Modified all existing F303 boards to point at the QMK_PROTON_C to ensure repeatable binary output - Modified version.h generation so that SKIP_VERSION=yes generates the same output
* 2020 November 28 Breaking Changes Update (#11053)James Young2020-11-286-6/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Branch point for 2020 November 28 Breaking Change