Commit Graph

62 Commits

Author SHA1 Message Date
a8d440e4e0 Tidy up NKRO_ENABLE rules (#15382) 2021-12-09 16:05:44 +11:00
c12b997679 Tidy up SLEEP_LED_ENABLE rules (#15362) 2021-12-01 21:13:00 +11:00
282e916d86 Remove use of __flash due to LTO issues (#15268) 2021-11-24 18:38:49 +11:00
160b0558f5 Require explicit enabling of RGB Matrix modes (#15018) 2021-11-15 10:41:04 -08:00
ea3b2e2f95 Merge remote-tracking branch 'origin/master' into develop 2021-11-05 18:27:47 +00:00
6bed639d08 [Keymap][GMMK Pro] Add personal profile (#15069)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Cory Ginsberg <coryginsberg@fb.com>
2021-11-05 11:27:18 -07:00
84ea77ead6 Remove BOOTMAGIC_ENABLE = lite option (#15002)
* 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-05 08:18:09 +11:00
640a596cca Merge remote-tracking branch 'origin/master' into develop 2021-10-23 06:04:24 +00:00
443d306827 [Keymap] Jonavin userspace keymap updates INVERT_NUMLOCK_INDICATOR (#14880)
Co-authored-by: Jonavin <=>
2021-10-22 23:04:08 -07:00
b36f2609fe Merge remote-tracking branch 'origin/master' into develop 2021-10-15 19:08:00 -07:00
4db5d85273 [Keymap] Added GMMK Pro keymap with RGB (#14648)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-10-15 19:02:19 -07:00
bc41d37baf Merge remote-tracking branch 'origin/master' into develop 2021-09-28 19:24:40 +00:00
705cd433c2 [Keymap] fix NKRO - switch to get_mods() and refactor encoder action code (#14278)
Co-authored-by: Jonavin <=>
2021-09-28 12:24:12 -07:00
09b933ad41 [Keymap] GMMK Pro keymap (#14389) 2021-09-18 12:05:16 -07:00
3496513865 [Keymap] Adding personal keymap (#14326)
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-09-16 21:38:11 -07:00
5af1799735 Remove BLUETOOTH_ENABLE from keyboard-level rules.mk (#14379) 2021-09-12 15:27:29 +10:00
4791cfae1a Remove width, height and key_count from info.json (#14274) 2021-09-12 14:04:56 +10:00
d7747a2d70 [Keymap] moults31 userspace and keymaps (#12025) 2021-09-10 18:56:50 -07:00
b6ca21c65c [Keymap] Jonavin keymap gmmk pro (#14220)
add rgb nightmode and optional colemak layer 

Co-authored-by: Jonavin <=>
2021-09-01 20:42:31 -07:00
fac5ec4656 Move GMMK Pro layouts to the correct subdir (#14241)
Also fix a compilation issue in the mike1808 keymap
2021-09-01 00:18:35 +01:00
eaad654798 [Keymap] Fixed GMMK Pro -> stickandgum keymap readme.md (#14123)
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
2021-08-24 01:48:35 -07:00
d8778eba92 Fixup line endings. 2021-08-23 19:37:16 +10:00
71df135254 [Keymap] Feature rich keymap for GMMK Pro (ANSI) (#14120)
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
2021-08-22 19:19:11 -07:00
c5f41d42d8 Updated RGB Matrix suspend define part 3 (#13954)
* Updated RGB Matrix suspend define part 3

* Revert "Update config.h for kbdfans/kbd67/mkiirgb/v3 (#13978)"

This reverts commit 80015f7fb0.

* Add additional boards/keymaps
2021-08-22 09:46:35 +10:00
4279b14adf Merge remote-tracking branch 'upstream/master' into develop
Conflicts:
	keyboards/gmmk/pro/ansi/keymaps/jonavin/rules.mk
	keyboards/space_space/rules.mk
2021-08-19 11:32:23 -07:00
98af5bc64e [Keymap] Add jonavin user space / common functions (#13876)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Jonavin <=>
2021-08-19 10:45:49 -07:00
999391f3ae Created "paddlegame" keymap (#13629)
* 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>
2021-08-18 08:43:27 +10:00
857716794b gmmk/pro/mike1808 keymap (#13398)
* 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
2021-08-18 07:10:46 +10:00
5711a3bac2 [Keymap] Improve andrebrait keymap (#13985) 2021-08-13 11:33:04 -07:00
799c2bdfa3 [Keyboard] Fix default keymap for GMMK Pro Iso (#13980) 2021-08-13 04:47:20 +10:00
33f64903b4 [Keymap] Add andrebrait layout for GMMK Pro (#13932) 2021-08-12 06:55:19 -07:00
dbee96098d Make default keymap for GMMK Pro reflect stock (#13850) 2021-08-09 10:04:58 -07:00
6fb9842936 Clean up remaining RGB_DISABLE_WHEN_USB_SUSPENDED defines Part 2 (#13912) 2021-08-07 15:18:06 +01:00
a03aa301de Remove Full Bootmagic (#13846)
* 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-06 23:59:56 -07:00
07a7724f2b Merge remote-tracking branch 'origin/master' into develop 2021-08-07 06:50:18 +00:00
e4342f8630 [Keymap] JackKenney's keymap for GMMK Pro (#13853) 2021-08-06 23:49:25 -07:00
13b94b468d Copy GMMK Pro screw specs to ISO readme (#13908) 2021-08-07 08:11:17 +10:00
9e7bfdf6c6 Merge remote-tracking branch 'origin/master' into develop 2021-08-06 11:55:12 +00:00
bdf86c4cbd Add replacement screw specifications to GMMK Pro readme (#13903) 2021-08-06 04:54:43 -07:00
53683e8d20 fix develop branch move file (#13832)
Co-authored-by: zvecr <git@zvecr.com>
2021-08-01 22:37:59 +10:00
80d8c4a483 Merge remote-tracking branch 'upstream/master' into develop 2021-07-29 23:04:06 -07:00
03212ced24 [Keymap] jonavin gmmk pro keymap add RGB functionality (#13591)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Jonavin <=>
2021-07-29 22:38:38 -07:00
b8a1e14f53 Remove deprecated callbacks for encoders and dip switches (#13404) 2021-07-24 00:37:19 -07:00
b994921703 [Keyboard] Split GMMK Pro PCBs into separate revisions (#13570)
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-07-19 17:57:19 -07:00
610788184a Merge remote-tracking branch 'upstream/master' into develop 2021-07-16 09:11:51 +10:00
c330fa725d Set some default configurations for GMMK Pro (#13219)
* Set some default configurations for GMMK Pro

* Remove FORCE_NKRO to avoid issues with KVMs
2021-07-16 09:06:23 +10:00
44d322623e Merge remote-tracking branch 'origin/master' into develop
Resolved Conflicts:
	keyboards/checkerboards/nop60/info.json
2021-07-14 10:30:28 -07:00
2fd4595955 [Keyboard} Add ISO support for the GMMK Pro (#13532)
* 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
2021-07-13 16:50:17 -07:00
00e97aae67 [Keymap] add simple gmmk pro macos keymap with rgb (#13504) 2021-07-12 09:36:24 -07:00
4459f91dc2 Merge remote-tracking branch 'origin/master' into develop 2021-07-03 08:37:05 +00:00