alterNERDtive/qmk_firmware
1
0
Fork 0
Code Pull requests Activity

Merge remote-tracking branch 'upstream/master' into develop

Browse source 
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
This commit is contained in:
James Young 2021-08-09 12:14:22 -07:00
commit 7bec943043
No known key found for this signature in database
GPG key ID: 87CBD151019773A8
39 changed files with 812 additions and 381 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
keyboards/bm40hsrgb/config.h
View file

@ -48,8 +48,10 @@
#define RGB_DI_PIN E2
#define DRIVER_LED_TOTAL 53
#ifdef RGB_DI_PIN
#define RGB_MATRIX_KEYPRESSES // reacts to keypresses
# define RGB_MATRIX_KEYPRESSES // reacts to keypresses
# define RGBLIGHT_LIMIT_VAL 180 // Limit to vendor-recommended value
#endif
#ifdef RGB_MATRIX_ENABLE
# define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 180 // Limit to vendor-recommended value
#endif

5
keyboards/bm43a/config.h
View file

@ -55,7 +55,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
#define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
#define RGBLIGHT_LIMIT_VAL 180 // Limit to vendor-recommended value
#define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */
/*== all animations enable ==*/
#define RGBLIGHT_ANIMATIONS
@ -70,3 +70,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
// #define RGBLIGHT_EFFECT_RGB_TEST
// #define RGBLIGHT_EFFECT_ALTERNATING
#endif
#ifdef RGB_MATRIX_ENABLE
# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 180 // Limit to vendor-recommended value
#endif

5
keyboards/bm60poker/config.h
View file

@ -53,7 +53,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
#define RGBLIGHT_LIMIT_VAL 5 /* The maximum brightness level */
#define RGBLIGHT_LIMIT_VAL 180 // Limit to vendor-recommended value
#define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */
/*== all animations enable ==*/
#define RGBLIGHT_ANIMATIONS
@ -68,3 +68,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
// #define RGBLIGHT_EFFECT_RGB_TEST
// #define RGBLIGHT_EFFECT_ALTERNATING
#endif
#ifdef RGB_MATRIX_ENABLE
# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 180 // Limit to vendor-recommended value
#endif

8
keyboards/bm60rgb/config.h
View file

@ -50,8 +50,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RGB_DI_PIN E2
#define DRIVER_LED_TOTAL 69
#ifdef RGB_DI_PIN
#define RGBLED_NUM 69
#define RGB_MATRIX_KEYPRESSES
# define RGBLED_NUM 69
# define RGB_MATRIX_KEYPRESSES
# define RGBLIGHT_LIMIT_VAL 180 // Limit to vendor-recommended value
#endif
#ifdef RGB_MATRIX_ENABLE
# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 180 // Limit to vendor-recommended value
#endif
// generated by KBFirmware JSON to QMK Parser

9
keyboards/bm60rgb_iso/config.h
View file

@ -50,12 +50,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RGB_DI_PIN E2
#define DRIVER_LED_TOTAL 70
#ifdef RGB_DI_PIN
#define RGBLED_NUM 70
#define RGB_MATRIX_KEYPRESSES
# define RGBLED_NUM 70
# define RGB_MATRIX_KEYPRESSES
// #define RGBLIGHT_HUE_STEP 8
// #define RGBLIGHT_SAT_STEP 8
// #define RGBLIGHT_VAL_STEP 8
// #define RGBLIGHT_LIMIT_VAL 180 /* The maximum brightness level */
# define RGBLIGHT_LIMIT_VAL 180 // Limit to vendor-recommended value
// #define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */
/*== all animations enable ==*/
// #define RGBLIGHT_ANIMATIONS
@ -70,3 +70,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
// #define RGBLIGHT_EFFECT_RGB_TEST
// #define RGBLIGHT_EFFECT_ALTERNATING
#endif
#ifdef RGB_MATRIX_ENABLE
# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 180 // Limit to vendor-recommended value
#endif

8
keyboards/bm68rgb/config.h
View file

@ -56,8 +56,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
// The number of LEDs connected
#define DRIVER_LED_TOTAL 74
#ifdef RGB_DI_PIN
#define RGBLED_NUM 74
#define RGB_MATRIX_KEYPRESSES // reacts to keypresses
# define RGBLED_NUM 74
# define RGB_MATRIX_KEYPRESSES // reacts to keypresses
# define RGBLIGHT_LIMIT_VAL 180 // Limit to vendor-recommended value
#endif
#ifdef RGB_MATRIX_ENABLE
# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 180 // Limit to vendor-recommended value
#endif
/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */

77
keyboards/ferris/0_2/bling/bling.c Normal file
View file

@ -0,0 +1,77 @@
/*
Copyright 2021 Pierre Chevalier <pierrechevalier83@gmail.com>
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 "quantum.h"
#include "drivers/issi/is31fl3731.h"
/*
| Left || Right |
| | 3 | | 0 || 0 | | 3 | |
| 5 | | | || | | | 6 |
| | | | || | | | |
| | | | 1 || 1 | | | |
| | 4 | | || | | 4 | |
| 6 | | | 2 || 2 | | | 5 |
*/
const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
/* Refer to IS31 manual for these locations
* driver
* | R location
* | | G location
* | | | B location
* | | | | */
{0, C9_10, C8_10, C7_10}, // Left RGB 5
{0, C9_12, C8_12, C7_12}, // Left RGB 3
{0, C9_15, C8_15, C6_14}, // Left RGB 0
{1, C1_2, C2_2, C4_3}, // Right RGB 0
{1, C1_5, C2_5, C3_5}, // Right RGB 3
{1, C1_8, C2_8, C3_8}, // Right RGB 6
{1, C1_7, C2_7, C3_7}, // Right RGB 5
{1, C1_6, C2_6, C3_6}, // Right RGB 4
{1, C1_3, C2_3, C3_3}, // Right RGB 1
{1, C1_4, C2_4, C3_4}, // Right RGB 2
{0, C9_13, C8_13, C7_13}, // Left RGB 2
{0, C9_14, C8_14, C7_14}, // Left RGB 1
{0, C9_11, C8_11, C7_11}, // Left RGB 4
{0, C9_9, C8_9, C7_9}, // Left RGB 6
};
// clang-format off
led_config_t g_led_config = {
// Key Matrix to LED Index
{
{},
}, {
// LED Index to Physical Position. The unit is roughly milimiters in the real world
// | Left || Right |
// x->| 10 | 32 | 64 || 160 | 192 | 214 |
// y |_____|_____|____||_____|_____|_____|
// 0 | | 1 | 2 || 3 | 4 | |
// 16 | 0 | | || | | 5 |
// 35 | | | 11 || 8 | | |
// 45 | | 12 | || | 7 | |
// 50 | 13 | | 10 || 9 | | 6 |
// 0 1 2 3 4 5
{10, 16}, {32, 0}, {64, 0}, {160, 0}, {192, 0}, {214, 16},
// 6 7 8 9
{214, 50}, {192, 45}, {160, 35}, {160, 50},
// 10 11 12 13
{64, 50}, {64, 35}, {32, 45}, {10, 50},
}, {
// LED Index to Flag
4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4
}
};

34
keyboards/ferris/0_2/bling/config.h Normal file
View file

