summaryrefslogtreecommitdiff
path: root/keyboards/melgeek
AgeCommit message (Collapse)Author
2022-10-27MelGeek MJ6XY Refactor (#18862)James Young
* mj6xy.h: convert tabs to spaces * info.json: convert tabs to spaces * info.json: apply friendly formatting Whitespace-only change. * rename LAYOUT_60_ansi_7u_spc to LAYOUT_60_ansi_tsangan - rename `60_ansi_7u_spc` keymap to `default_ansi_tsangan` * add K31 position to LAYOUT_60_iso * rename LAYOUT_60_iso_7u_spc_split_rshift to LAYOUT_60_iso_tsangan_split_rshift - rename `60_iso_7u_spc_split_rshift` keymap to `default_iso_tsangan_split_rshift` * add K31 position to LAYOUT_60_iso_arrow * add K31 position to LAYOUT_60_iso_arrow_6u_spc * add K31 position to LAYOUT_60_iso_arrow_3u_spc * refactor LAYOUT_60_iso_7u_spc into LAYOUT_60_iso_tsangan - add K31 position to layout macro - rename `60_iso_7u_spc` keymap to `default_iso_tsangan` * add K31 position to LAYOUT_64_iso - rename `64_iso` keymap to `default_64_iso` * add K31 position to LAYOUT_64_iso_3u_spc - rename `64_iso_3u_spc` keymap to `default_64_iso_3u_spc` * add K31 position to LAYOUT_64_iso_split_3u_spc - rename `64_iso_split_3u_spc` keymap to `default_64_iso_split_3u_spc` * remove LAYOUT_60_iso_1u_lshift_split_rshift macro and keymap Functionally identical to `LAYOUT_60_iso_split_rshift`. * remove LAYOUT_60_iso_1u_lshift_7u_spc_split_rshift macro and keymap Functionally identical to `LAYOUT_60_iso_tsangan_split_rshift`. * rename LAYOUT_60_ansi_7u_spc_split_bs to LAYOUT_60_ansi_tsangan_split_bs - rename `60_ansi_7u_spc_split_bs` keymap to `default_60_ansi_tsangan_split_bs` * add K31 position to LAYOUT_60_iso_split_bs * rename LAYOUT_60_iso_7u_spc_split_bs_rshift to LAYOUT_60_iso_tsangan_split_bs_rshift - rename `60_iso_7u_spc_split_bs_rshift` keymap to `default_60_iso_tsangan_split_bs_rshift` * add K31 position to LAYOUT_60_iso_arrow_split_bs * add K31 position to LAYOUT_60_iso_arrow_3u_spc_split_bs - rename `60_iso_arrow_3u_spc_split_bs` keymap to `default_60_iso_arrow_3u_spc_split_bs` * add K31 position to LAYOUT_60_iso_arrow_split_bs_3u_spc - rename `60_iso_arrow_split_bs_3u_spc` keymap to `default_60_iso_arrow_split_bs_3u_spc` * refactor LAYOUT_60_iso_7u_spc_split_bs into LAYOUT_60_iso_tsangan_split_bs - add K31 position to layout macro - rename `60_iso_7u_spc_split_bs` keymap to `default_60_iso_tsangan_split_bs` * add K31 position to LAYOUT_64_iso_split_bs - rename `64_iso_split_bs` keymap to `default_64_iso_split_bs` * add K31 position to LAYOUT_64_iso_3u_spc_split_bs rename `64_iso_3u_spc_split_bs` keymap to `default_64_iso_3u_spc_split_bs` * add K31 position to LAYOUT_64_iso_split_bs_3u_spc - rename `64_iso_split_bs_3u_spc` keymap to `default_64_iso_split_bs_3u_spc` * remove LAYOUT_60_ansi_arrow_6u_spc macro and keymap Functionally identical to `LAYOUT_60_ansi_arrow`. * remove LAYOUT_64_ansi_6u_spc macro and keymap Functionally identical to `LAYOUT_64_ansi`. * remove LAYOUT_60_iso_arrow_6u_spc macro and keymap Functionally identical to `LAYOUT_60_iso_arrow`. * remove LAYOUT_64_iso_6u_spc macro and keymap Functionally identical to `LAYOUT_64_iso`. * remove LAYOUT_60_ansi_arrow_6u_spc_split_bs macro and keymap Functionally identical to `LAYOUT_60_ansi_arrow_split_bs`. * remove LAYOUT_64_ansi_6u_spc_split_bs macro and keymap Functionally identical to `LAYOUT_64_ansi_split_bs`. * remove LAYOUT_60_iso_arrow_6u_spc_split_bs macro and keymap Functionally identical to `LAYOUT_60_iso_arrow_split_bs`. * remove LAYOUT_64_iso_6u_spc_split_bs macro and keymap Functionally identical to `LAYOUT_64_iso_split_bs`. * remove LAYOUT_60_iso_1u_lshift_split_bs_rshift macro and keymap Functionally identical to `LAYOUT_60_iso_split_bs_rshift`. * remove LAYOUT_60_iso_1u_lshift_7u_spc_split_bs_rshift macro and keymap Functionally identical to `LAYOUT_60_iso_tsangan_split_bs_rshift`. * refactor keymaps - convert tabs to spaces - update keycode grid alignment * remove LAYOUT_60_ansi_arrow_3u_spc macro and keymap Subset of `LAYOUT_60_ansi_arrow_3u_spc_split_bs`. * remove LAYOUT_60_iso_arrow_3u_spc macro and keymap Subset of `LAYOUT_60_iso_arrow_3u_spc_split_bs`. * remove LAYOUT_60_iso_tsangan_split_bs macro and keymap Subset of `LAYOUT_60_iso_tsangan_split_bs_rshift`. * remove LAYOUT_60_iso_tsangan_split_rshift macro and keymap Subset of `LAYOUT_60_iso_tsangan_split_bs_rshift`. * remove LAYOUT_64_ansi_3u_spc macro and keymap Subset of `LAYOUT_64_ansi_3u_spc_split_bs`. * remove LAYOUT_64_iso_3u_spc macro and keymap Subset of `LAYOUT_64_iso_3u_spc_split_bs`. * remove LAYOUT_60_iso_split_bs macro and keymap Subset of `LAYOUT_60_iso_split_bs_rshift`. * remove LAYOUT_60_iso_split_rshift macro and keymap Subset of `LAYOUT_60_iso_split_bs_rshift`. * add LAYOUT_60_ansi_split_bs_rshift macro and keymap * remove LAYOUT_60_ansi_split_bs macro and keymap Subset of `LAYOUT_60_ansi_split_bs_rshift`. * add LAYOUT_60_tsangan_hhkb macro and keymap * remove LAYOUT_60_ansi_tsangan_split_bs macro and keymap Subset of `LAYOUT_60_tsangan_hhkb`. * standardize keymap names Rename all keymaps per QMK guidelines (e.g. keymap using `LAYOUT_60_ansi_arrow` should be named `default_60_ansi_arrow`). * add LAYOUT_all; refactor default keymap Add a `LAYOUT_all` macro, and update the `default` keymap to use the new macro. * refactor via keymap Update the `via` keymap to match the behaviour of the `default` keymap. * improve keyboard readme - fix broken image reference - improve grammar on keyboard description - fix Hardware Availability link - fix `make` instructions - add bootloader and flashing instructions * fix default_60_tsangan_hhkb keymap Fix a keycode count mismatch. * mj6xy.h: add matrix diagram * KC_GESC -> QK_GESC per fauxpark * KC_SLCK -> KC_SCRL per fauxpark
2022-08-21RESET -> QK_BOOT user keymaps (#17940)Joel Challis
2022-08-20Merge remote-tracking branch 'origin/master' into developDrashna Jael're
2022-08-20RESET -> QK_BOOT keyboard readme (#18110)Joel Challis
2022-08-07Merge remote-tracking branch 'origin/master' into developQMK Bot
2022-08-07RESET -> QK_BOOT default keymaps (#17939)Joel Challis
2022-08-06Remove `UNUSED_PINS` (#17931)Nick Brassel
2022-08-03Move keyboard USB IDs and strings to data driven: M (#17859)Ryan
2022-06-20[Keyboard] Add tegic for melgeek! (#17400)bomb
Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-05-23Merge remote-tracking branch 'origin/master' into developQMK Bot
2022-05-22[Keyboard] mj64 Increase LED count (#17194)Albert Y
2022-05-15RESET -> QK_BOOT default keymaps (#17037)Joel Challis
2022-03-15Remove `NO_ACTION_MACRO` and `NO_ACTION_FUNCTION` from keyboard config.h ↵Ryan
(#16655)
2022-02-08[Keyboard] MelGeek Mach80 rev2 (#15610)bomb
2022-01-11Correct matrix effect name (#15816)Albert Y
2021-12-09Tidy up NKRO_ENABLE rules (#15382)Ryan
2021-12-01Tidy up `SLEEP_LED_ENABLE` rules (#15362)Ryan
2021-11-24Remove use of __flash due to LTO issues (#15268)Joel Challis
2021-11-16[Keyboard] Fix handful of boards compiling too large due to RGB matrix ↵Drashna Jaelre
changes (#15184)
2021-11-15Require explicit enabling of RGB Matrix modes (#15018)Drashna Jaelre
2021-11-05Remove `BOOTMAGIC_ENABLE = lite` option (#15002)James Young
* 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.
2021-11-03[Keyboard] Reduce compile size for melgeek mach80 (#15034)Drashna Jaelre
2021-10-10Clean up LED/RGB Matrix driver config (#14760)Ryan
2021-10-06Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-10-05MelGeek Mach80: correct Configurator layout (#14716)James Young
Adds a 0.5u gap between the top two rows.
2021-09-15Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-09-14[Keyboard] Add Mach80 for Melgeek (#14076)bomb
Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-09-12Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-09-12Remove BLUETOOTH_ENABLE from keyboard-level rules.mk (#14379)Ryan
2021-09-12Merge remote-tracking branch 'upstream/master' into developfauxpark
2021-09-12Remove width, height and key_count from info.json (#14274)Ryan
2021-09-09Fix number of elements in info.json does not match errors (#14213)Zach White
* 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
2021-08-07Clean up remaining RGB_DISABLE_WHEN_USB_SUSPENDED defines Part 2 (#13912)Drashna Jaelre
2021-08-06Remove Full Bootmagic (#13846)James Young
* 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
2021-08-07Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-08-06[Keyboard] Modify key drive pins for mojo68 (#13863)bomb
2021-07-31Fix compile issues due to LED changes (#13821)Drashna Jaelre
2021-07-31__flash? (#13799)Joel Challis
2021-07-29Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-07-29[Keyboard] Add Mojo68 for Melgeek (#13578)bomb
Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
2021-07-27Merge remote-tracking branch 'upstream/master' into developNick Brassel
2021-07-25[Keyboard] Change RGB light defaults for melgeek/mj6xy (#13657)bomb
Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
2021-07-20Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-07-19[Keyboard] Repaired melgeek/mj63/ RGB lamp driver problem (#13579)bomb
2021-07-15Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-07-15[Keyboard] correct the info.json for qmk configurator and add two empty ↵bomb
layers for via (#13552)
2021-07-14Merge remote-tracking branch 'origin/master' into developZach White
Resolved Conflicts: keyboards/checkerboards/nop60/info.json
2021-07-14[Keyboard] Add MelGeek MJ6xy which is a 60% keyboard that support mul… ↵bomb
(#13494) Co-authored-by: Ryan <fauxpark@gmail.com>
2021-06-09Fix RGB/LED Suspend defines (#13146)Drashna Jaelre
2021-06-08Set `BOOTLOADER = stm32-dfu` for all applicable STM32 boards (#12956)Ryan
* 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 11:59:19 +0000