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.

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

GMMK 2 WBG7 MCU compatibility #16436

Merged
merged 49 commits into from
Jul 12, 2022
Merged
Show file tree
Hide file tree
Changes from 18 commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
54f1adc
GMMK V2 QMK Compatibility
GloriousThrall Feb 22, 2022
1ee42ab
Merge branch 'gmmk_v2_keyboard' of github.com:GloriousThrall/qmk_firm…
GloriousThrall Feb 22, 2022
b75c646
Merge branch 'develop' of https://github.com/qmk/qmk_firmware into gm…
Feb 23, 2022
a2b1fcf
fix problems
Feb 23, 2022
1a65dc7
Merge pull request #2 from wb-Joy/gmmk_v2_keyboard
Feb 23, 2022
69e7134
Update keyboards/gmmk/gmmk2/config.h
Mar 14, 2022
538295e
Update keyboards/gmmk/gmmk2/config.h
Mar 14, 2022
e8ba28a
Merge branch 'gmmk_v2_keyboard' of https://github.com/GloriousThrall/…
Mar 14, 2022
abf22d7
Fix a minor problem
Mar 14, 2022
a115419
Merge pull request #3 from wb-Joy/gmmk_v2_keyboard
Mar 14, 2022
4d65006
Optimize the code
Mar 14, 2022
696d4d6
Merge pull request #4 from wb-Joy/gmmk_v2_keyboard
Mar 14, 2022
82362fb
Merge remote-tracking branch 'upstream/develop' into gmmk_v2_keyboard
Apr 20, 2022
45492a7
Merge pull request #9 from wb-Joy/gmmk_v2_keyboard
Apr 20, 2022
1a64d46
Update config.h
Apr 20, 2022
1f54d0e
Update
Apr 22, 2022
253fdd4
Merge remote-tracking branch 'upstream/develop' into gmmk_v2_keyboard
Apr 22, 2022
ce51b08
Update from develop
Apr 22, 2022
b213c16
Update config.h
Apr 24, 2022
dbbe108
Update keyboards/gmmk/gmmk2/p96/ansi/keymaps/via/config.h
Apr 24, 2022
d81fdb7
Update config.h
Apr 24, 2022
63327eb
Update keyboards/gmmk/gmmk2/p96/iso/keymaps/via/config.h
Apr 24, 2022
ec3a419
Update config.h
Apr 24, 2022
30bc0f3
Update keyboards/gmmk/gmmk2/p65/ansi/rules.mk
Apr 24, 2022
112d715
Update keyboards/gmmk/gmmk2/p96/ansi/keymaps/default/keymap.c
Apr 24, 2022
dbaf70a
Update keyboards/gmmk/gmmk2/p96/ansi/keymaps/via/keymap.c
Apr 24, 2022
cddfc1a
Update keyboards/gmmk/gmmk2/p96/ansi/rules.mk
Apr 24, 2022
80608d2
Update keyboards/gmmk/gmmk2/p96/iso/rules.mk
Apr 24, 2022
c44ed03
Update keyboards/gmmk/gmmk2/p65/iso/rules.mk
Apr 24, 2022
aabaed0
Update config.h
Apr 24, 2022
67e8267
Update config.h
Apr 24, 2022
e94c8be
Update config.h
Apr 24, 2022
e4c8b5a
Modify device pid
Apr 25, 2022
c1997b3
Modify device pid
Apr 25, 2022
2d1e3bb
Add gmmk2_p96 keyboard.
May 20, 2022
4b7d58f
Add gmmk2_p96 keyboard.
May 20, 2022
3017852
Update led matrix.
Jun 8, 2022
72556c7
Merge remote-tracking branch 'glorious/gmmk_v2_keyboard' into gmmk_v2…
Jun 8, 2022
bf2e43c
Update led matrix.
Jun 8, 2022
6720281
Delete eeprom_flash.c
Jul 2, 2022
a27e64a
Update keyboards/gmmk/gmmk2/p96/ansi/rules.mk
Jul 2, 2022
dd87ce4
Merge branch 'gmmk_v2_keyboard' of https://github.com/GloriousThrall/…
Jul 6, 2022
7038f61
Update from qmk develop branch
Jul 6, 2022
0befdce
Merge branch from qmk develop
Jul 6, 2022
165a680
Increased compatibility with wear_leveling.
Jul 6, 2022
31cb80a
Merge branch 'qmk:master' into gmmk_v2_keyboard
Jul 6, 2022
04fcb31
Merge branch 'gmmk_v2_keyboard' into gmmk_v2_keyboard
Jul 6, 2022
d32ab62
Merge qmk develop branch.
Jul 6, 2022
63ab2b2
Update config.h
Jul 7, 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
88 changes: 88 additions & 0 deletions keyboards/gmmk/gmmk2/config.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
/* Copyright 2021 Glorious, LLC <[email protected]>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

#pragma once

#include "config_common.h"

#define RGB_DISABLE_WHEN_USB_SUSPENDED
#define EXTERNAL_FLASH_SIZE (8 * 1024)
#define EEPROM_SIZE EXTERNAL_FLASH_SIZE

/* USB Device descriptor parameter */
#define DEVICE_VER 0x0001
#define VENDOR_ID 0x320F
#define PRODUCT_ID 0x5044
#define MANUFACTURER Glorious