@ -0,0 +1,34 @@
/*
Copyright 2021 Pierre Chevalier <pierrechevalier83@gmail.com>
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
#undef PRODUCT_ID
#define PRODUCT_ID 0x0002
#undef PRODUCT
#define PRODUCT Ferris 0.2 - Bling
/* LED Drivers */
#define DRIVER_ADDR_1 0b1110100
#define DRIVER_ADDR_2 0b1110101
#define DRIVER_COUNT 2
#define DRIVER_1_LED_TOTAL 7
#define DRIVER_2_LED_TOTAL 7
#define DRIVER_LED_TOTAL (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)

16
keyboards/ferris/0_2/bling/readme.md Normal file
View file

@ -0,0 +1,16 @@
# Ferris 0.2 - Bling
![Ferris 0.2 - Bling](https://i.imgur.com/8dmm5Mrh.jpg)
Ferris 0.2 with RGB underglow.
* Keyboard Maintainer: [Pierre Chevalier](https://github.com/pierrechevalier83)
* Hardware Supported:
* Ferris 0.2 - Bling: (STM32F072 MCU on the left, MCP23017 on the right, IS31FL3731 led driver chip on each side)
* Hardware Availability: [Cuddly Keyboards](https://cuddlykeyboards.com)
Make examples for this keyboard (after setting up your build environment):
make ferris/0_2/bling:default
See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).

2
keyboards/ferris/0_2/bling/rules.mk Normal file
View file

@ -0,0 +1,2 @@
RGB_MATRIX_ENABLE = yes
RGB_MATRIX_DRIVER = IS31FL3731

23
keyboards/ferris/0_2/compact/config.h Normal file
View file

@ -0,0 +1,23 @@
/*
Copyright 2021 Pierre Chevalier <pierrechevalier83@gmail.com>
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
#undef PRODUCT_ID
#define PRODUCT_ID 0x0003
#undef PRODUCT
#define PRODUCT Ferris 0.2 - Compact

17
keyboards/ferris/0_2/compact/readme.md Normal file
View file

@ -0,0 +1,17 @@
# Ferris 0.2 - Compact
![Ferris 0.2 - Compact, top view](https://i.imgur.com/V2ZLKjih.jpg)
![Ferris 0.2 - Compact, bottom view](https://i.imgur.com/3icP8pzh.jpg)
Ferris 0.2 - Compact with Kailh Choc support and Choc spacing.
* Keyboard Maintainer: [Pierre Chevalier](https://github.com/pierrechevalier83)
* Hardware Supported:
* Ferris 0.2 - Compact: (STM32F072 MCU on the left, MCP23017 on the right)
* Hardware Availability: [Cuddly Keyboards](https://cuddlykeyboards.com)
Make examples for this keyboard (after setting up your build environment):
make ferris/0_2/compact:default
See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).

0
keyboards/ferris/0_2/compact/rules.mk Normal file
View file

4
keyboards/ferris/0_2/config.h
View file

@ -21,8 +21,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define VENDOR_ID 0xC2AB
#define PRODUCT_ID 0x0001
#define DEVICE_VER 0x0002
#define MANUFACTURER Pierre
#define PRODUCT Ferris the keeb
#define MANUFACTURER Cuddly Keyboards Ltd.
#define PRODUCT Ferris 0.2
/* key matrix size */
#define MATRIX_ROWS 8

23
keyboards/ferris/0_2/high/config.h Normal file
View file

@ -0,0 +1,23 @@
/*
Copyright 2021 Pierre Chevalier <pierrechevalier83@gmail.com>
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
#undef PRODUCT_ID
#define PRODUCT_ID 0x0005
#undef PRODUCT
#define PRODUCT Ferris 0.2 - High

17
keyboards/ferris/0_2/high/readme.md Normal file
View file

@ -0,0 +1,17 @@
# Ferris 0.2 - High
![Ferris 0.2 - High, top view](https://i.imgur.com/aOqVmvph.jpg)
![Ferris 0.2 - High, bottom view](https://i.imgur.com/Nuqy5uJh.jpg)
Ferris 0.2 - High with Cherry MX support.
* Keyboard Maintainer: [Pierre Chevalier](https://github.com/pierrechevalier83)
* Hardware Supported:
* Ferris 0.2 - High: (STM32F072 MCU on the left, MCP23017 on the right)
* Hardware Availability: [Cuddly Keyboards](https://cuddlykeyboards.com)
Make examples for this keyboard (after setting up your build environment):
make ferris/0_2/high:default
See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).

0
keyboards/ferris/0_2/high/rules.mk Normal file
View file

23
keyboards/ferris/0_2/mini/config.h Normal file
View file

@ -0,0 +1,23 @@
/*
Copyright 2021 Pierre Chevalier <pierrechevalier83@gmail.com>
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
#undef PRODUCT_ID
#define PRODUCT_ID 0x0004
#undef PRODUCT
#define PRODUCT Ferris 0.2 - Mini

18
keyboards/ferris/0_2/mini/readme.md Normal file
View file

@ -0,0 +1,18 @@
# Ferris 0.2 - Mini
![Ferris 0.2 - Mini, top view](https://i.imgur.com/s3luptVh.jpg)
![Ferris 0.2 - Mini, bottom view](https://i.imgur.com/D4GxLQvh.jpg)
Ferris 0.2 - Mini with Kailh Choc Mini support and Choc spacing.
* Keyboard Maintainer: [Pierre Chevalier](https://github.com/pierrechevalier83)
* Hardware Supported:
* Ferris 0.2 - Mini: (STM32F072 MCU on the left, MCP23017 on the right)
* Hardware Availability: [Cuddly Keyboards](https://cuddlykeyboards.com)
Make examples for this keyboard (after setting up your build environment):
make ferris/0_2/mini:default
See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).

0
keyboards/ferris/0_2/mini/rules.mk Normal file
View file

7
keyboards/ferris/0_2/readme.md
View file

@ -1,14 +1,13 @@
# Ferris 0.2
![Ferris 0.2 - bling, top view](https://i.imgur.com/LwKlmnzh.jpg)
![Ferris 0.2 - bling, bottom view](https://i.imgur.com/qGnYGVOh.jpg)
![Ferris 0.2 family](https://i.imgur.com/SDVOlyZ.jpg)
An stm32f072 based split 34 keys column staggered keyboard named and decorated after the rustlang mascott. All PCB files and some thoughts on the design are available on the [project's github page](https://github.com/pierrechevalier83/ferris)
An STM32F072-based split 34-key column-staggered keyboard named and decorated after the Rust mascot. All PCB files and some thoughts on the design are available on the [project's github page](https://github.com/pierrechevalier83/ferris).
* Keyboard Maintainer: [Pierre Chevalier](https://github.com/pierrechevalier83)
* Hardware Supported:
* Ferris 0.2: stm32f072 chip. Comes in 4 variants: bling, mini, high and compact
* Hardware Availability: Pierre Chevalier has been selling keyboard kits (see the #ferris channel in the 40% discord chat). Wider availability is on the horizon.
* Hardware Availability: [Cuddly Keyboards](https://cuddlykeyboards.com)
Make examples for this keyboard (after setting up your build environment):

8
keyboards/ferris/keymaps/default/config.h
View file

@ -37,3 +37,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define PERMISSIVE_HOLD
#define IGNORE_MOD_TAP_INTERRUPT
#define TAPPING_FORCE_HOLD
// Underglow configuration
#ifdef RGBLIGHT_ENABLE
#define RGBLIGHT_ANIMATIONS
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
#endif

4
keyboards/ferris/keymaps/default/keymap.json
View file

@ -50,8 +50,8 @@
"KC_TRNS" , "KC_TRNS" , "KC_TRNS" , "KC_TRNS" , "KC_TRNS",
"KC_TRNS" , "KC_MINS" , "KC_BSLS" , "KC_GRV" , "KC_TRNS",
"KC_TRNS" , "KC_TRNS",
"KC_TRNS" , "KC_TRNS"
"RGB_RMOD" , "KC_TRNS",
"KC_TRNS" , "RGB_MOD"
],
["KC_TRNS" , "KC_COLN" , "KC_LT" , "KC_GT" , "KC_SCLN",
"KC_TRNS" , "KC_TRNS" , "KC_TRNS" , "KC_TRNS" , "KC_TRNS",

8
keyboards/ferris/keymaps/pierrec83/config.h
View file

@ -37,3 +37,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define PERMISSIVE_HOLD
#define IGNORE_MOD_TAP_INTERRUPT
#define TAPPING_FORCE_HOLD
// Underglow configuration
#ifdef RGBLIGHT_ENABLE
#define RGBLIGHT_ANIMATIONS
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
#endif

4
keyboards/ferris/keymaps/pierrec83/keymap.json
View file

@ -50,8 +50,8 @@
"KC_TRNS" , "KC_HOME" , "KC_PGDN" , "KC_END" , "KC_TRNS",
"KC_TRNS" , "KC_TRNS" , "KC_TRNS" , "KC_TRNS" , "KC_TRNS",
"LGUI(KC_LEFT)" , "KC_TRNS",
"KC_TRNS" , "LGUI(KC_RGHT)"
"RGB_RMOD" , "KC_TRNS",
"KC_TRNS" , "RGB_MOD"
],
["KC_TRNS" , "KC_TRNS" , "KC_TRNS" , "KC_TRNS" , "KC_TRNS",
"KC_TRNS" , "KC_UNDS" , "KC_PIPE" , "KC_QUOT" , "KC_TRNS",

8
keyboards/ferris/keymaps/test/config.h
View file

@ -18,3 +18,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
#define DEBUG_MATRIX_SCAN_RATE
// Underglow configuration
#ifdef RGBLIGHT_ENABLE
#define RGBLIGHT_ANIMATIONS
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
#endif

6
keyboards/ferris/readme.md
View file

@ -9,12 +9,16 @@ A split 34 keys column staggered keyboard named and decorated after the rustlang
* Ferris 0.1 (With atmega32u4 chip. Comes in 4 variants: base, low, high and compact)
* Ferris 0.2 (With stm32f072 chip. Comes in 4 variants: bling, mini, high and compact)
* Ferris sweep (With pro-micro. Comes in a couple of PCB edge cuts shapes, but with identical pinout)
* Hardware Availability: Pierre Chevalier has been selling keyboard kits (see the #ferris channel in the 40% discord chat). Wider availability is on the horizon.
* Hardware Availability: [Cuddly Keyboards](https://cuddlykeyboards.com)
Make examples for this keyboard (after setting up your build environment):
make ferris/0_1:default
make ferris/0_2:default
make ferris/0_2/bling:default
make ferris/0_2/compact:default
make ferris/0_2/mini:default
make ferris/0_2/high:default
make ferris/sweep:default:avrdude-split-right
See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).

70
keyboards/hidtech/bastyl/keymaps/nstickney/keymap.c Normal file
View file

@ -0,0 +1,70 @@
/*
* Copyright 2020 Quentin LEBASTARD <qlebastard@gmail.com>
* Copyright 2020 Anthony MARIN <anthony@hidtech.ca>
* Copyright 2021 Stick <stick@stma.is>
*
* 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 "nstickney.h"
#include "unicodemap.h"
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[BASE] = LAYOUT(KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC,
//-------------------------------//
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_DEL,
//-------------------------------//
CC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, CC_QUOT,
//-------------------------------//
KC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSPC,
//-------------------------------//
AC_SLSH, FC_BSLS, KC_SPC, KC_ENT, FC_MINS, AC_EQL,
//-------------------------------//
KC_LBRC, TD(LOCKS), TD(LAYERS), KC_RBRC),
[SYMB] = LAYOUT(_______, XP(IEX, SS1), X(SS2), X(SS3), XP(CUR, GBP), X(EUR), X(V14), X(V12), X(V34), XP(LSQ, LDQ), XP(RSQ, RDQ), _______,
//-------------------------------//
_______, XP(A_D, AXD), XP(A_R, ACR), XP(E_A, ECA), XP(REG, CPL), X(THR), XP(U_D, UCD), XP(U_A, UCA), XP(I_A, ICA), XP(O_A, OCA), XP(O_D, OCD), _______,
//-------------------------------//
_______, XP(A_A, ACA), XP(S_S, SEC), XP(ETH, ETC), X(EMD), _______, _______, _______, _______, XP(O_S, OCS), XP(PLC, DEG), XP(ACT, DIS),
//-------------------------------//
_______, XP(AEL, AEC), _______, XP(CPR, CNT), _______, _______, _______, _______, XP(N_T, NCT), X(MCR), XP(C_C, CCC), _______,
//-------------------------------//
X(IQM), XP(NOT, BKB), _______, _______, X(YEN), XP(MLT, DIV),
//-------------------------------//
_______, _______, _______, _______),
[NUMP] = LAYOUT(_______, _______, KC_P7, KC_P8, KC_P9, KC_PSLS, _______, KC_P7, KC_P8, KC_P9, KC_PSLS, _______,
//-------------------------------//
_______, _______, KC_P4, KC_P5, KC_P6, KC_PAST, _______, KC_P4, KC_P5, KC_P6, KC_PAST, _______,
//-------------------------------//
_______, _______, KC_P1, KC_P2, KC_P3, KC_PMNS, _______, KC_P1, KC_P2, KC_P3, KC_PMNS, _______,
//-------------------------------//
_______, _______, KC_P0, KC_PCMM, KC_PDOT, KC_PPLS, _______, KC_P0, KC_PCMM, KC_PDOT, KC_PPLS, _______,
//-------------------------------//
_______, _______, _______, KC_PENT, _______, _______,
//-------------------------------//
_______, _______, _______, _______),
[FCTN] = LAYOUT(KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_SYSREQ,
//-------------------------------//
KC_PSCR, RGB_TOG, KC_HOME, KC_UP, KC_END, KC_PGUP, KC_LOCK, KC_LBRC, KC_RBRC, S(KC_LBRC), S(KC_RBRC), KC_INS,
//-------------------------------//
KC_PAUS, RGB_VAI, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_BRIU, KC_CLR,
//-------------------------------//
_______, KC_MPRV, KC_MRWD, KC_MPLY, KC_MFFD, KC_MNXT, KC_MSTP, KC_MUTE, KC_VOLD, KC_VOLU, KC_BRID, _______,
//-------------------------------//
RESET, _______, _______, _______, _______, RESET,
//-------------------------------//
_______, KC_F11, KC_F12, _______)};

47
keyboards/keebio/iris/keymaps/nstickney/README.md
View file

@ -1,47 +0,0 @@
# nstickney's Iris Layout
> Familiar layout for users who regularly switch between Iris and more standard layouts.
[![Keymap](https://i.imgur.com/hKs7fYr.jpg)](http://www.keyboard-layout-editor.com/#/gists/aa6093ea2eb9c750ab941b92adae7036)
[![standard-readme compliant](https://img.shields.io/badge/readme%20style-standard-brightgreen.svg)](https://github.com/RichardLitt/standard-readme)
## Install
For instructions on building and installing this keymap, see the [docs](https://docs.qmk.fm/#/getting_started_make_guide). Below is the command for me; it may be different for you.
```sh
$ make keebio/iris/rev2:nstickney:avrdude
```
## Usage
0. QWERTY `BASE` layer.
* `/`, `\`, ` `, `[ENTER]`, `-`, and `=` on the thumb clusters.
* `CAPSLOCK` replaced by `ESC`; hold it down for `CTRL`. `'` can also be held for `CTRL`.
* [Space-Cadet Shift](https://docs.qmk.fm/#/feature_space_cadet_shift) is enabled, so the `SHIFT` keys send `(` and `)` when tapped.
* Hold down `/` or `=` for `ALT`.
* Hold down `\` or `-` to access the functions layer.
* Upper-center thumb keys are `GUI` and `MENU`.
* Tapping `GUI` 2, 3, or 4 times will toggle `NUMLOCK`, `CAPSLOCK`, or `SCROLLLOCK`, respectively.
* Tapping `MENU` 2, 3, or 4 times will toggle the `NUMP`, `SYMB`, and `SYSH` layers, respectively.
0. Unicode-input symbols on `SYMB` and `SYSH` layers. Based (loosely) on US-International layout.
0. `NUMP` layer has number pads on each hand. Number pad `7`-`8`-`9` align with QWERTY `7`-`8`-`9` on right hand.
0. Function, arrow, media, and miscellaneous keys on `FCTN` layer.
* `F1` through `F10` on `1`-`10`. `F11` is on `GUI` and `F12` is on `MENU`.
* Brackets (`[` and `]`) available on `U` and `I`; braces (`{` and `}`) on `O` and `P`.
* Arrow keys on `ESDF` and `HJKL`; familiar for both Vim users and FPS gamers.
* `W` is `HOME`; `R` is `END`. `T` is `PAGE UP` and `G` is `PAGE DOWN`.
* Music controls on lower row of left hand.
* Volume and screen brightness on lower row of right hand.
* `PRINT SCREEN`, `PAUSE`, `SYSREQ`, `INSERT`, and `CLEAR` also mapped, as intelligently as possible.
* `A` toggles the RGB underglow (which changes color to indicate active layer).
* `Q` toggles the Unicode input through Linux, WinCompose, and MacOS.
## Contribute
If you are using this layout and think you've found a better way to do something, I'd appreciate an [issue](https://github.com/nstickney/qmk_firmware/issues), or better yet a [pull request](https://github.com/nstickney/qmk_firmware/pulls).
## License
Copyright &copy; 2016-2019 @nstickney. Released under [GPL-2.0](/LICENSE).

50
keyboards/keebio/iris/keymaps/nstickney/config.h
View file

@ -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
#define RGBLED_NUM 12
#define RGBLIGHT_SPLIT

134
keyboards/keebio/iris/keymaps/nstickney/keymap.c
View file

@ -1,99 +1,53 @@
/* 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/>.
*/
#include "nstickney.h"
#include "unicodemap.h"
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[BASE] = LAYOUT(
// ┌──────────┬──────────┬──────────┬──────────┬──────────┬──────────┐ ┌──────────┬──────────┬──────────┬──────────┬──────────┬──────────┐
KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC,
// ├──────────┼──────────┼──────────┼──────────┼──────────┼──────────┤ ├──────────┼──────────┼──────────┼──────────┼──────────┼──────────┤
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_DEL,
// ├──────────┼──────────┼──────────┼──────────┼──────────┼──────────┤ ├──────────┼──────────┼──────────┼──────────┼──────────┼──────────┤
CC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, CC_QUOT,
// ├──────────┼──────────┼──────────┼──────────┼──────────┼──────────┼──────────┐ ┌──────────┼──────────┼──────────┼──────────┼──────────┼──────────┼──────────┤
KC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, TD(LOCKS), TD(LAYERS),KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSPC,
// └──────────┴──────────┴──────────┴────┬─────┴────┬─────┴────┬─────┴────┬─────┘ └────┬─────┴────┬─────┴────┬─────┴────┬─────┴──────────┴──────────┴──────────┘
AC_SLSH, FC_BSLS, KC_SPC, KC_ENT, FC_MINS, AC_EQL
// └──────────┴──────────┴──────────┘ └──────────┴──────────┴──────────┘
),
[BASE] = LAYOUT(
KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_DEL,
CC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, CC_QUOT,
KC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, TD(LOCKS), TD(LAYERS), KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSPC,
AC_SLSH, FC_BSLS, KC_SPC, KC_ENT, FC_MINS, AC_EQL
),
[SYMB] = LAYOUT(
// ┌──────────┬──────────┬──────────┬──────────┬──────────┬──────────┐ ┌──────────┬──────────┬──────────┬──────────┬──────────┬──────────┐
UC(0x00EF),UC(0x00A1),UC(0x00B2),UC(0x00B3),UC(0x00A4),UC(0x20AC), UC(0x00BC),UC(0x00BD),UC(0x00BE),UC(0x2018),UC(0x2019),_______,
// ├──────────┼──────────┼──────────┼──────────┼──────────┼──────────┤ ├──────────┼──────────┼──────────┼──────────┼──────────┼──────────┤
_______, UC(0x00E4),UC(0x00E5),UC(0x00E9),UC(0x00AE),UC(0x00FE), UC(0x00FC),UC(0x00FA),UC(0x00ED),UC(0x00F3),UC(0x00F6),_______,
// ├──────────┼──────────┼──────────┼──────────┼──────────┼──────────┤ ├──────────┼──────────┼──────────┼──────────┼──────────┼──────────┤
_______, UC(0x00E1),UC(0x00DF),UC(0x00F0),UC(0x00EC),UC(0x00ED), UC(0x00EE),UC(0x00E0),UC(0x00E2),UC(0x00F8),UC(0x00B6),UC(0x00B4),
// ├──────────┼──────────┼──────────┼──────────┼──────────┼──────────┼──────────┐ ┌──────────┼──────────┼──────────┼──────────┼──────────┼──────────┼──────────┤
_______, UC(0x00E6),UC(0x00E8),UC(0x00A9),UC(0x00EA),UC(0x00EB),_______, _______, UC(0x00F1),UC(0x00FD),UC(0x00E7),UC(0x00F4),UC(0x00BF),_______,
// └──────────┴──────────┴──────────┴────┬─────┴────┬─────┴────┬─────┴────┬─────┘ └────┬─────┴────┬─────┴────┬─────┴────┬─────┴──────────┴──────────┴──────────┘
UC(0x00BF),_______, UC(0x00AC), UC(0x00B1),_______, UC(0x00D7)
// └──────────┴──────────┴──────────┘ └──────────┴──────────┴──────────┘
),
[SYMB] = LAYOUT(
_______, XP(IEX, SS1), X(SS2), X(SS3), XP(CUR, GBP), X(EUR), X(V14), X(V12), X(V34), XP(LSQ, LDQ), XP(RSQ, RDQ), _______,
_______, XP(A_D, AXD), XP(A_R, ACR), XP(E_A, ECA), XP(REG, CPL), X(THR), XP(U_D, UCD), XP(U_A, UCA), XP(I_A, ICA), XP(O_A, OCA), XP(O_D, OCD), _______,
_______, XP(A_A, ACA), XP(S_S, SEC), XP(ETH, ETC), X(EMD), _______, _______, _______, _______, XP(O_S, OCS), XP(PLC, DEG), XP(ACT, DIS),
_______, XP(AEL, AEC), _______, XP(CPR, CNT), _______, _______, _______, _______, XP(N_T, NCT), X(MCR), XP(C_C, CCC), _______, _______, _______,
X(IQM), XP(NOT, BKB), _______, _______, X(YEN), XP(MLT, DIV)
),
[SYSH] = LAYOUT(
// ┌──────────┬──────────┬──────────┬──────────┬──────────┬──────────┐ ┌──────────┬──────────┬──────────┬──────────┬──────────┬──────────┐
UC(0x00CF),UC(0x00B9),UC(0x2200),UC(0x2201),UC(0x00A3),UC(0x00A5), UC(0x00B5),UC(0x00AB),UC(0x00BB),UC(0x201C),UC(0x201D),_______,
// ├──────────┼──────────┼──────────┼──────────┼──────────┼──────────┤ ├──────────┼──────────┼──────────┼──────────┼──────────┼──────────┤
_______, UC(0x00C4),UC(0x00C5),UC(0x00C9),UC(0x2122),UC(0x00DE), UC(0x00DC),UC(0x00DA),UC(0x00CD),UC(0x00D3),UC(0x00D6),_______,
// ├──────────┼──────────┼──────────┼──────────┼──────────┼──────────┤ ├──────────┼──────────┼──────────┼──────────┼──────────┼──────────┤
_______, UC(0x00C1),UC(0x00A7),UC(0x00D0),UC(0x00CC),UC(0x00CD), UC(0x00CE),UC(0x00C1),UC(0x00C2),UC(0x00D8),UC(0x00B0),UC(0x00A8),
// ├──────────┼──────────┼──────────┼──────────┼──────────┼──────────┼──────────┐ ┌──────────┼──────────┼──────────┼──────────┼──────────┼──────────┼──────────┤
_______, UC(0x00C6),UC(0x00C8),UC(0x00A2),UC(0x00CA),UC(0x00CB),_______, _______, UC(0x00D1),UC(0x00DD),UC(0x00C7),UC(0x00D4),UC(0x203D),_______,
// └──────────┴──────────┴──────────┴────┬─────┴────┬─────┴────┬─────┴────┬─────┘ └────┬─────┴────┬─────┴────┬─────┴────┬─────┴──────────┴──────────┴──────────┘
UC(0x203D),_______, UC(0x00A6), UC(0x00AA),_______, UC(0x00F7)
// └──────────┴──────────┴──────────┘ └──────────┴──────────┴──────────┘
),
[NUMP] = LAYOUT(
_______, _______, KC_P7, KC_P8, KC_P9, KC_PSLS, _______, KC_P7, KC_P8, KC_P9, KC_PSLS, _______,
_______, _______, KC_P4, KC_P5, KC_P6, KC_PAST, _______, KC_P4, KC_P5, KC_P6, KC_PAST, _______,
_______, _______, KC_P1, KC_P2, KC_P3, KC_PMNS, _______, KC_P1, KC_P2, KC_P3, KC_PMNS, _______,
_______, _______, KC_P0, KC_PCMM, KC_PDOT, KC_PPLS, _______, _______, _______, KC_P0, KC_PCMM, KC_PDOT, KC_PPLS, _______,
_______, _______, _______, KC_PENT, _______, _______
),
[NUMP] = LAYOUT(
// ┌──────────┬──────────┬──────────┬──────────┬──────────┬──────────┐ ┌──────────┬──────────┬──────────┬──────────┬──────────┬──────────┐
_______, _______, KC_P7, KC_P8, KC_P9, KC_PSLS, _______, KC_P7, KC_P8, KC_P9, KC_PSLS, _______,
// ├──────────┼──────────┼──────────┼──────────┼──────────┼──────────┤ ├──────────┼──────────┼──────────┼──────────┼──────────┼──────────┤
_______, _______, KC_P4, KC_P5, KC_P6, KC_PAST, _______, KC_P4, KC_P5, KC_P6, KC_PAST, _______,
// ├──────────┼──────────┼──────────┼──────────┼──────────┼──────────┤ ├──────────┼──────────┼──────────┼──────────┼──────────┼──────────┤
_______, _______, KC_P1, KC_P2, KC_P3, KC_PMNS, _______, KC_P1, KC_P2, KC_P3, KC_PMNS, _______,
// ├──────────┼──────────┼──────────┼──────────┼──────────┼──────────┼──────────┐ ┌──────────┼──────────┼──────────┼──────────┼──────────┼──────────┼──────────┤
_______, _______, KC_P0, KC_PCMM, KC_PDOT, KC_PPLS, _______, _______, _______, KC_P0, KC_PCMM, KC_PDOT, KC_PPLS, _______,
// └──────────┴──────────┴──────────┴────┬─────┴────┬─────┴────┬─────┴────┬─────┘ └────┬─────┴────┬─────┴────┬─────┴────┬─────┴──────────┴──────────┴──────────┘
_______, _______, _______, KC_PENT, _______, _______
// └──────────┴──────────┴──────────┘ └──────────┴──────────┴──────────┘
),
[FCTN] = LAYOUT(
KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_SYSREQ,
KC_PSCR, RGB_TOG, KC_HOME, KC_UP, KC_END, KC_PGUP, KC_LOCK, KC_LBRC, KC_RBRC, S(KC_LBRC), S(KC_RBRC), KC_INS,
KC_PAUS, RGB_VAI, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_BRIU, KC_CLR,
_______, KC_MPRV, KC_MRWD, KC_MPLY, KC_MFFD, KC_MNXT, KC_F11, KC_F12, KC_MSTP, KC_MUTE, KC_VOLD, KC_VOLU, KC_BRID, _______,
_______, _______, _______, _______, _______, _______
)
[FCTN] = LAYOUT(
// ┌──────────┬──────────┬──────────┬──────────┬──────────┬──────────┐ ┌──────────┬──────────┬──────────┬──────────┬──────────┬──────────┐
KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_SYSREQ,
// ├──────────┼──────────┼──────────┼──────────┼──────────┼──────────┤ ├──────────┼──────────┼──────────┼──────────┼──────────┼──────────┤
KC_PSCR, UC_MOD, KC_HOME, KC_UP, KC_END, KC_PGUP, UC(0x2014),KC_LBRC, KC_RBRC, S(KC_LBRC),S(KC_RBRC),KC_INS,
// ├──────────┼──────────┼──────────┼──────────┼──────────┼──────────┤ ├──────────┼──────────┼──────────┼──────────┼──────────┼──────────┤
KC_PAUS, RGB_TOG, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_BRIU, KC_CLR,
// ├──────────┼──────────┼──────────┼──────────┼──────────┼──────────┼──────────┐ ┌──────────┼──────────┼──────────┼──────────┼──────────┼──────────┼──────────┤
_______, KC_MPRV, KC_MRWD, KC_MPLY, KC_MFFD, KC_MNXT, KC_F11, KC_F12, KC_MSTP, KC_MUTE, KC_VOLD, KC_VOLU, KC_BRID, _______,
// └──────────┴──────────┴──────────┴────┬─────┴────┬─────┴────┬─────┴────┬─────┘ └────┬─────┴────┬─────┴────┬─────┴────┬─────┴──────────┴──────────┴──────────┘
_______, _______, _______, _______, _______, _______
// └──────────┴──────────┴──────────┘ └──────────┴──────────┴──────────┘
)
};
// Initialize rgblight
void keyboard_post_init_user(void) {
rgblight_enable_noeeprom();
rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT);
layer_state_set_user(layer_state);
uint16_t user_hue = rgblight_get_hue();
for (uint16_t i = 0; i < 256; ++i) {
rgblight_sethsv_noeeprom( (i + user_hue) % 256, 255, 255);
wait_ms(5);
}
layer_state_set_user(layer_state);
};
// Turn on RGB underglow according to active layer
layer_state_t layer_state_set_user(layer_state_t state) {
switch (biton32(state)) {
case FCTN: rgblight_sethsv_noeeprom(96, 255, 255); break;
case NUMP: rgblight_sethsv_noeeprom(162, 255, 255); break;
case SYMB:
case SYSH: rgblight_sethsv_noeeprom(227, 255, 255); break;
default: rgblight_sethsv_noeeprom(13, 255, 255); break;
}
return state;
};

