diff options
-rw-r--r-- | keyboards/infinity60/infinity60.h | 11 | ||||
-rw-r--r-- | keyboards/infinity60/info.json | 78 | ||||
-rw-r--r-- | keyboards/infinity60/keymaps/default/keymap.c | 10 | ||||
-rwxr-xr-x | keyboards/infinity60/keymaps/depariel/keymap.c | 16 | ||||
-rw-r--r-- | keyboards/infinity60/keymaps/hasu/keymap.c | 12 | ||||
-rw-r--r-- | keyboards/infinity60/keymaps/jpetermans/config.h | 7 | ||||
-rw-r--r-- | keyboards/infinity60/keymaps/jpetermans/keymap.c | 17 | ||||
-rw-r--r-- | keyboards/infinity60/keymaps/jpetermans/rules.mk | 4 | ||||
-rw-r--r-- | keyboards/infinity60/matrix.c | 19 | ||||
-rw-r--r-- | keyboards/infinity60/readme.md | 3 |
10 files changed, 130 insertions, 47 deletions
diff --git a/keyboards/infinity60/infinity60.h b/keyboards/infinity60/infinity60.h index 21b8eeba2..a71921045 100644 --- a/keyboards/infinity60/infinity60.h +++ b/keyboards/infinity60/infinity60.h | |||
@@ -14,16 +14,14 @@ GNU General Public License for more details. | |||
14 | You should have received a copy of the GNU General Public License | 14 | You should have received a copy of the GNU General Public License |
15 | along with this program. If not, see <http://www.gnu.org/licenses/>. | 15 | along with this program. If not, see <http://www.gnu.org/licenses/>. |
16 | */ | 16 | */ |
17 | #ifndef KEYMAP_COMMON_H | 17 | #pragma once |
18 | #define KEYMAP_COMMON_H | ||
19 | 18 | ||
20 | #include "quantum.h" | 19 | #include "quantum.h" |
21 | 20 | ||
22 | #define LAYOUT_60_ansi_split_bs_rshift KEYMAP | ||
23 | |||
24 | #ifdef INFINITY_PROTOTYPE | 21 | #ifdef INFINITY_PROTOTYPE |
22 | |||
25 | /* Infinity prototype */ | 23 | /* Infinity prototype */ |
26 | #define KEYMAP( \ | 24 | #define LAYOUT_60_ansi_split_bs_rshift( \ |
27 | K00, K10, K20, K30, K40, K50, K60, K70, K80, K01, K11, K21, K31, K41, K86, \ | 25 | K00, K10, K20, K30, K40, K50, K60, K70, K80, K01, K11, K21, K31, K41, K86, \ |
28 | K51, K61, K71, K81, K02, K12, K22, K32, K42, K52, K62, K72, K82, K03, \ | 26 | K51, K61, K71, K81, K02, K12, K22, K32, K42, K52, K62, K72, K82, K03, \ |
29 | K13, K23, K33, K43, K53, K63, K73, K83, K04, K14, K24, K34, K44, \ | 27 | K13, K23, K33, K43, K53, K63, K73, K83, K04, K14, K24, K34, K44, \ |
@@ -44,7 +42,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
44 | #else | 42 | #else |
45 | 43 | ||
46 | /* Infinity production */ | 44 | /* Infinity production */ |
47 | #define KEYMAP( \ | 45 | #define LAYOUT_60_ansi_split_bs_rshift( \ |
48 | K00, K10, K20, K30, K40, K50, K60, K70, K80, K01, K11, K21, K31, K41, K51, \ | 46 | K00, K10, K20, K30, K40, K50, K60, K70, K80, K01, K11, K21, K31, K41, K51, \ |
49 | K61, K71, K81, K02, K12, K22, K32, K42, K52, K62, K72, K82, K03, K13, \ | 47 | K61, K71, K81, K02, K12, K22, K32, K42, K52, K62, K72, K82, K03, K13, \ |
50 | K23, K33, K43, K53, K63, K73, K83, K04, K14, K24, K34, K44, K54, \ | 48 | K23, K33, K43, K53, K63, K73, K83, K04, K14, K24, K34, K44, K54, \ |
@@ -64,4 +62,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
64 | 62 | ||
65 | #endif | 63 | #endif |
66 | 64 | ||
67 | #endif | ||
diff --git a/keyboards/infinity60/info.json b/keyboards/infinity60/info.json new file mode 100644 index 000000000..06df911e5 --- /dev/null +++ b/keyboards/infinity60/info.json | |||
@@ -0,0 +1,78 @@ | |||
1 | { | ||
2 | "keyboard_name": "Infinity 60%", | ||
3 | "keyboard_folder": "infinity60", | ||
4 | "url": "https://input.club/devices/infinity-keyboard/", | ||
5 | "maintainer": "qmk", | ||
6 | "width": 15, | ||
7 | "height": 5, | ||
8 | "layouts": { | ||
9 | "LAYOUT_60_ansi_split_bs_rshift": { | ||
10 | "key_count": 63, | ||
11 | "layout": [ | ||
12 | {"label":"Esc", "x":0, "y":0}, | ||
13 | {"label":"1", "x":1, "y":0}, | ||
14 | {"label":"2", "x":2, "y":0}, | ||
15 | {"label":"3", "x":3, "y":0}, | ||
16 | {"label":"4", "x":4, "y":0}, | ||
17 | {"label":"5", "x":5, "y":0}, | ||
18 | {"label":"6", "x":6, "y":0}, | ||
19 | {"label":"7", "x":7, "y":0}, | ||
20 | {"label":"8", "x":8, "y":0}, | ||
21 | {"label":"9", "x":9, "y":0}, | ||
22 | {"label":"0", "x":10, "y":0}, | ||
23 | {"label":"-", "x":11, "y":0}, | ||
24 | {"label":"=", "x":12, "y":0}, | ||
25 | {"label":"\\", "x":13, "y":0}, | ||
26 | {"label":"`", "x":14, "y":0}, | ||
27 | {"label":"Tab", "x":0, "y":1, "w":1.5}, | ||
28 | {"label":"Q", "x":1.5, "y":1}, | ||
29 | {"label":"W", "x":2.5, "y":1}, | ||
30 | {"label":"E", "x":3.5, "y":1}, | ||
31 | {"label":"R", "x":4.5, "y":1}, | ||
32 | {"label":"T", "x":5.5, "y":1}, | ||
33 | {"label":"Y", "x":6.5, "y":1}, | ||
34 | {"label":"U", "x":7.5, "y":1}, | ||
35 | {"label":"I", "x":8.5, "y":1}, | ||
36 | {"label":"O", "x":9.5, "y":1}, | ||
37 | {"label":"P", "x":10.5, "y":1}, | ||
38 | {"label":"[", "x":11.5, "y":1}, | ||
39 | {"label":"]", "x":12.5, "y":1}, | ||
40 | {"label":"Backspace", "x":13.5, "y":1, "w":1.5}, | ||
41 | {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, | ||
42 | {"label":"A", "x":1.75, "y":2}, | ||
43 | {"label":"S", "x":2.75, "y":2}, | ||
44 | {"label":"D", "x":3.75, "y":2}, | ||
45 | {"label":"F", "x":4.75, "y":2}, | ||
46 | {"label":"G", "x":5.75, "y":2}, | ||
47 | {"label":"H", "x":6.75, "y":2}, | ||
48 | {"label":"J", "x":7.75, "y":2}, | ||
49 | {"label":"K", "x":8.75, "y":2}, | ||
50 | {"label":"L", "x":9.75, "y":2}, | ||
51 | {"label":";", "x":10.75, "y":2}, | ||
52 | {"label":"'", "x":11.75, "y":2}, | ||
53 | {"label":"Enter", "x":12.75, "y":2, "w":2.25}, | ||
54 | {"label":"Shift", "x":0, "y":3, "w":2.25}, | ||
55 | {"label":"Z", "x":2.25, "y":3}, | ||
56 | {"label":"X", "x":3.25, "y":3}, | ||
57 | {"label":"C", "x":4.25, "y":3}, | ||
58 | {"label":"V", "x":5.25, "y":3}, | ||
59 | {"label":"B", "x":6.25, "y":3}, | ||
60 | {"label":"N", "x":7.25, "y":3}, | ||
61 | {"label":"M", "x":8.25, "y":3}, | ||
62 | {"label":",", "x":9.25, "y":3}, | ||
63 | {"label":".", "x":10.25, "y":3}, | ||
64 | {"label":"/", "x":11.25, "y":3}, | ||
65 | {"label":"Shift", "x":12.25, "y":3, "w":1.75}, | ||
66 | {"label":"Fn", "x":14, "y":3}, | ||
67 | {"label":"Ctrl", "x":0, "y":4, "w":1.5}, | ||
68 | {"label":"GUI", "x":1.5, "y":4}, | ||
69 | {"label":"Alt", "x":2.5, "y":4, "w":1.5}, | ||
70 | {"label":"Space", "x":4, "y":4, "w":6}, | ||
71 | {"label":"Alt", "x":10, "y":4, "w":1.5}, | ||
72 | {"label":"GUI", "x":11.5, "y":4}, | ||
73 | {"label":"Fn", "x":12.5, "y":4}, | ||
74 | {"label":"Ctrl", "x":13.5, "y":4, "w":1.5} | ||
75 | ] | ||
76 | } | ||
77 | } | ||
78 | } | ||
diff --git a/keyboards/infinity60/keymaps/default/keymap.c b/keyboards/infinity60/keymaps/default/keymap.c index 8347c94b4..5d310e3b2 100644 --- a/keyboards/infinity60/keymaps/default/keymap.c +++ b/keyboards/infinity60/keymaps/default/keymap.c | |||
@@ -1,11 +1,11 @@ | |||
1 | #include "infinity60.h" | 1 | #include QMK_KEYBOARD_H |
2 | 2 | ||
3 | const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | 3 | const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |
4 | /* Layer 0: Default Layer | 4 | /* Layer 0: Default Layer |
5 | * ,-----------------------------------------------------------. | 5 | * ,-----------------------------------------------------------. |
6 | * |Esc| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =| `|BSp| | 6 | * |Esc| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =| \| `| |
7 | * |-----------------------------------------------------------| | 7 | * |-----------------------------------------------------------| |
8 | * |Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]| \| | 8 | * |Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]| Bksp| |
9 | * |-----------------------------------------------------------| | 9 | * |-----------------------------------------------------------| |
10 | * |Contro| A| S| D| F| G| H| J| K| L| ;| '|Enter | | 10 | * |Contro| A| S| D| F| G| H| J| K| L| ;| '|Enter | |
11 | * |-----------------------------------------------------------| | 11 | * |-----------------------------------------------------------| |
@@ -14,7 +14,7 @@ const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
14 | * | |Gui|Alt | Space |Alt |Gui| | | | 14 | * | |Gui|Alt | Space |Alt |Gui| | | |
15 | * `-----------------------------------------------------------' | 15 | * `-----------------------------------------------------------' |
16 | */ | 16 | */ |
17 | [0] = KEYMAP( | 17 | [0] = LAYOUT_60_ansi_split_bs_rshift( |
18 | KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS,KC_EQL, KC_BSLS, KC_GRV, \ | 18 | KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS,KC_EQL, KC_BSLS, KC_GRV, \ |
19 | KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC,KC_RBRC,KC_BSPC, \ | 19 | KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC,KC_RBRC,KC_BSPC, \ |
20 | KC_LCTL,KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN,KC_QUOT,KC_ENT, \ | 20 | KC_LCTL,KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN,KC_QUOT,KC_ENT, \ |
@@ -34,7 +34,7 @@ const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
34 | * | |Gui|Alt | Space |Alt |Gui| | | | 34 | * | |Gui|Alt | Space |Alt |Gui| | | |
35 | * `-----------------------------------------------------------' | 35 | * `-----------------------------------------------------------' |
36 | */ | 36 | */ |
37 | [1] = KEYMAP( | 37 | [1] = LAYOUT_60_ansi_split_bs_rshift( |
38 | KC_PWR, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_DEL, \ | 38 | KC_PWR, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_DEL, \ |
39 | KC_CAPS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_PSCR,KC_SLCK,KC_PAUS, KC_UP, KC_TRNS, KC_BSPC, \ | 39 | KC_CAPS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_PSCR,KC_SLCK,KC_PAUS, KC_UP, KC_TRNS, KC_BSPC, \ |
40 | KC_TRNS,KC_VOLD,KC_VOLU,KC_MUTE,KC_TRNS,KC_TRNS,KC_PAST,KC_PSLS,KC_HOME,KC_PGUP,KC_LEFT,KC_RGHT,KC_PENT, \ | 40 | KC_TRNS,KC_VOLD,KC_VOLU,KC_MUTE,KC_TRNS,KC_TRNS,KC_PAST,KC_PSLS,KC_HOME,KC_PGUP,KC_LEFT,KC_RGHT,KC_PENT, \ |
diff --git a/keyboards/infinity60/keymaps/depariel/keymap.c b/keyboards/infinity60/keymaps/depariel/keymap.c index 57f9487f2..d1a1a04a4 100755 --- a/keyboards/infinity60/keymaps/depariel/keymap.c +++ b/keyboards/infinity60/keymaps/depariel/keymap.c | |||
@@ -1,4 +1,4 @@ | |||
1 | #include "infinity60.h" | 1 | #include QMK_KEYBOARD_H |
2 | 2 | ||
3 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | 3 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |
4 | /* Layer 0: Default Layer | 4 | /* Layer 0: Default Layer |
@@ -14,7 +14,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
14 | * |Fn2 |Gui |Alt | Space |RAlt|Prv|PlPs|Next| | 14 | * |Fn2 |Gui |Alt | Space |RAlt|Prv|PlPs|Next| |
15 | * `-----------------------------------------------------------' | 15 | * `-----------------------------------------------------------' |
16 | */ | 16 | */ |
17 | [0] = KEYMAP( | 17 | [0] = LAYOUT_60_ansi_split_bs_rshift( |
18 | KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_GRV, \ | 18 | KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_GRV, \ |
19 | KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC, \ | 19 | KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC, \ |
20 | KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, LT(5, KC_ENT), \ | 20 | KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, LT(5, KC_ENT), \ |
@@ -23,7 +23,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
23 | 23 | ||
24 | /* Layer 1: "Toggle" off SpaceFn for League of Legends | 24 | /* Layer 1: "Toggle" off SpaceFn for League of Legends |
25 | */ | 25 | */ |
26 | [1] = KEYMAP( | 26 | [1] = LAYOUT_60_ansi_split_bs_rshift( |
27 | KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_GRV, \ | 27 | KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_GRV, \ |
28 | KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC, \ | 28 | KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC, \ |
29 | KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, \ | 29 | KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, \ |
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
32 | 32 | ||
33 | /* Layer 2: "Toggle" off SpaceFn for MapleRoyals | 33 | /* Layer 2: "Toggle" off SpaceFn for MapleRoyals |
34 | */ | 34 | */ |
35 | [2] = KEYMAP( | 35 | [2] = LAYOUT_60_ansi_split_bs_rshift( |
36 | KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_GRV, \ | 36 | KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_GRV, \ |
37 | KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC, \ | 37 | KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC, \ |
38 | KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, \ | 38 | KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, \ |
@@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
41 | 41 | ||
42 | /* Layer 3: FN layer 1 | 42 | /* Layer 3: FN layer 1 |
43 | */ | 43 | */ |
44 | [3] = KEYMAP( | 44 | [3] = LAYOUT_60_ansi_split_bs_rshift( |
45 | KC_NO, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_NO, KC_NO, \ | 45 | KC_NO, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_NO, KC_NO, \ |
46 | KC_NO, KC_BTN1, KC_MS_U, KC_BTN2, LALT(KC_F4), KC_HOME, KC_PGUP, KC_PSCR, KC_SLCK, KC_UP, KC_NO, KC_LPRN, KC_RPRN, KC_DEL, \ | 46 | KC_NO, KC_BTN1, KC_MS_U, KC_BTN2, LALT(KC_F4), KC_HOME, KC_PGUP, KC_PSCR, KC_SLCK, KC_UP, KC_NO, KC_LPRN, KC_RPRN, KC_DEL, \ |
47 | MO(6), KC_MS_L, KC_MS_D, KC_MS_R, KC_NO, KC_END, KC_PGDN, KC_TILD, KC_LEFT, KC_DOWN, KC_RGHT, KC_NO, KC_NO, \ | 47 | MO(6), KC_MS_L, KC_MS_D, KC_MS_R, KC_NO, KC_END, KC_PGDN, KC_TILD, KC_LEFT, KC_DOWN, KC_RGHT, KC_NO, KC_NO, \ |
@@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
50 | 50 | ||
51 | /* Layer 4: FN layer 2 | 51 | /* Layer 4: FN layer 2 |
52 | */ | 52 | */ |
53 | [4] = KEYMAP( | 53 | [4] = LAYOUT_60_ansi_split_bs_rshift( |
54 | KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_PMNS, KC_PPLS, KC_PSLS, TG(2), \ | 54 | KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_PMNS, KC_PPLS, KC_PSLS, TG(2), \ |
55 | KC_CAPS, KC_NO, KC_UP, KC_NO, KC_NO, KC_NO, KC_NO, KC_PSCR, KC_NO, KC_P7, KC_P8, KC_P9, KC_PAST, KC_BSPC, \ | 55 | KC_CAPS, KC_NO, KC_UP, KC_NO, KC_NO, KC_NO, KC_NO, KC_PSCR, KC_NO, KC_P7, KC_P8, KC_P9, KC_PAST, KC_BSPC, \ |
56 | KC_LCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_P4, KC_P5, KC_P6, KC_PENT, \ | 56 | KC_LCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_P4, KC_P5, KC_P6, KC_PENT, \ |
@@ -59,7 +59,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
59 | 59 | ||
60 | /* Layer 5: FN layer 3 | 60 | /* Layer 5: FN layer 3 |
61 | */ | 61 | */ |
62 | [5] = KEYMAP( | 62 | [5] = LAYOUT_60_ansi_split_bs_rshift( |
63 | KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, \ | 63 | KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, \ |
64 | KC_TAB , KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_F13, KC_F14, KC_F15, KC_F16, KC_NO, KC_TRNS, \ | 64 | KC_TAB , KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_F13, KC_F14, KC_F15, KC_F16, KC_NO, KC_TRNS, \ |
65 | KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_F17, KC_F18, KC_F19, KC_F20, LT(5, KC_ENT), \ | 65 | KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_F17, KC_F18, KC_F19, KC_F20, LT(5, KC_ENT), \ |
@@ -68,7 +68,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
68 | 68 | ||
69 | /* Layer 6: FN layer 4 | 69 | /* Layer 6: FN layer 4 |
70 | */ | 70 | */ |
71 | [6] = KEYMAP( | 71 | [6] = LAYOUT_60_ansi_split_bs_rshift( |
72 | KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, \ | 72 | KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, \ |
73 | LCTL(LSFT(KC_TAB)), KC_NO, LGUI(KC_UP), KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, \ | 73 | LCTL(LSFT(KC_TAB)), KC_NO, LGUI(KC_UP), KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, \ |
74 | MO(6), LGUI(KC_LEFT), LGUI(KC_DOWN), LGUI(KC_RGHT), KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, \ | 74 | MO(6), LGUI(KC_LEFT), LGUI(KC_DOWN), LGUI(KC_RGHT), KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, \ |
diff --git a/keyboards/infinity60/keymaps/hasu/keymap.c b/keyboards/infinity60/keymaps/hasu/keymap.c index 9982078c1..ec0d32183 100644 --- a/keyboards/infinity60/keymaps/hasu/keymap.c +++ b/keyboards/infinity60/keymaps/hasu/keymap.c | |||
@@ -1,4 +1,4 @@ | |||
1 | #include "infinity60.h" | 1 | #include QMK_KEYBOARD_H |
2 | 2 | ||
3 | const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | 3 | const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |
4 | /* Layer 0: Default Layer | 4 | /* Layer 0: Default Layer |
@@ -14,7 +14,7 @@ const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
14 | * | |Gui|Alt | Space |Alt |Gui| | | | 14 | * | |Gui|Alt | Space |Alt |Gui| | | |
15 | * `-----------------------------------------------------------' | 15 | * `-----------------------------------------------------------' |
16 | */ | 16 | */ |
17 | [0] = KEYMAP( | 17 | [0] = LAYOUT_60_ansi_split_bs_rshift( |
18 | KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS,KC_EQL, KC_BSLS,KC_GRV, \ | 18 | KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS,KC_EQL, KC_BSLS,KC_GRV, \ |
19 | KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC,KC_RBRC,KC_BSPC, \ | 19 | KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC,KC_RBRC,KC_BSPC, \ |
20 | KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, LT(3, KC_SCLN), KC_QUOT,MT(KC_RCTL, KC_ENT), \ | 20 | KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, LT(3, KC_SCLN), KC_QUOT,MT(KC_RCTL, KC_ENT), \ |
@@ -34,7 +34,7 @@ const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
34 | * | |Gui|Alt | Space |Alt |Gui| | | | 34 | * | |Gui|Alt | Space |Alt |Gui| | | |
35 | * `-----------------------------------------------------------' | 35 | * `-----------------------------------------------------------' |
36 | */ | 36 | */ |
37 | [1] = KEYMAP( | 37 | [1] = LAYOUT_60_ansi_split_bs_rshift( |
38 | KC_PWR, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_DEL, \ | 38 | KC_PWR, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_DEL, \ |
39 | KC_CAPS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_PSCR,KC_SLCK,KC_PAUS, KC_UP, KC_TRNS,KC_BSPC, \ | 39 | KC_CAPS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_PSCR,KC_SLCK,KC_PAUS, KC_UP, KC_TRNS,KC_BSPC, \ |
40 | KC_LCTL,KC_VOLD,KC_VOLU,KC_MUTE,KC_TRNS,KC_TRNS,KC_PAST,KC_PSLS,KC_HOME,KC_PGUP,KC_LEFT,KC_RGHT,KC_ENT, \ | 40 | KC_LCTL,KC_VOLD,KC_VOLU,KC_MUTE,KC_TRNS,KC_TRNS,KC_PAST,KC_PSLS,KC_HOME,KC_PGUP,KC_LEFT,KC_RGHT,KC_ENT, \ |
@@ -54,7 +54,7 @@ const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
54 | * |Gui|Alt | Space |Alt |Gui| | 54 | * |Gui|Alt | Space |Alt |Gui| |
55 | * `-------------------------------------------' | 55 | * `-------------------------------------------' |
56 | */ | 56 | */ |
57 | [2] = KEYMAP( | 57 | [2] = LAYOUT_60_ansi_split_bs_rshift( |
58 | KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_DEL, \ | 58 | KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_DEL, \ |
59 | KC_TAB, KC_HOME,KC_PGDN,KC_UP, KC_PGUP,KC_END, KC_HOME,KC_PGDN,KC_PGUP,KC_END, KC_NO, KC_NO, KC_NO, KC_BSPC, \ | 59 | KC_TAB, KC_HOME,KC_PGDN,KC_UP, KC_PGUP,KC_END, KC_HOME,KC_PGDN,KC_PGUP,KC_END, KC_NO, KC_NO, KC_NO, KC_BSPC, \ |
60 | KC_LCTL,KC_NO, KC_LEFT,KC_DOWN,KC_RGHT,KC_NO, KC_LEFT,KC_DOWN,KC_UP, KC_RGHT,KC_NO, KC_NO, KC_ENT, \ | 60 | KC_LCTL,KC_NO, KC_LEFT,KC_DOWN,KC_RGHT,KC_NO, KC_LEFT,KC_DOWN,KC_UP, KC_RGHT,KC_NO, KC_NO, KC_ENT, \ |
@@ -75,7 +75,7 @@ const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
75 | * `--------------------------------------------' | 75 | * `--------------------------------------------' |
76 | * Mc: Mouse Cursor / Mb: Mouse Button / Mw: Mouse Wheel | 76 | * Mc: Mouse Cursor / Mb: Mouse Button / Mw: Mouse Wheel |
77 | */ | 77 | */ |
78 | [3] = KEYMAP( | 78 | [3] = LAYOUT_60_ansi_split_bs_rshift( |
79 | KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_DEL, \ | 79 | KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_DEL, \ |
80 | LALT(KC_TAB), KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_WH_L,KC_WH_D,KC_MS_U, KC_WH_U, KC_WH_R, ALT_T(KC_LEFT), ALT_T(KC_RGHT),LALT(KC_TAB), \ | 80 | LALT(KC_TAB), KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_WH_L,KC_WH_D,KC_MS_U, KC_WH_U, KC_WH_R, ALT_T(KC_LEFT), ALT_T(KC_RGHT),LALT(KC_TAB), \ |
81 | KC_LCTL, KC_ACL0,KC_ACL1,KC_ACL2,KC_ACL2,KC_NO, KC_NO, KC_MS_L,KC_MS_D, KC_MS_R, LT(3, KC_SCLN), KC_NO, KC_ENT, \ | 81 | KC_LCTL, KC_ACL0,KC_ACL1,KC_ACL2,KC_ACL2,KC_NO, KC_NO, KC_MS_L,KC_MS_D, KC_MS_R, LT(3, KC_SCLN), KC_NO, KC_ENT, \ |
@@ -96,7 +96,7 @@ const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
96 | * `--------------------------------------------' | 96 | * `--------------------------------------------' |
97 | * Mc: Mouse Cursor / Mb: Mouse Button / Mw: Mouse Wheel | 97 | * Mc: Mouse Cursor / Mb: Mouse Button / Mw: Mouse Wheel |
98 | */ | 98 | */ |
99 | [4] = KEYMAP( | 99 | [4] = LAYOUT_60_ansi_split_bs_rshift( |
100 | KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_DEL, \ | 100 | KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_DEL, \ |
101 | LALT(KC_TAB), KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_WH_L,KC_WH_D,KC_MS_U, KC_WH_U, KC_WH_R,KC_BTN4,KC_BTN5,LALT(KC_TAB), \ | 101 | LALT(KC_TAB), KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_WH_L,KC_WH_D,KC_MS_U, KC_WH_U, KC_WH_R,KC_BTN4,KC_BTN5,LALT(KC_TAB), \ |
102 | KC_LCTL, KC_VOLD,KC_VOLU,KC_MUTE,KC_NO, KC_NO, KC_NO, KC_MS_L,KC_MS_D, KC_MS_R, KC_BTN1,KC_NO, KC_ENT, \ | 102 | KC_LCTL, KC_VOLD,KC_VOLU,KC_MUTE,KC_NO, KC_NO, KC_NO, KC_MS_L,KC_MS_D, KC_MS_R, KC_BTN1,KC_NO, KC_ENT, \ |
diff --git a/keyboards/infinity60/keymaps/jpetermans/config.h b/keyboards/infinity60/keymaps/jpetermans/config.h index 72a2ed081..1949a9ad9 100644 --- a/keyboards/infinity60/keymaps/jpetermans/config.h +++ b/keyboards/infinity60/keymaps/jpetermans/config.h | |||
@@ -1,11 +1,6 @@ | |||
1 | #ifndef CONFIG_USER_H | 1 | #pragma once |
2 | #define CONFIG_USER_H | ||
3 | |||
4 | |||
5 | #include "../../config.h" | ||
6 | 2 | ||
7 | //overrides | 3 | //overrides |
8 | #undef TAPPING_TOGGLE | 4 | #undef TAPPING_TOGGLE |
9 | #define TAPPING_TOGGLE 2 | 5 | #define TAPPING_TOGGLE 2 |
10 | 6 | ||
11 | #endif | ||
diff --git a/keyboards/infinity60/keymaps/jpetermans/keymap.c b/keyboards/infinity60/keymaps/jpetermans/keymap.c index 59249ff72..c99b05e4c 100644 --- a/keyboards/infinity60/keymaps/jpetermans/keymap.c +++ b/keyboards/infinity60/keymaps/jpetermans/keymap.c | |||
@@ -1,9 +1,6 @@ | |||
1 | #include "infinity60.h" | 1 | #include QMK_KEYBOARD_H |
2 | #include "led_controller.h" | 2 | #include "led_controller.h" |
3 | 3 | ||
4 | //Helpful Defines | ||
5 | #define _______ KC_TRNS | ||
6 | |||
7 | //Define Layer Names | 4 | //Define Layer Names |
8 | #define _BASE 0 | 5 | #define _BASE 0 |
9 | #define _NUMPAD 1 | 6 | #define _NUMPAD 1 |
@@ -54,7 +51,7 @@ const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
54 | * `-----------------------------------------------------------' | 51 | * `-----------------------------------------------------------' |
55 | */ | 52 | */ |
56 | /* default */ | 53 | /* default */ |
57 | [_BASE] = KEYMAP( \ | 54 | [_BASE] = LAYOUT_60_ansi_split_bs_rshift( \ |
58 | KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS,KC_EQL, KC_BSLS,KC_NO,\ | 55 | KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS,KC_EQL, KC_BSLS,KC_NO,\ |
59 | KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC,KC_RBRC,KC_BSPC, \ | 56 | KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC,KC_RBRC,KC_BSPC, \ |
60 | TT(_FNAV), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN,KC_QUOT,KC_ENT, \ | 57 | TT(_FNAV), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN,KC_QUOT,KC_ENT, \ |
@@ -63,7 +60,7 @@ const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
63 | ), | 60 | ), |
64 | 61 | ||
65 | /* numpad */ | 62 | /* numpad */ |
66 | [_NUMPAD] = KEYMAP( \ | 63 | [_NUMPAD] = LAYOUT_60_ansi_split_bs_rshift( \ |
67 | _______,_______,_______,_______,_______,_______,_______, KC_P7, KC_P8, KC_P9, KC_PSLS, _______,_______,_______,KC_NO,\ | 64 | _______,_______,_______,_______,_______,_______,_______, KC_P7, KC_P8, KC_P9, KC_PSLS, _______,_______,_______,KC_NO,\ |
68 | _______,_______,_______,_______,_______,_______,_______, KC_P4, KC_P5, KC_P6, KC_PAST, _______,_______,_______, \ | 65 | _______,_______,_______,_______,_______,_______,_______, KC_P4, KC_P5, KC_P6, KC_PAST, _______,_______,_______, \ |
69 | MO(_FNAV),_______,_______,_______,_______,_______,_______, KC_P1, KC_P2, KC_P3, KC_PMNS, _______,_______, \ | 66 | MO(_FNAV),_______,_______,_______,_______,_______,_______, KC_P1, KC_P2, KC_P3, KC_PMNS, _______,_______, \ |
@@ -72,7 +69,7 @@ const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
72 | ), | 69 | ), |
73 | 70 | ||
74 | /* F-, arrow, and media keys */ | 71 | /* F-, arrow, and media keys */ |
75 | [_FNAV] = KEYMAP( \ | 72 | [_FNAV] = LAYOUT_60_ansi_split_bs_rshift( \ |
76 | KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______,KC_NO,\ | 73 | KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______,KC_NO,\ |
77 | KC_CAPS,_______,_______,_______,_______,_______,_______,KC_PGUP,KC_UP,KC_PGDN,KC_PSCR,_______,_______,KC_DEL, \ | 74 | KC_CAPS,_______,_______,_______,_______,_______,_______,KC_PGUP,KC_UP,KC_PGDN,KC_PSCR,_______,_______,KC_DEL, \ |
78 | _______,_______,KC_BTN2,_______,_______,_______,KC_HOME,KC_LEFT,KC_DOWN,KC_RGHT,KC_INS,_______,_______, \ | 75 | _______,_______,KC_BTN2,_______,_______,_______,KC_HOME,KC_LEFT,KC_DOWN,KC_RGHT,KC_INS,_______,_______, \ |
@@ -81,7 +78,7 @@ const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
81 | ), | 78 | ), |
82 | 79 | ||
83 | /* media */ | 80 | /* media */ |
84 | [_MEDIA] = KEYMAP( \ | 81 | [_MEDIA] = LAYOUT_60_ansi_split_bs_rshift( \ |
85 | _______,F(MODE_SINGLE),F(MODE_PAGE),F(MODE_FLASH),_______,_______,_______, _______, _______, _______,KC_MUTE, KC_VOLD, KC_VOLU,_______,KC_NO,\ | 82 | _______,F(MODE_SINGLE),F(MODE_PAGE),F(MODE_FLASH),_______,_______,_______, _______, _______, _______,KC_MUTE, KC_VOLD, KC_VOLU,_______,KC_NO,\ |
86 | _______,_______,_______,_______,_______,_______,_______, _______, _______, _______,_______, _______,_______,_______,\ | 83 | _______,_______,_______,_______,_______,_______,_______, _______, _______, _______,_______, _______,_______,_______,\ |
87 | _______,_______,_______,_______,_______,F(GAME),_______, _______, _______, _______,_______, _______,_______, \ | 84 | _______,_______,_______,_______,_______,F(GAME),_______, _______, _______, _______,_______, _______,_______, \ |
@@ -89,7 +86,7 @@ const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
89 | _______,_______,_______, KC_MPLY, _______,_______, _______,_______ \ | 86 | _______,_______,_______, KC_MPLY, _______,_______, _______,_______ \ |
90 | ), | 87 | ), |
91 | /* ~ */ | 88 | /* ~ */ |
92 | [_TILDE] = KEYMAP( \ | 89 | [_TILDE] = LAYOUT_60_ansi_split_bs_rshift( \ |
93 | KC_GRV,_______,_______,_______,_______,_______,_______, _______, _______, _______,_______, _______,_______,_______,KC_NO,\ | 90 | KC_GRV,_______,_______,_______,_______,_______,_______, _______, _______, _______,_______, _______,_______,_______,KC_NO,\ |
94 | _______,_______,_______,_______,_______,_______,_______, _______, _______, _______,_______, _______,_______,_______,\ | 91 | _______,_______,_______,_______,_______,_______,_______, _______, _______, _______,_______, _______,_______,_______,\ |
95 | _______,_______,_______,_______,_______,_______,_______, _______, _______, _______,_______, _______,_______, \ | 92 | _______,_______,_______,_______,_______,_______,_______, _______, _______, _______,_______, _______,_______, \ |
@@ -97,7 +94,7 @@ const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
97 | _______,_______,_______, _______, _______,_______, _______,_______ \ | 94 | _______,_______,_______, _______, _______,_______, _______,_______ \ |
98 | ), | 95 | ), |
99 | /* template */ | 96 | /* template */ |
100 | [5] = KEYMAP( \ | 97 | [5] = LAYOUT_60_ansi_split_bs_rshift( \ |
101 | _______,_______,_______,_______,_______,_______,_______, _______, _______, _______,_______, _______,_______,_______,KC_NO,\ | 98 | _______,_______,_______,_______,_______,_______,_______, _______, _______, _______,_______, _______,_______,_______,KC_NO,\ |
102 | _______,_______,_______,_______,_______,_______,_______, _______, _______, _______,_______, _______,_______,_______,\ | 99 | _______,_______,_______,_______,_______,_______,_______, _______, _______, _______,_______, _______,_______,_______,\ |
103 | _______,_______,_______,_______,_______,_______,_______, _______, _______, _______,_______, _______,_______, \ | 100 | _______,_______,_______,_______,_______,_______,_______, _______, _______, _______,_______, _______,_______, \ |
diff --git a/keyboards/infinity60/keymaps/jpetermans/rules.mk b/keyboards/infinity60/keymaps/jpetermans/rules.mk deleted file mode 100644 index df3d1e952..000000000 --- a/keyboards/infinity60/keymaps/jpetermans/rules.mk +++ /dev/null | |||
@@ -1,4 +0,0 @@ | |||
1 | |||
2 | ifndef QUANTUM_DIR | ||
3 | include ../../../../Makefile | ||
4 | endif | ||
diff --git a/keyboards/infinity60/matrix.c b/keyboards/infinity60/matrix.c index bf86591cc..ba16e6900 100644 --- a/keyboards/infinity60/matrix.c +++ b/keyboards/infinity60/matrix.c | |||
@@ -177,3 +177,22 @@ void matrix_print(void) | |||
177 | xprintf("\n"); | 177 | xprintf("\n"); |
178 | } | 178 | } |
179 | } | 179 | } |
180 | |||
181 | __attribute__ ((weak)) | ||
182 | void matrix_init_kb(void) { | ||
183 | matrix_init_user(); | ||
184 | } | ||
185 | |||
186 | __attribute__ ((weak)) | ||
187 | void matrix_scan_kb(void) { | ||
188 | matrix_scan_user(); | ||
189 | } | ||
190 | |||
191 | __attribute__ ((weak)) | ||
192 | void matrix_init_user(void) { | ||
193 | } | ||
194 | |||
195 | __attribute__ ((weak)) | ||
196 | void matrix_scan_user(void) { | ||
197 | } | ||
198 | |||
diff --git a/keyboards/infinity60/readme.md b/keyboards/infinity60/readme.md index e77abca64..01f3a8a2f 100644 --- a/keyboards/infinity60/readme.md +++ b/keyboards/infinity60/readme.md | |||
@@ -11,4 +11,5 @@ Make example for this keyboard (after setting up your build environment): | |||
11 | 11 | ||
12 | make infinity60:default | 12 | make infinity60:default |
13 | 13 | ||
14 | See [build environment setup](https://docs.qmk.fm/build_environment_setup.html) then the [make instructions](https://docs.qmk.fm/make_instructions.html) for more information. | 14 | 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). |
15 | |||