summaryrefslogtreecommitdiffstats
path: root/keyboards/melgeek
Commit message (Collapse)AuthorAgeFilesLines
...
| * [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 * Remove matrix_col_t to allow MATRIX_ROWS > 32 (#10183) * Add support for soft serial to ATmega32U2 (#10204) * Change MIDI velocity implementation to allow direct control of velocity value (#9940) * Add ability to build a subset of all keyboards based on platform. * Actually use eeprom_driver_init(). * Make bootloader_jump weak for ChibiOS. (#10417) * Joystick 16-bit support (#10439) * Per-encoder resolutions (#10259) * Share button state from mousekey to pointing_device (#10179) * Add hotfix for chibios keyboards not wake (#10088) * Add advanced/efficient RGB Matrix Indicators (#8564) * Naming change. * Support for STM32 GPIOF,G,H,I,J,K (#10206) * Add milc as a dependency and remove the installed milc (#10563) * ChibiOS upgrade: early init conversions (#10214) * ChibiOS upgrade: configuration file migrator (#9952) * Haptic and solenoid cleanup (#9700) * XD75 cleanup (#10524) * OLED display update interval support (#10388) * Add definition based on currently-selected serial driver. (#10716) * New feature: Retro Tapping per key (#10622) * Allow for modification of output RGB values when using rgblight/rgb_matrix. (#10638) * Add housekeeping task callbacks so that keyboards/keymaps are capable of executing code for each main loop iteration. (#10530) * Rescale both ChibiOS and AVR backlighting. * Reduce Helix keyboard build variation (#8669) * Minor change to behavior allowing display updates to continue between task ticks (#10750) * Some GPIO manipulations in matrix.c change to atomic. (#10491) * qmk cformat (#10767) * [Keyboard] Update the Speedo firmware for v3.0 (#10657) * Maartenwut/Maarten namechange to evyd13/Evy (#10274) * [quantum] combine repeated lines of code (#10837) * Add step sequencer feature (#9703) * aeboards/ext65 refactor (#10820) * Refactor xelus/dawn60 for Rev2 later (#10584) * add DEBUG_MATRIX_SCAN_RATE_ENABLE to common_features.mk (#10824) * [Core] Added `add_oneshot_mods` & `del_oneshot_mods` (#10549) * update chibios os usb for the otg driver (#8893) * Remove HD44780 References, Part 4 (#10735) * [Keyboard] Add Valor FRL TKL (+refactor) (#10512) * Fix cursor position bug in oled_write_raw functions (#10800) * Fixup version.h writing when using SKIP_VERSION=yes (#10972) * Allow for certain code in the codebase assuming length of string. (#10974) * Add AT90USB support for serial.c (#10706) * Auto shift: support repeats and early registration (#9826) * Rename ledmatrix.h to match .c file (#7949) * Split RGB_MATRIX_ENABLE into _ENABLE and _DRIVER (#10231) * Split LED_MATRIX_ENABLE into _ENABLE and _DRIVER (#10840) * Merge point for 2020 Nov 28 Breaking Change
* [Keyboard] Fix IIC stall bug (#10700)MelGeek2020-11-011-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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/melgee