1
keyboards/keebio/iris/keymaps/nstickney/rules.mk
View file

@ -1 +0,0 @@
RGBLIGHT_ENABLE = yes

142
layouts/community/ergodox/nstickney/keymap.c
View file

@ -1,142 +0,0 @@
#include "nstickney.h"
/*
* This keymap simulates the key limitations of an Iris on an ErgoDox. See the
* matching iris layout (/keyboards/keebio/iris/keymaps/nstickney) for further
* information.
*/
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[BASE] = LAYOUT_ergodox(
// left hand
KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, XXXXXXX,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, XXXXXXX,
CC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G,
KC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, XXXXXXX,
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, AC_SLSH,
TD(LOCKS), XXXXXXX,
XXXXXXX,
FC_BSLS, KC_SPC, XXXXXXX,
// right hand
XXXXXXX, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC,
XXXXXXX, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_DEL,
KC_H, KC_J, KC_K, KC_L, KC_SCLN, CC_QUOT,
XXXXXXX, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSPC,
AC_EQL, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
XXXXXXX, TD(LAYERS),
XXXXXXX,
XXXXXXX, KC_ENT, FC_MINS
),
[SYMB] = LAYOUT_ergodox(
// left hand
UC(0x00EF), UC(0x00A1), UC(0x00B2), UC(0x00B3), UC(0x00A4), UC(0x20AC), _______,
_______, UC(0x00E4), UC(0x00E5), UC(0x00E9), UC(0x00AE), UC(0x00FE), _______,
_______, UC(0x00E1), UC(0x00DF), UC(0x00F0), UC(0x00EC), UC(0x00ED),
_______, UC(0x00E6), UC(0x00E8), UC(0x00A9), UC(0x00EA), UC(0x00EB), _______,
_______, _______, _______, _______, UC(0x00BF),
_______, _______,
_______,
_______, UC(0x00AC), _______,
// right hand
_______, UC(0x00BC), UC(0x00BD), UC(0x00BE), UC(0x2018), UC(0x2019), _______,
_______, UC(0x00FC), UC(0x00FA), UC(0x00ED), UC(0x00F3), UC(0x00F6), _______,
UC(0x00EE), UC(0x00E0), UC(0x00E2), UC(0x00F8), UC(0x00B6), UC(0x00B4),
_______, UC(0x00F1), UC(0x00FD), UC(0x00E7), UC(0x00F4), UC(0x00BF), _______,
UC(0x00D7), _______, _______, _______, _______,
_______, _______,
_______,
_______, UC(0x00B1), _______
),
[SYSH] = LAYOUT_ergodox(
// left hand
UC(0x00CF), UC(0x00B9), UC(0x2200), UC(0x2201), UC(0x00A3), UC(0x00A5), _______,
_______, UC(0x00C4), UC(0x00C5), UC(0x00C9), UC(0x2122), UC(0x00DE), _______,
_______, UC(0x00C1), UC(0x00A7), UC(0x00D0), UC(0x00CC), UC(0x00CD),
_______, UC(0x00C6), UC(0x00C8), UC(0x00A2), UC(0x00CA), UC(0x00CB), _______,
_______, _______, _______, _______, UC(0x203D),
_______, _______,
_______,
_______, UC(0x00A6), _______,
// right hand
_______, UC(0x00B5), UC(0x00AB), UC(0x00BB), UC(0x201C), UC(0x201D), _______,
_______, UC(0x00DC), UC(0x00DA), UC(0x00CD), UC(0x00D3), UC(0x00D6), _______,
UC(0x00CE), UC(0x00C1), UC(0x00C2), UC(0x00D8), UC(0x00B0), UC(0x00A8),
_______, UC(0x00D1), UC(0x00DD), UC(0x00C7), UC(0x00D4), UC(0x203D), _______,
UC(0x00F7), _______, _______, _______, _______,
_______, _______,
_______,
_______, UC(0x00AA), _______
),
[NUMP] = LAYOUT_ergodox(
// left hand
_______, _______, KC_P7, KC_P8, KC_P9, KC_PSLS, _______,
_______, _______, KC_P4, KC_P5, KC_P6, KC_PAST, _______,
_______, _______, KC_P1, KC_P2, KC_P3, KC_PMNS,
_______, _______, KC_P0, KC_PCMM, KC_PDOT, KC_PPLS, _______,
_______, _______, _______, _______, _______,
_______, _______,
_______,
_______, _______, _______,
// right hand
_______, _______, KC_P7, KC_P8, KC_P9, KC_PSLS, _______,
_______, _______, KC_P4, KC_P5, KC_P6, KC_PAST, _______,
_______, KC_P1, KC_P2, KC_P3, KC_PMNS, _______,
_______, _______, KC_P0, KC_PCMM, KC_PDOT, KC_PPLS, _______,
_______, _______, _______, _______, _______,
_______, _______,
_______,
_______, KC_PENT, _______
),
[FCTN] = LAYOUT_ergodox(
// left hand
KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, _______,
KC_PSCR, RGB_TOG, KC_HOME, KC_UP, KC_END, KC_PGUP, _______,
KC_PAUS, _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN,
_______, KC_MPRV, KC_MRWD, KC_MPLY, KC_MFFD, KC_MNXT, _______,
_______, _______, _______, _______, _______,
KC_F11, _______,
_______,
_______, _______, _______,
// right hand
_______, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_SYSREQ,
_______, UC(0x2014), KC_LBRC, KC_RBRC, S(KC_LBRC), S(KC_RBRC), KC_INS,
KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_BRIU, KC_CLR,
_______, KC_MSTP, KC_MUTE, KC_VOLD, KC_VOLU, KC_BRID, _______,
_______, _______, _______, _______, _______,
_______, KC_F12,
_______,
_______, _______, _______
),
};
// Runs just one time when the keyboard initializes.
void matrix_init_user (void) {
ergodox_board_led_off();
};
// Runs constantly in the background, in a loop.
void matrix_scan_user (void) {
if (IS_LAYER_ON(SYMB) || IS_LAYER_ON(SYSH)) {
ergodox_right_led_1_on();
} else {
ergodox_right_led_1_off();
}
if (IS_LAYER_ON(NUMP)) {
ergodox_right_led_2_on();
} else {
ergodox_right_led_2_off();
}
if (IS_LAYER_ON(FCTN)) {
ergodox_right_led_3_on();
} else {
ergodox_right_led_3_off();
}
};

