aboutsummaryrefslogtreecommitdiff
path: root/layouts
diff options
context:
space:
mode:
authorJames Young <18669334+noroadsleft@users.noreply.github.com>2021-08-09 12:14:22 -0700
committerJames Young <18669334+noroadsleft@users.noreply.github.com>2021-08-09 12:14:22 -0700
commit7bec943043b8d03482e9f4ffc69cc63b9fc4a18a (patch)
treee138b4d121f2196d3983e1643cab4381ee729c9b /layouts
parentc0628c2820b436550f62af5f6b7fae1f66b0bf8b (diff)
parent26ea090190b815862f108903e5f41f20c6d16d66 (diff)
downloadqmk_firmware-7bec943043b8d03482e9f4ffc69cc63b9fc4a18a.tar.gz
qmk_firmware-7bec943043b8d03482e9f4ffc69cc63b9fc4a18a.zip
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 'layouts')
-rw-r--r--layouts/community/ergodox/nstickney/keymap.c142
1 files changed, 0 insertions, 142 deletions
diff --git a/layouts/community/ergodox/nstickney/keymap.c b/layouts/community/ergodox/nstickney/keymap.c
deleted file mode 100644
index a37bc5f96..000000000
--- a/layouts/community/ergodox/nstickney/keymap.c
+++ /dev/null
@@ -1,142 +0,0 @@
1#include "nstickney.h"
2
3/*
4 * This keymap simulates the key limitations of an Iris on an ErgoDox. See the
5 * matching iris layout (/keyboards/keebio/iris/keymaps/nstickney) for further
6 * information.
7 */
8
9const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
10 [BASE] = LAYOUT_ergodox(
11 // left hand
12 KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, XXXXXXX,
13 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, XXXXXXX,
14 CC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G,
15 KC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, XXXXXXX,
16 XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, AC_SLSH,
17 TD(LOCKS), XXXXXXX,
18 XXXXXXX,
19 FC_BSLS, KC_SPC, XXXXXXX,
20 // right hand
21 XXXXXXX, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC,
22 XXXXXXX, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_DEL,
23 KC_H, KC_J, KC_K, KC_L, KC_SCLN, CC_QUOT,
24 XXXXXXX, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSPC,
25 AC_EQL, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
26 XXXXXXX, TD(LAYERS),
27 XXXXXXX,
28 XXXXXXX, KC_ENT, FC_MINS
29 ),
30
31 [SYMB] = LAYOUT_ergodox(
32 // left hand
33 UC(0x00EF), UC(0x00A1), UC(0x00B2), UC(0x00B3), UC(0x00A4), UC(0x20AC), _______,
34 _______, UC(0x00E4), UC(0x00E5), UC(0x00E9), UC(0x00AE), UC(0x00FE), _______,
35 _______, UC(0x00E1), UC(0x00DF), UC(0x00F0), UC(0x00EC), UC(0x00ED),
36 _______, UC(0x00E6), UC(0x00E8), UC(0x00A9), UC(0x00EA), UC(0x00EB), _______,
37 _______, _______, _______, _______, UC(0x00BF),
38 _______, _______,
39 _______,
40 _______, UC(0x00AC), _______,
41 // right hand
42 _______, UC(0x00BC), UC(0x00BD), UC(0x00BE), UC(0x2018), UC(0x2019), _______,
43 _______, UC(0x00FC), UC(0x00FA), UC(0x00ED), UC(0x00F3), UC(0x00F6), _______,
44 UC(0x00EE), UC(0x00E0), UC(0x00E2), UC(0x00F8), UC(0x00B6), UC(0x00B4),
45 _______, UC(0x00F1), UC(0x00FD), UC(0x00E7), UC(0x00F4), UC(0x00BF), _______,
46 UC(0x00D7), _______, _______, _______, _______,
47 _______, _______,
48 _______,
49 _______, UC(0x00B1), _______
50 ),
51
52 [SYSH] = LAYOUT_ergodox(
53 // left hand
54 UC(0x00CF), UC(0x00B9), UC(0x2200), UC(0x2201), UC(0x00A3), UC(0x00A5), _______,
55 _______, UC(0x00C4), UC(0x00C5), UC(0x00C9), UC(0x2122), UC(0x00DE), _______,
56 _______, UC(0x00C1), UC(0x00A7), UC(0x00D0), UC(0x00CC), UC(0x00CD),
57 _______, UC(0x00C6), UC(0x00C8), UC(0x00A2), UC(0x00CA), UC(0x00CB), _______,
58 _______, _______, _______, _______, UC(0x203D),
59 _______, _______,
60 _______,
61 _______, UC(0x00A6), _______,
62 // right hand
63 _______, UC(0x00B5), UC(0x00AB), UC(0x00BB), UC(0x201C), UC(0x201D), _______,
64 _______, UC(0x00DC), UC(0x00DA), UC(0x00CD), UC(0x00D3), UC(0x00D6), _______,
65 UC(0x00CE), UC(0x00C1), UC(0x00C2), UC(0x00D8), UC(0x00B0), UC(0x00A8),
66 _______, UC(0x00D1), UC(0x00DD), UC(0x00C7), UC(0x00D4), UC(0x203D), _______,
67 UC(0x00F7), _______, _______, _______, _______,
68 _______, _______,
69 _______,
70 _______, UC(0x00AA), _______
71 ),
72
73 [NUMP] = LAYOUT_ergodox(
74 // left hand
75 _______, _______, KC_P7, KC_P8, KC_P9, KC_PSLS, _______,
76 _______, _______, KC_P4, KC_P5, KC_P6, KC_PAST, _______,
77 _______, _______, KC_P1, KC_P2, KC_P3, KC_PMNS,
78 _______, _______, KC_P0, KC_PCMM, KC_PDOT, KC_PPLS, _______,
79 _______, _______, _______, _______, _______,
80 _______, _______,
81 _______,
82 _______, _______, _______,
83 // right hand
84 _______, _______, KC_P7, KC_P8, KC_P9, KC_PSLS, _______,
85 _______, _______, KC_P4, KC_P5, KC_P6, KC_PAST, _______,
86 _______, KC_P1, KC_P2, KC_P3, KC_PMNS, _______,
87 _______, _______, KC_P0, KC_PCMM, KC_PDOT, KC_PPLS, _______,
88 _______, _______, _______, _______, _______,
89 _______, _______,
90 _______,
91 _______, KC_PENT, _______
92 ),
93
94 [FCTN] = LAYOUT_ergodox(
95 // left hand
96 KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, _______,
97 KC_PSCR, RGB_TOG, KC_HOME, KC_UP, KC_END, KC_PGUP, _______,
98 KC_PAUS, _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN,
99 _______, KC_MPRV, KC_MRWD, KC_MPLY, KC_MFFD, KC_MNXT, _______,
100 _______, _______, _______, _______, _______,
101 KC_F11, _______,
102 _______,
103 _______, _______, _______,
104 // right hand
105 _______, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_SYSREQ,
106 _______, UC(0x2014), KC_LBRC, KC_RBRC, S(KC_LBRC), S(KC_RBRC), KC_INS,
107 KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_BRIU, KC_CLR,
108 _______, KC_MSTP, KC_MUTE, KC_VOLD, KC_VOLU, KC_BRID, _______,
109 _______, _______, _______, _______, _______,
110 _______, KC_F12,
111 _______,
112 _______, _______, _______
113 ),
114};
115
116// Runs just one time when the keyboard initializes.
117void matrix_init_user (void) {
118 ergodox_board_led_off();
119};
120
121// Runs constantly in the background, in a loop.
122void matrix_scan_user (void) {
123
124 if (IS_LAYER_ON(SYMB) || IS_LAYER_ON(SYSH)) {
125 ergodox_right_led_1_on();
126 } else {
127 ergodox_right_led_1_off();
128 }
129
130 if (IS_LAYER_ON(NUMP)) {
131 ergodox_right_led_2_on();
132 } else {
133 ergodox_right_led_2_off();
134 }
135
136 if (IS_LAYER_ON(FCTN)) {
137 ergodox_right_led_3_on();
138 } else {
139 ergodox_right_led_3_off();
140 }
141
142}; \ No newline at end of file
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-16 09:51:33 +0000