// RGB Matrix Animation modes. Explicitly enabled
// For full list of effects, see:
// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
#define ENABLE_RGB_MATRIX_ALPHAS_MODS
#define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
#define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
#define ENABLE_RGB_MATRIX_BREATHING
#define ENABLE_RGB_MATRIX_BAND_SAT
#define ENABLE_RGB_MATRIX_BAND_VAL
#define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
#define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
#define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
#define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
#define ENABLE_RGB_MATRIX_CYCLE_ALL
#define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
#define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
#define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
#define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
#define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
#define ENABLE_RGB_MATRIX_DUAL_BEACON
#define ENABLE_RGB_MATRIX_RAINBOW_BEACON
#define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
#define ENABLE_RGB_MATRIX_RAINDROPS
#define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
#define ENABLE_RGB_MATRIX_HUE_BREATHING
#define ENABLE_RGB_MATRIX_HUE_PENDULUM
#define ENABLE_RGB_MATRIX_HUE_WAVE
#define ENABLE_RGB_MATRIX_PIXEL_RAIN
#define ENABLE_RGB_MATRIX_PIXEL_FLOW
#define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined
#define ENABLE_RGB_MATRIX_TYPING_HEATMAP
#define ENABLE_RGB_MATRIX_DIGITAL_RAIN
// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined
#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
#define ENABLE_RGB_MATRIX_SOLID_REACTIVE
#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
#define ENABLE_RGB_MATRIX_SPLASH
#define ENABLE_RGB_MATRIX_MULTISPLASH
#define ENABLE_RGB_MATRIX_SOLID_SPLASH
#define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH


/* Send up to 4 key press events per scan */
#define QMK_KEYS_PER_SCAN 4

/* Set debounce time to 5ms */
#define DEBOUNCE 5

/* Force NKRO on boot up regardless of the setting saved in the EEPROM (uncomment to enable it) */
// #define FORCE_NKRO
17 changes: 17 additions & 0 deletions keyboards/gmmk/gmmk2/gmmk2.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
/* Copyright 2021 Glorious, LLC <[email protected]>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

#include "gmmk2.h"
29 changes: 29 additions & 0 deletions keyboards/gmmk/gmmk2/gmmk2.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
/* Copyright 2021 Glorious, LLC <[email protected]>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

#pragma once

#include "quantum.h"

#if defined(KEYBOARD_gmmk_gmmk2_p65_ansi)
# include "p65/ansi/ansi.h"
#elif defined(KEYBOARD_gmmk_gmmk2_p65_iso)
# include "p65/iso/iso.h"
#elif defined(KEYBOARD_gmmk_gmmk2_p96_ansi)
# include "p96/ansi/ansi.h"
#elif defined(KEYBOARD_gmmk_gmmk2_p96_iso)
# include "p96/iso/iso.h"
#endif // GMMK V2 revisions
30 changes: 30 additions & 0 deletions keyboards/gmmk/gmmk2/halconf.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
/*
Copyright (C) 2021 Westberry Technology (ChangZhou) Corp., Ltd

This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.

This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.

You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

/*
* This file was auto-generated by:
* `qmk chibios-confmigrate -i keyboards/wb_support/gmmk2/halconf.h -r platforms/chibios/boards/common/configs/halconf.h`
*/

#pragma once

#define HAL_USE_SPI TRUE
#define SPI_USE_WAIT TRUE
#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD

#include_next <halconf.h>

30 changes: 30 additions & 0 deletions keyboards/gmmk/gmmk2/mcuconf.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
/*
Copyright (C) 2021 Westberry Technology (ChangZhou) Corp., Ltd

This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.

This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.

You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/*
* This file was auto-generated by:
* `qmk chibios-confmigrate -i keyboards/wb_support/gmmk2/mcuconf.h -r platforms/chibios/GENERIC_WB32_F3G71XX/configs/mcuconf.h`
*/

#pragma once

#include_next <mcuconf.h>

#undef WB32_SPI_USE_QSPI
#define WB32_SPI_USE_QSPI TRUE

#undef WB32_SPI_USE_SPIM2
#define WB32_SPI_USE_SPIM2 TRUE
Loading