63
users/nstickney/config.h Normal file
View file

@ -0,0 +1,63 @@
/* 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/>.
*/
// Changes from Bastyl defaults
#ifdef MASTER_RIGHT
# undef MASTER_RIGHT
#endif
// Turn off RGB lights when computer is sleeping
#define RGBLIGHT_SLEEP
// https://beta.docs.qmk.fm/developing-qmk/qmk-reference/config_options#features-that-can-be-disabled
#define NO_ACTION_ONESHOT
#define NO_ACTION_MACRO
#define NO_ACTION_FUNCTION
// Turn off all possible RGB animations
#ifdef RGB_ANIMATIONS
# undef RGB_ANIMATIONS
#endif
#ifdef RGB_EFFECT_ALTERNATING
# undef RGB_EFFECT_ALTERNATING
#endif
#ifdef RGB_EFFECT_BREATHING
# undef RGB_EFFECT_BREATHING
#endif
#ifdef RGB_EFFECT_CHRISTMAS
# undef RGB_EFFECT_CHRISTMAS
#endif
#ifdef RGB_EFFECT_KNIGHT
# undef RGB_EFFECT_KNIGHT
#endif
#ifdef RGB_EFFECT_RAINBOW_MOOD
# undef RGB_EFFECT_RAINBOW_MOOD
#endif
#ifdef RGB_EFFECT_RAINBOW_SWIRL
# undef RGB_EFFECT_RAINBOW_SWIRL
#endif
#ifdef RGB_EFFECT_RGB_TEST
# undef RGB_EFFECT_RGB_TEST
#endif
#ifdef RGB_EFFECT_SNAKE
# undef RGB_EFFECT_SNAKE
#endif
#ifdef RGB_EFFECT_STATIC_GRADIENT
# undef RGB_EFFECT_STATIC_GRADIENT
#endif
#ifdef RGB_EFFECT_TWINKLE
# undef RGB_EFFECT_TWINKLE
#endif

