diff options
| author | James Young <18669334+noroadsleft@users.noreply.github.com> | 2021-08-09 12:14:22 -0700 |
|---|---|---|
| committer | James Young <18669334+noroadsleft@users.noreply.github.com> | 2021-08-09 12:14:22 -0700 |
| commit | 7bec943043b8d03482e9f4ffc69cc63b9fc4a18a (patch) | |
| tree | e138b4d121f2196d3983e1643cab4381ee729c9b /keyboards/keebio/iris/keymaps/nstickney/config.h | |
| parent | c0628c2820b436550f62af5f6b7fae1f66b0bf8b (diff) | |
| parent | 26ea090190b815862f108903e5f41f20c6d16d66 (diff) | |
Merge remote-tracking branch 'upstream/master' into develop
Fixes merge conflicts in:
- keyboards/bm40hsrgb/config.h
- Conflict from PR 13132:
- RGB_DISABLE_WHEN_USB_SUSPENDED signature updated in develop branch, unmodified in master branch
- updated file with changes from master branch
- keyboards/keebio/iris/keymaps/nstickney/keymap.c
- Conflict from PR 11456:
- layer_state_set_user() updated in develop branch, removed in master branch
- updated file with changes from master branch
Diffstat (limited to 'keyboards/keebio/iris/keymaps/nstickney/config.h')
| -rw-r--r-- | keyboards/keebio/iris/keymaps/nstickney/config.h | 50 |
1 files changed, 17 insertions, 33 deletions
diff --git a/keyboards/keebio/iris/keymaps/nstickney/config.h b/keyboards/keebio/iris/keymaps/nstickney/config.h index f4899781e5..da682cb921 100644 --- a/keyboards/keebio/iris/keymaps/nstickney/config.h +++ b/keyboards/keebio/iris/keymaps/nstickney/config.h @@ -1,36 +1,20 @@ -/* -Copyright 2017 Danny Nguyen <danny@keeb.io> - -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/>. -*/ +/* Copyright 2021 @nstickney + * + * 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 -/* Use I2C or Serial, not both */ - -#define USE_SERIAL -// #define USE_I2C - -/* Select hand configuration */ - -#define MASTER_LEFT -// #define MASTER_RIGHT -// #define EE_HANDS - -// #undef RGBLED_NUM -// #define RGBLIGHT_ANIMATIONS -// #define RGBLED_NUM 12 -// #define RGBLIGHT_HUE_STEP 8 -// #define RGBLIGHT_SAT_STEP 8 -// #define RGBLIGHT_VAL_STEP 8
\ No newline at end of file +#define RGBLED_NUM 12 +#define RGBLIGHT_SPLIT |