From 83fa6fe916bfd7d337f05d7805f0a51ad86c8b43 Mon Sep 17 00:00:00 2001 From: GloriousThrall <74627436+GloriousThrall@users.noreply.github.com> Date: Thu, 19 May 2022 19:47:22 -0500 Subject: [PATCH] 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 Co-authored-by: zvecr --- data/mappings/keyboard_aliases.json | 8 ++++++- keyboards/gmmk/pro/config.h | 1 - keyboards/gmmk/pro/halconf.h | 7 ------ keyboards/gmmk/pro/mcuconf.h | 6 ----- keyboards/gmmk/pro/pro.h | 8 +++---- keyboards/gmmk/pro/{ => rev1}/ansi/ansi.c | 0 keyboards/gmmk/pro/{ => rev1}/ansi/ansi.h | 0 keyboards/gmmk/pro/{ => rev1}/ansi/config.h | 0 keyboards/gmmk/pro/{ => rev1}/ansi/info.json | 0 .../ansi/keymaps/alexmarmon/keymap.c | 0 .../ansi/keymaps/alexmarmon/readme.md | 0 .../ansi/keymaps/andrebrait/config.h | 0 .../ansi/keymaps/andrebrait/keymap.c | 0 .../ansi/keymaps/andrebrait/readme.md | 0 .../ansi/keymaps/andrebrait/rules.mk | 0 .../ansi/keymaps/andrewcharnley/config.h | 0 .../ansi/keymaps/andrewcharnley/keymap.c | 0 .../ansi/keymaps/andrewcharnley/readme.md | 0 .../{ => rev1}/ansi/keymaps/batin/keymap.c | 0 .../ansi/keymaps/benschaeff/keymap.c | 0 .../ansi/keymaps/benschaeff/readme.md | 0 .../ansi/keymaps/byungyoonc/config.h | 0 .../ansi/keymaps/byungyoonc/keymap.c | 0 .../ansi/keymaps/byungyoonc/readme.md | 0 .../keymaps/byungyoonc/rgb_matrix_user.inc | 0 .../ansi/keymaps/byungyoonc/rules.mk | 0 .../{ => rev1}/ansi/keymaps/cedrikl/keymap.c | 0 .../ansi/keymaps/cedrikl/rgb_matrix_map.h | 0 .../{ => rev1}/ansi/keymaps/cedrikl/rules.mk | 0 .../ansi/keymaps/coryginsberg/config.h | 0 .../ansi/keymaps/coryginsberg/keymap.c | 0 .../ansi/keymaps/coryginsberg/readme.md | 0 .../ansi/keymaps/coryginsberg/rules.mk | 0 .../{ => rev1}/ansi/keymaps/default/keymap.c | 0 .../{ => rev1}/ansi/keymaps/gigahawk/config.h | 0 .../{ => rev1}/ansi/keymaps/gigahawk/keymap.c | 0 .../ansi/keymaps/gourdo1/caps_word.c | 0 .../ansi/keymaps/gourdo1/caps_word.h | 0 .../{ => rev1}/ansi/keymaps/gourdo1/config.h | 0 .../{ => rev1}/ansi/keymaps/gourdo1/keymap.c | 0 .../{ => rev1}/ansi/keymaps/gourdo1/readme.md | 0 .../ansi/keymaps/gourdo1/rgb_matrix_map.h | 0 .../{ => rev1}/ansi/keymaps/gourdo1/rules.mk | 0 .../ansi/keymaps/hachetman/config.h | 0 .../ansi/keymaps/hachetman/keymap.c | 0 .../ansi/keymaps/hachetman/readme.md | 0 .../ansi/keymaps/hachetman/rules.mk | 0 .../ansi/keymaps/jackkenney/keymap.c | 0 .../{ => rev1}/ansi/keymaps/jonavin/config.h | 0 .../{ => rev1}/ansi/keymaps/jonavin/keymap.c | 0 .../{ => rev1}/ansi/keymaps/jonavin/readme.md | 0 .../ansi/keymaps/jonavin/rgb_matrix_map.h | 0 .../{ => rev1}/ansi/keymaps/jonavin/rules.mk | 0 .../ansi/keymaps/lalitmaganti/config.h | 0 .../ansi/keymaps/lalitmaganti/keymap.c | 0 .../ansi/keymaps/lalitmaganti/rules.mk | 0 .../{ => rev1}/ansi/keymaps/macos/config.h | 0 .../{ => rev1}/ansi/keymaps/macos/keymap.c | 0 .../{ => rev1}/ansi/keymaps/macos/readme.md | 0 .../{ => rev1}/ansi/keymaps/macos/rules.mk | 0 .../{ => rev1}/ansi/keymaps/mattgauf/ansi.c | 0 .../{ => rev1}/ansi/keymaps/mattgauf/config.h | 0 .../ansi/keymaps/mattgauf/helpers.c | 0 .../{ => rev1}/ansi/keymaps/mattgauf/keymap.c | 0 .../ansi/keymaps/mattgauf/keymap_helpers.h | 0 .../ansi/keymaps/mattgauf/readme.md | 0 .../{ => rev1}/ansi/keymaps/mattgauf/rules.mk | 0 .../ansi/keymaps/mike1808/.gitignore | 0 .../ansi/keymaps/mike1808/README.md | 0 .../{ => rev1}/ansi/keymaps/mike1808/config.h | 0 .../ansi/keymaps/mike1808/encoder.c | 0 .../ansi/keymaps/mike1808/encoder.h | 0 .../{ => rev1}/ansi/keymaps/mike1808/fun.c | 0 .../{ => rev1}/ansi/keymaps/mike1808/keymap.c | 0 .../ansi/keymaps/mike1808/mike1808.c | 0 .../ansi/keymaps/mike1808/mike1808.h | 0 .../ansi/keymaps/mike1808/process_record.c | 0 .../ansi/keymaps/mike1808/process_record.h | 0 .../keymaps/mike1808/rgb_matrix_ledmaps.c | 0 .../keymaps/mike1808/rgb_matrix_ledmaps.h | 0 .../{ => rev1}/ansi/keymaps/mike1808/rules.mk | 0 .../{ => rev1}/ansi/keymaps/mike1808/utils.c | 0 .../{ => rev1}/ansi/keymaps/mike1808/utils.h | 0 .../{ => rev1/ansi}/keymaps/moults31/keymap.c | 0 .../ansi/keymaps/paddlegame/config.h | 0 .../ansi/keymaps/paddlegame/keymap.c | 0 .../ansi/keymaps/paddlegame/paddlegame.h | 0 .../ansi/keymaps/paddlegame/readme.md | 0 .../ansi/keymaps/paddlegame/rgb_matrix_map.h | 0 .../ansi/keymaps/paddlegame/rules.mk | 0 .../ansi/keymaps/stickandgum/config.h | 0 .../ansi/keymaps/stickandgum/keymap.c | 0 .../ansi/keymaps/stickandgum/readme.md | 0 .../ansi/keymaps/stickandgum/rules.mk | 0 .../pro/{ => rev1}/ansi/keymaps/via/keymap.c | 0 .../pro/{ => rev1}/ansi/keymaps/via/rules.mk | 0 .../ansi/keymaps/wholesomeducky/keymap.c | 0 .../{ => rev1}/ansi/keymaps/willwm/keymap.c | 0 .../ansi/keymaps/willwm/keymap.json | 0 .../{ => rev1}/ansi/keymaps/willwm/readme.md | 0 .../{ => rev1}/ansi/keymaps/willwm/rules.mk | 0 keyboards/gmmk/pro/{ => rev1}/ansi/readme.md | 4 ++-- keyboards/gmmk/pro/{ => rev1}/ansi/rules.mk | 0 keyboards/gmmk/pro/rev1/config.h | 22 ++++++++++++++++++ keyboards/gmmk/pro/rev1/halconf.h | 23 +++++++++++++++++++ keyboards/gmmk/pro/{ => rev1}/iso/config.h | 0 keyboards/gmmk/pro/{ => rev1}/iso/info.json | 0 keyboards/gmmk/pro/{ => rev1}/iso/iso.c | 0 keyboards/gmmk/pro/{ => rev1}/iso/iso.h | 0 .../{ => rev1}/iso/keymaps/chofstede/keymap.c | 0 .../iso/keymaps/chofstede/readme.md | 0 .../{ => rev1}/iso/keymaps/default/keymap.c | 0 .../{ => rev1}/iso/keymaps/jonavin/config.h | 0 .../{ => rev1}/iso/keymaps/jonavin/keymap.c | 0 .../{ => rev1}/iso/keymaps/jonavin/readme.md | 0 .../iso/keymaps/jonavin/rgb_matrix_map.h | 0 .../{ => rev1}/iso/keymaps/jonavin/rules.mk | 0 .../pro/{ => rev1}/iso/keymaps/via/keymap.c | 0 .../pro/{ => rev1}/iso/keymaps/via/rules.mk | 0 .../{ => rev1}/iso/keymaps/vitoni/config.h | 0 .../{ => rev1}/iso/keymaps/vitoni/keymap.c | 0 .../{ => rev1}/iso/keymaps/vitoni/readme.adoc | 0 keyboards/gmmk/pro/{ => rev1}/iso/readme.md | 4 ++-- keyboards/gmmk/pro/{ => rev1}/iso/rules.mk | 0 keyboards/gmmk/pro/rev1/mcuconf.h | 22 ++++++++++++++++++ 125 files changed, 82 insertions(+), 23 deletions(-) delete mode 100644 keyboards/gmmk/pro/halconf.h delete mode 100644 keyboards/gmmk/pro/mcuconf.h rename keyboards/gmmk/pro/{ => rev1}/ansi/ansi.c (100%) rename keyboards/gmmk/pro/{ => rev1}/ansi/ansi.h (100%) rename keyboards/gmmk/pro/{ => rev1}/ansi/config.h (100%) rename keyboards/gmmk/pro/{ => rev1}/ansi/info.json (100%) rename keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/alexmarmon/keymap.c (100%) rename keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/alexmarmon/readme.md (100%) rename keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/andrebrait/config.h (100%) rename keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/andrebrait/keymap.c (100%) rename keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/andrebrait/readme.md (100%) rename keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/andrebrait/rules.mk (100%) rename keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/andrewcharnley/config.h (100%) rename keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/andrewcharnley/keymap.c (100%) rename keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/andrewcharnley/readme.md (100%) rename keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/batin/keymap.c (100%) rename keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/benschaeff/keymap.c (100%) rename keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/benschaeff/readme.md (100%) rename keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/byungyoonc/config.h (100%) rename keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/byungyoonc/keymap.c (100%) rename keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/byungyoonc/readme.md (100%) rename keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/byungyoonc/rgb_matrix_user.inc (100%) rename keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/byungyoonc/rules.mk (100%) rename keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/cedrikl/keymap.c (100%) rename keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/cedrikl/rgb_matrix_map.h (100%) rename keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/cedrikl/rules.mk (100%) rename keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/coryginsberg/config.h (100%) rename keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/coryginsberg/keymap.c (100%) rename keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/coryginsberg/readme.md (100%) rename keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/coryginsberg/rules.mk (100%) rename keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/default/keymap.c (100%) rename keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/gigahawk/config.h (100%) rename keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/gigahawk/keymap.c (100%) rename keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/gourdo1/caps_word.c (100%) rename keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/gourdo1/caps_word.h (100%) rename keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/gourdo1/config.h (100%) rename keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/gourdo1/keymap.c (100%) rename keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/gourdo1/readme.md (100%) rename keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/gourdo1/rgb_matrix_map.h (100%) rename keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/gourdo1/rules.mk (100%) rename keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/hachetman/config.h (100%) rename keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/hachetman/keymap.c (100%) rename keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/hachetman/readme.md (100%) rename keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/hachetman/rules.mk (100%) rename keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/jackkenney/keymap.c (100%) rename keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/jonavin/config.h (100%) rename keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/jonavin/keymap.c (100%) rename keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/jonavin/readme.md (100%) rename keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/jonavin/rgb_matrix_map.h (100%) rename keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/jonavin/rules.mk (100%) rename keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/lalitmaganti/config.h (100%) rename keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/lalitmaganti/keymap.c (100%) rename keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/lalitmaganti/rules.mk (100%) rename keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/macos/config.h (100%) rename keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/macos/keymap.c (100%) rename keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/macos/readme.md (100%) rename keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/macos/rules.mk (100%) rename keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/mattgauf/ansi.c (100%) rename keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/mattgauf/config.h (100%) rename keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/mattgauf/helpers.c (100%) rename keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/mattgauf/keymap.c (100%) rename keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/mattgauf/keymap_helpers.h (100%) rename keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/mattgauf/readme.md (100%) rename keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/mattgauf/rules.mk (100%) rename keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/mike1808/.gitignore (100%) rename keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/mike1808/README.md (100%) rename keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/mike1808/config.h (100%) rename keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/mike1808/encoder.c (100%) rename keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/mike1808/encoder.h (100%) rename keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/mike1808/fun.c (100%) rename keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/mike1808/keymap.c (100%) rename keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/mike1808/mike1808.c (100%) rename keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/mike1808/mike1808.h (100%) rename keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/mike1808/process_record.c (100%) rename keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/mike1808/process_record.h (100%) rename keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/mike1808/rgb_matrix_ledmaps.c (100%) rename keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/mike1808/rgb_matrix_ledmaps.h (100%) rename keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/mike1808/rules.mk (100%) rename keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/mike1808/utils.c (100%) rename keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/mike1808/utils.h (100%) rename keyboards/gmmk/pro/{ => rev1/ansi}/keymaps/moults31/keymap.c (100%) rename keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/paddlegame/config.h (100%) rename keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/paddlegame/keymap.c (100%) rename keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/paddlegame/paddlegame.h (100%) rename keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/paddlegame/readme.md (100%) rename keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/paddlegame/rgb_matrix_map.h (100%) rename keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/paddlegame/rules.mk (100%) rename keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/stickandgum/config.h (100%) rename keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/stickandgum/keymap.c (100%) rename keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/stickandgum/readme.md (100%) rename keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/stickandgum/rules.mk (100%) rename keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/via/keymap.c (100%) rename keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/via/rules.mk (100%) rename keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/wholesomeducky/keymap.c (100%) rename keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/willwm/keymap.c (100%) rename keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/willwm/keymap.json (100%) rename keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/willwm/readme.md (100%) rename keyboards/gmmk/pro/{ => rev1}/ansi/keymaps/willwm/rules.mk (100%) rename keyboards/gmmk/pro/{ => rev1}/ansi/readme.md (95%) rename keyboards/gmmk/pro/{ => rev1}/ansi/rules.mk (100%) create mode 100644 keyboards/gmmk/pro/rev1/config.h create mode 100644 keyboards/gmmk/pro/rev1/halconf.h rename keyboards/gmmk/pro/{ => rev1}/iso/config.h (100%) rename keyboards/gmmk/pro/{ => rev1}/iso/info.json (100%) rename keyboards/gmmk/pro/{ => rev1}/iso/iso.c (100%) rename keyboards/gmmk/pro/{ => rev1}/iso/iso.h (100%) rename keyboards/gmmk/pro/{ => rev1}/iso/keymaps/chofstede/keymap.c (100%) rename keyboards/gmmk/pro/{ => rev1}/iso/keymaps/chofstede/readme.md (100%) rename keyboards/gmmk/pro/{ => rev1}/iso/keymaps/default/keymap.c (100%) rename keyboards/gmmk/pro/{ => rev1}/iso/keymaps/jonavin/config.h (100%) rename keyboards/gmmk/pro/{ => rev1}/iso/keymaps/jonavin/keymap.c (100%) rename keyboards/gmmk/pro/{ => rev1}/iso/keymaps/jonavin/readme.md (100%) rename keyboards/gmmk/pro/{ => rev1}/iso/keymaps/jonavin/rgb_matrix_map.h (100%) rename keyboards/gmmk/pro/{ => rev1}/iso/keymaps/jonavin/rules.mk (100%) rename keyboards/gmmk/pro/{ => rev1}/iso/keymaps/via/keymap.c (100%) rename keyboards/gmmk/pro/{ => rev1}/iso/keymaps/via/rules.mk (100%) rename keyboards/gmmk/pro/{ => rev1}/iso/keymaps/vitoni/config.h (100%) rename keyboards/gmmk/pro/{ => rev1}/iso/keymaps/vitoni/keymap.c (100%) rename keyboards/gmmk/pro/{ => rev1}/iso/keymaps/vitoni/readme.adoc (100%) rename keyboards/gmmk/pro/{ => rev1}/iso/readme.md (96%) rename keyboards/gmmk/pro/{ => rev1}/iso/rules.mk (100%) create mode 100644 keyboards/gmmk/pro/rev1/mcuconf.h diff --git a/data/mappings/keyboard_aliases.json b/data/mappings/keyboard_aliases.json index 343812718e..87b9e6af68 100644 --- a/data/mappings/keyboard_aliases.json +++ b/data/mappings/keyboard_aliases.json @@ -165,7 +165,13 @@ target: 'gh60/revc' }, 'gmmk/pro': { - target: 'gmmk/pro/ansi' + target: 'gmmk/pro/rev1/ansi' + }, + 'gmmk/pro/ansi': { + target: 'gmmk/pro/rev1/ansi' + }, + 'gmmk/pro/iso': { + target: 'gmmk/pro/rev1/iso' }, 'handwired/ferris': { target: 'ferris/0_1' diff --git a/keyboards/gmmk/pro/config.h b/keyboards/gmmk/pro/config.h index d83c965fc5..aba69c8872 100644 --- a/keyboards/gmmk/pro/config.h +++ b/keyboards/gmmk/pro/config.h @@ -53,7 +53,6 @@ #define LOCKING_RESYNC_ENABLE /* SPI Config for LED Driver */ -#define SPI_DRIVER SPID1 #define SPI_SCK_PIN A5 #define SPI_MOSI_PIN A6 #define SPI_MISO_PIN A7 diff --git a/keyboards/gmmk/pro/halconf.h b/keyboards/gmmk/pro/halconf.h deleted file mode 100644 index 23ecb202a1..0000000000 --- a/keyboards/gmmk/pro/halconf.h +++ /dev/null @@ -1,7 +0,0 @@ -#pragma once - -#define HAL_USE_SPI TRUE -#define SPI_USE_WAIT TRUE -#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD - -#include_next diff --git a/keyboards/gmmk/pro/mcuconf.h b/keyboards/gmmk/pro/mcuconf.h deleted file mode 100644 index bb1c0acde2..0000000000 --- a/keyboards/gmmk/pro/mcuconf.h +++ /dev/null @@ -1,6 +0,0 @@ -#pragma once - -#include_next - -#undef STM32_SPI_USE_SPI1 -#define STM32_SPI_USE_SPI1 TRUE diff --git a/keyboards/gmmk/pro/pro.h b/keyboards/gmmk/pro/pro.h index 38dd4d78b9..0e53ffe225 100644 --- a/keyboards/gmmk/pro/pro.h +++ b/keyboards/gmmk/pro/pro.h @@ -18,8 +18,8 @@ along with this program. If not, see . #include "quantum.h" -#if defined(KEYBOARD_gmmk_pro_ansi) -# include "ansi.h" -#elif defined(KEYBOARD_gmmk_pro_iso) -# include "iso.h" +#if defined(KEYBOARD_gmmk_pro_rev1_ansi) +# include "rev1/ansi/ansi.h" +#elif defined(KEYBOARD_gmmk_pro_rev1_iso) +# include "rev1/iso/iso.h" #endif // GMMK Pro revisions diff --git a/keyboards/gmmk/pro/ansi/ansi.c b/keyboards/gmmk/pro/rev1/ansi/ansi.c similarity index 100% rename from keyboards/gmmk/pro/ansi/ansi.c rename to keyboards/gmmk/pro/rev1/ansi/ansi.c diff --git a/keyboards/gmmk/pro/ansi/ansi.h b/keyboards/gmmk/pro/rev1/ansi/ansi.h similarity index 100% rename from keyboards/gmmk/pro/ansi/ansi.h rename to keyboards/gmmk/pro/rev1/ansi/ansi.h diff --git a/keyboards/gmmk/pro/ansi/config.h b/keyboards/gmmk/pro/rev1/ansi/config.h similarity index 100% rename from keyboards/gmmk/pro/ansi/config.h rename to keyboards/gmmk/pro/rev1/ansi/config.h diff --git a/keyboards/gmmk/pro/ansi/info.json b/keyboards/gmmk/pro/rev1/ansi/info.json similarity index 100% rename from keyboards/gmmk/pro/ansi/info.json rename to keyboards/gmmk/pro/rev1/ansi/info.json diff --git a/keyboards/gmmk/pro/ansi/keymaps/alexmarmon/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/alexmarmon/keymap.c similarity index 100% rename from keyboards/gmmk/pro/ansi/keymaps/alexmarmon/keymap.c rename to keyboards/gmmk/pro/rev1/ansi/keymaps/alexmarmon/keymap.c diff --git a/keyboards/gmmk/pro/ansi/keymaps/alexmarmon/readme.md b/keyboards/gmmk/pro/rev1/ansi/keymaps/alexmarmon/readme.md similarity index 100% rename from keyboards/gmmk/pro/ansi/keymaps/alexmarmon/readme.md rename to keyboards/gmmk/pro/rev1/ansi/keymaps/alexmarmon/readme.md diff --git a/keyboards/gmmk/pro/ansi/keymaps/andrebrait/config.h b/keyboards/gmmk/pro/rev1/ansi/keymaps/andrebrait/config.h similarity index 100% rename from keyboards/gmmk/pro/ansi/keymaps/andrebrait/config.h rename to keyboards/gmmk/pro/rev1/ansi/keymaps/andrebrait/config.h diff --git a/keyboards/gmmk/pro/ansi/keymaps/andrebrait/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/andrebrait/keymap.c similarity index 100% rename from keyboards/gmmk/pro/ansi/keymaps/andrebrait/keymap.c rename to keyboards/gmmk/pro/rev1/ansi/keymaps/andrebrait/keymap.c diff --git a/keyboards/gmmk/pro/ansi/keymaps/andrebrait/readme.md b/keyboards/gmmk/pro/rev1/ansi/keymaps/andrebrait/readme.md similarity index 100% rename from keyboards/gmmk/pro/ansi/keymaps/andrebrait/readme.md rename to keyboards/gmmk/pro/rev1/ansi/keymaps/andrebrait/readme.md diff --git a/keyboards/gmmk/pro/ansi/keymaps/andrebrait/rules.mk b/keyboards/gmmk/pro/rev1/ansi/keymaps/andrebrait/rules.mk similarity index 100% rename from keyboards/gmmk/pro/ansi/keymaps/andrebrait/rules.mk rename to keyboards/gmmk/pro/rev1/ansi/keymaps/andrebrait/rules.mk diff --git a/keyboards/gmmk/pro/ansi/keymaps/andrewcharnley/config.h b/keyboards/gmmk/pro/rev1/ansi/keymaps/andrewcharnley/config.h similarity index 100% rename from keyboards/gmmk/pro/ansi/keymaps/andrewcharnley/config.h rename to keyboards/gmmk/pro/rev1/ansi/keymaps/andrewcharnley/config.h diff --git a/keyboards/gmmk/pro/ansi/keymaps/andrewcharnley/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/andrewcharnley/keymap.c similarity index 100% rename from keyboards/gmmk/pro/ansi/keymaps/andrewcharnley/keymap.c rename to keyboards/gmmk/pro/rev1/ansi/keymaps/andrewcharnley/keymap.c diff --git a/keyboards/gmmk/pro/ansi/keymaps/andrewcharnley/readme.md b/keyboards/gmmk/pro/rev1/ansi/keymaps/andrewcharnley/readme.md similarity index 100% rename from keyboards/gmmk/pro/ansi/keymaps/andrewcharnley/readme.md rename to keyboards/gmmk/pro/rev1/ansi/keymaps/andrewcharnley/readme.md diff --git a/keyboards/gmmk/pro/ansi/keymaps/batin/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/batin/keymap.c similarity index 100% rename from keyboards/gmmk/pro/ansi/keymaps/batin/keymap.c rename to keyboards/gmmk/pro/rev1/ansi/keymaps/batin/keymap.c diff --git a/keyboards/gmmk/pro/ansi/keymaps/benschaeff/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/benschaeff/keymap.c similarity index 100% rename from keyboards/gmmk/pro/ansi/keymaps/benschaeff/keymap.c rename to keyboards/gmmk/pro/rev1/ansi/keymaps/benschaeff/keymap.c diff --git a/keyboards/gmmk/pro/ansi/keymaps/benschaeff/readme.md b/keyboards/gmmk/pro/rev1/ansi/keymaps/benschaeff/readme.md similarity index 100% rename from keyboards/gmmk/pro/ansi/keymaps/benschaeff/readme.md rename to keyboards/gmmk/pro/rev1/ansi/keymaps/benschaeff/readme.md diff --git a/keyboards/gmmk/pro/ansi/keymaps/byungyoonc/config.h b/keyboards/gmmk/pro/rev1/ansi/keymaps/byungyoonc/config.h similarity index 100% rename from keyboards/gmmk/pro/ansi/keymaps/byungyoonc/config.h rename to keyboards/gmmk/pro/rev1/ansi/keymaps/byungyoonc/config.h diff --git a/keyboards/gmmk/pro/ansi/keymaps/byungyoonc/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/byungyoonc/keymap.c similarity index 100% rename from keyboards/gmmk/pro/ansi/keymaps/byungyoonc/keymap.c rename to keyboards/gmmk/pro/rev1/ansi/keymaps/byungyoonc/keymap.c diff --git a/keyboards/gmmk/pro/ansi/keymaps/byungyoonc/readme.md b/keyboards/gmmk/pro/rev1/ansi/keymaps/byungyoonc/readme.md similarity index 100% rename from keyboards/gmmk/pro/ansi/keymaps/byungyoonc/readme.md rename to keyboards/gmmk/pro/rev1/ansi/keymaps/byungyoonc/readme.md diff --git a/keyboards/gmmk/pro/ansi/keymaps/byungyoonc/rgb_matrix_user.inc b/keyboards/gmmk/pro/rev1/ansi/keymaps/byungyoonc/rgb_matrix_user.inc similarity index 100% rename from keyboards/gmmk/pro/ansi/keymaps/byungyoonc/rgb_matrix_user.inc rename to keyboards/gmmk/pro/rev1/ansi/keymaps/byungyoonc/rgb_matrix_user.inc diff --git a/keyboards/gmmk/pro/ansi/keymaps/byungyoonc/rules.mk b/keyboards/gmmk/pro/rev1/ansi/keymaps/byungyoonc/rules.mk similarity index 100% rename from keyboards/gmmk/pro/ansi/keymaps/byungyoonc/rules.mk rename to keyboards/gmmk/pro/rev1/ansi/keymaps/byungyoonc/rules.mk diff --git a/keyboards/gmmk/pro/ansi/keymaps/cedrikl/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/cedrikl/keymap.c similarity index 100% rename from keyboards/gmmk/pro/ansi/keymaps/cedrikl/keymap.c rename to keyboards/gmmk/pro/rev1/ansi/keymaps/cedrikl/keymap.c diff --git a/keyboards/gmmk/pro/ansi/keymaps/cedrikl/rgb_matrix_map.h b/keyboards/gmmk/pro/rev1/ansi/keymaps/cedrikl/rgb_matrix_map.h similarity index 100% rename from keyboards/gmmk/pro/ansi/keymaps/cedrikl/rgb_matrix_map.h rename to keyboards/gmmk/pro/rev1/ansi/keymaps/cedrikl/rgb_matrix_map.h diff --git a/keyboards/gmmk/pro/ansi/keymaps/cedrikl/rules.mk b/keyboards/gmmk/pro/rev1/ansi/keymaps/cedrikl/rules.mk similarity index 100% rename from keyboards/gmmk/pro/ansi/keymaps/cedrikl/rules.mk rename to keyboards/gmmk/pro/rev1/ansi/keymaps/cedrikl/rules.mk diff --git a/keyboards/gmmk/pro/ansi/keymaps/coryginsberg/config.h b/keyboards/gmmk/pro/rev1/ansi/keymaps/coryginsberg/config.h similarity index 100% rename from keyboards/gmmk/pro/ansi/keymaps/coryginsberg/config.h rename to keyboards/gmmk/pro/rev1/ansi/keymaps/coryginsberg/config.h diff --git a/keyboards/gmmk/pro/ansi/keymaps/coryginsberg/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/coryginsberg/keymap.c similarity index 100% rename from keyboards/gmmk/pro/ansi/keymaps/coryginsberg/keymap.c rename to keyboards/gmmk/pro/rev1/ansi/keymaps/coryginsberg/keymap.c diff --git a/keyboards/gmmk/pro/ansi/keymaps/coryginsberg/readme.md b/keyboards/gmmk/pro/rev1/ansi/keymaps/coryginsberg/readme.md similarity index 100% rename from keyboards/gmmk/pro/ansi/keymaps/coryginsberg/readme.md rename to keyboards/gmmk/pro/rev1/ansi/keymaps/coryginsberg/readme.md diff --git a/keyboards/gmmk/pro/ansi/keymaps/coryginsberg/rules.mk b/keyboards/gmmk/pro/rev1/ansi/keymaps/coryginsberg/rules.mk similarity index 100% rename from keyboards/gmmk/pro/ansi/keymaps/coryginsberg/rules.mk rename to keyboards/gmmk/pro/rev1/ansi/keymaps/coryginsberg/rules.mk diff --git a/keyboards/gmmk/pro/ansi/keymaps/default/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/default/keymap.c similarity index 100% rename from keyboards/gmmk/pro/ansi/keymaps/default/keymap.c rename to keyboards/gmmk/pro/rev1/ansi/keymaps/default/keymap.c diff --git a/keyboards/gmmk/pro/ansi/keymaps/gigahawk/config.h b/keyboards/gmmk/pro/rev1/ansi/keymaps/gigahawk/config.h similarity index 100% rename from keyboards/gmmk/pro/ansi/keymaps/gigahawk/config.h rename to keyboards/gmmk/pro/rev1/ansi/keymaps/gigahawk/config.h diff --git a/keyboards/gmmk/pro/ansi/keymaps/gigahawk/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/gigahawk/keymap.c similarity index 100% rename from keyboards/gmmk/pro/ansi/keymaps/gigahawk/keymap.c rename to keyboards/gmmk/pro/rev1/ansi/keymaps/gigahawk/keymap.c diff --git a/keyboards/gmmk/pro/ansi/keymaps/gourdo1/caps_word.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/gourdo1/caps_word.c similarity index 100% rename from keyboards/gmmk/pro/ansi/keymaps/gourdo1/caps_word.c rename to keyboards/gmmk/pro/rev1/ansi/keymaps/gourdo1/caps_word.c diff --git a/keyboards/gmmk/pro/ansi/keymaps/gourdo1/caps_word.h b/keyboards/gmmk/pro/rev1/ansi/keymaps/gourdo1/caps_word.h similarity index 100% rename from keyboards/gmmk/pro/ansi/keymaps/gourdo1/caps_word.h rename to keyboards/gmmk/pro/rev1/ansi/keymaps/gourdo1/caps_word.h diff --git a/keyboards/gmmk/pro/ansi/keymaps/gourdo1/config.h b/keyboards/gmmk/pro/rev1/ansi/keymaps/gourdo1/config.h similarity index 100% rename from keyboards/gmmk/pro/ansi/keymaps/gourdo1/config.h rename to keyboards/gmmk/pro/rev1/ansi/keymaps/gourdo1/config.h diff --git a/keyboards/gmmk/pro/ansi/keymaps/gourdo1/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/gourdo1/keymap.c similarity index 100% rename from keyboards/gmmk/pro/ansi/keymaps/gourdo1/keymap.c rename to keyboards/gmmk/pro/rev1/ansi/keymaps/gourdo1/keymap.c diff --git a/keyboards/gmmk/pro/ansi/keymaps/gourdo1/readme.md b/keyboards/gmmk/pro/rev1/ansi/keymaps/gourdo1/readme.md similarity index 100% rename from keyboards/gmmk/pro/ansi/keymaps/gourdo1/readme.md rename to keyboards/gmmk/pro/rev1/ansi/keymaps/gourdo1/readme.md diff --git a/keyboards/gmmk/pro/ansi/keymaps/gourdo1/rgb_matrix_map.h b/keyboards/gmmk/pro/rev1/ansi/keymaps/gourdo1/rgb_matrix_map.h similarity index 100% rename from keyboards/gmmk/pro/ansi/keymaps/gourdo1/rgb_matrix_map.h rename to keyboards/gmmk/pro/rev1/ansi/keymaps/gourdo1/rgb_matrix_map.h diff --git a/keyboards/gmmk/pro/ansi/keymaps/gourdo1/rules.mk b/keyboards/gmmk/pro/rev1/ansi/keymaps/gourdo1/rules.mk similarity index 100% rename from keyboards/gmmk/pro/ansi/keymaps/gourdo1/rules.mk rename to keyboards/gmmk/pro/rev1/ansi/keymaps/gourdo1/rules.mk diff --git a/keyboards/gmmk/pro/ansi/keymaps/hachetman/config.h b/keyboards/gmmk/pro/rev1/ansi/keymaps/hachetman/config.h similarity index 100% rename from keyboards/gmmk/pro/ansi/keymaps/hachetman/config.h rename to keyboards/gmmk/pro/rev1/ansi/keymaps/hachetman/config.h diff --git a/keyboards/gmmk/pro/ansi/keymaps/hachetman/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/hachetman/keymap.c similarity index 100% rename from keyboards/gmmk/pro/ansi/keymaps/hachetman/keymap.c rename to keyboards/gmmk/pro/rev1/ansi/keymaps/hachetman/keymap.c diff --git a/keyboards/gmmk/pro/ansi/keymaps/hachetman/readme.md b/keyboards/gmmk/pro/rev1/ansi/keymaps/hachetman/readme.md similarity index 100% rename from keyboards/gmmk/pro/ansi/keymaps/hachetman/readme.md rename to keyboards/gmmk/pro/rev1/ansi/keymaps/hachetman/readme.md diff --git a/keyboards/gmmk/pro/ansi/keymaps/hachetman/rules.mk b/keyboards/gmmk/pro/rev1/ansi/keymaps/hachetman/rules.mk similarity index 100% rename from keyboards/gmmk/pro/ansi/keymaps/hachetman/rules.mk rename to keyboards/gmmk/pro/rev1/ansi/keymaps/hachetman/rules.mk diff --git a/keyboards/gmmk/pro/ansi/keymaps/jackkenney/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/jackkenney/keymap.c similarity index 100% rename from keyboards/gmmk/pro/ansi/keymaps/jackkenney/keymap.c rename to keyboards/gmmk/pro/rev1/ansi/keymaps/jackkenney/keymap.c diff --git a/keyboards/gmmk/pro/ansi/keymaps/jonavin/config.h b/keyboards/gmmk/pro/rev1/ansi/keymaps/jonavin/config.h similarity index 100% rename from keyboards/gmmk/pro/ansi/keymaps/jonavin/config.h rename to keyboards/gmmk/pro/rev1/ansi/keymaps/jonavin/config.h diff --git a/keyboards/gmmk/pro/ansi/keymaps/jonavin/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/jonavin/keymap.c similarity index 100% rename from keyboards/gmmk/pro/ansi/keymaps/jonavin/keymap.c rename to keyboards/gmmk/pro/rev1/ansi/keymaps/jonavin/keymap.c diff --git a/keyboards/gmmk/pro/ansi/keymaps/jonavin/readme.md b/keyboards/gmmk/pro/rev1/ansi/keymaps/jonavin/readme.md similarity index 100% rename from keyboards/gmmk/pro/ansi/keymaps/jonavin/readme.md rename to keyboards/gmmk/pro/rev1/ansi/keymaps/jonavin/readme.md diff --git a/keyboards/gmmk/pro/ansi/keymaps/jonavin/rgb_matrix_map.h b/keyboards/gmmk/pro/rev1/ansi/keymaps/jonavin/rgb_matrix_map.h similarity index 100% rename from keyboards/gmmk/pro/ansi/keymaps/jonavin/rgb_matrix_map.h rename to keyboards/gmmk/pro/rev1/ansi/keymaps/jonavin/rgb_matrix_map.h diff --git a/keyboards/gmmk/pro/ansi/keymaps/jonavin/rules.mk b/keyboards/gmmk/pro/rev1/ansi/keymaps/jonavin/rules.mk similarity index 100% rename from keyboards/gmmk/pro/ansi/keymaps/jonavin/rules.mk rename to keyboards/gmmk/pro/rev1/ansi/keymaps/jonavin/rules.mk diff --git a/keyboards/gmmk/pro/ansi/keymaps/lalitmaganti/config.h b/keyboards/gmmk/pro/rev1/ansi/keymaps/lalitmaganti/config.h similarity index 100% rename from keyboards/gmmk/pro/ansi/keymaps/lalitmaganti/config.h rename to keyboards/gmmk/pro/rev1/ansi/keymaps/lalitmaganti/config.h diff --git a/keyboards/gmmk/pro/ansi/keymaps/lalitmaganti/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/lalitmaganti/keymap.c similarity index 100% rename from keyboards/gmmk/pro/ansi/keymaps/lalitmaganti/keymap.c rename to keyboards/gmmk/pro/rev1/ansi/keymaps/lalitmaganti/keymap.c diff --git a/keyboards/gmmk/pro/ansi/keymaps/lalitmaganti/rules.mk b/keyboards/gmmk/pro/rev1/ansi/keymaps/lalitmaganti/rules.mk similarity index 100% rename from keyboards/gmmk/pro/ansi/keymaps/lalitmaganti/rules.mk rename to keyboards/gmmk/pro/rev1/ansi/keymaps/lalitmaganti/rules.mk diff --git a/keyboards/gmmk/pro/ansi/keymaps/macos/config.h b/keyboards/gmmk/pro/rev1/ansi/keymaps/macos/config.h similarity index 100% rename from keyboards/gmmk/pro/ansi/keymaps/macos/config.h rename to keyboards/gmmk/pro/rev1/ansi/keymaps/macos/config.h diff --git a/keyboards/gmmk/pro/ansi/keymaps/macos/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/macos/keymap.c similarity index 100% rename from keyboards/gmmk/pro/ansi/keymaps/macos/keymap.c rename to keyboards/gmmk/pro/rev1/ansi/keymaps/macos/keymap.c diff --git a/keyboards/gmmk/pro/ansi/keymaps/macos/readme.md b/keyboards/gmmk/pro/rev1/ansi/keymaps/macos/readme.md similarity index 100% rename from keyboards/gmmk/pro/ansi/keymaps/macos/readme.md rename to keyboards/gmmk/pro/rev1/ansi/keymaps/macos/readme.md diff --git a/keyboards/gmmk/pro/ansi/keymaps/macos/rules.mk b/keyboards/gmmk/pro/rev1/ansi/keymaps/macos/rules.mk similarity index 100% rename from keyboards/gmmk/pro/ansi/keymaps/macos/rules.mk rename to keyboards/gmmk/pro/rev1/ansi/keymaps/macos/rules.mk diff --git a/keyboards/gmmk/pro/ansi/keymaps/mattgauf/ansi.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/mattgauf/ansi.c similarity index 100% rename from keyboards/gmmk/pro/ansi/keymaps/mattgauf/ansi.c rename to keyboards/gmmk/pro/rev1/ansi/keymaps/mattgauf/ansi.c diff --git a/keyboards/gmmk/pro/ansi/keymaps/mattgauf/config.h b/keyboards/gmmk/pro/rev1/ansi/keymaps/mattgauf/config.h similarity index 100% rename from keyboards/gmmk/pro/ansi/keymaps/mattgauf/config.h rename to keyboards/gmmk/pro/rev1/ansi/keymaps/mattgauf/config.h diff --git a/keyboards/gmmk/pro/ansi/keymaps/mattgauf/helpers.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/mattgauf/helpers.c similarity index 100% rename from keyboards/gmmk/pro/ansi/keymaps/mattgauf/helpers.c rename to keyboards/gmmk/pro/rev1/ansi/keymaps/mattgauf/helpers.c diff --git a/keyboards/gmmk/pro/ansi/keymaps/mattgauf/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/mattgauf/keymap.c similarity index 100% rename from keyboards/gmmk/pro/ansi/keymaps/mattgauf/keymap.c rename to keyboards/gmmk/pro/rev1/ansi/keymaps/mattgauf/keymap.c diff --git a/keyboards/gmmk/pro/ansi/keymaps/mattgauf/keymap_helpers.h b/keyboards/gmmk/pro/rev1/ansi/keymaps/mattgauf/keymap_helpers.h similarity index 100% rename from keyboards/gmmk/pro/ansi/keymaps/mattgauf/keymap_helpers.h rename to keyboards/gmmk/pro/rev1/ansi/keymaps/mattgauf/keymap_helpers.h diff --git a/keyboards/gmmk/pro/ansi/keymaps/mattgauf/readme.md b/keyboards/gmmk/pro/rev1/ansi/keymaps/mattgauf/readme.md similarity index 100% rename from keyboards/gmmk/pro/ansi/keymaps/mattgauf/readme.md rename to keyboards/gmmk/pro/rev1/ansi/keymaps/mattgauf/readme.md diff --git a/keyboards/gmmk/pro/ansi/keymaps/mattgauf/rules.mk b/keyboards/gmmk/pro/rev1/ansi/keymaps/mattgauf/rules.mk similarity index 100% rename from keyboards/gmmk/pro/ansi/keymaps/mattgauf/rules.mk rename to keyboards/gmmk/pro/rev1/ansi/keymaps/mattgauf/rules.mk diff --git a/keyboards/gmmk/pro/ansi/keymaps/mike1808/.gitignore b/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/.gitignore similarity index 100% rename from keyboards/gmmk/pro/ansi/keymaps/mike1808/.gitignore rename to keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/.gitignore diff --git a/keyboards/gmmk/pro/ansi/keymaps/mike1808/README.md b/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/README.md similarity index 100% rename from keyboards/gmmk/pro/ansi/keymaps/mike1808/README.md rename to keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/README.md diff --git a/keyboards/gmmk/pro/ansi/keymaps/mike1808/config.h b/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/config.h similarity index 100% rename from keyboards/gmmk/pro/ansi/keymaps/mike1808/config.h rename to keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/config.h diff --git a/keyboards/gmmk/pro/ansi/keymaps/mike1808/encoder.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/encoder.c similarity index 100% rename from keyboards/gmmk/pro/ansi/keymaps/mike1808/encoder.c rename to keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/encoder.c diff --git a/keyboards/gmmk/pro/ansi/keymaps/mike1808/encoder.h b/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/encoder.h similarity index 100% rename from keyboards/gmmk/pro/ansi/keymaps/mike1808/encoder.h rename to keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/encoder.h diff --git a/keyboards/gmmk/pro/ansi/keymaps/mike1808/fun.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/fun.c similarity index 100% rename from keyboards/gmmk/pro/ansi/keymaps/mike1808/fun.c rename to keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/fun.c diff --git a/keyboards/gmmk/pro/ansi/keymaps/mike1808/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/keymap.c similarity index 100% rename from keyboards/gmmk/pro/ansi/keymaps/mike1808/keymap.c rename to keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/keymap.c diff --git a/keyboards/gmmk/pro/ansi/keymaps/mike1808/mike1808.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/mike1808.c similarity index 100% rename from keyboards/gmmk/pro/ansi/keymaps/mike1808/mike1808.c rename to keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/mike1808.c diff --git a/keyboards/gmmk/pro/ansi/keymaps/mike1808/mike1808.h b/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/mike1808.h similarity index 100% rename from keyboards/gmmk/pro/ansi/keymaps/mike1808/mike1808.h rename to keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/mike1808.h diff --git a/keyboards/gmmk/pro/ansi/keymaps/mike1808/process_record.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/process_record.c similarity index 100% rename from keyboards/gmmk/pro/ansi/keymaps/mike1808/process_record.c rename to keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/process_record.c diff --git a/keyboards/gmmk/pro/ansi/keymaps/mike1808/process_record.h b/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/process_record.h similarity index 100% rename from keyboards/gmmk/pro/ansi/keymaps/mike1808/process_record.h rename to keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/process_record.h diff --git a/keyboards/gmmk/pro/ansi/keymaps/mike1808/rgb_matrix_ledmaps.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/rgb_matrix_ledmaps.c similarity index 100% rename from keyboards/gmmk/pro/ansi/keymaps/mike1808/rgb_matrix_ledmaps.c rename to keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/rgb_matrix_ledmaps.c diff --git a/keyboards/gmmk/pro/ansi/keymaps/mike1808/rgb_matrix_ledmaps.h b/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/rgb_matrix_ledmaps.h similarity index 100% rename from keyboards/gmmk/pro/ansi/keymaps/mike1808/rgb_matrix_ledmaps.h rename to keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/rgb_matrix_ledmaps.h diff --git a/keyboards/gmmk/pro/ansi/keymaps/mike1808/rules.mk b/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/rules.mk similarity index 100% rename from keyboards/gmmk/pro/ansi/keymaps/mike1808/rules.mk rename to keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/rules.mk diff --git a/keyboards/gmmk/pro/ansi/keymaps/mike1808/utils.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/utils.c similarity index 100% rename from keyboards/gmmk/pro/ansi/keymaps/mike1808/utils.c rename to keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/utils.c diff --git a/keyboards/gmmk/pro/ansi/keymaps/mike1808/utils.h b/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/utils.h similarity index 100% rename from keyboards/gmmk/pro/ansi/keymaps/mike1808/utils.h rename to keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/utils.h diff --git a/keyboards/gmmk/pro/keymaps/moults31/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/moults31/keymap.c similarity index 100% rename from keyboards/gmmk/pro/keymaps/moults31/keymap.c rename to keyboards/gmmk/pro/rev1/ansi/keymaps/moults31/keymap.c diff --git a/keyboards/gmmk/pro/ansi/keymaps/paddlegame/config.h b/keyboards/gmmk/pro/rev1/ansi/keymaps/paddlegame/config.h similarity index 100% rename from keyboards/gmmk/pro/ansi/keymaps/paddlegame/config.h rename to keyboards/gmmk/pro/rev1/ansi/keymaps/paddlegame/config.h diff --git a/keyboards/gmmk/pro/ansi/keymaps/paddlegame/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/paddlegame/keymap.c similarity index 100% rename from keyboards/gmmk/pro/ansi/keymaps/paddlegame/keymap.c rename to keyboards/gmmk/pro/rev1/ansi/keymaps/paddlegame/keymap.c diff --git a/keyboards/gmmk/pro/ansi/keymaps/paddlegame/paddlegame.h b/keyboards/gmmk/pro/rev1/ansi/keymaps/paddlegame/paddlegame.h similarity index 100% rename from keyboards/gmmk/pro/ansi/keymaps/paddlegame/paddlegame.h rename to keyboards/gmmk/pro/rev1/ansi/keymaps/paddlegame/paddlegame.h diff --git a/keyboards/gmmk/pro/ansi/keymaps/paddlegame/readme.md b/keyboards/gmmk/pro/rev1/ansi/keymaps/paddlegame/readme.md similarity index 100% rename from keyboards/gmmk/pro/ansi/keymaps/paddlegame/readme.md rename to keyboards/gmmk/pro/rev1/ansi/keymaps/paddlegame/readme.md diff --git a/keyboards/gmmk/pro/ansi/keymaps/paddlegame/rgb_matrix_map.h b/keyboards/gmmk/pro/rev1/ansi/keymaps/paddlegame/rgb_matrix_map.h similarity index 100% rename from keyboards/gmmk/pro/ansi/keymaps/paddlegame/rgb_matrix_map.h rename to keyboards/gmmk/pro/rev1/ansi/keymaps/paddlegame/rgb_matrix_map.h diff --git a/keyboards/gmmk/pro/ansi/keymaps/paddlegame/rules.mk b/keyboards/gmmk/pro/rev1/ansi/keymaps/paddlegame/rules.mk similarity index 100% rename from keyboards/gmmk/pro/ansi/keymaps/paddlegame/rules.mk rename to keyboards/gmmk/pro/rev1/ansi/keymaps/paddlegame/rules.mk diff --git a/keyboards/gmmk/pro/ansi/keymaps/stickandgum/config.h b/keyboards/gmmk/pro/rev1/ansi/keymaps/stickandgum/config.h similarity index 100% rename from keyboards/gmmk/pro/ansi/keymaps/stickandgum/config.h rename to keyboards/gmmk/pro/rev1/ansi/keymaps/stickandgum/config.h diff --git a/keyboards/gmmk/pro/ansi/keymaps/stickandgum/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/stickandgum/keymap.c similarity index 100% rename from keyboards/gmmk/pro/ansi/keymaps/stickandgum/keymap.c rename to keyboards/gmmk/pro/rev1/ansi/keymaps/stickandgum/keymap.c diff --git a/keyboards/gmmk/pro/ansi/keymaps/stickandgum/readme.md b/keyboards/gmmk/pro/rev1/ansi/keymaps/stickandgum/readme.md similarity index 100% rename from keyboards/gmmk/pro/ansi/keymaps/stickandgum/readme.md rename to keyboards/gmmk/pro/rev1/ansi/keymaps/stickandgum/readme.md diff --git a/keyboards/gmmk/pro/ansi/keymaps/stickandgum/rules.mk b/keyboards/gmmk/pro/rev1/ansi/keymaps/stickandgum/rules.mk similarity index 100% rename from keyboards/gmmk/pro/ansi/keymaps/stickandgum/rules.mk rename to keyboards/gmmk/pro/rev1/ansi/keymaps/stickandgum/rules.mk diff --git a/keyboards/gmmk/pro/ansi/keymaps/via/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/via/keymap.c similarity index 100% rename from keyboards/gmmk/pro/ansi/keymaps/via/keymap.c rename to keyboards/gmmk/pro/rev1/ansi/keymaps/via/keymap.c diff --git a/keyboards/gmmk/pro/ansi/keymaps/via/rules.mk b/keyboards/gmmk/pro/rev1/ansi/keymaps/via/rules.mk similarity index 100% rename from keyboards/gmmk/pro/ansi/keymaps/via/rules.mk rename to keyboards/gmmk/pro/rev1/ansi/keymaps/via/rules.mk diff --git a/keyboards/gmmk/pro/ansi/keymaps/wholesomeducky/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/wholesomeducky/keymap.c similarity index 100% rename from keyboards/gmmk/pro/ansi/keymaps/wholesomeducky/keymap.c rename to keyboards/gmmk/pro/rev1/ansi/keymaps/wholesomeducky/keymap.c diff --git a/keyboards/gmmk/pro/ansi/keymaps/willwm/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/willwm/keymap.c similarity index 100% rename from keyboards/gmmk/pro/ansi/keymaps/willwm/keymap.c rename to keyboards/gmmk/pro/rev1/ansi/keymaps/willwm/keymap.c diff --git a/keyboards/gmmk/pro/ansi/keymaps/willwm/keymap.json b/keyboards/gmmk/pro/rev1/ansi/keymaps/willwm/keymap.json similarity index 100% rename from keyboards/gmmk/pro/ansi/keymaps/willwm/keymap.json rename to keyboards/gmmk/pro/rev1/ansi/keymaps/willwm/keymap.json diff --git a/keyboards/gmmk/pro/ansi/keymaps/willwm/readme.md b/keyboards/gmmk/pro/rev1/ansi/keymaps/willwm/readme.md similarity index 100% rename from keyboards/gmmk/pro/ansi/keymaps/willwm/readme.md rename to keyboards/gmmk/pro/rev1/ansi/keymaps/willwm/readme.md diff --git a/keyboards/gmmk/pro/ansi/keymaps/willwm/rules.mk b/keyboards/gmmk/pro/rev1/ansi/keymaps/willwm/rules.mk similarity index 100% rename from keyboards/gmmk/pro/ansi/keymaps/willwm/rules.mk rename to keyboards/gmmk/pro/rev1/ansi/keymaps/willwm/rules.mk diff --git a/keyboards/gmmk/pro/ansi/readme.md b/keyboards/gmmk/pro/rev1/ansi/readme.md similarity index 95% rename from keyboards/gmmk/pro/ansi/readme.md rename to keyboards/gmmk/pro/rev1/ansi/readme.md index 9800aef88e..c6721b026a 100644 --- a/keyboards/gmmk/pro/ansi/readme.md +++ b/keyboards/gmmk/pro/rev1/ansi/readme.md @@ -8,11 +8,11 @@ A tenkeyless 75% keyboard made and sold by Glorious LLC. Equipped with the STM32 Make example for this keyboard (after setting up your build environment): - make gmmk/pro/ansi:default + make gmmk/pro/rev1/ansi:default Flashing example for this keyboard: - make gmmk/pro/ansi:default:flash + make gmmk/pro/rev1/ansi:default:flash To reset the board into bootloader mode, do one of the following: diff --git a/keyboards/gmmk/pro/ansi/rules.mk b/keyboards/gmmk/pro/rev1/ansi/rules.mk similarity index 100% rename from keyboards/gmmk/pro/ansi/rules.mk rename to keyboards/gmmk/pro/rev1/ansi/rules.mk diff --git a/keyboards/gmmk/pro/rev1/config.h b/keyboards/gmmk/pro/rev1/config.h new file mode 100644 index 0000000000..9ece2e2c6c --- /dev/null +++ b/keyboards/gmmk/pro/rev1/config.h @@ -0,0 +1,22 @@ +/* Copyright 2021 Glorious, LLC + * + * 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 . + */ + +#pragma once + +#include "config_common.h" + +/* SPI Config for LED Driver */ +#define SPI_DRIVER SPID1 diff --git a/keyboards/gmmk/pro/rev1/halconf.h b/keyboards/gmmk/pro/rev1/halconf.h new file mode 100644 index 0000000000..8d9b60c234 --- /dev/null +++ b/keyboards/gmmk/pro/rev1/halconf.h @@ -0,0 +1,23 @@ +/* Copyright 2021 Glorious, LLC + * + * 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 . + */ + +#pragma once + +#define HAL_USE_SPI TRUE +#define SPI_USE_WAIT TRUE +#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD + +#include_next diff --git a/keyboards/gmmk/pro/iso/config.h b/keyboards/gmmk/pro/rev1/iso/config.h similarity index 100% rename from keyboards/gmmk/pro/iso/config.h rename to keyboards/gmmk/pro/rev1/iso/config.h diff --git a/keyboards/gmmk/pro/iso/info.json b/keyboards/gmmk/pro/rev1/iso/info.json similarity index 100% rename from keyboards/gmmk/pro/iso/info.json rename to keyboards/gmmk/pro/rev1/iso/info.json diff --git a/keyboards/gmmk/pro/iso/iso.c b/keyboards/gmmk/pro/rev1/iso/iso.c similarity index 100% rename from keyboards/gmmk/pro/iso/iso.c rename to keyboards/gmmk/pro/rev1/iso/iso.c diff --git a/keyboards/gmmk/pro/iso/iso.h b/keyboards/gmmk/pro/rev1/iso/iso.h similarity index 100% rename from keyboards/gmmk/pro/iso/iso.h rename to keyboards/gmmk/pro/rev1/iso/iso.h diff --git a/keyboards/gmmk/pro/iso/keymaps/chofstede/keymap.c b/keyboards/gmmk/pro/rev1/iso/keymaps/chofstede/keymap.c similarity index 100% rename from keyboards/gmmk/pro/iso/keymaps/chofstede/keymap.c rename to keyboards/gmmk/pro/rev1/iso/keymaps/chofstede/keymap.c diff --git a/keyboards/gmmk/pro/iso/keymaps/chofstede/readme.md b/keyboards/gmmk/pro/rev1/iso/keymaps/chofstede/readme.md similarity index 100% rename from keyboards/gmmk/pro/iso/keymaps/chofstede/readme.md rename to keyboards/gmmk/pro/rev1/iso/keymaps/chofstede/readme.md diff --git a/keyboards/gmmk/pro/iso/keymaps/default/keymap.c b/keyboards/gmmk/pro/rev1/iso/keymaps/default/keymap.c similarity index 100% rename from keyboards/gmmk/pro/iso/keymaps/default/keymap.c rename to keyboards/gmmk/pro/rev1/iso/keymaps/default/keymap.c diff --git a/keyboards/gmmk/pro/iso/keymaps/jonavin/config.h b/keyboards/gmmk/pro/rev1/iso/keymaps/jonavin/config.h similarity index 100% rename from keyboards/gmmk/pro/iso/keymaps/jonavin/config.h rename to keyboards/gmmk/pro/rev1/iso/keymaps/jonavin/config.h diff --git a/keyboards/gmmk/pro/iso/keymaps/jonavin/keymap.c b/keyboards/gmmk/pro/rev1/iso/keymaps/jonavin/keymap.c similarity index 100% rename from keyboards/gmmk/pro/iso/keymaps/jonavin/keymap.c rename to keyboards/gmmk/pro/rev1/iso/keymaps/jonavin/keymap.c diff --git a/keyboards/gmmk/pro/iso/keymaps/jonavin/readme.md b/keyboards/gmmk/pro/rev1/iso/keymaps/jonavin/readme.md similarity index 100% rename from keyboards/gmmk/pro/iso/keymaps/jonavin/readme.md rename to keyboards/gmmk/pro/rev1/iso/keymaps/jonavin/readme.md diff --git a/keyboards/gmmk/pro/iso/keymaps/jonavin/rgb_matrix_map.h b/keyboards/gmmk/pro/rev1/iso/keymaps/jonavin/rgb_matrix_map.h similarity index 100% rename from keyboards/gmmk/pro/iso/keymaps/jonavin/rgb_matrix_map.h rename to keyboards/gmmk/pro/rev1/iso/keymaps/jonavin/rgb_matrix_map.h diff --git a/keyboards/gmmk/pro/iso/keymaps/jonavin/rules.mk b/keyboards/gmmk/pro/rev1/iso/keymaps/jonavin/rules.mk similarity index 100% rename from keyboards/gmmk/pro/iso/keymaps/jonavin/rules.mk rename to keyboards/gmmk/pro/rev1/iso/keymaps/jonavin/rules.mk diff --git a/keyboards/gmmk/pro/iso/keymaps/via/keymap.c b/keyboards/gmmk/pro/rev1/iso/keymaps/via/keymap.c similarity index 100% rename from keyboards/gmmk/pro/iso/keymaps/via/keymap.c rename to keyboards/gmmk/pro/rev1/iso/keymaps/via/keymap.c diff --git a/keyboards/gmmk/pro/iso/keymaps/via/rules.mk b/keyboards/gmmk/pro/rev1/iso/keymaps/via/rules.mk similarity index 100% rename from keyboards/gmmk/pro/iso/keymaps/via/rules.mk rename to keyboards/gmmk/pro/rev1/iso/keymaps/via/rules.mk diff --git a/keyboards/gmmk/pro/iso/keymaps/vitoni/config.h b/keyboards/gmmk/pro/rev1/iso/keymaps/vitoni/config.h similarity index 100% rename from keyboards/gmmk/pro/iso/keymaps/vitoni/config.h rename to keyboards/gmmk/pro/rev1/iso/keymaps/vitoni/config.h diff --git a/keyboards/gmmk/pro/iso/keymaps/vitoni/keymap.c b/keyboards/gmmk/pro/rev1/iso/keymaps/vitoni/keymap.c similarity index 100% rename from keyboards/gmmk/pro/iso/keymaps/vitoni/keymap.c rename to keyboards/gmmk/pro/rev1/iso/keymaps/vitoni/keymap.c diff --git a/keyboards/gmmk/pro/iso/keymaps/vitoni/readme.adoc b/keyboards/gmmk/pro/rev1/iso/keymaps/vitoni/readme.adoc similarity index 100% rename from keyboards/gmmk/pro/iso/keymaps/vitoni/readme.adoc rename to keyboards/gmmk/pro/rev1/iso/keymaps/vitoni/readme.adoc diff --git a/keyboards/gmmk/pro/iso/readme.md b/keyboards/gmmk/pro/rev1/iso/readme.md similarity index 96% rename from keyboards/gmmk/pro/iso/readme.md rename to keyboards/gmmk/pro/rev1/iso/readme.md index 62dbee5d0f..50601a79ce 100644 --- a/keyboards/gmmk/pro/iso/readme.md +++ b/keyboards/gmmk/pro/rev1/iso/readme.md @@ -8,11 +8,11 @@ A tenkeyless 75% keyboard made and sold by Glorious LLC. Equipped with the STM32 Make example for this keyboard (after setting up your build environment): - make gmmk/pro/iso:default + make gmmk/pro/rev1/iso:default Flashing example for this keyboard: - make gmmk/pro/iso:default:flash + make gmmk/pro/rev1/iso:default:flash To reset the board into bootloader mode, do one of the following: diff --git a/keyboards/gmmk/pro/iso/rules.mk b/keyboards/gmmk/pro/rev1/iso/rules.mk similarity index 100% rename from keyboards/gmmk/pro/iso/rules.mk rename to keyboards/gmmk/pro/rev1/iso/rules.mk diff --git a/keyboards/gmmk/pro/rev1/mcuconf.h b/keyboards/gmmk/pro/rev1/mcuconf.h new file mode 100644 index 0000000000..48eb8be9d8 --- /dev/null +++ b/keyboards/gmmk/pro/rev1/mcuconf.h @@ -0,0 +1,22 @@ +/* Copyright 2021 Glorious, LLC + * + * 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 . + */ + +#pragma once + +#include_next + +#undef STM32_SPI_USE_SPI1 +#define STM32_SPI_USE_SPI1 TRUE