Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move GMMK Pro to allow for multiple revisions #16423

Merged
merged 29 commits into from
May 20, 2022
Merged

Move GMMK Pro to allow for multiple revisions #16423

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
134965c
Added GMMK PRO Rev2 WBG7 MCU compatibility. Added GMMK 2 WBG7 MCU com…
GloriousThrall Feb 22, 2022
cd8886f
GMMK PRO MCU Updates only (removed other kbs)
GloriousThrall Feb 22, 2022
b75deac
Merge branch 'qmk:master' into gmmk_updates_and_v2
GloriousThrall Feb 22, 2022
064e2e7
Merge branch 'develop' of https://github.com/qmk/qmk_firmware into gm…
Feb 23, 2022
936d7a7
fix problems
Feb 23, 2022
b129a75
Merge pull request #1 from wb-Joy/gmmk_updates_and_v2
Feb 23, 2022
c3efc9e
Merge branch 'develop' of https://github.com/qmk/qmk_firmware into gm…
Mar 14, 2022
72fd2d1
Optimize the code.
Mar 14, 2022
bdbde18
Merge pull request #5 from wb-Joy/gmmk_updates_and_v2
Mar 14, 2022
685fe04
Merge branch 'develop' of https://github.com/qmk/qmk_firmware into gm…
Apr 14, 2022
7cb43b3
Merge pull request #6 from wb-Joy/gmmk_updates_and_v2
Apr 14, 2022
7bb54c0
Update form develop branch
Apr 14, 2022
f8237f2
Update
Apr 14, 2022
e689f9b
Merge pull request #7 from wb-Joy/gmmk_updates_and_v2
Apr 14, 2022
7910fc4
Merge remote-tracking branch 'upstream/develop' into gmmk_updates_and_v2
Apr 20, 2022
ded9c7e
Updater from qmk/develop
Apr 20, 2022
b578ae3
Merge pull request #8 from wb-Joy/gmmk_updates_and_v2
Apr 20, 2022
27ecf89
Merge remote-tracking branch 'upstream/develop' into gmmk_updates_and_v2
Apr 22, 2022
d1c336e
Update
Apr 22, 2022
d21844f
Update from develop
Apr 22, 2022
254ed06
Update config.h
Apr 24, 2022
4e60820
Update config.h
Apr 24, 2022
35903b4
Merge branch 'develop' of https://github.com/qmk/qmk_firmware into gm…
May 16, 2022
2cc32b1
Remove gmmk pro rev2
May 16, 2022
4e52724
Merge pull request #13 from wb-Joy/gmmk_updates_and_v2
May 16, 2022
c8014d0
move moults31/keymap.c
May 16, 2022
4f773a9
Merge pull request #14 from wb-Joy/gmmk_updates_and_v2
May 16, 2022
96372c7
Update
May 16, 2022
bf4da1d
tidy up
zvecr May 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix problems
  • Loading branch information
Joy committed Feb 23, 2022
commit 936d7a75049003ab208fceda14c23744b4cbc9dd
9 changes: 5 additions & 4 deletions keyboards/gmmk/pro/rev2/ansi/rules.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,14 @@ MOUSEKEY_ENABLE = yes # Mouse keys
EXTRAKEY_ENABLE = yes # Audio control and System control
CONSOLE_ENABLE = no # Console for debug
COMMAND_ENABLE = no # Commands for debug and configuration
# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
NKRO_ENABLE = yes # USB Nkey Rollover
NKRO_ENABLE = yes # Enable N-Key Rollover
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output
ENCODER_ENABLE = yes
RGB_MATRIX_ENABLE = yes
RGB_MATRIX_DRIVER = AW20216
FLASH_DRIVER = spi # Enable SPI flash
EEPROM_DRIVER = custom # Enable SPI flash memory
SRC += ../src/eeprom_flash.c \
../src/wb32_spi_master.c
4 changes: 2 additions & 2 deletions keyboards/gmmk/pro/rev2/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@

#include "config_common.h"

#define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
#define EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN B12
#define EXTERNAL_FLASH_SIZE 8
#define EXTERNAL_FLASH_SIZE (8 * 1024)
#define EEPROM_SIZE EXTERNAL_FLASH_SIZE

/* SPI Config for LED Driver */
#define SPI_DRIVER SPIDQ
Loading