summaryrefslogtreecommitdiffstats
path: root/keyboards/gmmk/pro
Commit message (Collapse)AuthorAgeFilesLines
* Remove use of __flash due to LTO issues (#15268)Joel Challis2021-11-241-1/+1
|
* Require explicit enabling of RGB Matrix modes (#15018)Drashna Jaelre2021-11-152-41/+90
|
* Merge remote-tracking branch 'origin/master' into developQMK Bot2021-11-054-0/+155
|\
| * [Keymap][GMMK Pro] Add personal profile (#15069)Cory Ginsberg2021-11-054-0/+155
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Cory Ginsberg <coryginsberg@fb.com>
* | Remove `BOOTMAGIC_ENABLE = lite` option (#15002)James Young2021-11-054-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-10-233-4/+17
|\|
| * [Keymap] Jonavin userspace keymap updates INVERT_NUMLOCK_INDICATOR (#14880)jonavin2021-10-223-4/+17
| | | | | | Co-authored-by: Jonavin <=>
* | Merge remote-tracking branch 'origin/master' into developDrashna Jael're2021-10-152-50/+73
|\|
| * [Keymap] Added GMMK Pro keymap with RGB (#14648)BenSchaeff2021-10-152-0/+146
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-283-1/+39
|\|
| * [Keymap] fix NKRO - switch to get_mods() and refactor encoder action code ↵jonavin2021-09-283-1/+39
| | | | | | | | | | (#14278) Co-authored-by: Jonavin <=>
* | [Keymap] GMMK Pro keymap (#14389)BenSchaeff2021-09-181-0/+123
|/
* [Keymap] Adding personal keymap (#14326)Matt2021-09-167-0/+772
| | | | Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
* Remove BLUETOOTH_ENABLE from keyboard-level rules.mk (#14379)Ryan2021-09-122-2/+0
|
* Remove width, height and key_count from info.json (#14274)Ryan2021-09-122-4/+0
|
* [Keymap] moults31 userspace and keymaps (#12025)Zac Moulton2021-09-101-0/+92
|
* [Keymap] Jonavin keymap gmmk pro (#14220)jonavin2021-09-014-4/+40
| | | | | add rgb nightmode and optional colemak layer Co-authored-by: Jonavin <=>
* Move GMMK Pro layouts to the correct subdir (#14241)Andre Brait2021-09-0117-1/+1
| | | Also fix a compilation issue in the mike1808 keymap
* [Keymap] Fixed GMMK Pro -> stickandgum keymap readme.md (#14123)stickandgum2021-08-242-11/+10
| | | Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
* Fixup line endings.Nick Brassel2021-08-232-139/+139
|
* [Keymap] Feature rich keymap for GMMK Pro (ANSI) (#14120)stickandgum2021-08-224-0/+441
| | | Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
* Updated RGB Matrix suspend define part 3 (#13954)Drashna Jaelre2021-08-222-2/+2
| | | | | | | | | * Updated RGB Matrix suspend define part 3 * Revert "Update config.h for kbdfans/kbd67/mkiirgb/v3 (#13978)" This reverts commit 80015f7fb023f27ad5307815fd5433694a3bcb4a. * Add additional boards/keymaps
* Merge remote-tracking branch 'upstream/master' into developJames Young2021-08-193-176/+29
|\ | | | | | | | | | | Conflicts: keyboards/gmmk/pro/ansi/keymaps/jonavin/rules.mk keyboards/space_space/rules.mk
| * [Keymap] Add jonavin user space / common functions (#13876)jonavin2021-08-193-176/+29
| | | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Jonavin <=>
* | Created "paddlegame" keymap (#13629)Tomas Guinan2021-08-186-0/+744
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Added gmmk pro paddlegame keymap * Replaced config.h with my own * Adjust code to better fit style guide * Update readme to include layout * Fixed keymap, was missing a few keys * Replaced all instances of _isWinKeyDisabled with keymap_config.no_gui * Update keyboards/gmmk/pro/ansi/keymaps/paddlegame/keymap.c Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Tomas Guinan <bngrybt@gmail.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
* | gmmk/pro/mike1808 keymap (#13398)Mikael Manukyan2021-08-1816-0/+989
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add gmmk/pro/mike1808 keymap * Add licenses * Update readme * Add underglow support for rgb matrix layers * Change FN to TT * Fix rgb layer disabling during rgb settings change * also clean up some code
* | [Keymap] Improve andrebrait keymap (#13985)Andre Brait2021-08-131-20/+27
| |
* | [Keyboard] Fix default keymap for GMMK Pro Iso (#13980)Drashna Jaelre2021-08-131-1/+1
| |
* | [Keymap] Add andrebrait layout for GMMK Pro (#13932)Andre Brait2021-08-128-3/+342
| |
* | Make default keymap for GMMK Pro reflect stock (#13850)Andre Brait2021-08-095-24/+51
| |
* | Clean up remaining RGB_DISABLE_WHEN_USB_SUSPENDED defines Part 2 (#13912)Drashna Jaelre2021-08-071-1/+1
| |
* | Remove Full Bootmagic (#13846)James Young2021-08-063-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-071-0/+66
|\|
| * [Keymap] JackKenney's keymap for GMMK Pro (#13853)Jack Kenney2021-08-061-0/+66
| |
* | Copy GMMK Pro screw specs to ISO readme (#13908)Gigahawk2021-08-071-0/+14
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-061-0/+14
|\|
| * Add replacement screw specifications to GMMK Pro readme (#13903)Gigahawk2021-08-061-0/+14
| |
* | fix develop branch move file (#13832)Jonavin2021-08-011-0/+0
| | | | | | Co-authored-by: zvecr <git@zvecr.com>
* | Merge remote-tracking branch 'upstream/master' into developJames Young2021-07-294-34/+356
|\|
| * [Keymap] jonavin gmmk pro keymap add RGB functionality (#13591)Jonavin2021-07-294-34/+356
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Jonavin <=>
* | Remove deprecated callbacks for encoders and dip switches (#13404)Drashna Jaelre2021-07-241-13/+12
| |
* | [Keyboard] Split GMMK Pro PCBs into separate revisions (#13570)Gigahawk2021-07-1932-402/+904
| | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'upstream/master' into developNick Brassel2021-07-161-0/+8
|\|
| * Set some default configurations for GMMK Pro (#13219)Andre Brait2021-07-161-0/+9
| | | | | | | | | | * Set some default configurations for GMMK Pro * Remove FORCE_NKRO to avoid issues with KVMs
* | Merge remote-tracking branch 'origin/master' into developZach White2021-07-143-0/+197
|\| | | | | | | | | Resolved Conflicts: keyboards/checkerboards/nop60/info.json
| * [Keyboard} Add ISO support for the GMMK Pro (#13532)Anton2021-07-133-0/+197
| | | | | | | | | | | | | | | | | | | | * Added iso layer support for the GMMK Pro iso version * Adjusted the mapping * aligning with best practises * aligning with comments from PR * Added iso layout to info.json
* | [Keymap] add simple gmmk pro macos keymap with rgb (#13504)Alex Marmon2021-07-122-0/+73
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-034-0/+207
|\|
| * [Keymap] gmmk pro keymap with numpad, enhanced encoder functionality and Win ↵Jonavin2021-07-034-0/+207
| | | | | | | | | | key lock (#13406) Co-authored-by: Jonavin <=>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-06-244-0/+279
|\|
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-27 01:10:55 +0000