diff options
| author | noroadsleft <18669334+noroadsleft@users.noreply.github.com> | 2019-03-17 10:04:50 -0700 |
|---|---|---|
| committer | Drashna Jaelre <drashna@live.com> | 2019-03-17 10:04:50 -0700 |
| commit | e30c993d75b2edd78c185a5d5f33f2fe10635eb5 (patch) | |
| tree | 99cd471fa193325963919ddf2a7ff27adac49fc9 /keyboards/xd75/keymaps | |
| parent | e9ace1487887c1f8b4a7e8e6d87c322988bec9ce (diff) | |
| download | qmk_firmware-e30c993d75b2edd78c185a5d5f33f2fe10635eb5.tar.gz qmk_firmware-e30c993d75b2edd78c185a5d5f33f2fe10635eb5.zip | |
[Keyboard] XD75 refactor (#5420)
* Refactor layout macro names
Update the names of the layout macros to reflect QMK's desired usage.
- KEYMAP renamed to LAYOUT
- colinta keymap updated accordingly
- KC_KEYMAP renamed to LAYOUT_kc
- mtdjr keymap updated accordingly
* Update xd75.h to use #pragma once include guard
* Update keymaps to use QMK_KEYBOARD_H
* Refactor default keymap
- updated to use layout macro
- remove deprecated action_get_macro function
- add functions from QMK keymap.c template
- process_record_user
- matrix_init_user
- matrix_scan_user
- led_set_user
* Update supporting files
- updated config.h files to use #pragma once include guard
- remove errant QUANTUM_DIR code block
* Rename readme files to fully lowercase filenames
* Restructure keyboard readme
Updated the readme to better align with the current QMK template.
* Bugfixes to supporting files
Diffstat (limited to 'keyboards/xd75/keymaps')
41 files changed, 101 insertions, 167 deletions
diff --git a/keyboards/xd75/keymaps/adi/config.h b/keyboards/xd75/keymaps/adi/config.h index 244c75c77..08bed9ccb 100644 --- a/keyboards/xd75/keymaps/adi/config.h +++ b/keyboards/xd75/keymaps/adi/config.h | |||
| @@ -14,12 +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 | #ifndef CONFIG_USER_H | 17 | #pragma once |
| 18 | #define CONFIG_USER_H | ||
| 19 | |||
| 20 | #include "../../config.h" | ||
| 21 | 18 | ||
| 22 | // Disable backlight | 19 | // Disable backlight |
| 23 | #undef BACKLIGHT_ENABLE | 20 | #undef BACKLIGHT_ENABLE |
| 24 | |||
| 25 | #endif | ||
diff --git a/keyboards/xd75/keymaps/adi/keymap.c b/keyboards/xd75/keymaps/adi/keymap.c index a91b7d35d..4f9e414c1 100644 --- a/keyboards/xd75/keymaps/adi/keymap.c +++ b/keyboards/xd75/keymaps/adi/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 "xd75.h" | 16 | #include QMK_KEYBOARD_H |
| 17 | 17 | ||
| 18 | // Fillers to make layering more clear | 18 | // Fillers to make layering more clear |
| 19 | #define ___T___ KC_TRNS | 19 | #define ___T___ KC_TRNS |
diff --git a/keyboards/xd75/keymaps/adi/rules.mk b/keyboards/xd75/keymaps/adi/rules.mk index 52a8f38d4..a0c4fc967 100644 --- a/keyboards/xd75/keymaps/adi/rules.mk +++ b/keyboards/xd75/keymaps/adi/rules.mk | |||
| @@ -13,3 +13,4 @@ | |||
| 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 | BACKLIGHT_ENABLE = no | ||
diff --git a/keyboards/xd75/keymaps/atomic_style/config.h b/keyboards/xd75/keymaps/atomic_style/config.h index f52a97bbc..a72596783 100644 --- a/keyboards/xd75/keymaps/atomic_style/config.h +++ b/keyboards/xd75/keymaps/atomic_style/config.h | |||
| @@ -14,11 +14,6 @@ | |||
| 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 | #ifndef CONFIG_USER_H | 17 | #pragma once |
| 18 | #define CONFIG_USER_H | ||
| 19 | |||
| 20 | #include "../../config.h" | ||
| 21 | 18 | ||
| 22 | // place overrides here | 19 | // place overrides here |
| 23 | |||
| 24 | #endif | ||
diff --git a/keyboards/xd75/keymaps/atomic_style/keymap.c b/keyboards/xd75/keymaps/atomic_style/keymap.c index d3e86b050..bdbbc4af3 100644 --- a/keyboards/xd75/keymaps/atomic_style/keymap.c +++ b/keyboards/xd75/keymaps/atomic_style/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 "xd75.h" | 16 | #include QMK_KEYBOARD_H |
| 17 | 17 | ||
| 18 | // Fillers to make layering more clear | 18 | // Fillers to make layering more clear |
| 19 | #define ___T___ KC_TRNS | 19 | #define ___T___ KC_TRNS |
diff --git a/keyboards/xd75/keymaps/bbaserdem/config.h b/keyboards/xd75/keymaps/bbaserdem/config.h index 28d32e562..271f48d00 100644 --- a/keyboards/xd75/keymaps/bbaserdem/config.h +++ b/keyboards/xd75/keymaps/bbaserdem/config.h | |||
| @@ -1,6 +1,3 @@ | |||
| 1 | #ifndef CONFIG_KEYMAP_H | 1 | #pragma once |
| 2 | #define CONFIG_KEYMAP_H | ||
| 3 | 2 | ||
| 4 | #include "../../config.h" | 3 | // place overrides here |
| 5 | |||
| 6 | #endif | ||
diff --git a/keyboards/xd75/keymaps/bbaserdem/keymap.c b/keyboards/xd75/keymaps/bbaserdem/keymap.c index 68071d018..6f8576b09 100644 --- a/keyboards/xd75/keymaps/bbaserdem/keymap.c +++ b/keyboards/xd75/keymaps/bbaserdem/keymap.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | #include "xd75.h" | 1 | #include QMK_KEYBOARD_H |
| 2 | #include "bbaserdem.h" | 2 | #include "bbaserdem.h" |
| 3 | 3 | ||
| 4 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | 4 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |
diff --git a/keyboards/xd75/keymaps/bramver/README.md b/keyboards/xd75/keymaps/bramver/readme.md index 2dcac5f0e..2dcac5f0e 100644 --- a/keyboards/xd75/keymaps/bramver/README.md +++ b/keyboards/xd75/keymaps/bramver/readme.md | |||
diff --git a/keyboards/xd75/keymaps/c4software_bepo/config.h b/keyboards/xd75/keymaps/c4software_bepo/config.h index 39845f15b..6605bbf93 100644 --- a/keyboards/xd75/keymaps/c4software_bepo/config.h +++ b/keyboards/xd75/keymaps/c4software_bepo/config.h | |||
| @@ -16,4 +16,4 @@ | |||
| 16 | 16 | ||
| 17 | # pragma once | 17 | # pragma once |
| 18 | 18 | ||
| 19 | #include "../../config.h" | 19 | // place overrides here |
diff --git a/keyboards/xd75/keymaps/c4software_bepo/README.md b/keyboards/xd75/keymaps/c4software_bepo/readme.md index b95130a31..b95130a31 100644 --- a/keyboards/xd75/keymaps/c4software_bepo/README.md +++ b/keyboards/xd75/keymaps/c4software_bepo/readme.md | |||
diff --git a/keyboards/xd75/keymaps/cbbrowne/config.h b/keyboards/xd75/keymaps/cbbrowne/config.h index f6bb06f39..0ff61e1f4 100644 --- a/keyboards/xd75/keymaps/cbbrowne/config.h +++ b/keyboards/xd75/keymaps/cbbrowne/config.h | |||
| @@ -14,9 +14,9 @@ | |||
| 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 | #ifndef CONFIG_USER_H | 17 | #pragma once |
| 18 | #define CONFIG_USER_H | ||
| 19 | 18 | ||
| 19 | // place overrides here | ||
| 20 | #ifndef NO_DEBUG | 20 | #ifndef NO_DEBUG |
| 21 | #define NO_DEBUG | 21 | #define NO_DEBUG |
| 22 | #endif | 22 | #endif |
| @@ -24,8 +24,6 @@ | |||
| 24 | #define NO_PRINT | 24 | #define NO_PRINT |
| 25 | #endif | 25 | #endif |
| 26 | 26 | ||
| 27 | #include "../../config.h" | ||
| 28 | |||
| 29 | #define LEADER_TIMEOUT 300 | 27 | #define LEADER_TIMEOUT 300 |
| 30 | #define BACKLIGHT_BREATHING | 28 | #define BACKLIGHT_BREATHING |
| 31 | 29 | ||
| @@ -34,10 +32,3 @@ | |||
| 34 | #define randadd 53 | 32 | #define randadd 53 |
| 35 | #define randmul 181 | 33 | #define randmul 181 |
| 36 | #define randmod 167 | 34 | #define randmod 167 |
| 37 | |||
| 38 | /* Filler to make layering a bit clearer * | ||
| 39 | * borrowed from basic keymap */ | ||
| 40 | |||
| 41 | #define _____ KC_NO | ||
| 42 | |||
| 43 | #endif | ||
diff --git a/keyboards/xd75/keymaps/cbbrowne/keymap.c b/keyboards/xd75/keymaps/cbbrowne/keymap.c index b20cafabc..6c356ac80 100644 --- a/keyboards/xd75/keymaps/cbbrowne/keymap.c +++ b/keyboards/xd75/keymaps/cbbrowne/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 "xd75.h" | 16 | #include QMK_KEYBOARD_H |
| 17 | 17 | ||
| 18 | /* Fillers to make layering more clear */ | 18 | /* Fillers to make layering more clear */ |
| 19 | #define ___T___ KC_TRNS | 19 | #define ___T___ KC_TRNS |
diff --git a/keyboards/xd75/keymaps/cbbrowne/rules.mk b/keyboards/xd75/keymaps/cbbrowne/rules.mk index 0968298a0..eb2f87063 100644 --- a/keyboards/xd75/keymaps/cbbrowne/rules.mk +++ b/keyboards/xd75/keymaps/cbbrowne/rules.mk | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | # Build Options | 1 | # Build Options |
| 2 | # change to "no" to disable the options, or define them in the Makefile in | 2 | # change to "no" to disable the options, or define them in the Makefile in |
| 3 | # the appropriate keymap folder that will get included automatically | 3 | # the appropriate keymap folder that will get included automatically |
| 4 | # | 4 | # |
| 5 | BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration(+1000) | 5 | BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration(+1000) |
| @@ -18,7 +18,3 @@ API_SYSEX_ENABLE = no # Enable SYSEX API (+5390) | |||
| 18 | 18 | ||
| 19 | # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE | 19 | # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE |
| 20 | SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend | 20 | SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend |
| 21 | |||
| 22 | ifndef QUANTUM_DIR | ||
| 23 | include ../../../../Makefile | ||
| 24 | endif | ||
diff --git a/keyboards/xd75/keymaps/colinta/config.h b/keyboards/xd75/keymaps/colinta/config.h index 3b39bee81..354c9c918 100644 --- a/keyboards/xd75/keymaps/colinta/config.h +++ b/keyboards/xd75/keymaps/colinta/config.h | |||
| @@ -14,15 +14,12 @@ | |||
| 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 | #ifndef CONFIG_USER_H | 17 | #pragma once |
| 18 | #define CONFIG_USER_H | ||
| 19 | 18 | ||
| 20 | #include "../../config.h" | 19 | // place overrides here |
| 21 | 20 | ||
| 22 | // QMK customization: | 21 | // QMK customization: |
| 23 | // - after 1.5s, turn off one-shot keys | 22 | // - after 1.5s, turn off one-shot keys |
| 24 | #define ONESHOT_TIMEOUT 1500 | 23 | #define ONESHOT_TIMEOUT 1500 |
| 25 | // - TT(layer) only needs one press | 24 | // - TT(layer) only needs one press |
| 26 | #define TAPPING_TOGGLE 1 | 25 | #define TAPPING_TOGGLE 1 |
| 27 | |||
| 28 | #endif | ||
diff --git a/keyboards/xd75/keymaps/colinta/keymap.c b/keyboards/xd75/keymaps/colinta/keymap.c index a50a02c36..257caad33 100644 --- a/keyboards/xd75/keymaps/colinta/keymap.c +++ b/keyboards/xd75/keymaps/colinta/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 "xd75.h" | 16 | #include QMK_KEYBOARD_H |
| 17 | 17 | ||
| 18 | #ifdef IS_COLINTA | 18 | #ifdef IS_COLINTA |
| 19 | #include "secrets.h" | 19 | #include "secrets.h" |
| @@ -91,7 +91,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 91 | * '--/RRND----/MUTE----/FFWD-------------------------------------------------------------------------------------------------------------' | 91 | * '--/RRND----/MUTE----/FFWD-------------------------------------------------------------------------------------------------------------' |
| 92 | */ | 92 | */ |
| 93 | 93 | ||
| 94 | [LAYER_COLEMAK] = KEYMAP( | 94 | [LAYER_COLEMAK] = LAYOUT( |
| 95 | KC_GRV, TH_F1, TH_F2, TH_F3, TH_F4, TH_F5, MM_0, MM_1, KC_DEL, TH_F6, TH_F7, TH_F8, TH_F9, TH_F10, KC_MINS, | 95 | KC_GRV, TH_F1, TH_F2, TH_F3, TH_F4, TH_F5, MM_0, MM_1, KC_DEL, TH_F6, TH_F7, TH_F8, TH_F9, TH_F10, KC_MINS, |
| 96 | KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, MM_2, GOTO_FN, KC_BSPC, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_EQL, | 96 | KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, MM_2, GOTO_FN, KC_BSPC, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_EQL, |
| 97 | OSCTL, KC_A, KC_R, KC_S, KC_T, KC_D, KC_LBRC, KC_RBRC, KC_ENT, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT, | 97 | OSCTL, KC_A, KC_R, KC_S, KC_T, KC_D, KC_LBRC, KC_RBRC, KC_ENT, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT, |
| @@ -113,7 +113,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 113 | * '--------------------------------------------------------------------------------------------------------------------------------------' | 113 | * '--------------------------------------------------------------------------------------------------------------------------------------' |
| 114 | */ | 114 | */ |
| 115 | 115 | ||
| 116 | [LAYER_RECORD] = KEYMAP( | 116 | [LAYER_RECORD] = LAYOUT( |
| 117 | _____, _____, _____, _____, _____, _____, DYN_REC_STOP, DYN_REC_STOP, _____, _____, _____, _____, _____, _____, _____, | 117 | _____, _____, _____, _____, _____, _____, DYN_REC_STOP, DYN_REC_STOP, _____, _____, _____, _____, _____, _____, _____, |
| 118 | _____, _____, _____, _____, _____, _____, DYN_REC_STOP, DYN_REC_STOP, _____, _____, _____, _____, _____, _____, _____, | 118 | _____, _____, _____, _____, _____, _____, DYN_REC_STOP, DYN_REC_STOP, _____, _____, _____, _____, _____, _____, _____, |
| 119 | _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, | 119 | _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, |
| @@ -135,7 +135,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 135 | * '--------------------------------------------------------------------------------------------------------------------------------------' | 135 | * '--------------------------------------------------------------------------------------------------------------------------------------' |
| 136 | */ | 136 | */ |
| 137 | 137 | ||
| 138 | [LAYER_QWERTY] = KEYMAP( | 138 | [LAYER_QWERTY] = LAYOUT( |
| 139 | _____, _____, _____, _____, _____, _____, MM_0, MM_1, _____, _____, _____, _____, _____, _____, _____, | 139 | _____, _____, _____, _____, _____, _____, MM_0, MM_1, _____, _____, _____, _____, _____, _____, _____, |
| 140 | _____, KC_Q, KC_W, KC_E, KC_R, KC_T, MM_2, GOTO_FN, _____, KC_Y, KC_U, KC_I, KC_O, KC_P, _____, | 140 | _____, KC_Q, KC_W, KC_E, KC_R, KC_T, MM_2, GOTO_FN, _____, KC_Y, KC_U, KC_I, KC_O, KC_P, _____, |
| 141 | MOD_LSFT, KC_A, KC_S, KC_D, KC_F, KC_G, _____, _____, _____, KC_H, KC_J, KC_K, KC_L, KC_SCLN, _____, | 141 | MOD_LSFT, KC_A, KC_S, KC_D, KC_F, KC_G, _____, _____, _____, KC_H, KC_J, KC_K, KC_L, KC_SCLN, _____, |
| @@ -157,7 +157,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 157 | * '--------------------------------------------------------------------------------------------------------------------------------------' | 157 | * '--------------------------------------------------------------------------------------------------------------------------------------' |
| 158 | */ | 158 | */ |
| 159 | 159 | ||
| 160 | [LAYER_FN] = KEYMAP( | 160 | [LAYER_FN] = LAYOUT( |
| 161 | GOTO_CM, GOTO_QW, KC_NO, KC_NO, KC_NO, KC_NO, DYN_REC_START1, DYN_REC_START2, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, | 161 | GOTO_CM, GOTO_QW, KC_NO, KC_NO, KC_NO, KC_NO, DYN_REC_START1, DYN_REC_START2, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, |
| 162 | KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, | 162 | KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, |
| 163 | KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, | 163 | KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, |
diff --git a/keyboards/xd75/keymaps/davidrambo/config.h b/keyboards/xd75/keymaps/davidrambo/config.h index f21914703..6e6349c7c 100644 --- a/keyboards/xd75/keymaps/davidrambo/config.h +++ b/keyboards/xd75/keymaps/davidrambo/config.h | |||
| @@ -14,12 +14,9 @@ | |||
| 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 | #ifndef CONFIG_USER_H | 17 | #pragma once |
| 18 | #define CONFIG_USER_H | ||
| 19 | 18 | ||
| 20 | #include "../../config.h" | 19 | // place overrides here |
| 21 | 20 | ||
| 22 | #define TAPPING_TERM 200 | 21 | #define TAPPING_TERM 200 |
| 23 | #define PERMISSIVE_HOLD | 22 | #define PERMISSIVE_HOLD |
| 24 | |||
| 25 | #endif | ||
diff --git a/keyboards/xd75/keymaps/davidrambo/keymap.c b/keyboards/xd75/keymaps/davidrambo/keymap.c index b37cad054..442a00afd 100644 --- a/keyboards/xd75/keymaps/davidrambo/keymap.c +++ b/keyboards/xd75/keymaps/davidrambo/keymap.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | #include "xd75.h" | 1 | #include QMK_KEYBOARD_H |
| 2 | 2 | ||
| 3 | #define A_BSPC LALT(KC_BSPC) // delete whole word in Mac | 3 | #define A_BSPC LALT(KC_BSPC) // delete whole word in Mac |
| 4 | // #define C_BSPS LCTL(KC_BSPC) // delete whole word in PC; currently not in use | 4 | // #define C_BSPS LCTL(KC_BSPC) // delete whole word in PC; currently not in use |
diff --git a/keyboards/xd75/keymaps/default/config.h b/keyboards/xd75/keymaps/default/config.h index 015377b5f..e6975da8a 100644 --- a/keyboards/xd75/keymaps/default/config.h +++ b/keyboards/xd75/keymaps/default/config.h | |||
| @@ -14,11 +14,6 @@ | |||
| 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 | #ifndef CONFIG_USER_H | 17 | #pragma once |
| 18 | #define CONFIG_USER_H | ||
| 19 | |||
| 20 | #include "../../config.h" | ||
| 21 | 18 | ||
| 22 | // place overrides here | 19 | // place overrides here |
| 23 | |||
| 24 | #endif | ||
diff --git a/keyboards/xd75/keymaps/default/keymap.c b/keyboards/xd75/keymaps/default/keymap.c index 03f605385..0e5c7dbaa 100644 --- a/keyboards/xd75/keymaps/default/keymap.c +++ b/keyboards/xd75/keymaps/default/keymap.c | |||
| @@ -13,12 +13,18 @@ | |||
| 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 "xd75.h" | 16 | #include QMK_KEYBOARD_H |
| 17 | 17 | ||
| 18 | // Layer shorthand | 18 | // Layer shorthand |
| 19 | #define _QW 0 | 19 | #define _QW 0 |
| 20 | #define _FN 1 | 20 | #define _FN 1 |
| 21 | 21 | ||
| 22 | // Defines the keycodes used by our macros in process_record_user | ||
| 23 | enum custom_keycodes { | ||
| 24 | QMKBEST = SAFE_RANGE, | ||
| 25 | QMKURL | ||
| 26 | }; | ||
| 27 | |||
| 22 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | 28 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |
| 23 | 29 | ||
| 24 | /* QWERTY | 30 | /* QWERTY |
| @@ -35,13 +41,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 35 | * '--------------------------------------------------------------------------------------------------------------------------------------' | 41 | * '--------------------------------------------------------------------------------------------------------------------------------------' |
| 36 | */ | 42 | */ |
| 37 | 43 | ||
| 38 | [_QW] = { /* QWERTY */ | 44 | [_QW] = LAYOUT_ortho_5x15( /* QWERTY */ |
| 39 | { KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_MINS, KC_GRV, KC_EQL, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC }, | 45 | KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_MINS, KC_GRV, KC_EQL, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, |
| 40 | { KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_LBRC, KC_BSLS, KC_RBRC, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_QUOT }, | 46 | KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_LBRC, KC_BSLS, KC_RBRC, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_QUOT, |
| 41 | { KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_HOME, KC_DEL, KC_PGUP, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENT }, | 47 | KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_HOME, KC_DEL, KC_PGUP, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENT, |
| 42 | { KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_END, KC_UP, KC_PGDN, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT }, | 48 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_END, KC_UP, KC_PGDN, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, |
| 43 | { KC_LCTL, KC_LGUI, KC_LALT, MO(_FN), KC_SPC, KC_SPC, KC_LEFT, KC_DOWN, KC_RGHT, KC_SPC, KC_SPC, MO(_FN), KC_RALT, KC_RGUI, KC_RCTL }, | 49 | KC_LCTL, KC_LGUI, KC_LALT, MO(_FN), KC_SPC, KC_SPC, KC_LEFT, KC_DOWN, KC_RGHT, KC_SPC, KC_SPC, MO(_FN), KC_RALT, KC_RGUI, KC_RCTL |
| 44 | }, | 50 | ), |
| 45 | 51 | ||
| 46 | /* FUNCTION | 52 | /* FUNCTION |
| 47 | * .--------------------------------------------------------------------------------------------------------------------------------------. | 53 | * .--------------------------------------------------------------------------------------------------------------------------------------. |
| @@ -56,30 +62,46 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 56 | * | | | RGB TG | FN | RGB RMD| RGB MD | P0 | | P. | PENT | PENT | FN | | | | | 62 | * | | | RGB TG | FN | RGB RMD| RGB MD | P0 | | P. | PENT | PENT | FN | | | | |
| 57 | * '--------------------------------------------------------------------------------------------------------------------------------------' | 63 | * '--------------------------------------------------------------------------------------------------------------------------------------' |
| 58 | */ | 64 | */ |
| 59 | 65 | ||
| 60 | [_FN] = { /* FUNCTION */ | 66 | [_FN] = LAYOUT_ortho_5x15( /* FUNCTION */ |
| 61 | { KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_NLCK, KC_SLSH, KC_ASTR, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12 }, | 67 | KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_NLCK, KC_SLSH, KC_ASTR, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, |
| 62 | { KC_MSEL, KC_CALC, KC_MYCM, KC_MAIL, RGB_HUD, RGB_HUI, KC_P7, KC_P8, KC_P9, KC_MINS, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS }, | 68 | KC_MSEL, KC_CALC, KC_MYCM, KC_MAIL, RGB_HUD, RGB_HUI, KC_P7, KC_P8, KC_P9, KC_MINS, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, |
| 63 | { KC_MPRV, KC_MPLY, KC_MNXT, KC_MSTP, RGB_SAD, RGB_SAI, KC_P4, KC_P5, KC_P6, KC_PLUS, _______, RESET, _______, _______, _______ }, | 69 | KC_MPRV, KC_MPLY, KC_MNXT, KC_MSTP, RGB_SAD, RGB_SAI, KC_P4, KC_P5, KC_P6, KC_PLUS, _______, RESET, _______, _______, _______, |
| 64 | { KC_VOLD, KC_MUTE, KC_VOLU, KC_APP, RGB_VAD, RGB_VAI, KC_P1, KC_P2, KC_P3, KC_PENT, _______, _______, _______, _______, _______ }, | 70 | KC_VOLD, KC_MUTE, KC_VOLU, KC_APP, RGB_VAD, RGB_VAI, KC_P1, KC_P2, KC_P3, KC_PENT, _______, _______, _______, _______, _______, |
| 65 | { _______, _______, RGB_TOG, MO(_FN), RGB_RMOD,RGB_MOD, KC_P0, _______, KC_PDOT, KC_PENT, KC_PENT, MO(_FN), _______, _______, _______ }, | 71 | _______, _______, RGB_TOG, MO(_FN), RGB_RMOD,RGB_MOD, KC_P0, _______, KC_PDOT, KC_PENT, KC_PENT, MO(_FN), _______, _______, _______ |
| 66 | } | 72 | ) |
| 67 | }; | 73 | }; |
| 68 | 74 | ||
| 69 | const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) | 75 | bool process_record_user(uint16_t keycode, keyrecord_t *record) { |
| 70 | { | 76 | switch (keycode) { |
| 71 | // MACRODOWN only works in this function | 77 | case QMKBEST: |
| 72 | switch(id) { | 78 | if (record->event.pressed) { |
| 73 | case 0: | 79 | // when keycode QMKBEST is pressed |
| 74 | if (record->event.pressed) { | 80 | SEND_STRING("QMK is the best thing ever!"); |
| 75 | register_code(KC_RSFT); | 81 | } else { |
| 76 | #ifdef BACKLIGHT_ENABLE | 82 | // when keycode QMKBEST is released |
| 77 | backlight_step(); | ||
| 78 | #endif | ||
| 79 | } else { | ||
| 80 | unregister_code(KC_RSFT); | ||
| 81 | } | ||
| 82 | break; | ||
| 83 | } | 83 | } |
| 84 | return MACRO_NONE; | 84 | break; |
| 85 | }; | 85 | case QMKURL: |
| 86 | if (record->event.pressed) { | ||
| 87 | // when keycode QMKURL is pressed | ||
| 88 | SEND_STRING("https://qmk.fm/" SS_TAP(X_ENTER)); | ||
| 89 | } else { | ||
| 90 | // when keycode QMKURL is released | ||
| 91 | } | ||
| 92 | break; | ||
| 93 | } | ||
| 94 | return true; | ||
| 95 | } | ||
| 96 | |||
| 97 | void matrix_init_user(void) { | ||
| 98 | |||
| 99 | } | ||
| 100 | |||
| 101 | void matrix_scan_user(void) { | ||
| 102 | |||
| 103 | } | ||
| 104 | |||
| 105 | void led_set_user(uint8_t usb_led) { | ||
| 106 | |||
| 107 | } | ||
diff --git a/keyboards/xd75/keymaps/developper_bepo/config.h b/keyboards/xd75/keymaps/developper_bepo/config.h index 78357b5bc..0183e0242 100644 --- a/keyboards/xd75/keymaps/developper_bepo/config.h +++ b/keyboards/xd75/keymaps/developper_bepo/config.h | |||
| @@ -16,4 +16,4 @@ | |||
| 16 | 16 | ||
| 17 | #pragma once | 17 | #pragma once |
| 18 | 18 | ||
| 19 | #include "../../config.h" | 19 | // place overrides here |
diff --git a/keyboards/xd75/keymaps/developper_bepo/README.md b/keyboards/xd75/keymaps/developper_bepo/readme.md index 7954a683a..7954a683a 100644 --- a/keyboards/xd75/keymaps/developper_bepo/README.md +++ b/keyboards/xd75/keymaps/developper_bepo/readme.md | |||
diff --git a/keyboards/xd75/keymaps/dyn_macro_tap_dance/config.h b/keyboards/xd75/keymaps/dyn_macro_tap_dance/config.h index 015377b5f..e6975da8a 100644 --- a/keyboards/xd75/keymaps/dyn_macro_tap_dance/config.h +++ b/keyboards/xd75/keymaps/dyn_macro_tap_dance/config.h | |||
| @@ -14,11 +14,6 @@ | |||
| 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 | #ifndef CONFIG_USER_H | 17 | #pragma once |
| 18 | #define CONFIG_USER_H | ||
| 19 | |||
| 20 | #include "../../config.h" | ||
| 21 | 18 | ||
| 22 | // place overrides here | 19 | // place overrides here |
| 23 | |||
| 24 | #endif | ||
diff --git a/keyboards/xd75/keymaps/dyn_macro_tap_dance/keymap.c b/keyboards/xd75/keymaps/dyn_macro_tap_dance/keymap.c index 594e5c41c..cf4bfb4dc 100644 --- a/keyboards/xd75/keymaps/dyn_macro_tap_dance/keymap.c +++ b/keyboards/xd75/keymaps/dyn_macro_tap_dance/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 "xd75.h" | 16 | #include QMK_KEYBOARD_H |
| 17 | 17 | ||
| 18 | enum planck_keycodes { | 18 | enum planck_keycodes { |
| 19 | DUMMY = SAFE_RANGE, | 19 | DUMMY = SAFE_RANGE, |
diff --git a/keyboards/xd75/keymaps/emilyh/config.h b/keyboards/xd75/keymaps/emilyh/config.h index f52a97bbc..a72596783 100644 --- a/keyboards/xd75/keymaps/emilyh/config.h +++ b/keyboards/xd75/keymaps/emilyh/config.h | |||
| @@ -14,11 +14,6 @@ | |||
| 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 | #ifndef CONFIG_USER_H | 17 | #pragma once |
| 18 | #define CONFIG_USER_H | ||
| 19 | |||
| 20 | #include "../../config.h" | ||
| 21 | 18 | ||
| 22 | // place overrides here | 19 | // place overrides here |
| 23 | |||
| 24 | #endif | ||
diff --git a/keyboards/xd75/keymaps/emilyh/keymap.c b/keyboards/xd75/keymaps/emilyh/keymap.c index f597dc2b9..bea9863d5 100644 --- a/keyboards/xd75/keymaps/emilyh/keymap.c +++ b/keyboards/xd75/keymaps/emilyh/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 "xd75.h" | 16 | #include QMK_KEYBOARD_H |
| 17 | #include "backlight.h" | 17 | #include "backlight.h" |
| 18 | 18 | ||
| 19 | // Fillers to make layering more clear | 19 | // Fillers to make layering more clear |
diff --git a/keyboards/xd75/keymaps/fabian/config.h b/keyboards/xd75/keymaps/fabian/config.h index 59de3fa55..a72596783 100644 --- a/keyboards/xd75/keymaps/fabian/config.h +++ b/keyboards/xd75/keymaps/fabian/config.h | |||
| @@ -14,11 +14,6 @@ | |||
| 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 | #ifndef CONFIG_USER_H | 17 | #pragma once |
| 18 | #define CONFIG_USER_H | ||
| 19 | |||
| 20 | #include QMK_KEYBOARD_CONFIG_H | ||
| 21 | 18 | ||
| 22 | // place overrides here | 19 | // place overrides here |
| 23 | |||
| 24 | #endif | ||
diff --git a/keyboards/xd75/keymaps/french/config.h b/keyboards/xd75/keymaps/french/config.h index 015377b5f..e6975da8a 100644 --- a/keyboards/xd75/keymaps/french/config.h +++ b/keyboards/xd75/keymaps/french/config.h | |||
| @@ -14,11 +14,6 @@ | |||
| 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 | #ifndef CONFIG_USER_H | 17 | #pragma once |
| 18 | #define CONFIG_USER_H | ||
| 19 | |||
| 20 | #include "../../config.h" | ||
| 21 | 18 | ||
| 22 | // place overrides here | 19 | // place overrides here |
| 23 | |||
| 24 | #endif | ||
diff --git a/keyboards/xd75/keymaps/french/keymap.c b/keyboards/xd75/keymaps/french/keymap.c index 1ffec2202..547a67b6e 100644 --- a/keyboards/xd75/keymaps/french/keymap.c +++ b/keyboards/xd75/keymaps/french/keymap.c | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | #include "keymap_french.c" | 1 | #include "keymap_french.c" |
| 2 | #include "xd75.h" | 2 | #include QMK_KEYBOARD_H |
| 3 | 3 | ||
| 4 | 4 | ||
| 5 | // Layer shorthand | 5 | // Layer shorthand |
diff --git a/keyboards/xd75/keymaps/french/README.md b/keyboards/xd75/keymaps/french/readme.md index 8c5330290..8c5330290 100644 --- a/keyboards/xd75/keymaps/french/README.md +++ b/keyboards/xd75/keymaps/french/readme.md | |||
diff --git a/keyboards/xd75/keymaps/germanized/config.h b/keyboards/xd75/keymaps/germanized/config.h index dd3f32275..65ab6a0dc 100644 --- a/keyboards/xd75/keymaps/germanized/config.h +++ b/keyboards/xd75/keymaps/germanized/config.h | |||
| @@ -14,10 +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 | #ifndef CONFIG_USER_H | 17 | #pragma once |
| 18 | #define CONFIG_USER_H | ||
| 19 | |||
| 20 | #include "../../config.h" | ||
| 21 | 18 | ||
| 22 | // place overrides here | 19 | // place overrides here |
| 23 | 20 | ||
| @@ -118,4 +115,3 @@ | |||
| 118 | 115 | ||
| 119 | // Launchy | 116 | // Launchy |
| 120 | #define ALT_SPC LALT(KC_SPC) | 117 | #define ALT_SPC LALT(KC_SPC) |
| 121 | #endif | ||
diff --git a/keyboards/xd75/keymaps/germanized/keymap.c b/keyboards/xd75/keymaps/germanized/keymap.c index b7c9620c1..bba1172ec 100644 --- a/keyboards/xd75/keymaps/germanized/keymap.c +++ b/keyboards/xd75/keymaps/germanized/keymap.c | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | /* Copyright 2017 Kolja Brauns | 1 | /* Copyright 2017 Kolja Brauns |
| 2 | */ | 2 | */ |
| 3 | #include "xd75.h" | 3 | #include QMK_KEYBOARD_H |
| 4 | 4 | ||
| 5 | #ifndef KEYMAP_GERMAN | 5 | #ifndef KEYMAP_GERMAN |
| 6 | #define KEYMAP_GERMAN | 6 | #define KEYMAP_GERMAN |
diff --git a/keyboards/xd75/keymaps/kim-kim-xd73/config.h b/keyboards/xd75/keymaps/kim-kim-xd73/config.h index e2390f770..0c8015e22 100644 --- a/keyboards/xd75/keymaps/kim-kim-xd73/config.h +++ b/keyboards/xd75/keymaps/kim-kim-xd73/config.h | |||
| @@ -14,12 +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 | #ifndef CONFIG_USER_H | 17 | #pragma once |
| 18 | #define CONFIG_USER_H | ||
| 19 | |||
| 20 | #include QMK_KEYBOARD_CONFIG_H | ||
| 21 | 18 | ||
| 22 | // place overrides here | 19 | // place overrides here |
| 23 | #undef BACKLIGHT_BREATHING | 20 | #undef BACKLIGHT_BREATHING |
| 24 | |||
| 25 | #endif | ||
diff --git a/keyboards/xd75/keymaps/kim-kim/config.h b/keyboards/xd75/keymaps/kim-kim/config.h index e2390f770..0c8015e22 100644 --- a/keyboards/xd75/keymaps/kim-kim/config.h +++ b/keyboards/xd75/keymaps/kim-kim/config.h | |||
| @@ -14,12 +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 | #ifndef CONFIG_USER_H | 17 | #pragma once |
| 18 | #define CONFIG_USER_H | ||
| 19 | |||
| 20 | #include QMK_KEYBOARD_CONFIG_H | ||
| 21 | 18 | ||
| 22 | // place overrides here | 19 | // place overrides here |
| 23 | #undef BACKLIGHT_BREATHING | 20 | #undef BACKLIGHT_BREATHING |
| 24 | |||
| 25 | #endif | ||
diff --git a/keyboards/xd75/keymaps/kloki/config.h b/keyboards/xd75/keymaps/kloki/config.h index 015377b5f..e6975da8a 100644 --- a/keyboards/xd75/keymaps/kloki/config.h +++ b/keyboards/xd75/keymaps/kloki/config.h | |||
| @@ -14,11 +14,6 @@ | |||
| 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 | #ifndef CONFIG_USER_H | 17 | #pragma once |
| 18 | #define CONFIG_USER_H | ||
| 19 | |||
| 20 | #include "../../config.h" | ||
| 21 | 18 | ||
| 22 | // place overrides here | 19 | // place overrides here |
| 23 | |||
| 24 | #endif | ||
diff --git a/keyboards/xd75/keymaps/kloki/keymap.c b/keyboards/xd75/keymaps/kloki/keymap.c index 340d9a8dc..b9bb2c66d 100644 --- a/keyboards/xd75/keymaps/kloki/keymap.c +++ b/keyboards/xd75/keymaps/kloki/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 "xd75.h" | 16 | #include QMK_KEYBOARD_H |
| 17 | 17 | ||
| 18 | // Layer shorthand | 18 | // Layer shorthand |
| 19 | #define _WO 0 | 19 | #define _WO 0 |
diff --git a/keyboards/xd75/keymaps/markus/config.h b/keyboards/xd75/keymaps/markus/config.h index bde866636..4e4e6f0d7 100644 --- a/keyboards/xd75/keymaps/markus/config.h +++ b/keyboards/xd75/keymaps/markus/config.h | |||
| @@ -14,10 +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 | #ifndef CONFIG_USER_H | 17 | #pragma once |
| 18 | #define CONFIG_USER_H | ||
| 19 | |||
| 20 | #include QMK_KEYBOARD_CONFIG_H | ||
| 21 | 18 | ||
| 22 | // place overrides here | 19 | // place overrides here |
| 23 | 20 | ||
| @@ -30,5 +27,3 @@ | |||
| 30 | #define MOUSEKEY_TIME_TO_MAX 0 | 27 | #define MOUSEKEY_TIME_TO_MAX 0 |
| 31 | #define MOUSEKEY_WHEEL_MAX_SPEED 1 | 28 | #define MOUSEKEY_WHEEL_MAX_SPEED 1 |
| 32 | #define MOUSEKEY_WHEEL_TIME_TO_MAX 0 | 29 | #define MOUSEKEY_WHEEL_TIME_TO_MAX 0 |
| 33 | |||
| 34 | #endif | ||
diff --git a/keyboards/xd75/keymaps/markus/keymap.c b/keyboards/xd75/keymaps/markus/keymap.c index e61fb09b1..eaf620151 100644 --- a/keyboards/xd75/keymaps/markus/keymap.c +++ b/keyboards/xd75/keymaps/markus/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 "xd75.h" | 17 | #include QMK_KEYBOARD_H |
| 18 | #include "keymap_german.h" | 18 | #include "keymap_german.h" |
| 19 | 19 | ||
| 20 | #define ________ KC_TRNS | 20 | #define ________ KC_TRNS |
diff --git a/keyboards/xd75/keymaps/mtdjr/config.h b/keyboards/xd75/keymaps/mtdjr/config.h index 7e2227c87..0ceba236f 100644 --- a/keyboards/xd75/keymaps/mtdjr/config.h +++ b/keyboards/xd75/keymaps/mtdjr/config.h | |||
| @@ -14,10 +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 | #ifndef CONFIG_USER_H | 17 | #pragma once |
| 18 | #define CONFIG_USER_H | ||
| 19 | |||
| 20 | #include "../../config.h" | ||
| 21 | 18 | ||
| 22 | // place overrides here | 19 | // place overrides here |
| 23 | #undef MANUFACTURER | 20 | #undef MANUFACTURER |
| @@ -25,5 +22,3 @@ | |||
| 25 | #define MANUFACTURER mtdjr | 22 | #define MANUFACTURER mtdjr |
| 26 | #define PRODUCT XD75 | 23 | #define PRODUCT XD75 |
| 27 | #define DESCRIPTION XD75Re | 24 | #define DESCRIPTION XD75Re |
| 28 | |||
| 29 | #endif | ||
diff --git a/keyboards/xd75/keymaps/mtdjr/keymap.c b/keyboards/xd75/keymaps/mtdjr/keymap.c index 074cf7335..e56d918fd 100644 --- a/keyboards/xd75/keymaps/mtdjr/keymap.c +++ b/keyboards/xd75/keymaps/mtdjr/keymap.c | |||
| @@ -3,7 +3,7 @@ | |||
| 3 | 3 | ||
| 4 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | 4 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |
| 5 | 5 | ||
| 6 | [_QWERTY] = KC_KEYMAP( | 6 | [_QWERTY] = LAYOUT_kc( |
| 7 | // .--------------------------------------------------------------------------. | 7 | // .--------------------------------------------------------------------------. |
| 8 | EXC, 1 , 2 , 3 , 4 , 5 ,PGUP,MPNT,PGDN, 6 , 7 , 8 , 9 , 0 ,BSPC, | 8 | EXC, 1 , 2 , 3 , 4 , 5 ,PGUP,MPNT,PGDN, 6 , 7 , 8 , 9 , 0 ,BSPC, |
| 9 | // |----+----+----+----+----+----+----+----+----+----+----+----+----+----+----| | 9 | // |----+----+----+----+----+----+----+----+----+----+----+----+----+----+----| |
| @@ -17,7 +17,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 17 | // '----+----+----+----+----+----+----+----+----+----+----+----+----+----+----' | 17 | // '----+----+----+----+----+----+----+----+----+----+----+----+----+----+----' |
| 18 | ), | 18 | ), |
| 19 | 19 | ||
| 20 | [_LOWER] = KC_KEYMAP( | 20 | [_LOWER] = LAYOUT_kc( |
| 21 | // .--------------------------------------------------------------------------. | 21 | // .--------------------------------------------------------------------------. |
| 22 | xxxx, F1 , F2 , F3 , F4 , F5 , F6 ,xxxx, F7 , F8 , F9 , F10, F11, F12, DEL, | 22 | xxxx, F1 , F2 , F3 , F4 , F5 , F6 ,xxxx, F7 , F8 , F9 , F10, F11, F12, DEL, |
| 23 | // |----+----+----+----+----+----+----+----+----+----+----+----+----+----+----| | 23 | // |----+----+----+----+----+----+----+----+----+----+----+----+----+----+----| |
| @@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 31 | // '----+----+----+----+----+----+----+----+----+----+----+----+----+----+----' | 31 | // '----+----+----+----+----+----+----+----+----+----+----+----+----+----+----' |
| 32 | ), | 32 | ), |
| 33 | 33 | ||
| 34 | [_RAISE] = KC_KEYMAP( | 34 | [_RAISE] = LAYOUT_kc( |
| 35 | // .--------------------------------------------------------------------------. | 35 | // .--------------------------------------------------------------------------. |
| 36 | xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx, | 36 | xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx, |
| 37 | // |----+----+----+----+----+----+----+----+----+----+----+----+----+----+----| | 37 | // |----+----+----+----+----+----+----+----+----+----+----+----+----+----+----| |
diff --git a/keyboards/xd75/keymaps/tdl-jturner/config.h b/keyboards/xd75/keymaps/tdl-jturner/config.h index 985247bb2..596aaff66 100644 --- a/keyboards/xd75/keymaps/tdl-jturner/config.h +++ b/keyboards/xd75/keymaps/tdl-jturner/config.h | |||
| @@ -16,10 +16,9 @@ | |||
| 16 | 16 | ||
| 17 | // additional config optoinsa vailable at https://docs.qmk.fm/reference/config-options#the-config.h-file | 17 | // additional config optoinsa vailable at https://docs.qmk.fm/reference/config-options#the-config.h-file |
| 18 | 18 | ||
| 19 | #ifndef CONFIG_USER_H | 19 | #pragma once |
| 20 | #define CONFIG_USER_H | ||
| 21 | 20 | ||
| 22 | #include "../../config.h" | 21 | // place overrides here |
| 23 | 22 | ||
| 24 | // place overrides here | 23 | // place overrides here |
| 25 | //#define TAPPING_TERM 200 | 24 | //#define TAPPING_TERM 200 |
| @@ -33,5 +32,3 @@ | |||
| 33 | #define MOUSEKEY_TIME_TO_MAX 60 | 32 | #define MOUSEKEY_TIME_TO_MAX 60 |
| 34 | #define MOUSEKEY_MAX_SPEED 7 | 33 | #define MOUSEKEY_MAX_SPEED 7 |
| 35 | #define MOUSEKEY_WHEEL_DELAY 0 | 34 | #define MOUSEKEY_WHEEL_DELAY 0 |
| 36 | |||
| 37 | #endif | ||
diff --git a/keyboards/xd75/keymaps/tdl-jturner/keymap.c b/keyboards/xd75/keymaps/tdl-jturner/keymap.c index 9789d9a86..593e54f14 100644 --- a/keyboards/xd75/keymaps/tdl-jturner/keymap.c +++ b/keyboards/xd75/keymaps/tdl-jturner/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 "xd75.h" | 16 | #include QMK_KEYBOARD_H |
| 17 | 17 | ||
| 18 | enum xd75_layers { | 18 | enum xd75_layers { |
| 19 | _QWERTY, | 19 | _QWERTY, |
