diff options
45 files changed, 349 insertions, 516 deletions
diff --git a/keyboards/1upkeyboards/1up60rgb/keymaps/iso/keymap.c b/keyboards/1upkeyboards/1up60rgb/keymaps/iso/keymap.c index b67de0b0c2..fd6087a238 100644 --- a/keyboards/1upkeyboards/1up60rgb/keymaps/iso/keymap.c +++ b/keyboards/1upkeyboards/1up60rgb/keymaps/iso/keymap.c @@ -1,4 +1,4 @@ -#include "1up60rgb.h" +#include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { diff --git a/keyboards/1upkeyboards/1up60rgb/keymaps/tsangan/keymap.c b/keyboards/1upkeyboards/1up60rgb/keymaps/tsangan/keymap.c index c8b2f84b72..a45947de54 100644 --- a/keyboards/1upkeyboards/1up60rgb/keymaps/tsangan/keymap.c +++ b/keyboards/1upkeyboards/1up60rgb/keymaps/tsangan/keymap.c @@ -1,4 +1,4 @@ -#include "1up60rgb.h" +#include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { diff --git a/keyboards/1upkeyboards/sweet16/keymaps/dlaroe/keymap.c b/keyboards/1upkeyboards/sweet16/keymaps/dlaroe/keymap.c index d3b6ef0378..5305d0ad05 100644 --- a/keyboards/1upkeyboards/sweet16/keymaps/dlaroe/keymap.c +++ b/keyboards/1upkeyboards/sweet16/keymaps/dlaroe/keymap.c @@ -1,4 +1,4 @@ -#include "sweet16.h" +#include QMK_KEYBOARD_H enum layers { num, diff --git a/keyboards/bpiphany/hid_liber/keymaps/bakageta/keymap.c b/keyboards/bpiphany/hid_liber/keymaps/bakageta/keymap.c index b86d578d33..414b7beb64 100755 --- a/keyboards/bpiphany/hid_liber/keymaps/bakageta/keymap.c +++ b/keyboards/bpiphany/hid_liber/keymaps/bakageta/keymap.c @@ -14,7 +14,7 @@ * 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 "hid_liber.h" +#include QMK_KEYBOARD_H // Helpful defines #define FN_CAPS LT(_FL, KC_CAPS) diff --git a/keyboards/contra/keymaps/maxr1998/keymap.c b/keyboards/contra/keymaps/maxr1998/keymap.c index b169ce3238..8a56c60746 100644 --- a/keyboards/contra/keymaps/maxr1998/keymap.c +++ b/keyboards/contra/keymaps/maxr1998/keymap.c @@ -14,7 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "contra.h" +#include QMK_KEYBOARD_H #include "keymap_german.h" enum contra_layers { diff --git a/keyboards/contra/keymaps/ryanm101/keymap.c b/keyboards/contra/keymaps/ryanm101/keymap.c index ff33043632..76cbdc7ff8 100644 --- a/keyboards/contra/keymaps/ryanm101/keymap.c +++ b/keyboards/contra/keymaps/ryanm101/keymap.c @@ -1,4 +1,4 @@ -#include "contra.h" +#include QMK_KEYBOARD_H #include "action_layer.h" extern keymap_config_t keymap_config; diff --git a/keyboards/deltasplit75/keymaps/itsaferbie/config.h b/keyboards/deltasplit75/keymaps/itsaferbie/config.h index 288b1acb8b..32605799a8 100644 --- a/keyboards/deltasplit75/keymaps/itsaferbie/config.h +++ b/keyboards/deltasplit75/keymaps/itsaferbie/config.h @@ -20,14 +20,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. // #define MASTER_RIGHT // #define EE_HANDS - -#ifdef SUBPROJECT_v2 - #include "../../v2/config.h" -#endif -#ifdef SUBPROJECT_protosplit - #include "../../protosplit/config.h" -#endif - #undef RGBLED_NUM #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/deltasplit75/keymaps/mbsurfer/config.h b/keyboards/deltasplit75/keymaps/mbsurfer/config.h index 2a2e4ece9f..3e79f43ed0 100644 --- a/keyboards/deltasplit75/keymaps/mbsurfer/config.h +++ b/keyboards/deltasplit75/keymaps/mbsurfer/config.h @@ -19,11 +19,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define MASTER_LEFT // #define MASTER_RIGHT // #define EE_HANDS - - -#ifdef SUBPROJECT_v2 - #include "../../v2/config.h" -#endif -#ifdef SUBPROJECT_protosplit - #include "../../protosplit/config.h" -#endif diff --git a/keyboards/deltasplit75/keymaps/mbsurfer/keymap.c b/keyboards/deltasplit75/keymaps/mbsurfer/keymap.c index 345e4168cf..e5c9ecc582 100644 --- a/keyboards/deltasplit75/keymaps/mbsurfer/keymap.c +++ b/keyboards/deltasplit75/keymaps/mbsurfer/keymap.c @@ -1,6 +1,4 @@ -#include "deltasplit75.h" -#include "action_layer.h" -#include "eeconfig.h" +#include QMK_KEYBOARD_H extern keymap_config_t keymap_config; diff --git a/keyboards/deltasplit75/keymaps/protosplit/config.h b/keyboards/deltasplit75/keymaps/protosplit/config.h index 2a2e4ece9f..3e79f43ed0 100644 --- a/keyboards/deltasplit75/keymaps/protosplit/config.h +++ b/keyboards/deltasplit75/keymaps/protosplit/config.h @@ -19,11 +19,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define MASTER_LEFT // #define MASTER_RIGHT // #define EE_HANDS - - -#ifdef SUBPROJECT_v2 - #include "../../v2/config.h" -#endif -#ifdef SUBPROJECT_protosplit - #include "../../protosplit/config.h" -#endif diff --git a/keyboards/donutcables/scrabblepad/keymaps/random/keymap.c b/keyboards/donutcables/scrabblepad/keymaps/random/keymap.c index efa6f6e717..7076800717 100644 --- a/keyboards/donutcables/scrabblepad/keymaps/random/keymap.c +++ b/keyboards/donutcables/scrabblepad/keymaps/random/keymap.c @@ -1,4 +1,4 @@ -#include "scrabblepad.h" +#include QMK_KEYBOARD_H #include <stdlib.h> static uint16_t keystroke; diff --git a/keyboards/ergodox_ez/keymaps/rmw/keymap.c b/keyboards/ergodox_ez/keymaps/rmw/keymap.c index b0b9bf13cd..d2cff99429 100644 --- a/keyboards/ergodox_ez/keymaps/rmw/keymap.c +++ b/keyboards/ergodox_ez/keymaps/rmw/keymap.c @@ -1,4 +1,4 @@ -#include "ergodox_ez.h" +#include QMK_KEYBOARD_H #include "version.h" #define LONGPRESS_DELAY 180 diff --git a/keyboards/gboards/gergoplex/keymaps/colemak-dhm/keymap.c b/keyboards/gboards/gergoplex/keymaps/colemak-dhm/keymap.c index 19b5f122ca..4303ef4165 100644 --- a/keyboards/gboards/gergoplex/keymaps/colemak-dhm/keymap.c +++ b/keyboards/gboards/gergoplex/keymaps/colemak-dhm/keymap.c @@ -3,7 +3,7 @@ * https://github.com/qmk/qmk_firmware/blob/master/docs/keycodes.md */ -#include "gergoplex.h" +#include QMK_KEYBOARD_H #include "g/keymap_combo.h" enum { diff --git a/keyboards/handwired/twig/twig50/keymaps/default/keymap.c b/keyboards/handwired/twig/twig50/keymaps/default/keymap.c index 9cdbc872ae..954c8e5637 100644 --- a/keyboards/handwired/twig/twig50/keymaps/default/keymap.c +++ b/keyboards/handwired/twig/twig50/keymaps/default/keymap.c @@ -1,7 +1,7 @@ // Copyright 2022 Takeshi Noda (nodatk@gmail.com) // SPDX-License-Identifier: GPL-2.0-or-later -#include "twig50.h" +#include QMK_KEYBOARD_H #define LAL_NCV LALT_T(KC_LNG2) #define RAL_CNV RALT_T(KC_LNG1) diff --git a/keyboards/handwired/xealous/rules.mk b/keyboards/handwired/xealous/rules.mk index 5e9547ec9d..a9391e9f56 100644 --- a/keyboards/handwired/xealous/rules.mk +++ b/keyboards/handwired/xealous/rules.mk @@ -11,7 +11,6 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality AUDIO_ENABLE = yes # Audio output RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. SPLIT_KEYBOARD = yes # Use shared split_common code -SUBPROJECT_rev1 = yes SRC += matrix.c DEBOUNCE_TYPE = sym_eager_pk diff --git a/keyboards/keebio/chocopad/keymaps/khord/keymap.c b/keyboards/keebio/chocopad/keymaps/khord/keymap.c index 3459ffe8a6..fa1e04bde8 100644 --- a/keyboards/keebio/chocopad/keymaps/khord/keymap.c +++ b/keyboards/keebio/chocopad/keymaps/khord/keymap.c @@ -1,4 +1,4 @@ -#include "chocopad.h" +#include QMK_KEYBOARD_H #define _BASE 0 #define _FN1 1 diff --git a/keyboards/keebio/iris/keymaps/krusli/keymap.c b/keyboards/keebio/iris/keymaps/krusli/keymap.c index ef51a973f6..67eee220fc 100644 --- a/keyboards/keebio/iris/keymaps/krusli/keymap.c +++ b/keyboards/keebio/iris/keymaps/krusli/keymap.c @@ -1,6 +1,4 @@ -#include "iris.h" -#include "action_layer.h" -#include "eeconfig.h" +#include QMK_KEYBOARD_H extern keymap_config_t keymap_config; diff --git a/keyboards/keebio/nyquist/keymaps/danielhklein/config.h b/keyboards/keebio/nyquist/keymaps/danielhklein/config.h index 74499ede71..0efe747f2a 100644 --- a/keyboards/keebio/nyquist/keymaps/danielhklein/config.h +++ b/keyboards/keebio/nyquist/keymaps/danielhklein/config.h @@ -18,7 +18,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define TAPPING_TERM 150 #define EE_HANDS - -#ifdef SUBPROJECT_rev1 - #include "../../rev1/config.h" -#endif diff --git a/keyboards/lets_split/keymaps/adam/config.h b/keyboards/lets_split/keymaps/adam/config.h index 9ba612359e..c2c45bebfd 100644 --- a/keyboards/lets_split/keymaps/adam/config.h +++ b/keyboards/lets_split/keymaps/adam/config.h @@ -21,15 +21,13 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #ifndef CONFIG_USER_H #define CONFIG_USER_H -#include "../../config.h" - /* Select hand configuration */ // #define MASTER_LEFT // #define MASTER_RIGHT #define EE_HANDS -#ifdef SUBPROJECT_rev2 +#ifdef KEYBOARD_lets_split_rev2 /* RGB Underglow */ #undef RGBLED_NUM #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/lets_split/keymaps/fabian/config.h b/keyboards/lets_split/keymaps/fabian/config.h index d05757233d..3e79f43ed0 100644 --- a/keyboards/lets_split/keymaps/fabian/config.h +++ b/keyboards/lets_split/keymaps/fabian/config.h @@ -19,14 +19,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define MASTER_LEFT // #define MASTER_RIGHT // #define EE_HANDS - - -#ifdef SUBPROJECT_rev1 - #include "../../rev1/config.h" -#endif -#ifdef SUBPROJECT_rev2 - #include "../../rev2/config.h" -#endif -#ifdef SUBPROJECT_rev2fliphalf - #include "../../rev2fliphalf/config.h" -#endif diff --git a/keyboards/lets_split/keymaps/heartrobotninja/config.h b/keyboards/lets_split/keymaps/heartrobotninja/config.h index d4193609ad..bd68b24d08 100644 --- a/keyboards/lets_split/keymaps/heartrobotninja/config.h +++ b/keyboards/lets_split/keymaps/heartrobotninja/config.h @@ -41,14 +41,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #undef TAPPING_TOGGLE #define TAPPING_TOGGLE 2 -#ifdef SUBPROJECT_rev1 -#include "../../rev1/config.h" -#endif -#ifdef SUBPROJECT_rev2 -#include "../../rev2/config.h" -#endif -#ifdef SUBPROJECT_rev2fliphalf -#include "../../rev2fliphalf/config.h" -#endif - #endif diff --git a/keyboards/lets_split/keymaps/mjt/config.h b/keyboards/lets_split/keymaps/mjt/config.h index 94be36ef55..e51e065bb6 100644 --- a/keyboards/lets_split/keymaps/mjt/config.h +++ b/keyboards/lets_split/keymaps/mjt/config.h @@ -20,17 +20,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. // #define MASTER_RIGHT // #define EE_HANDS - -#ifdef SUBPROJECT_rev1 - #include "../../rev1/config.h" -#endif -#ifdef SUBPROJECT_rev2 - #include "../../rev2/config.h" -#endif -#ifdef SUBPROJECT_rev2fliphalf - #include "../../rev2fliphalf/config.h" -#endif - #undef RGBLED_NUM #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/lets_split/keymaps/piemod/rules.mk b/keyboards/lets_split/keymaps/piemod/rules.mk index 79a0a17383..e4319facfb 100644 --- a/keyboards/lets_split/keymaps/piemod/rules.mk +++ b/keyboards/lets_split/keymaps/piemod/rules.mk @@ -10,4 +10,3 @@ AUDIO_ENABLE = no # Audio output on port C6 UNICODE_ENABLE = yes # Unicode BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. -SUBPROJECT_rev1 = no diff --git a/keyboards/lets_split/keymaps/zer09/keymap.c b/keyboards/lets_split/keymaps/zer09/keymap.c index 4adc40e9c6..e09fa0d318 100644 --- a/keyboards/lets_split/keymaps/zer09/keymap.c +++ b/keyboards/lets_split/keymaps/zer09/keymap.c @@ -1,6 +1,24 @@ -#include "keymap.h" +#include "zer09.h" -extern keymap_config_t keymap_config; +#undef LAYOUT +#define LAYOUT( \ + L00, L01, L02, L03, L04, R00, R01, R02, R03, R04, \ + L10, L11, L12, L13, L14, R10, R11, R12, R13, R14, \ + L20, L21, L22, L23, L24, R20, R21, R22, R23, R24, \ + L30, L31, L32, L33, L34, R30, R31, R32, R33, R34, \ + L40, L41, L42, L43, L44, R40, R41, R42, R43, R44 \ +) { \ + { L00, L01, L02, L03, L04 }, \ + { L10, L11, L12, L13, L14 }, \ + { L20, L21, L22, L23, L24 }, \ + { L30, L31, L32, L33, L34 }, \ + { L40, L41, L42, L43, L44 }, \ + { R00, R01, R02, R03, R04 }, \ + { R10, R11, R12, R13, R14 }, \ + { R20, R21, R22, R23, R24 }, \ + { R30, R31, R32, R33, R34 }, \ + { R40, R41, R42, R43, R44 } \ +} #define _baseLayer LAYOUT( \ KC_QUOTE, KC_COMMA, KC_DOT, KC_P, KC_Y, /**/KC_F, KC_G, KC_C, KC_R, KC_L, \ diff --git a/keyboards/lets_split/keymaps/zer09/keymap.h b/keyboards/lets_split/keymaps/zer09/keymap.h deleted file mode 100644 index 03f8f480af..0000000000 --- a/keyboards/lets_split/keymaps/zer09/keymap.h +++ /dev/null @@ -1,32 +0,0 @@ -#include "lets_split.h" -#include "action_layer.h" -#include "eeconfig.h" -#include "tap_dance.h" -#include "zer09.h" - -#ifdef LAYOUT_ortho_4x12 -#undef LAYOUT_ortho_4x12 -#endif - -#ifdef LAYOUT -#undef LAYOUT -#define LAYOUT( \ - L00, L01, L02, L03, L04, R00, R01, R02, R03, R04, \ - L10, L11, L12, L13, L14, R10, R11, R12, R13, R14, \ - L20, L21, L22, L23, L24, R20, R21, R22, R23, R24, \ - L30, L31, L32, L33, L34, R30, R31, R32, R33, R34, \ - L40, L41, L42, L43, L44, R40, R41, R42, R43, R44 \ -) \ - { \ - { L00, L01, L02, L03, L04 }, \ - { L10, L11, L12, L13, L14 }, \ - { L20, L21, L22, L23, L24 }, \ - { L30, L31, L32, L33, L34 }, \ - { L40, L41, L42, L43, L44 }, \ - { R00, R01, R02, R03, R04 }, \ - { R10, R11, R12, R13, R14 }, \ - { R20, R21, R22, R23, R24 }, \ - { R30, R31, R32, R33, R34 }, \ - { R40, R41, R42, R43, R44 } \ - } -#endif diff --git a/keyboards/massdrop/alt/keymaps/pregame/keymap.c b/keyboards/massdrop/alt/keymaps/pregame/keymap.c index fcc73825dd..d111b6a554 100644 --- a/keyboards/massdrop/alt/keymaps/pregame/keymap.c +++ b/keyboards/massdrop/alt/keymaps/pregame/keymap.c @@ -14,7 +14,45 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "keymap.h" +#include QMK_KEYBOARD_H + +#define MILLISECONDS_IN_SECOND 1000 + +// These are just to make it neater to use builtin HSV values in the keymap +#define RED {HSV_RED} +#define CORAL {HSV_CORAL} +#define ORANGE {HSV_ORANGE} +#define GOLDEN {HSV_GOLDENROD} +#define GOLD {HSV_GOLD} +#define YELLOW {HSV_YELLOW} +#define CHART {HSV_CHARTREUSE} +#define GREEN {HSV_GREEN} +#define SPRING {HSV_SPRINGGREEN} +#define TURQ {HSV_TURQUOISE} +#define TEAL {HSV_TEAL} +#define CYAN {HSV_CYAN} +#define AZURE {HSV_AZURE} +#define BLUE {HSV_BLUE} +#define PURPLE {HSV_PURPLE} +#define MAGENT {HSV_MAGENTA} +#define PINK {HSV_PINK} + + + +//========================================================== CONFIGURABLE DEFAULTS ========================================================== +extern bool g_suspend_state; +extern rgb_config_t rgb_matrix_config; +bool disable_layer_color; + +enum alt_keycodes { + U_T_AUTO = SAFE_RANGE, // USB Extra Port Toggle Auto Detect / Always Active + U_T_AGCR, // USB Toggle Automatic GCR control + DBG_TOG, // DEBUG Toggle On / Off + DBG_MTRX, // DEBUG Toggle Matrix Prints + DBG_KBD, // DEBUG Toggle Keyboard Prints + DBG_MOU, // DEBUG Toggle Mouse Prints + MD_BOOT, // Restart into bootloader after hold timeout +}; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { diff --git a/keyboards/massdrop/alt/keymaps/pregame/keymap.h b/keyboards/massdrop/alt/keymaps/pregame/keymap.h deleted file mode 100644 index 1980800336..0000000000 --- a/keyboards/massdrop/alt/keymaps/pregame/keymap.h +++ /dev/null @@ -1,58 +0,0 @@ -/* Copyright 2020 elijahblake81 - * - * 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 QMK_KEYBOARD_H - -// HID has not yet been implemented for this keyboard -// #include "raw_hid.h" - -#define MILLISECONDS_IN_SECOND 1000 - -// These are just to make it neater to use builtin HSV values in the keymap -#define RED {HSV_RED} -#define CORAL {HSV_CORAL} -#define ORANGE {HSV_ORANGE} -#define GOLDEN {HSV_GOLDENROD} -#define GOLD {HSV_GOLD} -#define YELLOW {HSV_YELLOW} -#define CHART {HSV_CHARTREUSE} -#define GREEN {HSV_GREEN} -#define SPRING {HSV_SPRINGGREEN} -#define TURQ {HSV_TURQUOISE} -#define TEAL {HSV_TEAL} -#define CYAN {HSV_CYAN} -#define AZURE {HSV_AZURE} -#define BLUE {HSV_BLUE} -#define PURPLE {HSV_PURPLE} -#define MAGENT {HSV_MAGENTA} -#define PINK {HSV_PINK} - - - -//========================================================== CONFIGURABLE DEFAULTS ========================================================== -extern bool g_suspend_state; -extern rgb_config_t rgb_matrix_config; -bool disable_layer_color; - -enum alt_keycodes { - U_T_AUTO = SAFE_RANGE, // USB Extra Port Toggle Auto Detect / Always Active - U_T_AGCR, // USB Toggle Automatic GCR control - DBG_TOG, // DEBUG Toggle On / Off - DBG_MTRX, // DEBUG Toggle Matrix Prints - DBG_KBD, // DEBUG Toggle Keyboard Prints - DBG_MOU, // DEBUG Toggle Mouse Prints - MD_BOOT, // Restart into bootloader after hold timeout -}; diff --git a/keyboards/massdrop/ctrl/keymaps/endgame/keymap.c b/keyboards/massdrop/ctrl/keymaps/endgame/keymap.c index 87b14ff93f..463ccb42ba 100644 --- a/keyboards/massdrop/ctrl/keymaps/endgame/keymap.c +++ b/keyboards/massdrop/ctrl/keymaps/endgame/keymap.c @@ -1,4 +1,98 @@ -#include "keymap.h" +#include QMK_KEYBOARD_H +#include <string.h> + +#define MILLISECONDS_IN_SECOND 1000 + +// These are just to make it neater to use builtin HSV values in the keymap +#define RED {HSV_RED} +#define CORAL {HSV_CORAL} +#define ORANGE {HSV_ORANGE} +#define GOLDEN {HSV_GOLDENROD} +#define GOLD {HSV_GOLD} +#define YELLOW {HSV_YELLOW} +#define CHART {HSV_CHARTREUSE} +#define GREEN {HSV_GREEN} +#define SPRING {HSV_SPRINGGREEN} +#define TURQ {HSV_TURQUOISE} +#define TEAL {HSV_TEAL} +#define CYAN {HSV_CYAN} +#define AZURE {HSV_AZURE} +#define BLUE {HSV_BLUE} +#define PURPLE {HSV_PURPLE} +#define MAGENT {HSV_MAGENTA} +#define PINK {HSV_PINK} + +//========================================================== CONFIGURABLE DEFAULTS ========================================================== +#define RGB_DEFAULT_TIME_OUT 30 +#define RGB_FAST_MODE_TIME_OUT 3 +#define RGB_TIME_OUT_MAX 600 +#define RGB_TIME_OUT_MIN 10 +#define RGB_TIME_OUT_STEP 10 + +extern rgb_config_t rgb_matrix_config; +bool disable_layer_color; + +bool rgb_enabled_flag; // Current LED state flag. If false then LED is off. +bool rgb_time_out_enable; // Idle LED toggle enable. If false then LED will not turn off after idle timeout. +bool rgb_time_out_fast_mode_enabled; // Enable flag for RGB timeout fast mode +bool rgb_time_out_user_value; // This holds the toggle value set by user with ROUT_TG. It's necessary as RGB_TOG changes timeout enable. +uint16_t rgb_time_out_seconds; // Idle LED timeout value, in seconds not milliseconds +uint16_t rgb_time_out_saved_seconds; // The saved user config for RGB timeout period +led_flags_t rgb_time_out_saved_flag; // Store LED flag before timeout so it can be restored when LED is turned on again. + +enum layout_names { + _KL=0, // Keys Layout: The main keyboard layout that has all the characters + _FL, // Function Layout: The function key activated layout with default functions and some added ones + _ML, // Mouse Layout: Mouse Keys and mouse movement + _GL, // GIT Layout: GIT shortcuts and macros + _VL, // VIM Layout: VIM shorcuts and macros + _YL, // Yakuake Layout: Yakuake drop-down terminal shortcuts and macros + _EL, // KDE Layout: Shortcuts for KDE desktop using default KDE shortcuts settings +}; + +enum tapdance_keycodes { + TD_LGUI_ML = 0, // Tap dance key to switch to mouse layer _ML + TD_APP_YL, + TD_CTRL_TERM, // Tap dance key to open terminal on LCTRL double press +}; + +enum ctrl_keycodes { + U_T_AUTO = SAFE_RANGE, // USB Extra Port Toggle Auto Detect / Always Active + U_T_AGCR, // USB Toggle Automatic GCR control + DBG_TOG, // DEBUG Toggle On / Off + DBG_MTRX, // DEBUG Toggle Matrix Prints + DBG_KBD, // DEBUG Toggle Keyboard Prints + DBG_MOU, // DEBUG Toggle Mouse Prints + MD_BOOT, // Restart into bootloader after hold timeout + SEL_CPY, // Select Copy. Select the word cursor is pointed at and copy, using double mouse click and ctrl+c + ROUT_TG, // Timeout Toggle. Toggle idle LED time out on or off + ROUT_VI, // Timeout Value Increase. Increase idle time out before LED disabled + ROUT_VD, // Timeout Value Decrease. Decrease idle time out before LED disabled + ROUT_FM, // RGB timeout fast mode toggle + COPY_ALL, // Copy all text using ctrl(a+c) + TERMINAL, // CTRL+ALT+T +}; + +enum string_macro_keycodes { + // The start of this enum should always be equal to end of ctrl_keycodes + 1 + G_INIT = TERMINAL + 1, // git init + G_CLONE, // git clone + G_CONF, // git config --global + G_ADD, // git add + G_DIFF, // git diff + G_RESET, // git reset + G_REBAS, // git rebase + G_BRANH, // git branch + G_CHECK, // git checkout + G_MERGE, // git merge + G_REMTE, // git remote add + G_FETCH, // git fetch + G_PULL, // git pull + G_PUSH, // git push + G_COMM, // git commit + G_STAT, // git status + G_LOG, // git log +}; static uint16_t idle_timer; // Idle LED timeout timer static uint8_t idle_second_counter; // Idle LED seconds counter, counts seconds not milliseconds diff --git a/keyboards/massdrop/ctrl/keymaps/endgame/keymap.h b/keyboards/massdrop/ctrl/keymaps/endgame/keymap.h deleted file mode 100644 index 2747681126..0000000000 --- a/keyboards/massdrop/ctrl/keymaps/endgame/keymap.h +++ /dev/null @@ -1,99 +0,0 @@ -#include QMK_KEYBOARD_H - -#include <print.h> -#include <string.h> -// HID has not yet been implemented for this keyboard -// #include "raw_hid.h" - -#define MILLISECONDS_IN_SECOND 1000 - -// These are just to make it neater to use builtin HSV values in the keymap -#define RED {HSV_RED} -#define CORAL {HSV_CORAL} -#define ORANGE {HSV_ORANGE} -#define GOLDEN {HSV_GOLDENROD} -#define GOLD {HSV_GOLD} -#define YELLOW {HSV_YELLOW} -#define CHART {HSV_CHARTREUSE} -#define GREEN {HSV_GREEN} -#define SPRING {HSV_SPRINGGREEN} -#define TURQ {HSV_TURQUOISE} -#define TEAL {HSV_TEAL} -#define CYAN {HSV_CYAN} -#define AZURE {HSV_AZURE} -#define BLUE {HSV_BLUE} -#define PURPLE {HSV_PURPLE} -#define MAGENT {HSV_MAGENTA} -#define PINK {HSV_PINK} - -//========================================================== CONFIGURABLE DEFAULTS ========================================================== -#define RGB_DEFAULT_TIME_OUT 30 -#define RGB_FAST_MODE_TIME_OUT 3 -#define RGB_TIME_OUT_MAX 600 -#define RGB_TIME_OUT_MIN 10 -#define RGB_TIME_OUT_STEP 10 - -extern rgb_config_t rgb_matrix_config; -bool disable_layer_color; - -bool rgb_enabled_flag; // Current LED state flag. If false then LED is off. -bool rgb_time_out_enable; // Idle LED toggle enable. If false then LED will not turn off after idle timeout. -bool rgb_time_out_fast_mode_enabled; // Enable flag for RGB timeout fast mode -bool rgb_time_out_user_value; // This holds the toggle value set by user with ROUT_TG. It's necessary as RGB_TOG changes timeout enable. -uint16_t rgb_time_out_seconds; // Idle LED timeout value, in seconds not milliseconds -uint16_t rgb_time_out_saved_seconds; // The saved user config for RGB timeout period -led_flags_t rgb_time_out_saved_flag; // Store LED flag before timeout so it can be restored when LED is turned on again. - -enum layout_names { - _KL=0, // Keys Layout: The main keyboard layout that has all the characters - _FL, // Function Layout: The function key activated layout with default functions and some added ones - _ML, // Mouse Layout: Mouse Keys and mouse movement - _GL, // GIT Layout: GIT shortcuts and macros - _VL, // VIM Layout: VIM shorcuts and macros - _YL, // Yakuake Layout: Yakuake drop-down terminal shortcuts and macros - _EL, // KDE Layout: Shortcuts for KDE desktop using default KDE shortcuts settings -}; - -enum tapdance_keycodes { - TD_LGUI_ML = 0, // Tap dance key to switch to mouse layer _ML - TD_APP_YL, - TD_CTRL_TERM, // Tap dance key to open terminal on LCTRL double press -}; - -enum ctrl_keycodes { - U_T_AUTO = SAFE_RANGE, // USB Extra Port Toggle Auto Detect / Always Active - U_T_AGCR, // USB Toggle Automatic GCR control - DBG_TOG, // DEBUG Toggle On / Off - DBG_MTRX, // DEBUG Toggle Matrix Prints - DBG_KBD, // DEBUG Toggle Keyboard Prints - DBG_MOU, // DEBUG Toggle Mouse Prints - MD_BOOT, // Restart into bootloader after hold timeout - SEL_CPY, // Select Copy. Select the word cursor is pointed at and copy, using double mouse click and ctrl+c - ROUT_TG, // Timeout Toggle. Toggle idle LED time out on or off - ROUT_VI, // Timeout Value Increase. Increase idle time out before LED disabled - ROUT_VD, // Timeout Value Decrease. Decrease idle time out before LED disabled - ROUT_FM, // RGB timeout fast mode toggle - COPY_ALL, // Copy all text using ctrl(a+c) - TERMINAL, // CTRL+ALT+T -}; - -enum string_macro_keycodes { - // The start of this enum should always be equal to end of ctrl_keycodes + 1 - G_INIT = TERMINAL + 1, // git init - G_CLONE, // git clone - G_CONF, // git config --global - G_ADD, // git add - G_DIFF, // git diff - G_RESET, // git reset - G_REBAS, // git rebase - G_BRANH, // git branch - G_CHECK, // git checkout - G_MERGE, // git merge - G_REMTE, // git remote add - G_FETCH, // git fetch - G_PULL, // git pull - G_PUSH, // git push - G_COMM, // git commit - G_STAT, // git status - G_LOG, // git log -}; diff --git a/keyboards/massdrop/ctrl/keymaps/matthewrobo/keymap.c b/keyboards/massdrop/ctrl/keymaps/matthewrobo/keymap.c index d97f45fde0..574587b2bf 100644 --- a/keyboards/massdrop/ctrl/keymaps/matthewrobo/keymap.c +++ b/keyboards/massdrop/ctrl/keymaps/matthewrobo/keymap.c @@ -16,7 +16,72 @@ 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 "keymap.h" +#include QMK_KEYBOARD_H + +#define MILLISECONDS_IN_SECOND 1000 + +// These are just to make it neater to use builtin HSV values in the keymap +// clang-format off +#define WHITE {HSV_WHITE} +#define RED {HSV_RED} +#define CORAL {HSV_CORAL} +#define ORANGE {HSV_ORANGE} +#define GOLDEN {HSV_GOLDENROD} +#define GOLD {HSV_GOLD} +#define YELLOW {HSV_YELLOW} +#define CHART {HSV_CHARTREUSE} +#define GREEN {HSV_GREEN} +#define SPRING {HSV_SPRINGGREEN} +#define TURQ {HSV_TURQUOISE} +#define TEAL {HSV_TEAL} +#define CYAN {HSV_CYAN} +#define AZURE {HSV_AZURE} +#define BLUE {HSV_BLUE} +#define PURPLE {HSV_PURPLE} +#define MAGENT {HSV_MAGENTA} +#define PINK {HSV_PINK} +#define HSV_CREAM 24, 240, 255 +#define CREAM {HSV_CREAM} +#define HSV_9B59B5 208, 192, 255 +#define M9B59B5 {HSV_9B59B5} +// clang-format on + +#define LT_CAPS LT(_NL, KC_CAPS) +#define _LAYER_ KC_TRNS + +//========================================================== CONFIGURABLE DEFAULTS ========================================================== +extern bool g_suspend_state; +extern rgb_config_t rgb_matrix_config; +bool disable_layer_color; + +bool rgb_enabled_flag; // Current LED state flag. If false then LED is off. + +enum layout_names { + _KL = 0, // Keys Layout: The main keyboard layout that has all the characters + _NL, // Navigation Layout: Cursor keys and numpad inputs + _FL, // Function Layout: The function key activated layout with default functions and some added ones +}; + +enum ctrl_keycodes { + U_T_AUTO = SAFE_RANGE, // USB Extra Port Toggle Auto Detect / Always Active + U_T_AGCR, // USB Toggle Automatic GCR control + DBG_TOG, // DEBUG Toggle On / Off + DBG_MTRX, // DEBUG Toggle Matrix Prints + DBG_KBD, // DEBUG Toggle Keyboard Prints + DBG_MOU, // DEBUG Toggle Mouse Prints + MD_BOOT, // Restart into bootloader after hold timeout + MAS_CRM, + MAS_PRP, + MAS_RED, + MAS_GRN, + MAS_BLU, + MAS_CYN, + MAS_MGT, + MAS_YEL, + MAS_KEY, + MAS_WHT, +}; + // clang-format off const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_KL] = LAYOUT( diff --git a/keyboards/massdrop/ctrl/keymaps/matthewrobo/keymap.h b/keyboards/massdrop/ctrl/keymaps/matthewrobo/keymap.h deleted file mode 100644 index e37f0d60f2..0000000000 --- a/keyboards/massdrop/ctrl/keymaps/matthewrobo/keymap.h +++ /dev/null @@ -1,86 +0,0 @@ -/* -QMK Firmware Massdrop CTRL M-AS Keymap -Copyright (C) 2020 matthewrobo - -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 3 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 QMK_KEYBOARD_H - -// HID has not yet been implemented for this keyboard -// #include "raw_hid.h" - -#define MILLISECONDS_IN_SECOND 1000 - -// These are just to make it neater to use builtin HSV values in the keymap -// clang-format off -#define WHITE {HSV_WHITE} -#define RED {HSV_RED} -#define CORAL {HSV_CORAL} -#define ORANGE {HSV_ORANGE} -#define GOLDEN {HSV_GOLDENROD} -#define GOLD {HSV_GOLD} -#define YELLOW {HSV_YELLOW} -#define CHART {HSV_CHARTREUSE} -#define GREEN {HSV_GREEN} -#define SPRING {HSV_SPRINGGREEN} -#define TURQ {HSV_TURQUOISE} -#define TEAL {HSV_TEAL} -#define CYAN {HSV_CYAN} -#define AZURE {HSV_AZURE} -#define BLUE {HSV_BLUE} -#define PURPLE {HSV_PURPLE} -#define MAGENT {HSV_MAGENTA} -#define PINK {HSV_PINK} -#define HSV_CREAM 24, 240, 255 -#define CREAM {HSV_CREAM} -#define HSV_9B59B5 208, 192, 255 -#define M9B59B5 {HSV_9B59B5} -// clang-format on - -#define LT_CAPS LT(_NL, KC_CAPS) -#define _LAYER_ KC_TRNS - -//========================================================== CONFIGURABLE DEFAULTS ========================================================== -extern bool g_suspend_state; -extern rgb_config_t rgb_matrix_config; -bool disable_layer_color; - -bool rgb_enabled_flag; // Current LED state flag. If false then LED is off. - -enum layout_names { - _KL = 0, // Keys Layout: The main keyboard layout that has all the characters - _NL, // Navigation Layout: Cursor keys and numpad inputs - _FL, // Function Layout: The function key activated layout with default functions and some added ones -}; - -enum ctrl_keycodes { - U_T_AUTO = SAFE_RANGE, // USB Extra Port Toggle Auto Detect / Always Active - U_T_AGCR, // USB Toggle Automatic GCR control - DBG_TOG, // DEBUG Toggle On / Off - DBG_MTRX, // DEBUG Toggle Matrix Prints - DBG_KBD, // DEBUG Toggle Keyboard Prints - DBG_MOU, // DEBUG Toggle Mouse Prints - MD_BOOT, // Restart into bootloader after hold timeout - MAS_CRM, - MAS_PRP, - MAS_RED, - MAS_GRN, - MAS_BLU, - MAS_CYN, - MAS_MGT, - MAS_YEL, - MAS_KEY, - MAS_WHT, -}; diff --git a/keyboards/massdrop/ctrl/keymaps/xanimos/keymap.c b/keyboards/massdrop/ctrl/keymaps/xanimos/keymap.c index ac41b17a96..5d95018dbc 100644 --- a/keyboards/massdrop/ctrl/keymaps/xanimos/keymap.c +++ b/keyboards/massdrop/ctrl/keymaps/xanimos/keymap.c @@ -14,7 +14,113 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "keymap.h" +#include QMK_KEYBOARD_H +#include <string.h> + +#define MILLISECONDS_IN_SECOND 1000 + +// These are just to make it neater to use builtin HSV values in the keymap +#define RED {HSV_RED} +#define CORAL {HSV_CORAL} +#define ORANGE {HSV_ORANGE} +#define GOLDEN {HSV_GOLDENROD} +#define GOLD {HSV_GOLD} +#define YELLOW {HSV_YELLOW} +#define CHART {HSV_CHARTREUSE} +#define GREEN {HSV_GREEN} +#define SPRING {HSV_SPRINGGREEN} +#define TURQ {HSV_TURQUOISE} +#define TEAL {HSV_TEAL} +#define CYAN {HSV_CYAN} +#define AZURE {HSV_AZURE} +#define BLUE {HSV_BLUE} +#define PURPLE {HSV_PURPLE} +#define MAGENT {HSV_MAGENTA} +#define PINK {HSV_PINK} + +//========================================================== CONFIGURABLE DEFAULTS ========================================================== +#define RGB_DEFAULT_TIME_OUT 30 +#define RGB_FAST_MODE_TIME_OUT 3 +#define RGB_TIME_OUT_MAX 600 +#define RGB_TIME_OUT_MIN 10 +#define RGB_TIME_OUT_STEP 10 + +extern rgb_config_t rgb_matrix_config; +bool disable_layer_color; + +bool rgb_enabled_flag; // Current LED state flag. If false then LED is off. +bool rgb_time_out_enable; // Idle LED toggle enable. If false then LED will not turn off after idle timeout. +bool rgb_time_out_fast_mode_enabled; // Enable flag for RGB timeout fast mode +bool rgb_time_out_user_value; // This holds the toggle value set by user with ROUT_TG. It's necessary as RGB_TOG changes timeout enable. +uint16_t rgb_time_out_seconds; // Idle LED timeout value, in seconds not milliseconds +uint16_t rgb_time_out_saved_seconds; // The saved user config for RGB timeout period +led_flags_t rgb_time_out_saved_flag; // Store LED flag before timeout so it can be restored when LED is turned on again. + +enum layout_names { + _KL=0, // Keys Layout: The main keyboard layout that has all the characters + _FL, // Function Layout: The function key activated layout with default functions and some added ones + _GL, // GIT Layout: GIT shortcuts and macros + _NUMPAD, // Numpad Layout: Adds a numpad to the keys +}; + +// Tap Dance keycodes +enum td_keycodes { + TD_FN_SWITCH = 0 +}; + +// Define a type containing as many tapdance states as you need +typedef enum { + TD_NONE, + TD_UNKNOWN, + TD_SINGLE_HOLD, + TD_DOUBLE_HOLD +} td_state_t; + +typedef struct { + bool is_press_action; + td_state_t state; +} td_tap_t; + +// Declare your tapdance functions: + +// Function to determine the current tapdance state +td_state_t cur_dance(tap_dance_state_t *state); + +// `finished` and `reset` functions for each tapdance keycode +void fn_tap_finished(tap_dance_state_t *state, void *user_data); +void fn_tap_reset(tap_dance_state_t *state, void *user_data); + +enum ctrl_keycodes { + MD_BOOT = SAFE_RANGE, // Restart into bootloader after hold timeout + ROUT_TG, // Timeout Toggle. Toggle idle LED time out on or off + ROUT_VI, // Timeout Value Increase. Increase idle time out before LED disabled + ROUT_VD, // Timeout Value Decrease. Decrease idle time out before LED disabled + ROUT_FM, // RGB timeout fast mode toggle + TOG_NPD, // Toggle Numpad On/Off + COPY_ALL, // Copy all text using ctrl(a+c) +}; + +enum string_macro_keycodes { + // The start of this enum should always be equal to end of ctrl_keycodes + 1 + G_INIT = COPY_ALL + 1, // git init + G_CLONE, // git clone + G_ADD, // git add + G_DIFF, // git diff + G_RESET, // git reset --soft + G_BRANH, // git branch list + G_CHECK, // git checkout + G_REMTE, // git remote add + G_FETCH, // git fetch + G_PULL, // git pull + G_PUPST, // git pull upstream + G_PUSH, // git push + G_PSORG, // git push -u origin + G_PSFWL, // git push --force-with-lease + G_COMM, // git commit + G_COMSG, // git commit -m ": [TFS-]" + G_STAT, // git status + G_LOG, // git log +}; static uint16_t idle_timer; // Idle LED timeout timer static uint8_t idle_second_counter; // Idle LED seconds counter, counts seconds not milliseconds diff --git a/keyboards/massdrop/ctrl/keymaps/xanimos/keymap.h b/keyboards/massdrop/ctrl/keymaps/xanimos/keymap.h deleted file mode 100644 index 2dae7131e4..0000000000 --- a/keyboards/massdrop/ctrl/keymaps/xanimos/keymap.h +++ /dev/null @@ -1,129 +0,0 @@ -/* Copyright 2022 Daniel Weeks (@xanimos) - * - * 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 QMK_KEYBOARD_H - -#include <print.h> -#include <string.h> - -#define MILLISECONDS_IN_SECOND 1000 - -// These are just to make it neater to use builtin HSV values in the keymap -#define RED {HSV_RED} -#define CORAL {HSV_CORAL} -#define ORANGE {HSV_ORANGE} -#define GOLDEN {HSV_GOLDENROD} -#define GOLD {HSV_GOLD} -#define YELLOW {HSV_YELLOW} -#define CHART {HSV_CHARTREUSE} -#define GREEN {HSV_GREEN} -#define SPRING {HSV_SPRINGGREEN} -#define TURQ {HSV_TURQUOISE} -#define TEAL {HSV_TEAL} -#define CYAN {HSV_CYAN} -#define AZURE {HSV_AZURE} -#define BLUE {HSV_BLUE} -#define PURPLE {HSV_PURPLE} -#define MAGENT {HSV_MAGENTA} -#define PINK {HSV_PINK} - -//========================================================== CONFIGURABLE DEFAULTS ========================================================== -#define RGB_DEFAULT_TIME_OUT 30 -#define RGB_FAST_MODE_TIME_OUT 3 -#define RGB_TIME_OUT_MAX 600 -#define RGB_TIME_OUT_MIN 10 -#define RGB_TIME_OUT_STEP 10 - -extern rgb_config_t rgb_matrix_config; -bool disable_layer_color; - -bool rgb_enabled_flag; // Current LED state flag. If false then LED is off. -bool rgb_time_out_enable; // Idle LED toggle enable. If false then LED will not turn off after idle timeout. -bool rgb_time_out_fast_mode_enabled; // Enable flag for RGB timeout fast mode -bool rgb_time_out_user_value; // This holds the toggle value set by user with ROUT_TG. It's necessary as RGB_TOG changes timeout enable. -uint16_t rgb_time_out_seconds; // Idle LED timeout value, in seconds not milliseconds -uint16_t rgb_time_out_saved_seconds; // The saved user config for RGB timeout period -led_flags_t rgb_time_out_saved_flag; // Store LED flag before timeout so it can be restored when LED is turned on again. - -enum layout_names { - _KL=0, // Keys Layout: The main keyboard layout that has all the characters - _FL, // Function Layout: The function key activated layout with default functions and some added ones - _GL, // GIT Layout: GIT shortcuts and macros - _NUMPAD, // Numpad Layout: Adds a numpad to the keys -}; - -// Tap Dance keycodes -enum td_keycodes { - TD_FN_SWITCH = 0 -}; - -// Define a type containing as many tapdance states as you need -typedef enum { - TD_NONE, - TD_UNKNOWN, - TD_SINGLE_HOLD, - TD_DOUBLE_HOLD -} td_state_t; - -typedef struct { - bool is_press_action; - td_state_t state; -} td_tap_t; - -// Declare your tapdance functions: - -// Function to determine the current tapdance state -td_state_t cur_dance(tap_dance_state_t *state); - -// `finished` and `reset` functions for each tapdance keycode -void fn_tap_finished(tap_dance_state_t *state, void *user_data); -void fn_tap_reset(tap_dance_state_t *state, void *user_data); - -enum ctrl_keycodes { - MD_BOOT = SAFE_RANGE, // Restart into bootloader after hold timeout - ROUT_TG, // Timeout Toggle. Toggle idle LED time out on or off - ROUT_VI, // Timeout Value Increase. Increase idle time out before LED disabled - ROUT_VD, // Timeout Value Decrease. Decrease idle time out before LED disabled - ROUT_FM, // RGB timeout fast mode toggle - TOG_NPD, // Toggle Numpad On/Off - COPY_ALL, // Copy all text using ctrl(a+c) -}; - -enum string_macro_keycodes { - // The start of this enum should always be equal to end of ctrl_keycodes + 1 - G_INIT = COPY_ALL + 1, // git init - G_CLONE, // git clone - G_ADD, // git add - G_DIFF, // git diff - G_RESET, // git reset --soft - G_BRANH, // git branch list - G_CHECK, // git checkout - G_REMTE, // git remote add - G_FETCH, // git fetch - G_PULL, // git pull - G_PUPST, // git pull upstream - G_PUSH, // git push - G_PSORG, // git push -u origin - G_PSFWL, // git push --force-with-lease - G_COMM, // git commit - G_COMSG, // git commit -m ": [TFS-]" - G_STAT, // git status - G_LOG, // git log -}; - - - - diff --git a/keyboards/mehkee96/keymaps/johann/keymap.c b/keyboards/mehkee96/keymaps/johann/keymap.c index 154506f816..30fdb742c4 100644 --- a/keyboards/mehkee96/keymaps/johann/keymap.c +++ b/keyboards/mehkee96/keymaps/johann/keymap.c @@ -1,4 +1,4 @@ -#include "mehkee96.h" +#include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { diff --git a/keyboards/mt/mt980/keymaps/walker/keymap.c b/keyboards/mt/mt980/keymaps/walker/keymap.c index 4e284ec913..e98a1d71de 100644 --- a/keyboards/mt/mt980/keymaps/walker/keymap.c +++ b/keyboards/mt/mt980/keymaps/walker/keymap.c @@ -1,4 +1,4 @@ -#include "mt980.h" +#include QMK_KEYBOARD_H bool numlock_on = true; diff --git a/keyboards/orthodox/keymaps/oscillope/rules.mk b/keyboards/orthodox/keymaps/oscillope/rules.mk index fb77881d96..72fe328aac 100644 --- a/keyboards/orthodox/keymaps/oscillope/rules.mk +++ b/keyboards/orthodox/keymaps/oscillope/rules.mk @@ -1,3 +1,2 @@ -SUBPROJECT_rev1 = no COMMAND_ENABLE = no MOUSEKEY_ENABLE = no diff --git a/keyboards/planck/keymaps/ishtob/keymap.c b/keyboards/planck/keymaps/ishtob/keymap.c index eebafddbed..75c581de19 100644 --- a/keyboards/planck/keymaps/ishtob/keymap.c +++ b/keyboards/planck/keymaps/ishtob/keymap.c @@ -1,13 +1,6 @@ // This is the canonical layout file for the Quantum project. If you want to add another keyboard, // this is the style you want to emulate. -#include "planck.h" -#include "action_layer.h" -// #include "dynamic_macro.h" -#ifdef AUDIO_ENABLE - #include "audio.h" -#endif -#include "eeconfig.h" #include "ishtob.h" extern keymap_config_t keymap_config; diff --git a/keyboards/planck/keymaps/mitch/rules.mk b/keyboards/planck/keymaps/mitch/rules.mk index 32dc2acc67..e69de29bb2 100644 --- a/keyboards/planck/keymaps/mitch/rules.mk +++ b/keyboards/planck/keymaps/mitch/rules.mk @@ -1,2 +0,0 @@ -SUBPROJECT = rev3 - diff --git a/keyboards/planck/keymaps/piemod/rules.mk b/keyboards/planck/keymaps/piemod/rules.mk index 3126ba9dc4..4f83056a80 100644 --- a/keyboards/planck/keymaps/piemod/rules.mk +++ b/keyboards/planck/keymaps/piemod/rules.mk @@ -1,5 +1,3 @@ -SUBPROJECT_DEFAULT = rev4 - MOUSEKEY_ENABLE = yes EXTRAKEY_ENABLE = yes AUDIO_ENABLE = yes diff --git a/keyboards/woodkeys/meira/keymaps/cole/keymap.c b/keyboards/woodkeys/meira/keymaps/cole/keymap.c index ea9f954331..365c9d18e5 100644 --- a/keyboards/woodkeys/meira/keymaps/cole/keymap.c +++ b/keyboards/woodkeys/meira/keymaps/cole/keymap.c @@ -13,7 +13,7 @@ * 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 "meira.h" +#include QMK_KEYBOARD_H #include "lighting.h" #ifdef RGBLIGHT_ENABLE diff --git a/keyboards/woodkeys/meira/keymaps/grahampheath/keymap.c b/keyboards/woodkeys/meira/keymaps/grahampheath/keymap.c index 26f70a4961..aa9730b88f 100644 --- a/keyboards/woodkeys/meira/keymaps/grahampheath/keymap.c +++ b/keyboards/woodkeys/meira/keymaps/grahampheath/keymap.c @@ -13,9 +13,7 @@ * 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 "meira.h" -#include "action_layer.h" -#include "action_code.h" +#include QMK_KEYBOARD_H #ifdef RGBLIGHT_ENABLE //Following line allows macro to read current RGB settings diff --git a/keyboards/woodkeys/meira/keymaps/takmiya/keymap.c b/keyboards/woodkeys/meira/keymaps/takmiya/keymap.c index 6896997d79..ddd695461e 100644 --- a/keyboards/woodkeys/meira/keymaps/takmiya/keymap.c +++ b/keyboards/woodkeys/meira/keymaps/takmiya/keymap.c @@ -13,8 +13,7 @@ * 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 "meira.h" -#include "issi.h" +#include QMK_KEYBOARD_H #include "lighting.h" #ifdef RGBLIGHT_ENABLE diff --git a/keyboards/ymdk/ymd96/keymaps/hgoel89/keymap.c b/keyboards/ymdk/ymd96/keymaps/hgoel89/keymap.c index 7f91059bf0..067beaa75a 100644 --- a/keyboards/ymdk/ymd96/keymaps/hgoel89/keymap.c +++ b/keyboards/ymdk/ymd96/keymaps/hgoel89/keymap.c @@ -1,5 +1,4 @@ -#include "ymd96.h" -#include "action_layer.h" +#include QMK_KEYBOARD_H /* #define _QWERTY 0 diff --git a/users/ishtob/ishtob.h b/users/ishtob/ishtob.h index 4d8e9eb4ed..fd9e19c809 100644 --- a/users/ishtob/ishtob.h +++ b/users/ishtob/ishtob.h @@ -1,6 +1,6 @@ #ifndef USERSPACE #define USERSPACE -#include "quantum.h" +#include QMK_KEYBOARD_H enum userspace_keycodes { QWERTY = SAFE_RANGE, diff --git a/users/zer09/zer09.h b/users/zer09/zer09.h index cc91cd6f28..764fed2315 100644 --- a/users/zer09/zer09.h +++ b/users/zer09/zer09.h @@ -1,7 +1,7 @@ #ifndef USERSPACE #define USERSPACE -#include "quantum.h" +#include QMK_KEYBOARD_H enum custom_keycodes { CK_SAFE = SAFE_RANGE, |