diff options
| author | QMK Bot <hello@qmk.fm> | 2021-02-07 17:58:56 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2021-02-07 17:58:56 +0000 |
| commit | 5007cdac72bc789ab4be61625d0f917cce92f893 (patch) | |
| tree | 923dd103372a5d0cbf1cff6605f169e7b2c21274 | |
| parent | a08c7c68cc51912582f7e93bb5c07419be3e8c9c (diff) | |
| parent | 13c562e1544a02e1fb63af5d885b7f5718b682b1 (diff) | |
| download | qmk_firmware-5007cdac72bc789ab4be61625d0f917cce92f893.tar.gz qmk_firmware-5007cdac72bc789ab4be61625d0f917cce92f893.zip | |
Merge remote-tracking branch 'origin/master' into develop
| -rw-r--r-- | keyboards/keebio/nyquist/keymaps/georgepetri/config.h | 1 | ||||
| -rw-r--r-- | keyboards/keebio/nyquist/keymaps/georgepetri/keymap.c | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/keyboards/keebio/nyquist/keymaps/georgepetri/config.h b/keyboards/keebio/nyquist/keymaps/georgepetri/config.h index d13d3294f..3274bb60f 100644 --- a/keyboards/keebio/nyquist/keymaps/georgepetri/config.h +++ b/keyboards/keebio/nyquist/keymaps/georgepetri/config.h | |||
| @@ -23,3 +23,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 23 | 23 | ||
| 24 | #define TAPPING_TOGGLE 2 | 24 | #define TAPPING_TOGGLE 2 |
| 25 | #define TAPPING_TERM 150 | 25 | #define TAPPING_TERM 150 |
| 26 | #undef RGBLED_SPLIT | ||
diff --git a/keyboards/keebio/nyquist/keymaps/georgepetri/keymap.c b/keyboards/keebio/nyquist/keymaps/georgepetri/keymap.c index 96ea4ff19..bd11a5ec8 100644 --- a/keyboards/keebio/nyquist/keymaps/georgepetri/keymap.c +++ b/keyboards/keebio/nyquist/keymaps/georgepetri/keymap.c | |||
| @@ -1,7 +1,5 @@ | |||
| 1 | #include QMK_KEYBOARD_H | 1 | #include QMK_KEYBOARD_H |
| 2 | 2 | ||
| 3 | extern keymap_config_t keymap_config; | ||
| 4 | |||
| 5 | #define _BASE 0 | 3 | #define _BASE 0 |
| 6 | #define _L 1 | 4 | #define _L 1 |
| 7 | #define _R 2 | 5 | #define _R 2 |