diff options
| author | Ryan <fauxpark@gmail.com> | 2023-04-14 19:42:50 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-14 19:42:50 +1000 |
| commit | 54634e92634f73a6d9111833adf58214cb4278c3 (patch) | |
| tree | b12409479c031deb6250368d9eac56866e9790e2 | |
| parent | cf5626e0246b66879b03a18115a19a566e839f48 (diff) | |
Fix some missing QMK_KEYBOARD_H includes in user keymaps (#20417)
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 @@ | |||
| 1 | #include "1up60rgb.h" | 1 | #include QMK_KEYBOARD_H |
| 2 | 2 | ||
| 3 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | 3 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |
| 4 | 4 | ||
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 @@ | |||
| 1 | #include "1up60rgb.h" | 1 | #include QMK_KEYBOARD_H |
| 2 | 2 | ||
| 3 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | 3 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |
| 4 | 4 | ||
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 @@ | |||
| 1 | #include "sweet16.h" | 1 | #include QMK_KEYBOARD_H |
| 2 | 2 | ||
| 3 | enum layers { | 3 | enum layers { |
| 4 | num, | 4 | 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 @@ | |||
| 14 | * You should have received a copy of the GNU General Public License | 14 | * You should have received a copy of the GNU General Public License |
| 15 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 15 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
| 16 | */ | 16 | */ |
| 17 | #include "hid_liber.h" | 17 | #include QMK_KEYBOARD_H |
| 18 | 18 | ||
| 19 | // Helpful defines | 19 | // Helpful defines |
| 20 | #define FN_CAPS LT(_FL, KC_CAPS) | 20 | #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 @@ | |||
| 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | #include "contra.h" | 17 | #include QMK_KEYBOARD_H |
| 18 | #include "keymap_german.h" | 18 | #include "keymap_german.h" |
| 19 | 19 | ||
| 20 | enum contra_layers { | 20 | 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 @@ | |||
| 1 | #include "contra.h" | 1 | #include QMK_KEYBOARD_H |
| 2 | #include "action_layer.h" | 2 | #include "action_layer.h" |
| 3 | 3 | ||
| 4 | extern keymap_config_t keymap_config; | 4 | 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/>. | |||
| 20 | // #define MASTER_RIGHT | 20 | // #define MASTER_RIGHT |
| 21 | // #define EE_HANDS | 21 | // #define EE_HANDS |
| 22 | 22 | ||
| 23 | |||
| 24 | #ifdef SUBPROJECT_v2 | ||
| 25 | #include "../../v2/config.h" | ||
| 26 | #endif | ||
| 27 | #ifdef SUBPROJECT_protosplit | ||
| 28 | #include "../../protosplit/config.h" | ||
| 29 | #endif | ||
| 30 | |||
| 31 | #undef RGBLED_NUM | 23 | #undef RGBLED_NUM |
| 32 | #define RGBLIGHT_EFFECT_BREATHING | 24 | #define RGBLIGHT_EFFECT_BREATHING |
| 33 | #define RGBLIGHT_EFFECT_RAINBOW_MOOD | 25 | #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/>. | |||
| 19 | #define MASTER_LEFT | 19 | #define MASTER_LEFT |
| 20 | // #define MASTER_RIGHT | 20 | // #define MASTER_RIGHT |
| 21 | // #define EE_HANDS | 21 | // #define EE_HANDS |
| 22 | |||
| 23 | |||
| 24 | #ifdef SUBPROJECT_v2 | ||
| 25 | #include "../../v2/config.h" | ||
| 26 | #endif | ||
| 27 | #ifdef SUBPROJECT_protosplit | ||
| 28 | #include "../../protosplit/config.h" | ||
| 29 | #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 @@ | |||
| 1 | #include "deltasplit75.h" | 1 | #include QMK_KEYBOARD_H |
| 2 | #include "action_layer.h" | ||
| 3 | #include "eeconfig.h" | ||
| 4 | 2 | ||
| 5 | extern keymap_config_t keymap_config; | 3 | extern keymap_config_t keymap_config; |
| 6 | 4 | ||
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/>. | |||
| 19 | #define MASTER_LEFT | 19 | #define MASTER_LEFT |
| 20 | // #define MASTER_RIGHT | 20 | // #define MASTER_RIGHT |
| 21 | // #define EE_HANDS | 21 | // #define EE_HANDS |
| 22 | |||
| 23 | |||
| 24 | #ifdef SUBPROJECT_v2 | ||
| 25 | #include "../../v2/config.h" | ||
| 26 | #endif | ||
| 27 | #ifdef SUBPROJECT_protosplit | ||
| 28 | #include "../../protosplit/config.h" | ||
| 29 | #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 @@ | |||
| 1 | #include "scrabblepad.h" | 1 | #include QMK_KEYBOARD_H |
| 2 | #include <stdlib.h> | 2 | #include <stdlib.h> |
| 3 | 3 | ||
| 4 | static uint16_t keystroke; | 4 | 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 @@ | |||
| 1 | #include "ergodox_ez.h" | 1 | #include QMK_KEYBOARD_H |
| 2 | #include "version.h" | 2 | #include "version.h" |
| 3 | 3 | ||
| 4 | #define LONGPRESS_DELAY 180 | 4 | #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 @@ | |||
| 3 | * https://github.com/qmk/qmk_firmware/blob/master/docs/keycodes.md | 3 | * https://github.com/qmk/qmk_firmware/blob/master/docs/keycodes.md |
| 4 | */ | 4 | */ |
| 5 | 5 | ||
| 6 | #include "gergoplex.h" | 6 | #include QMK_KEYBOARD_H |
| 7 | #include "g/keymap_combo.h" | 7 | #include "g/keymap_combo.h" |
| 8 | 8 | ||
| 9 | enum { | 9 | 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 @@ | |||
| 1 | // Copyright 2022 Takeshi Noda (nodatk@gmail.com) | 1 | // Copyright 2022 Takeshi Noda (nodatk@gmail.com) |
| 2 | // SPDX-License-Identifier: GPL-2.0-or-later | 2 | // SPDX-License-Identifier: GPL-2.0-or-later |
| 3 | 3 | ||
| 4 | #include "twig50.h" | 4 | #include QMK_KEYBOARD_H |
| 5 | 5 | ||
| 6 | #define LAL_NCV LALT_T(KC_LNG2) | 6 | #define LAL_NCV LALT_T(KC_LNG2) |
| 7 | #define RAL_CNV RALT_T(KC_LNG1) | 7 | #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 | |||
| 11 | AUDIO_ENABLE = yes # Audio output | 11 | AUDIO_ENABLE = yes # Audio output |
| 12 | RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. | 12 | RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. |
| 13 | SPLIT_KEYBOARD = yes # Use shared split_common code | 13 | SPLIT_KEYBOARD = yes # Use shared split_common code |
| 14 | SUBPROJECT_rev1 = yes | ||
| 15 | 14 | ||
| 16 | SRC += matrix.c | 15 | SRC += matrix.c |
| 17 | DEBOUNCE_TYPE = sym_eager_pk | 16 | 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 @@ | |||
| 1 | #include "chocopad.h" | 1 | #include QMK_KEYBOARD_H |
| 2 | 2 | ||
| 3 | #define _BASE 0 | 3 | #define _BASE 0 |
| 4 | #define _FN1 1 | 4 | #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 @@ | |||
| 1 | #include "iris.h" | 1 | #include QMK_KEYBOARD_H |
| 2 | #include "action_layer.h" | ||
| 3 | #include "eeconfig.h" | ||
| 4 | 2 | ||
| 5 | extern keymap_config_t keymap_config; | 3 | extern keymap_config_t keymap_config; |
| 6 | 4 | ||
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/>. | |||
| 18 | 18 | ||
| 19 | #define TAPPING_TERM 150 | 19 | #define TAPPING_TERM 150 |
| 20 | #define EE_HANDS | 20 | #define EE_HANDS |
| 21 | |||
| 22 | #ifdef SUBPROJECT_rev1 | ||
| 23 | #include "../../rev1/config.h" | ||
| 24 | #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/>. | |||
| 21 | #ifndef CONFIG_USER_H | 21 | #ifndef CONFIG_USER_H |
| 22 | #define CONFIG_USER_H | 22 | #define CONFIG_USER_H |
| 23 | 23 | ||
| 24 | #include "../../config.h" | ||
| 25 | |||
| 26 | /* Select hand configuration */ | 24 | /* Select hand configuration */ |
| 27 | 25 | ||
| 28 | // #define MASTER_LEFT | 26 | // #define MASTER_LEFT |
| 29 | // #define MASTER_RIGHT | 27 | // #define MASTER_RIGHT |
| 30 | #define EE_HANDS | 28 | #define EE_HANDS |
| 31 | 29 | ||
| 32 | #ifdef SUBPROJECT_rev2 | 30 | #ifdef KEYBOARD_lets_split_rev2 |
| 33 | /* RGB Underglow */ | 31 | /* RGB Underglow */ |
| 34 | #undef RGBLED_NUM | 32 | #undef RGBLED_NUM |
| 35 | #define RGBLIGHT_EFFECT_BREATHING | 33 | #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/>. | |||
| 19 | #define MASTER_LEFT | 19 | #define MASTER_LEFT |
| 20 | // #define MASTER_RIGHT | 20 | // #define MASTER_RIGHT |
| 21 | // #define EE_HANDS | 21 | // #define EE_HANDS |
| 22 | |||
| 23 | |||
| 24 | #ifdef SUBPROJECT_rev1 | ||
| 25 | #include "../../rev1/config.h" | ||
| 26 | #endif | ||
| 27 | #ifdef SUBPROJECT_rev2 | ||
| 28 | #include "../../rev2/config.h" | ||
| 29 | #endif | ||
| 30 | #ifdef SUBPROJECT_rev2fliphalf | ||
| 31 | #include "../../rev2fliphalf/config.h" | ||
| 32 | #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/>. | |||
| 41 | #undef TAPPING_TOGGLE | 41 | #undef TAPPING_TOGGLE |
| 42 | #define TAPPING_TOGGLE 2 | 42 | #define TAPPING_TOGGLE 2 |
| 43 | 43 | ||
| 44 | #ifdef SUBPROJECT_rev1 | ||
| 45 | #include "../../rev1/config.h" | ||
| 46 | #endif | ||
| 47 | #ifdef SUBPROJECT_rev2 | ||
| 48 | #include "../../rev2/config.h" | ||
| 49 | #endif | ||
| 50 | #ifdef SUBPROJECT_rev2fliphalf | ||
| 51 | #include "../../rev2fliphalf/config.h" | ||
| 52 | #endif | ||
| 53 | |||
| 54 | #endif | 44 | #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/>. | |||
| 20 | // #define MASTER_RIGHT | 20 | // #define MASTER_RIGHT |
| 21 | // #define EE_HANDS | 21 | // #define EE_HANDS |
| 22 | 22 | ||
| 23 | |||
| 24 | #ifdef SUBPROJECT_rev1 | ||
| 25 | #include "../../rev1/config.h" | ||
| 26 | #endif | ||
| 27 | #ifdef SUBPROJECT_rev2 | ||
| 28 | #include "../../rev2/config.h" | ||
| 29 | #endif | ||
| 30 | #ifdef SUBPROJECT_rev2fliphalf | ||
| 31 | #include "../../rev2fliphalf/config.h" | ||
| 32 | #endif | ||
| 33 | |||
| 34 | #undef RGBLED_NUM | 23 | #undef RGBLED_NUM |
| 35 | #define RGBLIGHT_EFFECT_BREATHING | 24 | #define RGBLIGHT_EFFECT_BREATHING |
| 36 | #define RGBLIGHT_EFFECT_RAINBOW_MOOD | 25 | #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 | |||
| 10 | UNICODE_ENABLE = yes # Unicode | 10 | UNICODE_ENABLE = yes # Unicode |
| 11 | BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID | 11 | BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID |
| 12 | RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. | 12 | RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. |
| 13 | 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 @@ | |||
| 1 | #include "keymap.h" | 1 | #include "zer09.h" |
| 2 | 2 | ||
| 3 | extern keymap_config_t keymap_config; | 3 | #undef LAYOUT |
| 4 | #define LAYOUT( \ | ||
| 5 | L00, L01, L02, L03, L04, R00, R01, R02, R03, R04, \ | ||
| 6 | L10, L11, L12, L13, L14, R10, R11, R12, R13, R14, \ | ||
| 7 | L20, L21, L22, L23, L24, R20, R21, R22, R23, R24, \ | ||
| 8 | L30, L31, L32, L33, L34, R30, R31, R32, R33, R34, \ | ||
| 9 | L40, L41, L42, L43, L44, R40, R41, R42, R43, R44 \ | ||
| 10 | ) { \ | ||
| 11 | { L00, L01, L02, L03, L04 }, \ | ||
| 12 | { L10, L11, L12, L13, L14 }, \ | ||
| 13 | { L20, L21, L22, L23, L24 }, \ | ||
| 14 | { L30, L31, L32, L33, L34 }, \ | ||
| 15 | { L40, L41, L42, L43, L44 }, \ | ||
| 16 | { R00, R01, R02, R03, R04 }, \ | ||
| 17 | { R10, R11, R12, R13, R14 }, \ | ||
| 18 | { R20, R21, R22, R23, R24 }, \ | ||
| 19 | { R30, R31, R32, R33, R34 }, \ | ||
| 20 | { R40, R41, R42, R43, R44 } \ | ||
| 21 | } | ||
| 4 | 22 | ||
| 5 | #define _baseLayer LAYOUT( \ | 23 | #define _baseLayer LAYOUT( \ |
| 6 | KC_QUOTE, KC_COMMA, KC_DOT, KC_P, KC_Y, /**/KC_F, KC_G, KC_C, KC_R, KC_L, \ | 24 | 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 @@ | |||
| 1 | #include "lets_split.h" | ||
| 2 | #include "action_layer.h" | ||
| 3 | #include "eeconfig.h" | ||
| 4 | #include "tap_dance.h" | ||
| 5 | #include "zer09.h" | ||
| 6 | |||
| 7 | #ifdef LAYOUT_ortho_4x12 | ||
| 8 | #undef LAYOUT_ortho_4x12 | ||
| 9 | #endif | ||
| 10 | |||
| 11 | #ifdef LAYOUT | ||
| 12 | #undef LAYOUT | ||
| 13 | #define LAYOUT( \ | ||
| 14 | L00, L01, L02, L03, L04, R00, R01, R02, R03, R04, \ | ||
| 15 | L10, L11, L12, L13, L14, R10, R11, R12, R13, R14, \ | ||
| 16 | L20, L21, L22, L23, L24, R20, R21, R22, R23, R24, \ | ||
| 17 | L30, L31, L32, L33, L34, R30, R31, R32, R33, R34, \ | ||
| 18 | L40, L41, L42, L43, L44, R40, R41, R42, R43, R44 \ | ||
| 19 | ) \ | ||
| 20 | { \ | ||
| 21 | { L00, L01, L02, L03, L04 }, \ | ||
| 22 | { L10, L11, L12, L13, L14 }, \ | ||
| 23 | { L20, L21, L22, L23, L24 }, \ | ||
| 24 | { L30, L31, L32, L33, L34 }, \ | ||
| 25 | { L40, L41, L42, L43, L44 }, \ | ||
| 26 | { R00, R01, R02, R03, R04 }, \ | ||
| 27 | { R10, R11, R12, R13, R14 }, \ | ||
| 28 | { R20, R21, R22, R23, R24 }, \ | ||
| 29 | { R30, R31, R32, R33, R34 }, \ | ||
| 30 | { R40, R41, R42, R43, R44 } \ | ||
| 31 | } | ||
| 32 | #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 @@ | |||
| 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | #include "keymap.h" | 17 | #include QMK_KEYBOARD_H |
| 18 | |||
| 19 | #define MILLISECONDS_IN_SECOND 1000 | ||
| 20 | |||
| 21 | // These are just to make it neater to use builtin HSV values in the keymap | ||
| 22 | #define RED {HSV_RED} | ||
| 23 | #define CORAL {HSV_CORAL} | ||
| 24 | #define ORANGE {HSV_ORANGE} | ||
| 25 | #define GOLDEN {HSV_GOLDENROD} | ||
| 26 | #define GOLD {HSV_GOLD} | ||
| 27 | #define YELLOW {HSV_YELLOW} | ||
| 28 | #define CHART {HSV_CHARTREUSE} | ||
| 29 | #define GREEN {HSV_GREEN} | ||
| 30 | #define SPRING {HSV_SPRINGGREEN} | ||
| 31 | #define TURQ {HSV_TURQUOISE} | ||
| 32 | #define TEAL {HSV_TEAL} | ||
| 33 | #define CYAN {HSV_CYAN} | ||
| 34 | #define AZURE {HSV_AZURE} | ||
| 35 | #define BLUE {HSV_BLUE} | ||
| 36 | #define PURPLE {HSV_PURPLE} | ||
| 37 | #define MAGENT {HSV_MAGENTA} | ||
| 38 | #define PINK {HSV_PINK} | ||
| 39 | |||
| 40 | |||
| 41 | |||
| 42 | //========================================================== CONFIGURABLE DEFAULTS ========================================================== | ||
| 43 | extern bool g_suspend_state; | ||
| 44 | extern rgb_config_t rgb_matrix_config; | ||
| 45 | bool disable_layer_color; | ||
| 46 | |||
| 47 | enum alt_keycodes { | ||
| 48 | U_T_AUTO = SAFE_RANGE, // USB Extra Port Toggle Auto Detect / Always Active | ||
| 49 | U_T_AGCR, // USB Toggle Automatic GCR control | ||
| 50 | DBG_TOG, // DEBUG Toggle On / Off | ||
| 51 | DBG_MTRX, // DEBUG Toggle Matrix Prints | ||
| 52 | DBG_KBD, // DEBUG Toggle Keyboard Prints | ||
| 53 | DBG_MOU, // DEBUG Toggle Mouse Prints | ||
| 54 | MD_BOOT, // Restart into bootloader after hold timeout | ||
| 55 | }; | ||
| 18 | 56 | ||
| 19 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | 57 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |
| 20 | 58 | ||
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 @@ | |||
| 1 | /* Copyright 2020 elijahblake81 | ||
| 2 | * | ||
| 3 | * This program is free software: you can redistribute it and/or modify | ||
| 4 | * it under the terms of the GNU General Public License as published by | ||
| 5 | * the Free Software Foundation, either version 2 of the License, or | ||
| 6 | * (at your option) any later version. | ||
| 7 | * | ||
| 8 | * This program is distributed in the hope that it will be useful, | ||
| 9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 11 | * GNU General Public License for more details. | ||
| 12 | * | ||
| 13 | * You should have received a copy of the GNU General Public License | ||
| 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 15 | */ | ||
| 16 | |||
| 17 | #include QMK_KEYBOARD_H | ||
| 18 | |||
| 19 | // HID has not yet been implemented for this keyboard | ||
| 20 | // #include "raw_hid.h" | ||
| 21 | |||
| 22 | #define MILLISECONDS_IN_SECOND 1000 | ||
| 23 | |||
| 24 | // These are just to make it neater to use builtin HSV values in the keymap | ||
| 25 | #define RED {HSV_RED} | ||
| 26 | #define CORAL {HSV_CORAL} | ||
| 27 | #define ORANGE {HSV_ORANGE} | ||
| 28 | #define GOLDEN {HSV_GOLDENROD} | ||
| 29 | #define GOLD {HSV_GOLD} | ||
| 30 | #define YELLOW {HSV_YELLOW} | ||
| 31 | #define CHART {HSV_CHARTREUSE} | ||
| 32 | #define GREEN {HSV_GREEN} | ||
| 33 | #define SPRING {HSV_SPRINGGREEN} | ||
| 34 | #define TURQ {HSV_TURQUOISE} | ||
| 35 | #define TEAL {HSV_TEAL} | ||
| 36 | #define CYAN {HSV_CYAN} | ||
| 37 | #define AZURE {HSV_AZURE} | ||
| 38 | #define BLUE {HSV_BLUE} | ||
| 39 | #define PURPLE {HSV_PURPLE} | ||
| 40 | #define MAGENT {HSV_MAGENTA} | ||
| 41 | #define PINK {HSV_PINK} | ||
| 42 | |||
| 43 | |||
| 44 | |||
| 45 | //========================================================== CONFIGURABLE DEFAULTS ========================================================== | ||
| 46 | extern bool g_suspend_state; | ||
| 47 | extern rgb_config_t rgb_matrix_config; | ||
| 48 | bool disable_layer_color; | ||
| 49 | |||
| 50 | enum alt_keycodes { | ||
| 51 | U_T_AUTO = SAFE_RANGE, // USB Extra Port Toggle Auto Detect / Always Active | ||
| 52 | U_T_AGCR, // USB Toggle Automatic GCR control | ||
| 53 | DBG_TOG, // DEBUG Toggle On / Off | ||
| 54 | DBG_MTRX, // DEBUG Toggle Matrix Prints | ||
| 55 | DBG_KBD, // DEBUG Toggle Keyboard Prints | ||
| 56 | DBG_MOU, // DEBUG Toggle Mouse Prints | ||
| 57 | MD_BOOT, // Restart into bootloader after hold timeout | ||
| 58 | }; | ||
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 @@ | |||
| 1 | #include "keymap.h" | 1 | #include QMK_KEYBOARD_H |
| 2 | #include <string.h> | ||
| 3 | |||
| 4 | #define MILLISECONDS_IN_SECOND 1000 | ||
| 5 | |||
| 6 | // These are just to make it neater to use builtin HSV values in the keymap | ||
| 7 | #define RED {HSV_RED} | ||
| 8 | #define CORAL {HSV_CORAL} | ||
| 9 | #define ORANGE {HSV_ORANGE} | ||
| 10 | #define GOLDEN {HSV_GOLDENROD} | ||
| 11 | #define GOLD {HSV_GOLD} | ||
| 12 | #define YELLOW {HSV_YELLOW} | ||
| 13 | #define CHART {HSV_CHARTREUSE} | ||
| 14 | #define GREEN {HSV_GREEN} | ||
| 15 | #define SPRING {HSV_SPRINGGREEN} | ||
| 16 | #define TURQ {HSV_TURQUOISE} | ||
| 17 | #define TEAL {HSV_TEAL} | ||
| 18 | #define CYAN {HSV_CYAN} | ||
| 19 | #define AZURE {HSV_AZURE} | ||
| 20 | #define BLUE {HSV_BLUE} | ||
| 21 | #define PURPLE {HSV_PURPLE} | ||
| 22 | #define MAGENT {HSV_MAGENTA} | ||
| 23 | #define PINK {HSV_PINK} | ||
| 24 | |||
| 25 | //========================================================== CONFIGURABLE DEFAULTS ========================================================== | ||
| 26 | #define RGB_DEFAULT_TIME_OUT 30 | ||
| 27 | #define RGB_FAST_MODE_TIME_OUT 3 | ||
| 28 | #define RGB_TIME_OUT_MAX 600 | ||
| 29 | #define RGB_TIME_OUT_MIN 10 | ||
| 30 | #define RGB_TIME_OUT_STEP 10 | ||
| 31 | |||
| 32 | extern rgb_config_t rgb_matrix_config; | ||
| 33 | bool disable_layer_color; | ||
| 34 | |||
| 35 | bool rgb_enabled_flag; // Current LED state flag. If false then LED is off. | ||
| 36 | bool rgb_time_out_enable; // Idle LED toggle enable. If false then LED will not turn off after idle timeout. | ||
| 37 | bool rgb_time_out_fast_mode_enabled; // Enable flag for RGB timeout fast mode | ||
| 38 | 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. | ||
| 39 | uint16_t rgb_time_out_seconds; // Idle LED timeout value, in seconds not milliseconds | ||
| 40 | uint16_t rgb_time_out_saved_seconds; // The saved user config for RGB timeout period | ||
| 41 | led_flags_t rgb_time_out_saved_flag; // Store LED flag before timeout so it can be restored when LED is turned on again. | ||
| 42 | |||
| 43 | enum layout_names { | ||
| 44 | _KL=0, // Keys Layout: The main keyboard layout that has all the characters | ||
| 45 | _FL, // Function Layout: The function key activated layout with default functions and some added ones | ||
| 46 | _ML, // Mouse Layout: Mouse Keys and mouse movement | ||
| 47 | _GL, // GIT Layout: GIT shortcuts and macros | ||
| 48 | _VL, // VIM Layout: VIM shorcuts and macros | ||
| 49 | _YL, // Yakuake Layout: Yakuake drop-down terminal shortcuts and macros | ||
| 50 | _EL, // KDE Layout: Shortcuts for KDE desktop using default KDE shortcuts settings | ||
| 51 | }; | ||
| 52 | |||
| 53 | enum tapdance_keycodes { | ||
| 54 | TD_LGUI_ML = 0, // Tap dance key to switch to mouse layer _ML | ||
| 55 | TD_APP_YL, | ||
| 56 | TD_CTRL_TERM, // Tap dance key to open terminal on LCTRL double press | ||
| 57 | }; | ||
| 58 | |||
| 59 | enum ctrl_keycodes { | ||
| 60 | U_T_AUTO = SAFE_RANGE, // USB Extra Port Toggle Auto Detect / Always Active | ||
| 61 | U_T_AGCR, // USB Toggle Automatic GCR control | ||
| 62 | DBG_TOG, // DEBUG Toggle On / Off | ||
| 63 | DBG_MTRX, // DEBUG Toggle Matrix Prints | ||
| 64 | DBG_KBD, // DEBUG Toggle Keyboard Prints | ||
| 65 | DBG_MOU, // DEBUG Toggle Mouse Prints | ||
| 66 | MD_BOOT, // Restart into bootloader after hold timeout | ||
| 67 | SEL_CPY, // Select Copy. Select the word cursor is pointed at and copy, using double mouse click and ctrl+c | ||
| 68 | ROUT_TG, // Timeout Toggle. Toggle idle LED time out on or off | ||
| 69 | ROUT_VI, // Timeout Value Increase. Increase idle time out before LED disabled | ||
| 70 | ROUT_VD, // Timeout Value Decrease. Decrease idle time out before LED disabled | ||
| 71 | ROUT_FM, // RGB timeout fast mode toggle | ||
| 72 | COPY_ALL, // Copy all text using ctrl(a+c) | ||
| 73 | TERMINAL, // CTRL+ALT+T | ||
| 74 | }; | ||
| 75 | |||
| 76 | enum string_macro_keycodes { | ||
| 77 | // The start of this enum should always be equal to end of ctrl_keycodes + 1 | ||
| 78 | G_INIT = TERMINAL + 1, // git init | ||
| 79 | G_CLONE, // git clone | ||
| 80 | G_CONF, // git config --global | ||
| 81 | G_ADD, // git add | ||
| 82 | G_DIFF, // git diff | ||
| 83 | G_RESET, // git reset | ||
| 84 | G_REBAS, // git rebase | ||
| 85 | G_BRANH, // git branch | ||
| 86 | G_CHECK, // git checkout | ||
| 87 | G_MERGE, // git merge | ||
| 88 | G_REMTE, // git remote add | ||
| 89 | G_FETCH, // git fetch | ||
| 90 | G_PULL, // git pull | ||
| 91 | G_PUSH, // git push | ||
| 92 | G_COMM, // git commit | ||
| 93 | G_STAT, // git status | ||
| 94 | G_LOG, // git log | ||
| 95 | }; | ||
| 2 | 96 | ||
| 3 | static uint16_t idle_timer; // Idle LED timeout timer | 97 | static uint16_t idle_timer; // Idle LED timeout timer |
| 4 | static uint8_t idle_second_counter; // Idle LED seconds counter, counts seconds not milliseconds | 98 | 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 @@ | |||
| 1 | #include QMK_KEYBOARD_H | ||
| 2 | |||
| 3 | #include <print.h> | ||
| 4 | #include <string.h> | ||
| 5 | // HID has not yet been implemented for this keyboard | ||
| 6 | // #include "raw_hid.h" | ||
| 7 | |||
| 8 | #define MILLISECONDS_IN_SECOND 1000 | ||
| 9 | |||
| 10 | // These are just to make it neater to use builtin HSV values in the keymap | ||
| 11 | #define RED {HSV_RED} | ||
| 12 | #define CORAL {HSV_CORAL} | ||
| 13 | #define ORANGE {HSV_ORANGE} | ||
| 14 | #define GOLDEN {HSV_GOLDENROD} | ||
| 15 | #define GOLD {HSV_GOLD} | ||
| 16 | #define YELLOW {HSV_YELLOW} | ||
| 17 | #define CHART {HSV_CHARTREUSE} | ||
| 18 | #define GREEN {HSV_GREEN} | ||
| 19 | #define SPRING {HSV_SPRINGGREEN} | ||
| 20 | #define TURQ {HSV_TURQUOISE} | ||
| 21 | #define TEAL {HSV_TEAL} | ||
| 22 | #define CYAN {HSV_CYAN} | ||
| 23 | #define AZURE {HSV_AZURE} | ||
| 24 | #define BLUE {HSV_BLUE} | ||
| 25 | #define PURPLE {HSV_PURPLE} | ||
| 26 | #define MAGENT {HSV_MAGENTA} | ||
| 27 | #define PINK {HSV_PINK} | ||
| 28 | |||
| 29 | //========================================================== CONFIGURABLE DEFAULTS ========================================================== | ||
| 30 | #define RGB_DEFAULT_TIME_OUT 30 | ||
| 31 | #define RGB_FAST_MODE_TIME_OUT 3 | ||
| 32 | #define RGB_TIME_OUT_MAX 600 | ||
| 33 | #define RGB_TIME_OUT_MIN 10 | ||
| 34 | #define RGB_TIME_OUT_STEP 10 | ||
| 35 | |||
| 36 | extern rgb_config_t rgb_matrix_config; | ||
| 37 | bool disable_layer_color; | ||
| 38 | |||
| 39 | bool rgb_enabled_flag; // Current LED state flag. If false then LED is off. | ||
| 40 | bool rgb_time_out_enable; // Idle LED toggle enable. If false then LED will not turn off after idle timeout. | ||
| 41 | bool rgb_time_out_fast_mode_enabled; // Enable flag for RGB timeout fast mode | ||
| 42 | 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. | ||
| 43 | uint16_t rgb_time_out_seconds; // Idle LED timeout value, in seconds not milliseconds | ||
| 44 | uint16_t rgb_time_out_saved_seconds; // The saved user config for RGB timeout period | ||
| 45 | led_flags_t rgb_time_out_saved_flag; // Store LED flag before timeout so it can be restored when LED is turned on again. | ||
| 46 | |||
| 47 | enum layout_names { | ||
| 48 | _KL=0, // Keys Layout: The main keyboard layout that has all the characters | ||
| 49 | _FL, // Function Layout: The function key activated layout with default functions and some added ones | ||
| 50 | _ML, // Mouse Layout: Mouse Keys and mouse movement | ||
| 51 | _GL, // GIT Layout: GIT shortcuts and macros | ||
| 52 | _VL, // VIM Layout: VIM shorcuts and macros | ||
| 53 | _YL, // Yakuake Layout: Yakuake drop-down terminal shortcuts and macros | ||
| 54 | _EL, // KDE Layout: Shortcuts for KDE desktop using default KDE shortcuts settings | ||
| 55 | }; | ||
| 56 | |||
| 57 | enum tapdance_keycodes { | ||
| 58 | TD_LGUI_ML = 0, // Tap dance key to switch to mouse layer _ML | ||
| 59 | TD_APP_YL, | ||
| 60 | TD_CTRL_TERM, // Tap dance key to open terminal on LCTRL double press | ||
| 61 | }; | ||
| 62 | |||
| 63 | enum ctrl_keycodes { | ||
| 64 | U_T_AUTO = SAFE_RANGE, // USB Extra Port Toggle Auto Detect / Always Active | ||
| 65 | U_T_AGCR, // USB Toggle Automatic GCR control | ||
| 66 | DBG_TOG, // DEBUG Toggle On / Off | ||
| 67 | DBG_MTRX, // DEBUG Toggle Matrix Prints | ||
| 68 | DBG_KBD, // DEBUG Toggle Keyboard Prints | ||
| 69 | DBG_MOU, // DEBUG Toggle Mouse Prints | ||
| 70 | MD_BOOT, // Restart into bootloader after hold timeout | ||
| 71 | SEL_CPY, // Select Copy. Select the word cursor is pointed at and copy, using double mouse click and ctrl+c | ||
| 72 | ROUT_TG, // Timeout Toggle. Toggle idle LED time out on or off | ||
| 73 | ROUT_VI, // Timeout Value Increase. Increase idle time out before LED disabled | ||
| 74 | ROUT_VD, // Timeout Value Decrease. Decrease idle time out before LED disabled | ||
| 75 | ROUT_FM, // RGB timeout fast mode toggle | ||
| 76 | COPY_ALL, // Copy all text using ctrl(a+c) | ||
| 77 | TERMINAL, // CTRL+ALT+T | ||
| 78 | }; | ||
| 79 | |||
| 80 | enum string_macro_keycodes { | ||
| 81 | // The start of this enum should always be equal to end of ctrl_keycodes + 1 | ||
| 82 | G_INIT = TERMINAL + 1, // git init | ||
| 83 | G_CLONE, // git clone | ||
| 84 | G_CONF, // git config --global | ||
| 85 | G_ADD, // git add | ||
| 86 | G_DIFF, // git diff | ||
| 87 | G_RESET, // git reset | ||
| 88 | G_REBAS, // git rebase | ||
| 89 | G_BRANH, // git branch | ||
| 90 | G_CHECK, // git checkout | ||
| 91 | G_MERGE, // git merge | ||
| 92 | G_REMTE, // git remote add | ||
| 93 | G_FETCH, // git fetch | ||
| 94 | G_PULL, // git pull | ||
| 95 | G_PUSH, // git push | ||
| 96 | G_COMM, // git commit | ||
| 97 | G_STAT, // git status | ||
| 98 | G_LOG, // git log | ||
| 99 | }; | ||
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 | |||
| 16 | along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | along with this program. If not, see <http://www.gnu.org/licenses/>. |
| 17 | */ | 17 | */ |
| 18 | 18 | ||
| 19 | #include "keymap.h" | 19 | #include QMK_KEYBOARD_H |
| 20 | |||
| 21 | #define MILLISECONDS_IN_SECOND 1000 | ||
| 22 | |||
| 23 | // These are just to make it neater to use builtin HSV values in the keymap | ||
| 24 | // clang-format off | ||
| 25 | #define WHITE {HSV_WHITE} | ||
| 26 | #define RED {HSV_RED} | ||
| 27 | #define CORAL {HSV_CORAL} | ||
| 28 | #define ORANGE {HSV_ORANGE} | ||
| 29 | #define GOLDEN {HSV_GOLDENROD} | ||
| 30 | #define GOLD {HSV_GOLD} | ||
| 31 | #define YELLOW {HSV_YELLOW} | ||
| 32 | #define CHART {HSV_CHARTREUSE} | ||
| 33 | #define GREEN {HSV_GREEN} | ||
| 34 | #define SPRING {HSV_SPRINGGREEN} | ||
| 35 | #define TURQ {HSV_TURQUOISE} | ||
| 36 | #define TEAL {HSV_TEAL} | ||
| 37 | #define CYAN {HSV_CYAN} | ||
| 38 | #define AZURE {HSV_AZURE} | ||
| 39 | #define BLUE {HSV_BLUE} | ||
| 40 | #define PURPLE {HSV_PURPLE} | ||
| 41 | #define MAGENT {HSV_MAGENTA} | ||
| 42 | #define PINK {HSV_PINK} | ||
| 43 | #define HSV_CREAM 24, 240, 255 | ||
| 44 | #define CREAM {HSV_CREAM} | ||
| 45 | #define HSV_9B59B5 208, 192, 255 | ||
| 46 | #define M9B59B5 {HSV_9B59B5} | ||
| 47 | // clang-format on | ||
| 48 | |||
| 49 | #define LT_CAPS LT(_NL, KC_CAPS) | ||
| 50 | #define _LAYER_ KC_TRNS | ||
| 51 | |||
| 52 | //========================================================== CONFIGURABLE DEFAULTS ========================================================== | ||
| 53 | extern bool g_suspend_state; | ||
| 54 | extern rgb_config_t rgb_matrix_config; | ||
| 55 | bool disable_layer_color; | ||
| 56 | |||
| 57 | bool rgb_enabled_flag; // Current LED state flag. If false then LED is off. | ||
| 58 | |||
| 59 | enum layout_names { | ||
| 60 | _KL = 0, // Keys Layout: The main keyboard layout that has all the characters | ||
| 61 | _NL, // Navigation Layout: Cursor keys and numpad inputs | ||
| 62 | _FL, // Function Layout: The function key activated layout with default functions and some added ones | ||
| 63 | }; | ||
| 64 | |||
| 65 | enum ctrl_keycodes { | ||
| 66 | U_T_AUTO = SAFE_RANGE, // USB Extra Port Toggle Auto Detect / Always Active | ||
| 67 | U_T_AGCR, // USB Toggle Automatic GCR control | ||
| 68 | DBG_TOG, // DEBUG Toggle On / Off | ||
| 69 | DBG_MTRX, // DEBUG Toggle Matrix Prints | ||
| 70 | DBG_KBD, // DEBUG Toggle Keyboard Prints | ||
| 71 | DBG_MOU, // DEBUG Toggle Mouse Prints | ||
| 72 | MD_BOOT, // Restart into bootloader after hold timeout | ||
| 73 | MAS_CRM, | ||
| 74 | MAS_PRP, | ||
| 75 | MAS_RED, | ||
| 76 | MAS_GRN, | ||
| 77 | MAS_BLU, | ||
| 78 | MAS_CYN, | ||
| 79 | MAS_MGT, | ||
| 80 | MAS_YEL, | ||
| 81 | MAS_KEY, | ||
| 82 | MAS_WHT, | ||
| 83 | }; | ||
| 84 | |||
| 20 | // clang-format off | 85 | // clang-format off |
| 21 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | 86 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |
| 22 | [_KL] = LAYOUT( | 87 | [_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 @@ | |||
| 1 | /* | ||
| 2 | QMK Firmware Massdrop CTRL M-AS Keymap | ||
| 3 | Copyright (C) 2020 matthewrobo | ||
| 4 | |||
| 5 | This program is free software: you can redistribute it and/or modify | ||
| 6 | it under the terms of the GNU General Public License as published by | ||
| 7 | the Free Software Foundation, either version 3 of the License, or | ||
| 8 | (at your option) any later version. | ||
| 9 | |||
| 10 | This program is distributed in the hope that it will be useful, | ||
| 11 | but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 13 | GNU General Public License for more details. | ||
| 14 | |||
| 15 | You should have received a copy of the GNU General Public License | ||
| 16 | along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 17 | */ | ||
| 18 | |||
| 19 | #include QMK_KEYBOARD_H | ||
| 20 | |||
| 21 | // HID has not yet been implemented for this keyboard | ||
| 22 | // #include "raw_hid.h" | ||
| 23 | |||
| 24 | #define MILLISECONDS_IN_SECOND 1000 | ||
| 25 | |||
| 26 | // These are just to make it neater to use builtin HSV values in the keymap | ||
| 27 | // clang-format off | ||
| 28 | #define WHITE {HSV_WHITE} | ||
| 29 | #define RED {HSV_RED} | ||
| 30 | #define CORAL {HSV_CORAL} | ||
| 31 | #define ORANGE {HSV_ORANGE} | ||
| 32 | #define GOLDEN {HSV_GOLDENROD} | ||
| 33 | #define GOLD {HSV_GOLD} | ||
| 34 | #define YELLOW {HSV_YELLOW} | ||
| 35 | #define CHART {HSV_CHARTREUSE} | ||
| 36 | #define GREEN {HSV_GREEN} | ||
| 37 | #define SPRING {HSV_SPRINGGREEN} | ||
| 38 | #define TURQ {HSV_TURQUOISE} | ||
| 39 | #define TEAL {HSV_TEAL} | ||
| 40 | #define CYAN {HSV_CYAN} | ||
| 41 | #define AZURE {HSV_AZURE} | ||
| 42 | #define BLUE {HSV_BLUE} | ||
| 43 | #define PURPLE {HSV_PURPLE} | ||
| 44 | #define MAGENT {HSV_MAGENTA} | ||
| 45 | #define PINK {HSV_PINK} | ||
| 46 | #define HSV_CREAM 24, 240, 255 | ||
| 47 | #define CREAM {HSV_CREAM} | ||
| 48 | #define HSV_9B59B5 208, 192, 255 | ||
| 49 | #define M9B59B5 {HSV_9B59B5} | ||
| 50 | // clang-format on | ||
| 51 | |||
| 52 | #define LT_CAPS LT(_NL, KC_CAPS) | ||
| 53 | #define _LAYER_ KC_TRNS | ||
| 54 | |||
| 55 | //========================================================== CONFIGURABLE DEFAULTS ========================================================== | ||
| 56 | extern bool g_suspend_state; | ||
| 57 | extern rgb_config_t rgb_matrix_config; | ||
| 58 | bool disable_layer_color; | ||
| 59 | |||
| 60 | bool rgb_enabled_flag; // Current LED state flag. If false then LED is off. | ||
| 61 | |||
| 62 | enum layout_names { | ||
| 63 | _KL = 0, // Keys Layout: The main keyboard layout that has all the characters | ||
| 64 | _NL, // Navigation Layout: Cursor keys and numpad inputs | ||
| 65 | _FL, // Function Layout: The function key activated layout with default functions and some added ones | ||
| 66 | }; | ||
| 67 | |||
| 68 | enum ctrl_keycodes { | ||
| 69 | U_T_AUTO = SAFE_RANGE, // USB Extra Port Toggle Auto Detect / Always Active | ||
| 70 | U_T_AGCR, // USB Toggle Automatic GCR control | ||
| 71 | DBG_TOG, // DEBUG Toggle On / Off | ||
| 72 | DBG_MTRX, // DEBUG Toggle Matrix Prints | ||
| 73 | DBG_KBD, // DEBUG Toggle Keyboard Prints | ||
| 74 | DBG_MOU, // DEBUG Toggle Mouse Prints | ||
| 75 | MD_BOOT, // Restart into bootloader after hold timeout | ||
| 76 | MAS_CRM, | ||
| 77 | MAS_PRP, | ||
| 78 | MAS_RED, | ||
| 79 | MAS_GRN, | ||
| 80 | MAS_BLU, | ||
| 81 | MAS_CYN, | ||
| 82 | MAS_MGT, | ||
| 83 | MAS_YEL, | ||
| 84 | MAS_KEY, | ||
| 85 | MAS_WHT, | ||
| 86 | }; | ||
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 @@ | |||
| 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | #include "keymap.h" | 17 | #include QMK_KEYBOARD_H |
| 18 | #include <string.h> | ||
| 19 | |||
| 20 | #define MILLISECONDS_IN_SECOND 1000 | ||
| 21 | |||
| 22 | // These are just to make it neater to use builtin HSV values in the keymap | ||
| 23 | #define RED {HSV_RED} | ||
| 24 | #define CORAL {HSV_CORAL} | ||
| 25 | #define ORANGE {HSV_ORANGE} | ||
| 26 | #define GOLDEN {HSV_GOLDENROD} | ||
| 27 | #define GOLD {HSV_GOLD} | ||
| 28 | #define YELLOW {HSV_YELLOW} | ||
| 29 | #define CHART {HSV_CHARTREUSE} | ||
| 30 | #define GREEN {HSV_GREEN} | ||
| 31 | #define SPRING {HSV_SPRINGGREEN} | ||
| 32 | #define TURQ {HSV_TURQUOISE} | ||
| 33 | #define TEAL {HSV_TEAL} | ||
| 34 | #define CYAN {HSV_CYAN} | ||
| 35 | #define AZURE {HSV_AZURE} | ||
| 36 | #define BLUE {HSV_BLUE} | ||
| 37 | #define PURPLE {HSV_PURPLE} | ||
| 38 | #define MAGENT {HSV_MAGENTA} | ||
| 39 | #define PINK {HSV_PINK} | ||
| 40 | |||
| 41 | //========================================================== CONFIGURABLE DEFAULTS ========================================================== | ||
| 42 | #define RGB_DEFAULT_TIME_OUT 30 | ||
| 43 | #define RGB_FAST_MODE_TIME_OUT 3 | ||
| 44 | #define RGB_TIME_OUT_MAX 600 | ||
| 45 | #define RGB_TIME_OUT_MIN 10 | ||
| 46 | #define RGB_TIME_OUT_STEP 10 | ||
| 47 | |||
| 48 | extern rgb_config_t rgb_matrix_config; | ||
| 49 | bool disable_layer_color; | ||
| 50 | |||
| 51 | bool rgb_enabled_flag; // Current LED state flag. If false then LED is off. | ||
| 52 | bool rgb_time_out_enable; // Idle LED toggle enable. If false then LED will not turn off after idle timeout. | ||
| 53 | bool rgb_time_out_fast_mode_enabled; // Enable flag for RGB timeout fast mode | ||
| 54 | 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. | ||
| 55 | uint16_t rgb_time_out_seconds; // Idle LED timeout value, in seconds not milliseconds | ||
| 56 | uint16_t rgb_time_out_saved_seconds; // The saved user config for RGB timeout period | ||
| 57 | led_flags_t rgb_time_out_saved_flag; // Store LED flag before timeout so it can be restored when LED is turned on again. | ||
| 58 | |||
| 59 | enum layout_names { | ||
| 60 | _KL=0, // Keys Layout: The main keyboard layout that has all the characters | ||
| 61 | _FL, // Function Layout: The function key activated layout with default functions and some added ones | ||
| 62 | _GL, // GIT Layout: GIT shortcuts and macros | ||
| 63 | _NUMPAD, // Numpad Layout: Adds a numpad to the keys | ||
| 64 | }; | ||
| 65 | |||
| 66 | // Tap Dance keycodes | ||
| 67 | enum td_keycodes { | ||
| 68 | TD_FN_SWITCH = 0 | ||
| 69 | }; | ||
| 70 | |||
| 71 | // Define a type containing as many tapdance states as you need | ||
| 72 | typedef enum { | ||
| 73 | TD_NONE, | ||
| 74 | TD_UNKNOWN, | ||
| 75 | TD_SINGLE_HOLD, | ||
| 76 | TD_DOUBLE_HOLD | ||
| 77 | } td_state_t; | ||
| 78 | |||
| 79 | typedef struct { | ||
| 80 | bool is_press_action; | ||
| 81 | td_state_t state; | ||
| 82 | } td_tap_t; | ||
| 83 | |||
| 84 | // Declare your tapdance functions: | ||
| 85 | |||
| 86 | // Function to determine the current tapdance state | ||
| 87 | td_state_t cur_dance(tap_dance_state_t *state); | ||
| 88 | |||
| 89 | // `finished` and `reset` functions for each tapdance keycode | ||
| 90 | void fn_tap_finished(tap_dance_state_t *state, void *user_data); | ||
| 91 | void fn_tap_reset(tap_dance_state_t *state, void *user_data); | ||
| 92 | |||
| 93 | enum ctrl_keycodes { | ||
| 94 | MD_BOOT = SAFE_RANGE, // Restart into bootloader after hold timeout | ||
| 95 | ROUT_TG, // Timeout Toggle. Toggle idle LED time out on or off | ||
| 96 | ROUT_VI, // Timeout Value Increase. Increase idle time out before LED disabled | ||
| 97 | ROUT_VD, // Timeout Value Decrease. Decrease idle time out before LED disabled | ||
| 98 | ROUT_FM, // RGB timeout fast mode toggle | ||
| 99 | TOG_NPD, // Toggle Numpad On/Off | ||
| 100 | COPY_ALL, // Copy all text using ctrl(a+c) | ||
| 101 | }; | ||
| 102 | |||
| 103 | enum string_macro_keycodes { | ||
| 104 | // The start of this enum should always be equal to end of ctrl_keycodes + 1 | ||
| 105 | G_INIT = COPY_ALL + 1, // git init | ||
| 106 | G_CLONE, // git clone | ||
| 107 | G_ADD, // git add | ||
| 108 | G_DIFF, // git diff | ||
| 109 | G_RESET, // git reset --soft | ||
| 110 | G_BRANH, // git branch list | ||
| 111 | G_CHECK, // git checkout | ||
| 112 | G_REMTE, // git remote add | ||
| 113 | G_FETCH, // git fetch | ||
| 114 | G_PULL, // git pull | ||
| 115 | G_PUPST, // git pull upstream | ||
| 116 | G_PUSH, // git push | ||
| 117 | G_PSORG, // git push -u origin | ||
| 118 | G_PSFWL, // git push --force-with-lease | ||
| 119 | G_COMM, // git commit | ||
| 120 | G_COMSG, // git commit -m ": [TFS-]" | ||
| 121 | G_STAT, // git status | ||
| 122 | G_LOG, // git log | ||
| 123 | }; | ||
| 18 | 124 | ||
| 19 | static uint16_t idle_timer; // Idle LED timeout timer | 125 | static uint16_t idle_timer; // Idle LED timeout timer |
| 20 | static uint8_t idle_second_counter; // Idle LED seconds counter, counts seconds not milliseconds | 126 | 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 @@ | |||
| 1 | /* Copyright 2022 Daniel Weeks (@xanimos) | ||
| 2 | * | ||
| 3 | * This program is free software: you can redistribute it and/or modify | ||
| 4 | * it under the terms of the GNU General Public License as published by | ||
| 5 | * the Free Software Foundation, either version 2 of the License, or | ||
| 6 | * (at your option) any later version. | ||
| 7 | * | ||
| 8 | * This program is distributed in the hope that it will be useful, | ||
| 9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 11 | * GNU General Public License for more details. | ||
| 12 | * | ||
| 13 | * You should have received a copy of the GNU General Public License | ||
| 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 15 | */ | ||
| 16 | |||
| 17 | #include QMK_KEYBOARD_H | ||
| 18 | |||
| 19 | #include <print.h> | ||
| 20 | #include <string.h> | ||
| 21 | |||
| 22 | #define MILLISECONDS_IN_SECOND 1000 | ||
| 23 | |||
| 24 | // These are just to make it neater to use builtin HSV values in the keymap | ||
| 25 | #define RED {HSV_RED} | ||
| 26 | #define CORAL {HSV_CORAL} | ||
| 27 | #define ORANGE {HSV_ORANGE} | ||
| 28 | #define GOLDEN {HSV_GOLDENROD} | ||
| 29 | #define GOLD {HSV_GOLD} | ||
| 30 | #define YELLOW {HSV_YELLOW} | ||
| 31 | #define CHART {HSV_CHARTREUSE} | ||
| 32 | #define GREEN {HSV_GREEN} | ||
| 33 | #define SPRING {HSV_SPRINGGREEN} | ||
| 34 | #define TURQ {HSV_TURQUOISE} | ||
| 35 | #define TEAL {HSV_TEAL} | ||
| 36 | #define CYAN {HSV_CYAN} | ||
| 37 | #define AZURE {HSV_AZURE} | ||
| 38 | #define BLUE {HSV_BLUE} | ||
| 39 | #define PURPLE {HSV_PURPLE} | ||
| 40 | #define MAGENT {HSV_MAGENTA} | ||
| 41 | #define PINK {HSV_PINK} | ||
| 42 | |||
| 43 | //========================================================== CONFIGURABLE DEFAULTS ========================================================== | ||
| 44 | #define RGB_DEFAULT_TIME_OUT 30 | ||
| 45 | #define RGB_FAST_MODE_TIME_OUT 3 | ||
| 46 | #define RGB_TIME_OUT_MAX 600 | ||
| 47 | #define RGB_TIME_OUT_MIN 10 | ||
| 48 | #define RGB_TIME_OUT_STEP 10 | ||
| 49 | |||
| 50 | extern rgb_config_t rgb_matrix_config; | ||
| 51 | bool disable_layer_color; | ||
| 52 | |||
| 53 | bool rgb_enabled_flag; // Current LED state flag. If false then LED is off. | ||
| 54 | bool rgb_time_out_enable; // Idle LED toggle enable. If false then LED will not turn off after idle timeout. | ||
| 55 | bool rgb_time_out_fast_mode_enabled; // Enable flag for RGB timeout fast mode | ||
| 56 | 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. | ||
| 57 | uint16_t rgb_time_out_seconds; // Idle LED timeout value, in seconds not milliseconds | ||
| 58 | uint16_t rgb_time_out_saved_seconds; // The saved user config for RGB timeout period | ||
| 59 | led_flags_t rgb_time_out_saved_flag; // Store LED flag before timeout so it can be restored when LED is turned on again. | ||
| 60 | |||
| 61 | enum layout_names { | ||
| 62 | _KL=0, // Keys Layout: The main keyboard layout that has all the characters | ||
| 63 | _FL, // Function Layout: The function key activated layout with default functions and some added ones | ||
| 64 | _GL, // GIT Layout: GIT shortcuts and macros | ||
| 65 | _NUMPAD, // Numpad Layout: Adds a numpad to the keys | ||
| 66 | }; | ||
| 67 | |||
| 68 | // Tap Dance keycodes | ||
| 69 | enum td_keycodes { | ||
| 70 | TD_FN_SWITCH = 0 | ||
| 71 | }; | ||
| 72 | |||
| 73 | // Define a type containing as many tapdance states as you need | ||
| 74 | typedef enum { | ||
| 75 | TD_NONE, | ||
| 76 | TD_UNKNOWN, | ||
| 77 | TD_SINGLE_HOLD, | ||
| 78 | TD_DOUBLE_HOLD | ||
| 79 | } td_state_t; | ||
| 80 | |||
| 81 | typedef struct { | ||
| 82 | bool is_press_action; | ||
| 83 | td_state_t state; | ||
| 84 | } td_tap_t; | ||
| 85 | |||
| 86 | // Declare your tapdance functions: | ||
| 87 | |||
| 88 | // Function to determine the current tapdance state | ||
| 89 | td_state_t cur_dance(tap_dance_state_t *state); | ||
| 90 | |||
| 91 | // `finished` and `reset` functions for each tapdance keycode | ||
| 92 | void fn_tap_finished(tap_dance_state_t *state, void *user_data); | ||
| 93 | void fn_tap_reset(tap_dance_state_t *state, void *user_data); | ||
| 94 | |||
| 95 | enum ctrl_keycodes { | ||
| 96 | MD_BOOT = SAFE_RANGE, // Restart into bootloader after hold timeout | ||
| 97 | ROUT_TG, // Timeout Toggle. Toggle idle LED time out on or off | ||
| 98 | ROUT_VI, // Timeout Value Increase. Increase idle time out before LED disabled | ||
| 99 | ROUT_VD, // Timeout Value Decrease. Decrease idle time out before LED disabled | ||
| 100 | ROUT_FM, // RGB timeout fast mode toggle | ||
| 101 | TOG_NPD, // Toggle Numpad On/Off | ||
| 102 | COPY_ALL, // Copy all text using ctrl(a+c) | ||
| 103 | }; | ||
| 104 | |||
| 105 | enum string_macro_keycodes { | ||
| 106 | // The start of this enum should always be equal to end of ctrl_keycodes + 1 | ||
| 107 | G_INIT = COPY_ALL + 1, // git init | ||
| 108 | G_CLONE, // git clone | ||
| 109 | G_ADD, // git add | ||
| 110 | G_DIFF, // git diff | ||
| 111 | G_RESET, // git reset --soft | ||
| 112 | G_BRANH, // git branch list | ||
| 113 | G_CHECK, // git checkout | ||
| 114 | G_REMTE, // git remote add | ||
| 115 | G_FETCH, // git fetch | ||
| 116 | G_PULL, // git pull | ||
| 117 | G_PUPST, // git pull upstream | ||
| 118 | G_PUSH, // git push | ||
| 119 | G_PSORG, // git push -u origin | ||
| 120 | G_PSFWL, // git push --force-with-lease | ||
| 121 | G_COMM, // git commit | ||
| 122 | G_COMSG, // git commit -m ": [TFS-]" | ||
| 123 | G_STAT, // git status | ||
| 124 | G_LOG, // git log | ||
| 125 | }; | ||
| 126 | |||
| 127 | |||
| 128 | |||
| 129 | |||
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 @@ | |||
| 1 | #include "mehkee96.h" | 1 | #include QMK_KEYBOARD_H |
| 2 | 2 | ||
| 3 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | 3 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |
| 4 | 4 | ||
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 @@ | |||
| 1 | #include "mt980.h" | 1 | #include QMK_KEYBOARD_H |
| 2 | 2 | ||
| 3 | bool numlock_on = true; | 3 | bool numlock_on = true; |
| 4 | 4 | ||
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 @@ | |||
| 1 | SUBPROJECT_rev1 = no | ||
| 2 | COMMAND_ENABLE = no | 1 | COMMAND_ENABLE = no |
| 3 | MOUSEKEY_ENABLE = no | 2 | 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 @@ | |||
| 1 | // This is the canonical layout file for the Quantum project. If you want to add another keyboard, | 1 | // This is the canonical layout file for the Quantum project. If you want to add another keyboard, |
| 2 | // this is the style you want to emulate. | 2 | // this is the style you want to emulate. |
| 3 | 3 | ||
| 4 | #include "planck.h" | ||
| 5 | #include "action_layer.h" | ||
| 6 | // #include "dynamic_macro.h" | ||
| 7 | #ifdef AUDIO_ENABLE | ||
| 8 | #include "audio.h" | ||
| 9 | #endif | ||
| 10 | #include "eeconfig.h" | ||
| 11 | #include "ishtob.h" | 4 | #include "ishtob.h" |
| 12 | 5 | ||
| 13 | extern keymap_config_t keymap_config; | 6 | 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 @@ | |||
| 1 | SUBPROJECT = rev3 | ||
| 2 | |||
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 @@ | |||
| 1 | SUBPROJECT_DEFAULT = rev4 | ||
| 2 | |||
| 3 | MOUSEKEY_ENABLE = yes | 1 | MOUSEKEY_ENABLE = yes |
| 4 | EXTRAKEY_ENABLE = yes | 2 | EXTRAKEY_ENABLE = yes |
| 5 | AUDIO_ENABLE = yes | 3 | 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 @@ | |||
| 13 | * You should have received a copy of the GNU General Public License | 13 | * You should have received a copy of the GNU General Public License |
| 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
| 15 | */ | 15 | */ |
| 16 | #include "meira.h" | 16 | #include QMK_KEYBOARD_H |
| 17 | #include "lighting.h" | 17 | #include "lighting.h" |
| 18 | 18 | ||
| 19 | #ifdef RGBLIGHT_ENABLE | 19 | #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 @@ | |||
| 13 | * You should have received a copy of the GNU General Public License | 13 | * You should have received a copy of the GNU General Public License |
| 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
| 15 | */ | 15 | */ |
| 16 | #include "meira.h" | 16 | #include QMK_KEYBOARD_H |
| 17 | #include "action_layer.h" | ||
| 18 | #include "action_code.h" | ||
| 19 | 17 | ||
| 20 | #ifdef RGBLIGHT_ENABLE | 18 | #ifdef RGBLIGHT_ENABLE |
| 21 | //Following line allows macro to read current RGB settings | 19 | //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 @@ | |||
| 13 | * You should have received a copy of the GNU General Public License | 13 | * You should have received a copy of the GNU General Public License |
| 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
| 15 | */ | 15 | */ |
| 16 | #include "meira.h" | 16 | #include QMK_KEYBOARD_H |
| 17 | #include "issi.h" | ||
| 18 | #include "lighting.h" | 17 | #include "lighting.h" |
| 19 | 18 | ||
| 20 | #ifdef RGBLIGHT_ENABLE | 19 | #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 @@ | |||
| 1 | #include "ymd96.h" | 1 | #include QMK_KEYBOARD_H |
| 2 | #include "action_layer.h" | ||
| 3 | 2 | ||
| 4 | /* | 3 | /* |
| 5 | #define _QWERTY 0 | 4 | #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 @@ | |||
| 1 | #ifndef USERSPACE | 1 | #ifndef USERSPACE |
| 2 | #define USERSPACE | 2 | #define USERSPACE |
| 3 | #include "quantum.h" | 3 | #include QMK_KEYBOARD_H |
| 4 | 4 | ||
| 5 | enum userspace_keycodes { | 5 | enum userspace_keycodes { |
| 6 | QWERTY = SAFE_RANGE, | 6 | 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 @@ | |||
| 1 | #ifndef USERSPACE | 1 | #ifndef USERSPACE |
| 2 | #define USERSPACE | 2 | #define USERSPACE |
| 3 | 3 | ||
| 4 | #include "quantum.h" | 4 | #include QMK_KEYBOARD_H |
| 5 | 5 | ||
| 6 | enum custom_keycodes { | 6 | enum custom_keycodes { |
| 7 | CK_SAFE = SAFE_RANGE, | 7 | CK_SAFE = SAFE_RANGE, |
