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

This commit is contained in:
QMK Bot 2021-07-11 15:47:49 +00:00
commit ca0c57125f
13 changed files with 297 additions and 292 deletions

View File

@ -21,21 +21,21 @@
/* Standard Arrangement
*
* 00 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 2d 0e 0f
*
* 10 11 12 13 14 15 16 17 18 19 1a 1b 1c 1d 1e 1f
* |
* 20 21 22 23 24 25 26 27 28 29 2a 2b 2c
*
* 30 |31 32 33 34 35 36 37 38 39 3a 3b 3c |3d 3e
* 00 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 2d 0e 0f ISO
*
* 10 11 12 13 14 15 16 17 18 19 1a 1b 1c 1d 1e 1f 1d
*
* 20 21 22 23 24 25 26 27 28 29 2a 2b 2c 2c
*
* 30 31 32 33 34 35 36 37 38 39 3a 3b 3c 3d 3e
*
* 40 41 42 44 |46 |48 4a 4b 4c 4d 4e 4f |
* 40 41 42 44 46 48 4a 4b 4c 4d 4e 4f
*
*/
#define LAYOUT_all( \
K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K2D, K0E, K0F, \
K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \
K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, \
K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, \
K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
K40, K41, K42, K44, K46, K48, K4A, K4B, K4C, K4D, K4E, K4F \
) { \
@ -57,7 +57,7 @@
*
* 30 32 33 34 35 36 37 38 39 3a 3b 3c 3e
*
* 40 41 42 46 4a 4b 4c 4d 4e 4f |
* 40 41 42 46 4a 4b 4c 4d 4e 4f
*
*/
#define LAYOUT_68_ansi( \
@ -75,7 +75,7 @@
}
/* LAYOUT_68_split_lshift
/* LAYOUT_68_ansi_split_lshift
*
* 00 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 0e 0f
*
@ -83,12 +83,12 @@
*
* 20 21 22 23 24 25 26 27 28 29 2a 2b 2c
*
* 30 |31 32 33 34 35 36 37 38 39 3a 3b 3c 3e
* 30 31 32 33 34 35 36 37 38 39 3a 3b 3c 3e
*
* 40 41 42 46 4a 4b 4c 4d 4e 4f |
* 40 41 42 46 4a 4b 4c 4d 4e 4f
*
*/
#define LAYOUT_68_split_lshift( \
#define LAYOUT_68_ansi_split_lshift( \
K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \
K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, \
@ -103,7 +103,7 @@
}
/* LAYOUT_68_split_rshift
/* LAYOUT_68_ansi_split_rshift
*
* 00 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 0e 0f
*
@ -113,10 +113,10 @@
*
* 30 32 33 34 35 36 37 38 39 3a 3b 3c 3d 3e
*
* 40 41 42 46 4a 4b 4c 4d 4e 4f |
* 40 41 42 46 4a 4b 4c 4d 4e 4f
*
*/
#define LAYOUT_68_split_rshift( \
#define LAYOUT_68_ansi_split_rshift( \
K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \
K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, \
@ -131,7 +131,7 @@
}
/* LAYOUT_68_split_bs
/* LAYOUT_68_ansi_split_bs
*
* 00 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 2d 0e 0f
*
@ -141,13 +141,13 @@
*
* 30 32 33 34 35 36 37 38 39 3a 3b 3c 3e
*
* 40 41 42 46 4a 4b 4c 4d 4e 4f |
* 40 41 42 46 4a 4b 4c 4d 4e 4f
*
*/
#define LAYOUT_68_split_bs( \
K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
#define LAYOUT_68_ansi_split_bs( \
K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K2D, K0E, K0F, \
K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \
K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, \
K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, \
K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3E, \
K40, K41, K42, K46, K4A, K4B, K4C, K4D, K4E, K4F \
) { \
@ -164,18 +164,18 @@
* 00 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 0e 0f
*
* 10 11 12 13 14 15 16 17 18 19 1a 1b 1c 1d 1e 1f
* |
*
* 20 21 22 23 24 25 26 27 28 29 2a 2b 2c
*
* 30 32 33 34 35 36 37 38 39 3a 3b 3c 3e
*
* 40 41 42 46 4a 4b 4c 4d 4e 4f |
* 40 41 42 46 4a 4b 4c 4d 4e 4f
*
*/
#define LAYOUT_68_iso( \
K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \
K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, \
K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1E, K1F, \
K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K1D, \
K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3E, \
K40, K41, K42, K46, K4A, K4B, K4C, K4D, K4E, K4F \
) { \
@ -187,7 +187,7 @@
}
/* LAYOUT_68_split_space
/* LAYOUT_68_ansi_split_space
*
* 00 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 0e 0f
*
@ -197,10 +197,10 @@
*
* 30 32 33 34 35 36 37 38 39 3a 3b 3c 3e
*
* 40 41 42 44 |46 |48 4a 4b 4c 4d 4e 4f |
* 40 41 42 44 46 48 4a 4b 4c 4d 4e 4f
*
*/
#define LAYOUT_68_split_space( \
#define LAYOUT_68_ansi_split_space( \
K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \
K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, \

