Commit graph

26 commits

Author SHA1 Message Date
James Young
90ab5c4ac5 GMMK2 65% ANSI Touch-Up (#21544)
* [chore] correct layout data

* [chore] rename LAYOUT to LAYOUT_65_ansi_blocker

Also adds a layout alias so as to not have to edit the user keymaps.

* [enhancement] enable Community Layout support
2023-07-17 13:48:15 -07:00
QMK Bot
915aa6506e Merge remote-tracking branch 'origin/master' into develop 2023-04-17 12:12:00 +00:00
Albert Y
c34e590367 GMMK 2 volume up/down Fn keys are backwards in default mapping (#20476) 2023-04-17 13:11:22 +01:00
Nick Brassel
432475f553 Encodermap direction define. (#20454) 2023-04-15 16:18:44 +01:00
Cameron Varley
139a4f31ea [Keyboard] Add GMMK Numpad (#20067)
Co-authored-by: Sergey Vlasov <sigprof@gmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2023-04-02 01:34:54 -07:00
Nick Brassel
41a03128b8 Remove usages of config_common.h from config.h files. (#19714) 2023-01-31 06:03:30 +11:00
ForsakenRei
d7c5a5ae63 KC_GESC -> QK_GESC and better alignment (#19018) 2022-11-10 01:27:09 +00:00
Ryan
294ced713d Normalise Unicode keycodes (#18898)
* `UC_MOD`/`UC_RMOD` -> `UC_NEXT`/`UC_PREV`

* `UNICODE_MODE_*` -> `QK_UNICODE_MODE_*`

* `UC_MAC` -> `UNICODE_MODE_MACOS`

* `UC_LNX` -> `UNICODE_MODE_LINUX`

* `UC_WIN` -> `UNICODE_MODE_WINDOWS`

* `UC_BSD` -> `UNICODE_MODE_BSD`

* `UC_WINC` -> `UNICODE_MODE_WINCOMPOSE`

* `UC_EMACS` -> `UNICODE_MODE_EMACS`

* `UC__COUNT` -> `UNICODE_MODE_COUNT`

* `UC_M_MA` -> `UC_MAC`

* `UC_M_LN` -> `UC_LINX`

* `UC_M_WI` -> `UC_WIN`

* `UC_M_BS` -> `UC_BSD`

* `UC_M_WC` -> `UC_WINC`

* `UC_M_EM` -> `UC_EMAC`

* Docs

* Update quantum/unicode/unicode.h
2022-10-31 21:15:12 +00:00
Ryan
58c0f56e04 Remove legacy Grave Escape keycodes (#18787) 2022-10-20 18:04:11 -07:00
Ryan
ab0ad878c6 Remove legacy keycodes, part 5 (#18710)
* `KC_SLCK` -> `KC_SCRL`
* `KC_NLCK` -> `KC_NUM`
2022-10-15 22:29:43 +01:00
fauxpark
419dbc36e0 Merge remote-tracking branch 'upstream/master' into develop 2022-10-06 04:47:34 +11:00
adophoxia
8cbb043fac [Keyboard] Add encoder map support for GMMK Pro (#18600) 2022-10-05 10:42:21 -07:00
Andre Brait
e9155420d4 GMMK Pro: fix unintended volume encoder taps (#17129) 2022-09-24 09:37:04 -07:00
Joy Lee
c4fc2599d5 Added gmmk v2 p65 keyboard. (#18185) 2022-09-09 23:12:48 +01:00
Joel Challis
5fc7a13803 RESET -> QK_BOOT user keymaps (#17940) 2022-08-21 23:55:30 +01:00
Joy Lee
6c2bff5e18 Added support for gmmk pro rev2 keyboard. (#17655)
Co-authored-by: Joy <chang.li@westberrytech.com>
2022-08-14 14:00:12 +10:00
Nick Brassel
d54da37be1 [Core] STM32_USB_USE_OTG1 => USB_ENDPOINTS_ARE_REORDERABLE (#17647) 2022-08-04 21:05:16 +10:00
GloriousThrall
eb126e69a1 GMMK 2 WBG7 MCU compatibility (#16436)
* GMMK V2 QMK Compatibility

* fix problems

* Update keyboards/gmmk/gmmk2/config.h

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Update keyboards/gmmk/gmmk2/config.h

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Fix a minor problem

* Optimize the code

* Update config.h

* Update

* Update config.h

* Update keyboards/gmmk/gmmk2/p96/ansi/keymaps/via/config.h

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Update config.h

* Update keyboards/gmmk/gmmk2/p96/iso/keymaps/via/config.h

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Update config.h

* Update keyboards/gmmk/gmmk2/p65/ansi/rules.mk

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Update keyboards/gmmk/gmmk2/p96/ansi/keymaps/default/keymap.c

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Update keyboards/gmmk/gmmk2/p96/ansi/keymaps/via/keymap.c

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Update keyboards/gmmk/gmmk2/p96/ansi/rules.mk

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Update keyboards/gmmk/gmmk2/p96/iso/rules.mk

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Update keyboards/gmmk/gmmk2/p65/iso/rules.mk

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Update config.h

* Update config.h

* Update config.h

* Modify device pid

* Add gmmk2_p96 keyboard.

* Add gmmk2_p96 keyboard.

* Update led matrix.

* Update led matrix.

* Delete eeprom_flash.c

* Update keyboards/gmmk/gmmk2/p96/ansi/rules.mk

Co-authored-by: Nick Brassel <nick@tzarc.org>

* Update from qmk develop branch

* Increased compatibility with wear_leveling.

* Update config.h

Co-authored-by: Joy <chang.li@westberrytech.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Nick Brassel <nick@tzarc.org>
2022-07-12 17:30:54 +10:00
GloriousThrall
f70f848890 Move GMMK Pro to allow for multiple revisions (#16423)
* Added GMMK PRO Rev2 WBG7 MCU compatibility. Added GMMK 2 WBG7 MCU compatibility.

* GMMK PRO MCU Updates only (removed other kbs)

* fix problems

* Optimize the code.

* Update form develop branch

* Update

* Updater from qmk/develop

* Update

* Update config.h

* Update config.h

* Remove gmmk pro rev2

* move moults31/keymap.c

* Update

* tidy up

Co-authored-by: Joy <chang.li@westberrytech.com>
Co-authored-by: zvecr <git@zvecr.com>
2022-05-20 01:47:22 +01:00
Joel Challis
1b3224d576 RESET -> QK_BOOT default keymaps (#17037) 2022-05-15 20:26:27 +01:00
Dasky
e5fd8ac497 GMMK Pro return false in encoder user. (#16830) 2022-04-11 20:18:44 +10:00
Andre Brait
c7545f4bd6 [Keymap] Add andrebrait layout for GMMK Pro (#13932) 2021-08-12 06:55:19 -07:00
Andre Brait
b354cf66eb Make default keymap for GMMK Pro reflect stock (#13850) 2021-08-09 10:04:58 -07:00
Gigahawk
cee2dda17c [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
Drashna Jaelre
768c92aab6 Convert Encoder callbacks to be boolean functions (#12805)
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
2021-05-21 23:17:32 -07:00
W. Ducky
1ba6fa7f87 GMMK Pro: Fixed Bootmagic Lite support; personal keymap; VIA support (#12554)
* Added WholesomeDucky keymap for GMMK Pro

* Finalized keymap & added 1000hz polling for GMMK Pro

* Corrected for RAlt and Fn being swapped

* Fixed RAlt and Fn being swapped in the layout definition. Updated personal keymap to reflect fixed layout.

* Removed an old comment from personal keymap for GMMK Pro

* added VIA support

* Defined bootmagic row and column for GMMK Pro Esc key

* Update keyboards/gmmk/pro/config.h

* Update keyboards/gmmk/pro/keymaps/via/keymap.c

* Update keyboards/gmmk/pro/keymaps/via/keymap.c
2021-04-27 11:37:11 -07:00