aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcsc027 <csc_dev@protonmail.com>2020-06-15 10:48:21 +0000
committerGitHub <noreply@github.com>2020-06-15 03:48:21 -0700
commit7576f6162e662c23a174ed8730c93e22a985e7c9 (patch)
tree7fc818a140c16242ab297df92496e2ebd16ebf9f
parente8a02afc8cb2c29f522ec05bbf89a8bcd32dbe26 (diff)
downloadqmk_firmware-7576f6162e662c23a174ed8730c93e22a985e7c9.tar.gz
qmk_firmware-7576f6162e662c23a174ed8730c93e22a985e7c9.zip
[Keymap] csc027/keymap-updates (#9420)
Diffstat
-rw-r--r--keyboards/keebio/iris/keymaps/csc027/keymap.c12
-rw-r--r--keyboards/planck/keymaps/csc027/keymap.c46
-rw-r--r--keyboards/planck/keymaps/csc027/rules.mk2
-rw-r--r--users/csc027/csc027.h2
-rw-r--r--users/csc027/defines.h52
-rw-r--r--users/csc027/usb_led.c18
6 files changed, 74 insertions, 58 deletions
diff --git a/keyboards/keebio/iris/keymaps/csc027/keymap.c b/keyboards/keebio/iris/keymaps/csc027/keymap.c
index 82a077391..f81e8f848 100644
--- a/keyboards/keebio/iris/keymaps/csc027/keymap.c
+++ b/keyboards/keebio/iris/keymaps/csc027/keymap.c
@@ -52,12 +52,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
52 _______, _______, _______, _______, _______, _______ 52 _______, _______, _______, _______, _______, _______
53 ), 53 ),
54 54
55 [_GW] = LAYOUT( 55 [_GG] = LAYOUT(
56 KC_Y, KC_GRV, KC_1, KC_2, KC_3, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, 56 KC_5, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC,
57 KC_B, KC_TAB, KC_T, KC_W, KC_4, KC_R, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS, 57 KC_T, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS,
58 KC_M, MC_LSEC, KC_A, KC_S, KC_D, KC_F, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENT, 58 KC_G, MC_LSEC, KC_A, KC_S, KC_D, KC_F, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENT,
59 KC_I, KC_LCTL, KC_Z, KC_LALT, KC_V, KC_SPC, KC_SPC, _______, KC_N, KC_M, KC_COMM, KC_DOT, TO(_CS), TO(_QW), 59 KC_B, KC_LCTL, KC_Z, KC_X, KC_C, KC_SPC, KC_SPC, _______, KC_N, KC_M, KC_COMM, KC_DOT, TO(_CS), TO(_QW),
60 KC_X, KC_C, KC_SPC, _______, KC_M, KC_B 60 KC_LALT, KC_V, KC_SPC, _______, KC_M, KC_B
61 ), 61 ),
62 62
63 [_CS] = LAYOUT( 63 [_CS] = LAYOUT(
diff --git a/keyboards/planck/keymaps/csc027/keymap.c b/keyboards/planck/keymaps/csc027/keymap.c
index e39be03eb..38e3e0741 100644
--- a/keyboards/planck/keymaps/csc027/keymap.c
+++ b/keyboards/planck/keymaps/csc027/keymap.c
@@ -46,43 +46,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
46 ___________________CONVENIENCE_L4__________________, ___________________CONVENIENCE_R4__________________ 46 ___________________CONVENIENCE_L4__________________, ___________________CONVENIENCE_R4__________________
47 ), 47 ),
48 48
49 /* Guild Wars 2 Layer 49 [_GG] = LAYOUT_wrapper(
50 * 50 ________________General_Game_4x12_L1_______________, ________________General_Game_4x12_R1_______________,
51 * ,-----------------------------------------------------------------------. 51 ________________General_Game_4x12_L2_______________, ________________General_Game_4x12_R2_______________,
52 * | ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 |BkSpc| 52 ________________General_Game_4x12_L3_______________, ________________General_Game_4x12_R3_______________,
53 * |-----------------------------------------------------------------------| 53 ________________General_Game_4x12_L4_______________, ________________General_Game_4x12_R4_______________
54 * | Tab | Q | W | E | R | T | Y | U | I | O | P | \ |
55 * |-----------------------------------------------------------------------|
56 * |Sf/Ec| A | S | D | F | G | H | J | K | L | ; |Enter|
57 * |-----------------------------------------------------------------------|
58 * | Ctl | Z | Alt | X | C |Space|Space| M | B | . |Nxt L|Rst L|
59 * `-----------------------------------------------------------------------'
60 */
61
62 [_GW] = LAYOUT_ortho_4x12(
63 KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC,
64 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS,
65 MC_LSEC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENT ,
66 KC_LCTL, KC_Z, KC_LALT, KC_X, KC_C, KC_SPC, KC_SPC, KC_M, KC_B, KC_DOT, TO(_CS), TO(_QW)
67 ), 54 ),
68 55
69 /* CS:GO Layer 56 [_CS] = LAYOUT_wrapper(
70 * 57 ___________________CSGO_4x12_L1____________________, ___________________CSGO_4x12_R1____________________,
71 * ,-----------------------------------------------------------------------. 58 ___________________CSGO_4x12_L2____________________, ___________________CSGO_4x12_R2____________________,
72 * | | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 |BkSpc| 59 ___________________CSGO_4x12_L3____________________, ___________________CSGO_4x12_R3____________________,
73 * |-----------------------------------------------------------------------| 60 ___________________CSGO_4x12_L4____________________, ___________________CSGO_4x12_R4____________________
74 * | Tab | Q | W | E | R | T | Y | 4 | 5 | 6 | |NmLck|
75 * |-----------------------------------------------------------------------|
76 * |Shift| A | S | D | F | G | H | 1 | 2 | 3 |Enter| Esc |
77 * |-----------------------------------------------------------------------|
78 * | Ctl | Z | Alt | X | B |Space|Space| 0 | 0 | . |Nxt L|Rst L|
79 * `-----------------------------------------------------------------------'
80 */
81
82 [_CS] = LAYOUT_ortho_4x12(
83 XXXXXXX, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_P7, KC_P8, KC_P9, KC_0, KC_BSPC,
84 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_P4, KC_P5, KC_P6, XXXXXXX, KC_NLCK,
85 KC_LSFT, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_P1, KC_P2, KC_P3, KC_PENT, KC_ESC ,
86 KC_LCTL, KC_Z, KC_LALT, KC_X, KC_B, KC_SPC, KC_SPC, KC_P0, KC_P0, KC_PDOT, TO(_QW), TO(_QW)
87 ) 61 )
88}; 62};
diff --git a/keyboards/planck/keymaps/csc027/rules.mk b/keyboards/planck/keymaps/csc027/rules.mk
index 801031fb1..cf92d5674 100644
--- a/keyboards/planck/keymaps/csc027/rules.mk
+++ b/keyboards/planck/keymaps/csc027/rules.mk
@@ -2,5 +2,5 @@ BOOTMAGIC_ENABLE = no
2COMMAND_ENABLE = no 2COMMAND_ENABLE = no
3CONSOLE_ENABLE = no 3CONSOLE_ENABLE = no
4EXTRAKEY_ENABLE = no 4EXTRAKEY_ENABLE = no
5LTO_ENABLE = yes 5LTO_ENABLE = no
6RGBLIGHT_ENABLE = no 6RGBLIGHT_ENABLE = no
diff --git a/users/csc027/csc027.h b/users/csc027/csc027.h
index 96bf7dc0e..6daae2a30 100644
--- a/users/csc027/csc027.h
+++ b/users/csc027/csc027.h
@@ -24,6 +24,6 @@ enum custom_layers {
24 _MS, // Mouse 24 _MS, // Mouse
25 _GT, // Git 25 _GT, // Git
26 _CN, // Convenience 26 _CN, // Convenience
27 _GW, // Guild Wars 2 27 _GG, // General Gaming
28 _CS // Counter-Strike: Global Offensive 28 _CS // Counter-Strike: Global Offensive
29}; 29};
diff --git a/users/csc027/defines.h b/users/csc027/defines.h
index 4f52938f1..3f599ad65 100644
--- a/users/csc027/defines.h
+++ b/users/csc027/defines.h
@@ -20,10 +20,6 @@
20 * QWERTY layer. 20 * QWERTY layer.
21 * - The "Git" one shot function goes to the macro layer which has Git 21 * - The "Git" one shot function goes to the macro layer which has Git
22 * commands implemented. 22 * commands implemented.
23 * - The "Convc" momentary function goes to the Convenience layer which has a
24 * tenkey. Note: The tenkey will operate using the secondary functions if
25 * the Number Lock is not enabled (e.g., Left and Right instead of 4 and
26 * 6).
27 * - The Right Shift key also doubles as an Enter key if it is tapped rather 23 * - The Right Shift key also doubles as an Enter key if it is tapped rather
28 * than held. 24 * than held.
29 * 25 *
@@ -46,7 +42,7 @@
46#define _____________________QWERTY_R1_____________________ KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC 42#define _____________________QWERTY_R1_____________________ KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC
47#define _____________________QWERTY_R2_____________________ KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT 43#define _____________________QWERTY_R2_____________________ KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT
48#define _____________________QWERTY_R3_____________________ KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, MC_RSFE 44#define _____________________QWERTY_R3_____________________ KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, MC_RSFE
49#define _____________________QWERTY_R4_____________________ KC_SPC, RAISE, KC_BSLS, OSL(_GT), TO(_GW), XXXXXXX 45#define _____________________QWERTY_R4_____________________ KC_SPC, RAISE, KC_BSLS, OSL(_GT), TO(_GG), XXXXXXX
50 46
51/* Raise Layer 47/* Raise Layer
52 * 48 *
@@ -213,6 +209,52 @@
213#define ___________________CONVENIENCE_R3__________________ XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______ 209#define ___________________CONVENIENCE_R3__________________ XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______
214#define ___________________CONVENIENCE_R4__________________ _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX 210#define ___________________CONVENIENCE_R4__________________ _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
215 211
212/* General Game Layer
213 *
214 * ,-----------------------------------. ,-----------------------------------.
215 * | ` | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 |BkSpc|
216 * |-----------------------------------| |-----------------------------------|
217 * | Tab | Q | W | E | R | T | | Y | U | I | O | P | \ |
218 * |-----------------------------------| |-----------------------------------|
219 * |Sf/Ec| A | S | D | F | G | | H | J | K | L | ; |Enter|
220 * |-----------------------------------| |-----------------------------------|
221 * | Ctl | Z | Alt | X | C |Space| |Space| M | B | . |Nxt L|Rst L|
222 * `-----------------------------------' `-----------------------------------'
223 */
224
225#define ________________General_Game_4x12_L1_______________ KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5
226#define ________________General_Game_4x12_L2_______________ KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T
227#define ________________General_Game_4x12_L3_______________ MC_LSEC, KC_A, KC_S, KC_D, KC_F, KC_G
228#define ________________General_Game_4x12_L4_______________ KC_LCTL, KC_Z, KC_LALT, KC_X, KC_C, KC_SPC
229
230#define ________________General_Game_4x12_R1_______________ KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC
231#define ________________General_Game_4x12_R2_______________ KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS
232#define ________________General_Game_4x12_R3_______________ KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENT
233#define ________________General_Game_4x12_R4_______________ KC_SPC, KC_M, KC_B, KC_DOT, TO(_CS), TO(_QW)
234
235/* CS:GO Layer
236 *
237 * ,-----------------------------------. ,-----------------------------------.
238 * | | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 |BkSpc|
239 * |-----------------------------------| |-----------------------------------|
240 * | Tab | Q | W | E | R | T | | Y | 4 | 5 | 6 | |NmLck|
241 * |-----------------------------------| |-----------------------------------|
242 * |Shift| A | S | D | F | G | | H | 1 | 2 | 3 |Enter| Esc |
243 * |-----------------------------------| |-----------------------------------|
244 * | Ctl | Z | Alt | X | B |Space| |Space| 0 | 0 | . |Nxt L|Rst L|
245 * `-----------------------------------' `-----------------------------------'
246 */
247
248#define ___________________CSGO_4x12_L1____________________ XXXXXXX, KC_1, KC_2, KC_3, KC_4, KC_5
249#define ___________________CSGO_4x12_L2____________________ KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T
250#define ___________________CSGO_4x12_L3____________________ KC_LSFT, KC_A, KC_S, KC_D, KC_F, KC_G
251#define ___________________CSGO_4x12_L4____________________ KC_LCTL, KC_Z, KC_LALT, KC_X, KC_B, KC_SPC
252
253#define ___________________CSGO_4x12_R1____________________ KC_6, KC_P7, KC_P8, KC_P9, KC_0, KC_BSPC
254#define ___________________CSGO_4x12_R2____________________ KC_Y, KC_P4, KC_P5, KC_P6, XXXXXXX, KC_NLCK
255#define ___________________CSGO_4x12_R3____________________ KC_H, KC_P1, KC_P2, KC_P3, KC_PENT, KC_ESC
256#define ___________________CSGO_4x12_R4____________________ KC_SPC, KC_P0, KC_P0, KC_PDOT, TO(_QW), TO(_QW)
257
216/* Convenience macros 258/* Convenience macros
217 * 259 *
218 * These are accelerator macros for simplifying declaration of PROGMEM strings 260 * These are accelerator macros for simplifying declaration of PROGMEM strings
diff --git a/users/csc027/usb_led.c b/users/csc027/usb_led.c
index 1418e32ca..473b153a1 100644
--- a/users/csc027/usb_led.c
+++ b/users/csc027/usb_led.c
@@ -10,21 +10,21 @@
10 10
11#if defined(AUDIO_ENABLE) || defined(RGBLIGHT_ENABLE) 11#if defined(AUDIO_ENABLE) || defined(RGBLIGHT_ENABLE)
12 12
13bool led_update_user(led_t usb_led) { 13bool led_update_user(led_t new_led) {
14 static led_t old_usb_led = { 14 static led_t old_led = {
15 .num_lock = false, 15 .num_lock = false,
16 .caps_lock = false, 16 .caps_lock = false,
17 .scroll_lock = false 17 .scroll_lock = false
18 }; 18 };
19 19
20 if(old_usb_led.caps_lock != usb_led.caps_lock) { 20 if(old_led.caps_lock != new_led.caps_lock) {
21 usb_led.caps_lock ? on_usb_led_on() : on_usb_led_off(); 21 new_led.caps_lock ? on_usb_led_on() : on_usb_led_off();
22 } else if(old_usb_led.num_lock != usb_led.num_lock) { 22 } else if(old_led.num_lock != new_led.num_lock) {
23 usb_led.num_lock ? on_usb_led_on() : on_usb_led_off(); 23 new_led.num_lock ? on_usb_led_on() : on_usb_led_off();
24 } else if(old_usb_led.scroll_lock != usb_led.scroll_lock) { 24 } else if(old_led.scroll_lock != new_led.scroll_lock) {
25 usb_led.scroll_lock ? on_usb_led_on() : on_usb_led_off(); 25 new_led.scroll_lock ? on_usb_led_on() : on_usb_led_off();
26 } 26 }
27 old_usb_led = usb_led; 27 old_led = new_led;
28 28
29 return true; 29 return true;
30} 30}
generated by cgit v1.2.3 (git 2.25.1) at 2025-11-20 22:04:51 +0000