112
users/nstickney/nstickney.c
View file

@ -1,34 +1,73 @@
/* 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/>.
*/
#include "nstickney.h"
// Tap Dancing
void dance_layer (qk_tap_dance_state_t *state, void *user_data) {
switch (state -> count) {
case 1: tap_code(KC_APP); break;
case 2: layer_invert(NUMP); break;
case 3: layer_invert(SYMB); break;
case 4: layer_invert(SYSH); break;
default: break;
}
void dance_layer(qk_tap_dance_state_t *state, void *user_data) {
switch (state->count) {
case 1:
tap_code(KC_APP);
break;
case 2:
layer_invert(NUMP);
break;
case 3:
layer_invert(SYMB);
break;
default:
break;
}
};
void dance_lock_finished (qk_tap_dance_state_t *state, void *user_data) {
switch (state->count) {
case 1: register_code(KC_LGUI); break;
case 2: register_code(KC_NLCK); break;
case 3: register_code(KC_CAPS); break;
case 4: register_code(KC_SLCK); break;
default: break;
}
void dance_lock_finished(qk_tap_dance_state_t *state, void *user_data) {
switch (state->count) {
case 1:
register_code(KC_LGUI);
break;
case 2:
register_code(KC_NLCK);
break;
case 3:
register_code(KC_CAPS);
break;
case 4:
register_code(KC_SLCK);
break;
default:
break;
}
};
void dance_lock_reset (qk_tap_dance_state_t *state, void *user_data) {
switch (state->count) {
case 1: unregister_code(KC_LGUI); break;
case 2: unregister_code(KC_NLCK); break;
case 3: register_code(KC_CAPS); break;
case 4: register_code(KC_SLCK); break;
default: break;
}
void dance_lock_reset(qk_tap_dance_state_t *state, void *user_data) {
switch (state->count) {
case 1:
unregister_code(KC_LGUI);
break;
case 2:
register_code(KC_NLCK);
break;
case 3:
register_code(KC_CAPS);
break;
case 4:
register_code(KC_SLCK);
break;
default:
break;
}
};
qk_tap_dance_action_t tap_dance_actions[] = {
@ -36,9 +75,22 @@ qk_tap_dance_action_t tap_dance_actions[] = {
[LAYERS] = ACTION_TAP_DANCE_FN(dance_layer)
};
void eeconfig_init_user (void) {
set_unicode_input_mode(UC_LNX); // Linux
//set_unicode_input_mode(UC_OSX); // Mac OSX
//set_unicode_input_mode(UC_WIN); // Windows (with registry key, see wiki)
//set_unicode_input_mode(UC_WINC); // Windows (with WinCompose, see wiki)
};
// RGB underglow per-layer hue values
const uint16_t LAYER_HUE[] = {6, 197, 133, 69};
// Initialize RGB underglow (colorful)
void keyboard_post_init_user(void) {
rgblight_enable_noeeprom();
rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT);
for (uint16_t i = 0; i < 256; ++i) {
rgblight_sethsv_noeeprom((i + LAYER_HUE[BASE]) % 256, 255, 136);
wait_ms(8);
}
};
// Turn on RGB underglow according to active layer
layer_state_t layer_state_set_user(layer_state_t state) {
uint8_t user_val = rgblight_get_val();
rgblight_sethsv_noeeprom(LAYER_HUE[get_highest_layer(state)], 255, user_val);
return state;
};

46
users/nstickney/nstickney.h
View file

@ -1,20 +1,22 @@
/* 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
#include QMK_KEYBOARD_H
#pragma once
#define USE_SERIAL
#define MASTER_LEFT
#undef UNICODE_SELECTED_MODES
#define UNICODE_SELECTED_MODES UC_OSX, UC_LNX, UC_WINC
// Layers
#define BASE 0 // Base layer
#define SYMB 1 // Symbols
#define SYSH 2 // Symbols, shifted
#define NUMP 3 // Numpad
#define FCTN 4 // Function
// Make keymaps more clear
// Specialty keycodes
#define CC_ESC LCTL_T(KC_ESC)
#define CC_QUOT RCTL_T(KC_QUOT)
#define AC_SLSH LALT_T(KC_SLSH)
@ -22,4 +24,16 @@
#define FC_BSLS LT(FCTN, KC_BSLS)
#define FC_MINS LT(FCTN, KC_MINS)
enum tap_dances {LOCKS = 0, LAYERS = 1};
// Layers
enum {
BASE, // Base layer
SYMB, // Symbols
NUMP, // Numpad
FCTN // Function
};
// Tap dance
enum {
LOCKS, // Activate NUM/CAPS/SCROLL lock
LAYERS // Activate NUMP and SYMB layers
};

49
users/nstickney/readme.md Normal file
View file

@ -0,0 +1,49 @@
# nstickney's Ortholinear Layout
> Familiar layout for users who regularly switch between Bastyl/Iris and standard QWERTY.
## Install
For instructions on building and installing this keymap, see the [docs](https://docs.qmk.fm/#/getting_started_make_guide).
Below is the command for me; it may be different for you.
Note that my Iris keyboard has an Elite-C on the left half and a ProMicro on the right half.
- Bastyl: `make hidtech/bastyl:nstickney:dfu`
- Iris
- Elite-C: `make keebio/iris/rev2:nstickney:dfu`
- ProMicro: `make keebio/iris/rev2:nstickney:avrdude`
## Usage
0. QWERTY `BASE` layer.
* `/`, `\`, `[SPACE]`, `[ENTER]`, `-`, and `=` on the thumb clusters.
* `[` and `]` added on Bastyl.
* `CAPSLOCK` replaced by `ESC`; hold it down for `CTRL`.
* `'` can also be held for `CTRL`.
* [Space-Cadet Shift](https://beta.docs.qmk.fm/using-qmk/advanced-keycodes/feature_space_cadet) is enabled, so the `SHIFT` keys send `(` and `)` when tapped.
* Hold down `/` or `=` for `ALT`.
* Hold down `\` or `-` to access the functions layer.
* Farthest thumb keys are `GUI` (left) and `MENU` (right).
* Tapping `GUI` 2, 3, or 4 times will toggle `NUMLOCK`, `CAPSLOCK`, or `SCROLLLOCK`, respectively.
* Tapping `MENU` 2 or 3 times will toggle the `NUMP` and `SYMB` layers, respectively.
0. Unicode-input symbols on `SYMB` layer. Based (loosely) on US-International layout.
0. `NUMP` layer has number pads on each hand. Number pad `7`-`8`-`9` align with QWERTY `7`-`8`-`9` on right hand.
0. Function, arrow, media, and miscellaneous keys on `FCTN` layer.
* `F1` through `F10` on `1`-`10`. `F11` is on `GUI` and `F12` is on `MENU`.
* Brackets (`[` and `]`) available on `U` and `I`; braces (`{` and `}`) on `O` and `P`.
* Arrow keys on `ESDF` and `HJKL`; familiar for both Vim users and FPS gamers.
* `W` is `HOME`; `R` is `END`. `T` is `PAGE UP` and `G` is `PAGE DOWN`.
* Music controls on lower row of left hand.
* Volume and screen brightness on lower row of right hand.
* `PRINT SCREEN`, `PAUSE`, `SYSREQ`, `INSERT`, and `CLEAR` also mapped, as intelligently as possible.
* `Q` toggles the RGB underglow (which changes color to indicate active layer).
* `A` increases RGB underglow brightness (with `SHIFT`, decreases brightness).
* `Y` is mapped to [`KC_LOCK`](https://beta.docs.qmk.fm/using-qmk/software-features/feature_key_lock).
## Contribute
If you are using this layout and think you've found a better way to do something, I'd appreciate an [issue](https://github.com/nstickney/qmk_firmware/issues), or better yet a [pull request](https://github.com/nstickney/qmk_firmware/pulls).
## License
Copyright &copy; 2016-2021 @nstickney. Released under [GPL-2.0](/LICENSE).

35
users/nstickney/rules.mk
View file

@ -1,4 +1,37 @@
# 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/>.
SRC += nstickney.c
KEY_LOCK_ENABLE = yes
RGBLIGHT_ENABLE = yes
TAP_DANCE_ENABLE = yes
UNICODE_ENABLE = yes
UNICODE_ENABLE = no
UNICODEMAP_ENABLE = yes
UCIS_ENABLE = no
# https://github.com/qmk/qmk_firmware/issues/3224#issuecomment-399769416
LTO_ENABLE = yes
# https://beta.docs.qmk.fm/developing-qmk/qmk-reference/getting_started_make_guide#rules-mk-options
API_SYSEX_ENABLE = no
AUDIO_ENABLE = no
BOOTMAGIC_ENABLE = no
COMMAND_ENABLE = no
CONSOLE_ENABLE = no
MOUSEKEY_ENABLE = no
MIDI_ENABLE = no
NKRO_ENABLE = no
SLEEP_LED_ENABLE = no
VARIABLE_TRACE = no

106
users/nstickney/unicodemap.h Normal file
View file

@ -0,0 +1,106 @@
/* 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
enum {
// Used on base
// Used on US-International
IEX, SS2, SS3, CUR, EUR, V14, V12, V34, LSQ, RSQ, YEN, MLT,
A_D, A_R, E_A, REG, THR, U_D, U_A, I_A, O_A, O_D, LDA, RDA, NOT,
A_A, S_S, ETH, EMD, OEL, O_S, PLC, ACT,
AEL, CPR, N_T, MCR, C_C, IQM,
// Used on US-International with Shift
SS1, GBP, DIV,
AXD, ACR, ECA, UCD, UCA, ICA, OCA, OCD, BKB,
ACA, SEC, ETC, OEC, OCS, DEG, DIS,
AEC, CNT, NCT, CCC,
// Added to US-International
// Added to US-International with Shift
LDQ, RDQ,
CPL
};
const uint32_t PROGMEM unicode_map[] = {
[IEX] = 0xA1, // ¡
[SS2] = 0xB2, // ²
[SS3] = 0xB3, // ³
[CUR] = 0xA4, // ¤
[EUR] = 0x20AC, // €
[V14] = 0xBC, // ¼
[V12] = 0xBD, // ½
[V34] = 0xBE, // ¾
[LSQ] = 0x2018, // ‘
[RSQ] = 0x2019, // ’
[YEN] = 0xA5, // ¥
[MLT] = 0xD7, // ×
[A_D] = 0xE4, // ä
[A_R] = 0xE5, // å
[E_A] = 0xE9, // é
[REG] = 0xAE, // ®
[THR] = 0xFE, // þ
[U_D] = 0xFC, // ü
[U_A] = 0xFA, // ú
[I_A] = 0xED, // í
[O_A] = 0xF3, // ó
[O_D] = 0xF6, // ö
[LDA] = 0xAB, // «
[RDA] = 0xBB, // »
[NOT] = 0xAC, // ¬
[A_A] = 0xE1, // á
[S_S] = 0xDF, // ß
[ETH] = 0xF0, // ð
[EMD] = 0x2014, // —
[OEL] = 0x153, // œ
[O_S] = 0xF8, // ø
[PLC] = 0xB6, // ¶
[ACT] = 0xB4, // ´
[AEL] = 0xE6, // æ
[CPR] = 0xA9, // ©
[N_T] = 0xF1, // ñ
[MCR] = 0xB5, // µ
[C_C] = 0xE7, // ç
[IQM] = 0xBF, // ¿
[SS1] = 0xB9, // ¹
[GBP] = 0xA3, // £
[DIV] = 0xF7, // ÷
[AXD] = 0xC4, // Ä
[ACR] = 0xC5, // Å
[ECA] = 0xC9, // É
[UCD] = 0xDC, // Ü
[UCA] = 0xDA, // Ú
[ICA] = 0xCD, // Í
[OCA] = 0xD3, // Ó
[OCD] = 0xD6, // Ö
[BKB] = 0xA6, // ¦
[ACA] = 0xC1, // Á
[SEC] = 0xA7, // §
[ETC] = 0xD0, // Ð
[OEC] = 0x152, // Œ
[OCS] = 0xD8, // Ø
[DEG] = 0xB0, // °
[DIS] = 0xA8, // ¨
[AEC] = 0xC6, // Æ
[CNT] = 0xA2, // ¢
[NCT] = 0xD1, // Ñ
[CCC] = 0xC7, // Ç
[LDQ] = 0x201C, // “
[RDQ] = 0x201D, // ”
[CPL] = 0x1F12F // 🄯
};