View File

@ -2,8 +2,8 @@
"keyboard_name": "ikki68_aurora",
"url": "https://ikki68.com/",
"maintainer": "qmk",
"width": 17.5,
"height": 6,
"width": 17.25,
"height": 5,
"layouts": {
"LAYOUT_68_ansi": {
"layout": [
@ -21,8 +21,8 @@
{ "label": "-", "x": 11, "y": 0 },
{ "label": "=", "x": 12, "y": 0 },
{ "label": "Backspace", "x": 13, "y": 0, "w": 2 },
{ "label": "Insert", "x": 15.5, "y": 0 },
{ "label": "PageUp", "x": 16.5, "y": 0 },
{ "label": "Insert", "x": 15.25, "y": 0 },
{ "label": "PageUp", "x": 16.25, "y": 0 },
{ "label": "Tab", "x": 0, "y": 1, "w": 1.5 },
{ "label": "Q", "x": 1.5, "y": 1 },
@ -38,8 +38,8 @@
{ "label": "[", "x": 11.5, "y": 1 },
{ "label": "]", "x": 12.5, "y": 1 },
{ "label": "\\", "x": 13.5, "y": 1, "w": 1.5 },
{ "label": "Delete", "x": 15.5, "y": 1 },
{ "label": "PageDown", "x": 16.5, "y": 1 },
{ "label": "Delete", "x": 15.25, "y": 1 },
{ "label": "PageDown", "x": 16.25, "y": 1 },
{ "label": "Caps Lock", "x": 0, "y": 2, "w": 1.75 },
{ "label": "A", "x": 1.75, "y": 2 },
@ -67,7 +67,7 @@
{ "label": ".", "x": 10.25, "y": 3 },
{ "label": "/", "x": 11.25, "y": 3 },
{ "label": "Shift", "x": 12.25, "y": 3, "w": 2.75 },
{ "label": "\u2191", "x": 15.5, "y": 3 },
{ "label": "\u2191", "x": 15.25, "y": 3 },
{ "label": "Ctrl", "x": 0, "y": 4, "w": 1.25 },
{ "label": "Win", "x": 1.25, "y": 4, "w": 1.25 },
@ -76,9 +76,9 @@
{ "label": "Alt", "x": 10, "y": 4, "w": 1.25 },
{ "label": "Ctrl", "x": 11.25, "y": 4, "w": 1.25 },
{ "label": "Menu", "x": 12.5, "y": 4, "w": 1.25 },
{ "label": "\u2190", "x": 14.5, "y": 4 },
{ "label": "\u2193", "x": 15.5, "y": 4 },
{ "label": "\u2192", "x": 16.5, "y": 4 }
{ "label": "\u2190", "x": 14.25, "y": 4 },
{ "label": "\u2193", "x": 15.25, "y": 4 },
{ "label": "\u2192", "x": 16.25, "y": 4 }
]
},
"LAYOUT_all": {
@ -98,88 +98,8 @@
{ "label": "=", "x": 12, "y": 0 },
{ "label": "Backspace", "x": 13, "y": 0 },
{ "label": "Backspace", "x": 14, "y": 0 },
{ "label": "Insert", "x": 15.5, "y": 0 },
{ "label": "PageUp", "x": 16.5, "y": 0 },
{ "label": "Tab", "x": 0, "y": 1, "w": 1.5 },
{ "label": "Q", "x": 1.5, "y": 1 },
{ "label": "W", "x": 2.5, "y": 1 },
{ "label": "E", "x": 3.5, "y": 1 },
{ "label": "R", "x": 4.5, "y": 1 },
{ "label": "T", "x": 5.5, "y": 1 },
{ "label": "Y", "x": 6.5, "y": 1 },
{ "label": "U", "x": 7.5, "y": 1 },
{ "label": "I", "x": 8.5, "y": 1 },
{ "label": "O", "x": 9.5, "y": 1 },
{ "label": "P", "x": 10.5, "y": 1 },
{ "label": "[", "x": 11.5, "y": 1 },
{ "label": "]", "x": 12.5, "y": 1 },
{ "label": "ISO", "x": 13.75, "y": 1, "w": 1.25, "h": 2 },
{ "label": "Delete", "x": 15.5, "y": 1 },
{ "label": "PageDown", "x": 16.5, "y": 1 },
{ "label": "Caps Lock", "x": 0, "y": 2, "w": 1.75 },
{ "label": "A", "x": 1.75, "y": 2 },
{ "label": "S", "x": 2.75, "y": 2 },
{ "label": "D", "x": 3.75, "y": 2 },
{ "label": "F", "x": 4.75, "y": 2 },
{ "label": "G", "x": 5.75, "y": 2 },
{ "label": "H", "x": 6.75, "y": 2 },
{ "label": "J", "x": 7.75, "y": 2 },
{ "label": "K", "x": 8.75, "y": 2 },
{ "label": "L", "x": 9.75, "y": 2 },
{ "label": ";", "x": 10.75, "y": 2 },
{ "label": "'", "x": 11.75, "y": 2 },
{ "label": "\\", "x": 12.75,"y": 2 },
{ "label": "Shift1", "x": 0, "y": 3, "w": 1.25 },
{ "label": "Shift2", "x": 1.25, "y": 3 },
{ "label": "Z", "x": 2.25, "y": 3 },
{ "label": "X", "x": 3.25, "y": 3 },
{ "label": "C", "x": 4.25, "y": 3 },
{ "label": "V", "x": 5.25, "y": 3 },
{ "label": "B", "x": 6.25, "y": 3 },
{ "label": "N", "x": 7.25, "y": 3 },
{ "label": "M", "x": 8.25, "y": 3 },
{ "label": ",", "x": 9.25, "y": 3 },
{ "label": ".", "x": 10.25, "y": 3 },
{ "label": "/", "x": 11.25, "y": 3 },
{ "label": "Shift1", "x": 12.25, "y": 3, "w": 1.75 },
{ "label": "Shift2", "x": 14, "y": 3},
{ "label": "\u2191", "x": 15.5, "y": 3 },
{ "label": "Ctrl", "x": 0, "y": 4, "w": 1.25 },
{ "label": "Win", "x": 1.25, "y": 4, "w": 1.25 },
{ "label": "Alt", "x": 2.5, "y": 4, "w": 1.25 },
{ "x": 3.75, "y": 4, "w": 2.25 },
{ "x": 6, "y": 4, "w": 1.25 },
{ "x": 7.25, "y": 4, "w": 2.75 },
{ "label": "Alt", "x": 10, "y": 4, "w": 1.25 },
{ "label": "Ctrl", "x": 11.25, "y": 4, "w": 1.25 },
{ "label": "Menu", "x": 12.5, "y": 4, "w": 1.25 },
{ "label": "\u2190", "x": 14.5, "y": 4 },
{ "label": "\u2193", "x": 15.5, "y": 4 },
{ "label": "\u2192", "x": 16.5, "y": 4 }
]
},
"LAYOUT_68_split_lshift": {
"layout": [
{ "label": "Esc", "x": 0, "y": 0 },
{ "label": "1", "x": 1, "y": 0 },
{ "label": "2", "x": 2, "y": 0 },
{ "label": "3", "x": 3, "y": 0 },
{ "label": "4", "x": 4, "y": 0 },
{ "label": "5", "x": 5, "y": 0 },
{ "label": "6", "x": 6, "y": 0 },
{ "label": "7", "x": 7, "y": 0 },
{ "label": "8", "x": 8, "y": 0 },
{ "label": "9", "x": 9, "y": 0 },
{ "label": "0", "x": 10, "y": 0 },
{ "label": "-", "x": 11, "y": 0 },
{ "label": "=", "x": 12, "y": 0 },
{ "label": "Backspace", "x": 13, "y": 0, "w": 2 },
{ "label": "Insert", "x": 15.5, "y": 0 },
{ "label": "PageUp", "x": 16.5, "y": 0 },
{ "label": "Insert", "x": 15.25, "y": 0 },
{ "label": "PageUp", "x": 16.25, "y": 0 },
{ "label": "Tab", "x": 0, "y": 1, "w": 1.5 },
{ "label": "Q", "x": 1.5, "y": 1 },
@ -195,8 +115,88 @@
{ "label": "[", "x": 11.5, "y": 1 },
{ "label": "]", "x": 12.5, "y": 1 },
{ "label": "\\", "x": 13.5,"y": 1, "w": 1.5 },
{ "label": "Delete", "x": 15.5, "y": 1 },
{ "label": "PageDown", "x": 16.5, "y": 1 },
{ "label": "Delete", "x": 15.25, "y": 1 },
{ "label": "PageDown", "x": 16.25, "y": 1 },
{ "label": "Caps Lock", "x": 0, "y": 2, "w": 1.75 },
{ "label": "A", "x": 1.75, "y": 2 },
{ "label": "S", "x": 2.75, "y": 2 },
{ "label": "D", "x": 3.75, "y": 2 },
{ "label": "F", "x": 4.75, "y": 2 },
{ "label": "G", "x": 5.75, "y": 2 },
{ "label": "H", "x": 6.75, "y": 2 },
{ "label": "J", "x": 7.75, "y": 2 },
{ "label": "K", "x": 8.75, "y": 2 },
{ "label": "L", "x": 9.75, "y": 2 },
{ "label": ";", "x": 10.75, "y": 2 },
{ "label": "'", "x": 11.75, "y": 2 },
{ "label": "Enter", "x": 12.75, "y": 2, "w": 2.25 },
{ "label": "Shift1", "x": 0, "y": 3, "w": 1.25 },
{ "label": "Shift2", "x": 1.25, "y": 3 },
{ "label": "Z", "x": 2.25, "y": 3 },
{ "label": "X", "x": 3.25, "y": 3 },
{ "label": "C", "x": 4.25, "y": 3 },
{ "label": "V", "x": 5.25, "y": 3 },
{ "label": "B", "x": 6.25, "y": 3 },
{ "label": "N", "x": 7.25, "y": 3 },
{ "label": "M", "x": 8.25, "y": 3 },
{ "label": ",", "x": 9.25, "y": 3 },
{ "label": ".", "x": 10.25, "y": 3 },
{ "label": "/", "x": 11.25, "y": 3 },
{ "label": "Shift1", "x": 12.25, "y": 3, "w": 1.75 },
{ "label": "Shift2", "x": 14, "y": 3},
{ "label": "\u2191", "x": 15.25, "y": 3 },
{ "label": "Ctrl", "x": 0, "y": 4, "w": 1.25 },
{ "label": "Win", "x": 1.25, "y": 4, "w": 1.25 },
{ "label": "Alt", "x": 2.5, "y": 4, "w": 1.25 },
{ "x": 3.75, "y": 4, "w": 2.25 },
{ "x": 6, "y": 4, "w": 1.25 },
{ "x": 7.25, "y": 4, "w": 2.75 },
{ "label": "Alt", "x": 10, "y": 4, "w": 1.25 },
{ "label": "Ctrl", "x": 11.25, "y": 4, "w": 1.25 },
{ "label": "Menu", "x": 12.5, "y": 4, "w": 1.25 },
{ "label": "\u2190", "x": 14.25, "y": 4 },
{ "label": "\u2193", "x": 15.25, "y": 4 },
{ "label": "\u2192", "x": 16.25, "y": 4 }
]
},
"LAYOUT_68_ansi_split_lshift": {
"layout": [
{ "label": "Esc", "x": 0, "y": 0 },
{ "label": "1", "x": 1, "y": 0 },
{ "label": "2", "x": 2, "y": 0 },
{ "label": "3", "x": 3, "y": 0 },
{ "label": "4", "x": 4, "y": 0 },
{ "label": "5", "x": 5, "y": 0 },
{ "label": "6", "x": 6, "y": 0 },
{ "label": "7", "x": 7, "y": 0 },
{ "label": "8", "x": 8, "y": 0 },
{ "label": "9", "x": 9, "y": 0 },
{ "label": "0", "x": 10, "y": 0 },
{ "label": "-", "x": 11, "y": 0 },
{ "label": "=", "x": 12, "y": 0 },
{ "label": "Backspace", "x": 13, "y": 0, "w": 2 },
{ "label": "Insert", "x": 15.25, "y": 0 },
{ "label": "PageUp", "x": 16.25, "y": 0 },
{ "label": "Tab", "x": 0, "y": 1, "w": 1.5 },
{ "label": "Q", "x": 1.5, "y": 1 },
{ "label": "W", "x": 2.5, "y": 1 },
{ "label": "E", "x": 3.5, "y": 1 },
{ "label": "R", "x": 4.5, "y": 1 },
{ "label": "T", "x": 5.5, "y": 1 },
{ "label": "Y", "x": 6.5, "y": 1 },
{ "label": "U", "x": 7.5, "y": 1 },
{ "label": "I", "x": 8.5, "y": 1 },
{ "label": "O", "x": 9.5, "y": 1 },
{ "label": "P", "x": 10.5, "y": 1 },
{ "label": "[", "x": 11.5, "y": 1 },
{ "label": "]", "x": 12.5, "y": 1 },
{ "label": "\\", "x": 13.5, "y": 1, "w": 1.5 },
{ "label": "Delete", "x": 15.25, "y": 1 },
{ "label": "PageDown", "x": 16.25, "y": 1 },
{ "label": "Caps Lock", "x": 0, "y": 2, "w": 1.75 },
{ "label": "A", "x": 1.75, "y": 2 },
@ -225,7 +225,7 @@
{ "label": ".", "x": 10.25, "y": 3 },
{ "label": "/", "x": 11.25, "y": 3 },
{ "label": "Shift", "x": 12.25, "y": 3, "w": 2.75 },
{ "label": "\u2191", "x": 15.5, "y": 3 },
{ "label": "\u2191", "x": 15.25, "y": 3 },
{ "label": "Ctrl", "x": 0, "y": 4, "w": 1.25 },
{ "label": "Win", "x": 1.25, "y": 4, "w": 1.25 },
@ -234,12 +234,12 @@
{ "label": "Alt", "x": 10, "y": 4, "w": 1.25 },
{ "label": "Ctrl", "x": 11.25, "y": 4, "w": 1.25 },
{ "label": "Menu", "x": 12.5, "y": 4, "w": 1.25 },
{ "label": "\u2190", "x": 14.5, "y": 4 },
{ "label": "\u2193", "x": 15.5, "y": 4 },
{ "label": "\u2192", "x": 16.5, "y": 4 }
{ "label": "\u2190", "x": 14.25, "y": 4 },
{ "label": "\u2193", "x": 15.25, "y": 4 },
{ "label": "\u2192", "x": 16.25, "y": 4 }
]
},
"LAYOUT_68_split_rshift": {
"LAYOUT_68_ansi_split_rshift": {
"layout": [
{ "label": "Esc", "x": 0, "y": 0 },
{ "label": "1", "x": 1, "y": 0 },
@ -255,8 +255,8 @@
{ "label": "-", "x": 11, "y": 0 },
{ "label": "=", "x": 12, "y": 0 },
{ "label": "Backspace", "x": 13, "y": 0, "w": 2 },
{ "label": "Insert", "x": 15.5, "y": 0 },
{ "label": "PageUp", "x": 16.5, "y": 0 },
{ "label": "Insert", "x": 15.25, "y": 0 },
{ "label": "PageUp", "x": 16.25, "y": 0 },
{ "label": "Tab", "x": 0, "y": 1, "w": 1.5 },
{ "label": "Q", "x": 1.5, "y": 1 },
@ -272,8 +272,8 @@
{ "label": "[", "x": 11.5, "y": 1 },
{ "label": "]", "x": 12.5, "y": 1 },
{ "label": "\\", "x": 13.5, "y": 1, "w": 1.5 },
{ "label": "Delete", "x": 15.5, "y": 1 },
{ "label": "PageDown", "x": 16.5, "y": 1 },
{ "label": "Delete", "x": 15.25, "y": 1 },
{ "label": "PageDown", "x": 16.25, "y": 1 },
{ "label": "Caps Lock", "x": 0, "y": 2, "w": 1.75 },
{ "label": "A", "x": 1.75, "y": 2 },
@ -302,7 +302,7 @@
{ "label": "/", "x": 11.25, "y": 3 },
{ "label": "Shift1", "x": 12.25, "y": 3, "w": 1.75 },
{ "label": "Shift2", "x": 14, "y": 3},
{ "label": "\u2191", "x": 15.5, "y": 3 },
{ "label": "\u2191", "x": 15.25, "y": 3 },
{ "label": "Ctrl", "x": 0, "y": 4, "w": 1.25 },
{ "label": "Win", "x": 1.25, "y": 4, "w": 1.25 },
@ -311,12 +311,12 @@
{ "label": "Alt", "x": 10, "y": 4, "w": 1.25 },
{ "label": "Ctrl", "x": 11.25, "y": 4, "w": 1.25 },
{ "label": "Menu", "x": 12.5, "y": 4, "w": 1.25 },
{ "label": "\u2190", "x": 14.5, "y": 4 },
{ "label": "\u2193", "x": 15.5, "y": 4 },
{ "label": "\u2192", "x": 16.5, "y": 4 }
{ "label": "\u2190", "x": 14.25, "y": 4 },
{ "label": "\u2193", "x": 15.25, "y": 4 },
{ "label": "\u2192", "x": 16.25, "y": 4 }
]
},
"LAYOUT_68_split_bs": {
"LAYOUT_68_ansi_split_bs": {
"layout": [
{ "label": "Esc", "x": 0, "y": 0 },
{ "label": "1", "x": 1, "y": 0 },
@ -333,8 +333,8 @@
{ "label": "=", "x": 12, "y": 0 },
{ "label": "Backspace1", "x": 13, "y": 0},
{ "label": "Backspace2", "x": 14, "y": 0},
{ "label": "Insert", "x": 15.5, "y": 0 },
{ "label": "PageUp", "x": 16.5, "y": 0 },
{ "label": "Insert", "x": 15.25, "y": 0 },
{ "label": "PageUp", "x": 16.25, "y": 0 },
{ "label": "Tab", "x": 0, "y": 1, "w": 1.5 },
{ "label": "Q", "x": 1.5, "y": 1 },
@ -350,8 +350,8 @@
{ "label": "[", "x": 11.5, "y": 1 },
{ "label": "]", "x": 12.5, "y": 1 },
{ "label": "\\", "x": 13.5, "y": 1, "w": 1.5 },
{ "label": "Delete", "x": 15.5, "y": 1 },
{ "label": "PageDown", "x": 16.5, "y": 1 },
{ "label": "Delete", "x": 15.25, "y": 1 },
{ "label": "PageDown", "x": 16.25, "y": 1 },
{ "label": "Caps Lock", "x": 0, "y": 2, "w": 1.75 },
{ "label": "A", "x": 1.75, "y": 2 },
@ -379,7 +379,7 @@
{ "label": ".", "x": 10.25, "y": 3 },
{ "label": "/", "x": 11.25, "y": 3 },
{ "label": "Shift", "x": 12.25, "y": 3, "w": 2.75 },
{ "label": "\u2191", "x": 15.5, "y": 3 },
{ "label": "\u2191", "x": 15.25, "y": 3 },
{ "label": "Ctrl", "x": 0, "y": 4, "w": 1.25 },
{ "label": "Win", "x": 1.25, "y": 4, "w": 1.25 },
@ -388,9 +388,9 @@
{ "label": "Alt", "x": 10, "y": 4, "w": 1.25 },
{ "label": "Ctrl", "x": 11.25, "y": 4, "w": 1.25 },
{ "label": "Menu", "x": 12.5, "y": 4, "w": 1.25 },
{ "label": "\u2190", "x": 14.5, "y": 4 },
{ "label": "\u2193", "x": 15.5, "y": 4 },
{ "label": "\u2192", "x": 16.5, "y": 4 }
{ "label": "\u2190", "x": 14.25, "y": 4 },
{ "label": "\u2193", "x": 15.25, "y": 4 },
{ "label": "\u2192", "x": 16.25, "y": 4 }
]
},
"LAYOUT_68_iso": {
@ -409,8 +409,8 @@
{ "label": "-", "x": 11, "y": 0 },
{ "label": "=", "x": 12, "y": 0 },
{ "label": "Backspace", "x": 13, "y": 0, "w": 2 },
{ "label": "Insert", "x": 15.5, "y": 0 },
{ "label": "PageUp", "x": 16.5, "y": 0 },
{ "label": "Insert", "x": 15.25, "y": 0 },
{ "label": "PageUp", "x": 16.25, "y": 0 },
{ "label": "Tab", "x": 0, "y": 1, "w": 1.5 },
{ "label": "Q", "x": 1.5, "y": 1 },
@ -425,9 +425,8 @@
{ "label": "P", "x": 10.5, "y": 1 },
{ "label": "[", "x": 11.5, "y": 1 },
{ "label": "]", "x": 12.5, "y": 1 },
{ "label": "ISO", "x": 13.75, "y": 1, "w": 1.25, "h": 2 },
{ "label": "Delete", "x": 15.5, "y": 1 },
{ "label": "PageDown", "x": 16.5, "y": 1 },
{ "label": "Delete", "x": 15.25, "y": 1 },
{ "label": "PageDown", "x": 16.25, "y": 1 },
{ "label": "Caps Lock", "x": 0, "y": 2, "w": 1.75 },
{ "label": "A", "x": 1.75, "y": 2 },
@ -442,6 +441,7 @@
{ "label": ";", "x": 10.75, "y": 2 },
{ "label": "'", "x": 11.75, "y": 2 },
{ "label": "\\", "x": 12.75,"y": 2 },
{ "label": "ISO", "x": 13.75, "y": 1, "w": 1.25, "h": 2 },
{ "label": "Shift", "x": 0, "y": 3, "w": 2.25 },
{ "label": "Z", "x": 2.25, "y": 3 },
@ -455,7 +455,7 @@
{ "label": ".", "x": 10.25, "y": 3 },
{ "label": "/", "x": 11.25, "y": 3 },
{ "label": "Shift", "x": 12.25, "y": 3, "w": 2.75 },
{ "label": "\u2191", "x": 15.5, "y": 3 },
{ "label": "\u2191", "x": 15.25, "y": 3 },
{ "label": "Ctrl", "x": 0, "y": 4, "w": 1.25 },
{ "label": "Win", "x": 1.25, "y": 4, "w": 1.25 },
@ -464,12 +464,12 @@
{ "label": "Alt", "x": 10, "y": 4, "w": 1.25 },
{ "label": "Ctrl", "x": 11.25, "y": 4, "w": 1.25 },
{ "label": "Menu", "x": 12.5, "y": 4, "w": 1.25 },
{ "label": "\u2190", "x": 14.5, "y": 4 },
{ "label": "\u2193", "x": 15.5, "y": 4 },
{ "label": "\u2192", "x": 16.5, "y": 4 }
{ "label": "\u2190", "x": 14.25, "y": 4 },
{ "label": "\u2193", "x": 15.25, "y": 4 },
{ "label": "\u2192", "x": 16.25, "y": 4 }
]
},
"LAYOUT_68_split_space": {
"LAYOUT_68_ansi_split_space": {
"layout": [
{ "label": "Esc", "x": 0, "y": 0 },
{ "label": "1", "x": 1, "y": 0 },
@ -485,8 +485,8 @@
{ "label": "-", "x": 11, "y": 0 },
{ "label": "=", "x": 12, "y": 0 },
{ "label": "Backspace", "x": 13, "y": 0, "w": 2 },
{ "label": "Insert", "x": 15.5, "y": 0 },
{ "label": "PageUp", "x": 16.5, "y": 0 },
{ "label": "Insert", "x": 15.25, "y": 0 },
{ "label": "PageUp", "x": 16.25, "y": 0 },
{ "label": "Tab", "x": 0, "y": 1, "w": 1.5 },
{ "label": "Q", "x": 1.5, "y": 1 },
@ -502,8 +502,8 @@
{ "label": "[", "x": 11.5, "y": 1 },
{ "label": "]", "x": 12.5, "y": 1 },
{ "label": "\\", "x": 13.5, "y": 1, "w": 1.5 },
{ "label": "Delete", "x": 15.5, "y": 1 },
{ "label": "PageDown", "x": 16.5, "y": 1 },
{ "label": "Delete", "x": 15.25, "y": 1 },
{ "label": "PageDown", "x": 16.25, "y": 1 },
{ "label": "Caps Lock", "x": 0, "y": 2, "w": 1.75 },
{ "label": "A", "x": 1.75, "y": 2 },
@ -531,7 +531,7 @@
{ "label": ".", "x": 10.25, "y": 3 },
{ "label": "/", "x": 11.25, "y": 3 },
{ "label": "Shift", "x": 12.25, "y": 3, "w": 2.75 },
{ "label": "\u2191", "x": 15.5, "y": 3 },
{ "label": "\u2191", "x": 15.25, "y": 3 },
{ "label": "Ctrl", "x": 0, "y": 4, "w": 1.25 },
{ "label": "Win", "x": 1.25, "y": 4, "w": 1.25 },
@ -542,9 +542,9 @@
{ "label": "Alt", "x": 10, "y": 4, "w": 1.25 },
{ "label": "Ctrl", "x": 11.25, "y": 4, "w": 1.25 },
{ "label": "Menu", "x": 12.5, "y": 4, "w": 1.25 },
{ "label": "\u2190", "x": 14.5, "y": 4 },
{ "label": "\u2193", "x": 15.5, "y": 4 },
{ "label": "\u2192", "x": 16.5, "y": 4 }
{ "label": "\u2190", "x": 14.25, "y": 4 },
{ "label": "\u2193", "x": 15.25, "y": 4 },
{ "label": "\u2192", "x": 16.25, "y": 4 }
]
}
}

View File

@ -19,29 +19,29 @@
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT_68_iso(
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_BSPC, KC_INS, KC_PGUP,
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_ENT, KC_DEL, KC_PGDN,
KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_BSLS,
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_DEL, KC_PGDN,
KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT,
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP,
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
),
[1] = LAYOUT_68_iso(
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, _______, _______, RESET,
_______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______
),
[2] = LAYOUT_68_iso(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______
),
[3] = LAYOUT_68_iso(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______
),

View File

@ -17,31 +17,31 @@
#include QMK_KEYBOARD_H
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT_68_split_bs(
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_BSPC, KC_INS, KC_PGUP,
[0] = LAYOUT_68_ansi_split_bs(
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_BSPC, KC_BSPC, KC_INS, KC_PGUP,
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_BSLS, KC_DEL, KC_PGDN,
KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_BSPC,
KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP,
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
),
[1] = LAYOUT_68_split_bs(
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, _______, _______, RESET,
[1] = LAYOUT_68_ansi_split_bs(
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, _______, _______, _______, RESET,
_______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______
),
[2] = LAYOUT_68_split_bs(
[2] = LAYOUT_68_ansi_split_bs(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______
),
[3] = LAYOUT_68_split_bs(
[3] = LAYOUT_68_ansi_split_bs(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______
),

View File

@ -17,28 +17,28 @@
#include QMK_KEYBOARD_H
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT_68_split_lshift(
[0] = LAYOUT_68_ansi_split_lshift(
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_BSPC, KC_INS, KC_PGUP,
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_BSLS, KC_DEL, KC_PGDN,
KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
KC_LSFT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP,
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
),
[1] = LAYOUT_68_split_lshift(
[1] = LAYOUT_68_ansi_split_lshift(
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, _______, _______, RESET,
_______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______
),
[2] = LAYOUT_68_split_lshift(
[2] = LAYOUT_68_ansi_split_lshift(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______
),
[3] = LAYOUT_68_split_lshift(
[3] = LAYOUT_68_ansi_split_lshift(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,

View File

@ -17,28 +17,28 @@
#include QMK_KEYBOARD_H
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT_68_split_rshift(
[0] = LAYOUT_68_ansi_split_rshift(
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_BSPC, KC_INS, KC_PGUP,
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_BSLS, KC_DEL, KC_PGDN,
KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_RSFT, KC_UP,
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
),
[1] = LAYOUT_68_split_rshift(
[1] = LAYOUT_68_ansi_split_rshift(
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, _______, _______, RESET,
_______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______
),
[2] = LAYOUT_68_split_rshift(
[2] = LAYOUT_68_ansi_split_rshift(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______
),
[3] = LAYOUT_68_split_rshift(
[3] = LAYOUT_68_ansi_split_rshift(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,

View File

@ -17,28 +17,28 @@
#include QMK_KEYBOARD_H
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT_68_split_space(
[0] = LAYOUT_68_ansi_split_space(
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_BSPC, KC_INS, KC_PGUP,
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_BSLS, KC_DEL, KC_PGDN,
KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP,
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
),
[1] = LAYOUT_68_split_space(
[1] = LAYOUT_68_ansi_split_space(
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, _______, _______, RESET,
_______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
),
[2] = LAYOUT_68_split_space(
[2] = LAYOUT_68_ansi_split_space(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
),
[3] = LAYOUT_68_split_space(
[3] = LAYOUT_68_ansi_split_space(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,

View File

@ -18,16 +18,16 @@
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT_all(
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_BSPC, KC_INS, KC_PGUP,
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_BSPC, KC_BSPC, KC_INS, KC_PGUP,
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_BSLS, KC_DEL, KC_PGDN,
KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_BSPC,
KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
KC_LSFT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_RSFT, KC_UP,
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
),
[1] = LAYOUT_all(
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, _______, _______, RESET,
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, _______, _______, _______, RESET,
_______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
),

View File

@ -18,30 +18,30 @@
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT_all(
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_BSPC, KC_INS, KC_PGUP,
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_BSPC, KC_BSPC, KC_INS, KC_PGUP,
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_BSLS, KC_DEL, KC_PGDN,
KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_BSPC,
KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
KC_LSFT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_RSFT, KC_UP,
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
),
[1] = LAYOUT_all(
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, _______, _______, RESET,
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, _______, _______, _______, RESET,
_______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
),
[2] = LAYOUT_all(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
),
[3] = LAYOUT_all(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
),

View File

@ -1 +1 @@
# The default via keymap for ikki68_aurora
# The via keymap for ikki68_aurora

View File

@ -17,4 +17,10 @@ Flashing example for this keyboard:
make wuque/ikki68_aurora:default:flash
To reset the board into bootloader mode, do one of the following:
* Tap the Reset switch mounted on the PCB
* In the case of the default keymap, use the key combination Fn + PageUp
* Hold the Esc key while connecting the USB cable (also erases persistent settings)
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).

View File

@ -4,7 +4,6 @@ MCU = atmega32u4
# Bootloader selection
BOOTLOADER = atmel-dfu
# Build Options
# change yes to no to disable
#