diff options
author | QMK Bot <hello@qmk.fm> | 2021-08-03 16:40:14 +0000 |
---|---|---|
committer | QMK Bot <hello@qmk.fm> | 2021-08-03 16:40:14 +0000 |
commit | 738e8e72ba1ef8da444c5c0406ec962c30d9242c (patch) | |
tree | f210dc6603e6deedf290bf0810ce540ab669b669 /users | |
parent | 69619768553b9a30ef71f4db0178c8ddb696fb0e (diff) | |
parent | 853344235a1cc1329000af2887de50ed4ce964a2 (diff) | |
download | qmk_firmware-738e8e72ba1ef8da444c5c0406ec962c30d9242c.tar.gz qmk_firmware-738e8e72ba1ef8da444c5c0406ec962c30d9242c.zip |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'users')
-rw-r--r-- | users/bcat/bcat.c | 16 | ||||
-rw-r--r-- | users/bcat/bcat.h | 18 | ||||
-rw-r--r-- | users/bcat/readme.md | 2 |
3 files changed, 34 insertions, 2 deletions
diff --git a/users/bcat/bcat.c b/users/bcat/bcat.c index 397d565da0..f21d282e43 100644 --- a/users/bcat/bcat.c +++ b/users/bcat/bcat.c @@ -1,3 +1,19 @@ +/* Copyright 2021 Jonathan Rascher + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + #include "bcat.h" #if defined(RGBLIGHT_ENABLE) diff --git a/users/bcat/bcat.h b/users/bcat/bcat.h index 1ea05e5fa8..0dae774ec5 100644 --- a/users/bcat/bcat.h +++ b/users/bcat/bcat.h @@ -1,8 +1,24 @@ +/* Copyright 2021 Jonathan Rascher + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + #pragma once #include "quantum.h" -enum user_keycodes { +enum user_keycode { MC_ALTT = SAFE_RANGE, KEYMAP_SAFE_RANGE, }; diff --git a/users/bcat/readme.md b/users/bcat/readme.md index 6d097d663d..1922f95f4a 100644 --- a/users/bcat/readme.md +++ b/users/bcat/readme.md @@ -15,7 +15,7 @@ Columnar-staggered split ergo layout, preferred for typing. Used on Crkbd. * [60% Tsangan HHKB](https://github.com/qmk/qmk_firmware/tree/master/layouts/community/60_tsangan_hhkb/bcat): Row-staggered layout, preferred for gaming. Used on ai03 Polaris, CannonKeys -AN-C, CannonKeys Instant60. +AN-C, CannonKeys Instant60, DZ60. ## Other keymaps |