diff --git a/keyboards/mechlovin/olly/jf/info.json b/keyboards/mechlovin/olly/jf/info.json
index cb0ab92fb4..b67551a111 100644
--- a/keyboards/mechlovin/olly/jf/info.json
+++ b/keyboards/mechlovin/olly/jf/info.json
@@ -1,686 +1,37 @@
{
- "keyboard_name": "Olly JF",
"manufacturer": "Mechlovin.Studio",
"url": "",
"maintainer": "Mechlovin' Studio",
"usb": {
- "vid": "0x4D4C",
- "pid": "0xD180",
- "device_version": "0.0.1"
+ "vid": "0x4D4C"
},
- "backlight": {
- "pin": "D4",
- "breathing": true
- },
- "indicators": {
- "caps_lock": "B0",
- "num_lock": "B1",
- "scroll_lock": "B2"
+ "features": {
+ "nkro": false,
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "rgblight": true
},
+ "diode_direction": "ROW2COL",
"rgblight": {
"led_count": 27,
"sleep": true,
"animations": {
+ "alternating": true,
"breathing": true,
+ "christmas": true,
+ "knight": true,
"rainbow_mood": true,
"rainbow_swirl": true,
- "snake": true,
- "knight": true,
- "christmas": true,
- "static_gradient": true,
"rgb_test": true,
- "alternating": true,
+ "snake": true,
+ "static_gradient": true,
"twinkle": true
}
},
- "ws2812": {
- "pin": "B3"
- },
"bootmagic": {
"matrix": [1, 14]
- },
- "processor": "atmega32a",
- "bootloader": "usbasploader",
- "layouts": {
- "LAYOUT_all": {
- "layout": [
- {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
- {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
- {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
- {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
- {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
-
- {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
- {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
- {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
- {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
-
- {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
- {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
- {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
- {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
-
- {"label": "F13", "matrix": [0, 14], "x": 15.25, "y": 0},
-
- {"label": "Insert", "matrix": [0, 15], "x": 16.5, "y": 0},
- {"label": "Home", "matrix": [0, 16], "x": 17.5, "y": 0},
- {"label": "Page Up", "matrix": [0, 17], "x": 18.5, "y": 0},
- {"label": "Print Screen", "matrix": [0, 18], "x": 19.5, "y": 0},
-
- {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
- {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
- {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
- {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
- {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
- {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
- {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
- {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
- {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
- {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
- {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
- {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
- {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
- {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
- {"label": "Delete", "matrix": [0, 13], "x": 14, "y": 1.25},
-
- {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
-
- {"label": "Num Lock", "matrix": [1, 15], "x": 16.5, "y": 1.25},
- {"label": "/", "matrix": [1, 16], "x": 17.5, "y": 1.25},
- {"label": "*", "matrix": [1, 17], "x": 18.5, "y": 1.25},
- {"label": "Pause", "matrix": [1, 18], "x": 19.5, "y": 1.25},
-
- {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
- {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
- {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
- {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
- {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
- {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
- {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
- {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
- {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
- {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
- {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
- {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
- {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
- {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
-
- {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
-
- {"label": "7", "matrix": [2, 15], "x": 16.5, "y": 2.25},
- {"label": "8", "matrix": [2, 16], "x": 17.5, "y": 2.25},
- {"label": "9", "matrix": [2, 17], "x": 18.5, "y": 2.25},
- {"label": "-", "matrix": [2, 18], "x": 19.5, "y": 2.25},
-
- {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
- {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
- {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
- {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
- {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
- {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
- {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
- {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
- {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
- {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
- {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
- {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
- {"label": "Enter", "matrix": [3, 12], "x": 12.75, "y": 3.25},
- {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 3.25, "w": 1.25},
-
- {"label": "4", "matrix": [3, 15], "x": 16.5, "y": 3.25},
- {"label": "5", "matrix": [3, 16], "x": 17.5, "y": 3.25},
- {"label": "6", "matrix": [3, 17], "x": 18.5, "y": 3.25},
- {"label": "+", "matrix": [3, 18], "x": 19.5, "y": 3.25},
-
- {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
- {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 4.25},
- {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
- {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
- {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
- {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
- {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
- {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
- {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
- {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
- {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
- {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
- {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
- {"label": "Shift", "matrix": [4, 13], "x": 14, "y": 4.25},
-
- {"label": "\u2191", "matrix": [4, 14], "x": 15.25, "y": 4.5},
-
- {"label": "1", "matrix": [4, 15], "x": 16.5, "y": 4.25},
- {"label": "2", "matrix": [4, 16], "x": 17.5, "y": 4.25},
- {"label": "3", "matrix": [4, 17], "x": 18.5, "y": 4.25},
- {"label": "Enter", "matrix": [4, 18], "x": 19.5, "y": 4.25},
-
- {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
- {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
- {"label": "Alt", "matrix": [5, 3], "x": 2.5, "y": 5.25, "w": 1.5},
- {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 6.25},
- {"label": "Alt", "matrix": [5, 10], "x": 10.25, "y": 5.25, "w": 1.25},
- {"label": "GUI", "matrix": [5, 11], "x": 11.5, "y": 5.25, "w": 1.25},
- {"label": "Ctrl", "matrix": [5, 12], "x": 12.75, "y": 5.25, "w": 1.25},
-
- {"label": "\u2190", "matrix": [5, 13], "x": 14.25, "y": 5.5},
- {"label": "\u2193", "matrix": [5, 14], "x": 15.25, "y": 5.5},
- {"label": "\u2192", "matrix": [5, 15], "x": 16.25, "y": 5.5},
-
- {"label": "0", "matrix": [5, 16], "x": 17.5, "y": 5.25},
- {"label": ".", "matrix": [5, 17], "x": 18.5, "y": 5.25},
- {"label": "Enter", "matrix": [5, 18], "x": 19.5, "y": 5.25}
- ]
- },
- "LAYOUT_ansi": {
- "layout": [
- {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
- {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
- {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
- {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
- {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
-
- {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
- {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
- {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
- {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
-
- {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
- {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
- {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
- {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
-
- {"label": "F13", "matrix": [0, 14], "x": 15.25, "y": 0},
-
- {"label": "Insert", "matrix": [0, 15], "x": 16.5, "y": 0},
- {"label": "Home", "matrix": [0, 16], "x": 17.5, "y": 0},
- {"label": "Page Up", "matrix": [0, 17], "x": 18.5, "y": 0},
- {"label": "Print Screen", "matrix": [0, 18], "x": 19.5, "y": 0},
-
- {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
- {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
- {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
- {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
- {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
- {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
- {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
- {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
- {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
- {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
- {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
- {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
- {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
- {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
-
- {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
-
- {"label": "Num Lock", "matrix": [1, 15], "x": 16.5, "y": 1.25},
- {"label": "/", "matrix": [1, 16], "x": 17.5, "y": 1.25},
- {"label": "*", "matrix": [1, 17], "x": 18.5, "y": 1.25},
- {"label": "Pause", "matrix": [1, 18], "x": 19.5, "y": 1.25},
-
- {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
- {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
- {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
- {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
- {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
- {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
- {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
- {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
- {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
- {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
- {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
- {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
- {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
- {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
-
- {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
-
- {"label": "7", "matrix": [2, 15], "x": 16.5, "y": 2.25},
- {"label": "8", "matrix": [2, 16], "x": 17.5, "y": 2.25},
- {"label": "9", "matrix": [2, 17], "x": 18.5, "y": 2.25},
- {"label": "-", "matrix": [2, 18], "x": 19.5, "y": 2.25},
-
- {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
- {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
- {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
- {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
- {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
- {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
- {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
- {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
- {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
- {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
- {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
- {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
- {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
-
- {"label": "4", "matrix": [3, 15], "x": 16.5, "y": 3.25},
- {"label": "5", "matrix": [3, 16], "x": 17.5, "y": 3.25},
- {"label": "6", "matrix": [3, 17], "x": 18.5, "y": 3.25},
- {"label": "+", "matrix": [3, 18], "x": 19.5, "y": 3.25},
-
- {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
- {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
- {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
- {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
- {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
- {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
- {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
- {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
- {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
- {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
- {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
- {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
-
- {"label": "\u2191", "matrix": [4, 14], "x": 15.25, "y": 4.5},
-
- {"label": "1", "matrix": [4, 15], "x": 16.5, "y": 4.25},
- {"label": "2", "matrix": [4, 16], "x": 17.5, "y": 4.25},
- {"label": "3", "matrix": [4, 17], "x": 18.5, "y": 4.25},
- {"label": "Enter", "matrix": [4, 18], "x": 19.5, "y": 4.25},
-
- {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
- {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
- {"label": "Alt", "matrix": [5, 3], "x": 2.5, "y": 5.25, "w": 1.5},
- {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 6.25},
- {"label": "Alt", "matrix": [5, 10], "x": 10.25, "y": 5.25, "w": 1.25},
- {"label": "GUI", "matrix": [5, 11], "x": 11.5, "y": 5.25, "w": 1.25},
- {"label": "Ctrl", "matrix": [5, 12], "x": 12.75, "y": 5.25, "w": 1.25},
-
- {"label": "\u2190", "matrix": [5, 13], "x": 14.25, "y": 5.5},
- {"label": "\u2193", "matrix": [5, 14], "x": 15.25, "y": 5.5},
- {"label": "\u2192", "matrix": [5, 15], "x": 16.25, "y": 5.5},
-
- {"label": "0", "matrix": [5, 16], "x": 17.5, "y": 5.25},
- {"label": ".", "matrix": [5, 17], "x": 18.5, "y": 5.25},
- {"label": "Enter", "matrix": [5, 18], "x": 19.5, "y": 5.25}
- ]
- },
- "LAYOUT_ansi_split_bs_rshift": {
- "layout": [
- {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
- {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
- {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
- {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
- {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
-
- {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
- {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
- {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
- {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
-
- {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
- {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
- {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
- {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
-
- {"label": "F13", "matrix": [0, 14], "x": 15.25, "y": 0},
-
- {"label": "Insert", "matrix": [0, 15], "x": 16.5, "y": 0},
- {"label": "Home", "matrix": [0, 16], "x": 17.5, "y": 0},
- {"label": "Page Up", "matrix": [0, 17], "x": 18.5, "y": 0},
- {"label": "Print Screen", "matrix": [0, 18], "x": 19.5, "y": 0},
-
- {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
- {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
- {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
- {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
- {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
- {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
- {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
- {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
- {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
- {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
- {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
- {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
- {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
- {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
- {"label": "Delete", "matrix": [0, 13], "x": 14, "y": 1.25},
-
- {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
-
- {"label": "Num Lock", "matrix": [1, 15], "x": 16.5, "y": 1.25},
- {"label": "/", "matrix": [1, 16], "x": 17.5, "y": 1.25},
- {"label": "*", "matrix": [1, 17], "x": 18.5, "y": 1.25},
- {"label": "Pause", "matrix": [1, 18], "x": 19.5, "y": 1.25},
-
- {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
- {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
- {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
- {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
- {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
- {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
- {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
- {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
- {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
- {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
- {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
- {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
- {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
- {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
-
- {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
-
- {"label": "7", "matrix": [2, 15], "x": 16.5, "y": 2.25},
- {"label": "8", "matrix": [2, 16], "x": 17.5, "y": 2.25},
- {"label": "9", "matrix": [2, 17], "x": 18.5, "y": 2.25},
- {"label": "-", "matrix": [2, 18], "x": 19.5, "y": 2.25},
-
- {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
- {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
- {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
- {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
- {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
- {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
- {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
- {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
- {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
- {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
- {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
- {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
- {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
-
- {"label": "4", "matrix": [3, 15], "x": 16.5, "y": 3.25},
- {"label": "5", "matrix": [3, 16], "x": 17.5, "y": 3.25},
- {"label": "6", "matrix": [3, 17], "x": 18.5, "y": 3.25},
- {"label": "+", "matrix": [3, 18], "x": 19.5, "y": 3.25},
-
- {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
- {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
- {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
- {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
- {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
- {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
- {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
- {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
- {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
- {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
- {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
- {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
- {"label": "Shift", "matrix": [4, 13], "x": 14, "y": 4.25},
-
- {"label": "\u2191", "matrix": [4, 14], "x": 15.25, "y": 4.5},
-
- {"label": "1", "matrix": [4, 15], "x": 16.5, "y": 4.25},
- {"label": "2", "matrix": [4, 16], "x": 17.5, "y": 4.25},
- {"label": "3", "matrix": [4, 17], "x": 18.5, "y": 4.25},
- {"label": "Enter", "matrix": [4, 18], "x": 19.5, "y": 4.25},
-
- {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
- {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
- {"label": "Alt", "matrix": [5, 3], "x": 2.5, "y": 5.25, "w": 1.5},
- {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 6.25},
- {"label": "Alt", "matrix": [5, 10], "x": 10.25, "y": 5.25, "w": 1.25},
- {"label": "GUI", "matrix": [5, 11], "x": 11.5, "y": 5.25, "w": 1.25},
- {"label": "Ctrl", "matrix": [5, 12], "x": 12.75, "y": 5.25, "w": 1.25},
-
- {"label": "\u2190", "matrix": [5, 13], "x": 14.25, "y": 5.5},
- {"label": "\u2193", "matrix": [5, 14], "x": 15.25, "y": 5.5},
- {"label": "\u2192", "matrix": [5, 15], "x": 16.25, "y": 5.5},
-
- {"label": "0", "matrix": [5, 16], "x": 17.5, "y": 5.25},
- {"label": ".", "matrix": [5, 17], "x": 18.5, "y": 5.25},
- {"label": "Enter", "matrix": [5, 18], "x": 19.5, "y": 5.25}
- ]
- },
- "LAYOUT_iso": {
- "layout": [
- {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
- {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
- {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
- {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
- {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
-
- {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
- {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
- {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
- {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
-
- {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
- {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
- {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
- {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
-
- {"label": "F13", "matrix": [0, 14], "x": 15.25, "y": 0},
-
- {"label": "Insert", "matrix": [0, 15], "x": 16.5, "y": 0},
- {"label": "Home", "matrix": [0, 16], "x": 17.5, "y": 0},
- {"label": "Page Up", "matrix": [0, 17], "x": 18.5, "y": 0},
- {"label": "Print Screen", "matrix": [0, 18], "x": 19.5, "y": 0},
-
- {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
- {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
- {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
- {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
- {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
- {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
- {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
- {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
- {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
- {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
- {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
- {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
- {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
- {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
-
- {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
-
- {"label": "Num Lock", "matrix": [1, 15], "x": 16.5, "y": 1.25},
- {"label": "/", "matrix": [1, 16], "x": 17.5, "y": 1.25},
- {"label": "*", "matrix": [1, 17], "x": 18.5, "y": 1.25},
- {"label": "Pause", "matrix": [1, 18], "x": 19.5, "y": 1.25},
-
- {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
- {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
- {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
- {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
- {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
- {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
- {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
- {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
- {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
- {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
- {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
- {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
- {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
-
- {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
-
- {"label": "7", "matrix": [2, 15], "x": 16.5, "y": 2.25},
- {"label": "8", "matrix": [2, 16], "x": 17.5, "y": 2.25},
- {"label": "9", "matrix": [2, 17], "x": 18.5, "y": 2.25},
- {"label": "-", "matrix": [2, 18], "x": 19.5, "y": 2.25},
-
- {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
- {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
- {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
- {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
- {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
- {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
- {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
- {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
- {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
- {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
- {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
- {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
- {"label": "#", "matrix": [3, 12], "x": 12.75, "y": 3.25},
- {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
-
- {"label": "4", "matrix": [3, 15], "x": 16.5, "y": 3.25},
- {"label": "5", "matrix": [3, 16], "x": 17.5, "y": 3.25},
- {"label": "6", "matrix": [3, 17], "x": 18.5, "y": 3.25},
- {"label": "+", "matrix": [3, 18], "x": 19.5, "y": 3.25},
-
- {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
- {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 4.25},
- {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
- {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
- {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
- {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
- {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
- {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
- {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
- {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
- {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
- {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
- {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
-
- {"label": "\u2191", "matrix": [4, 14], "x": 15.25, "y": 4.5},
-
- {"label": "1", "matrix": [4, 15], "x": 16.5, "y": 4.25},
- {"label": "2", "matrix": [4, 16], "x": 17.5, "y": 4.25},
- {"label": "3", "matrix": [4, 17], "x": 18.5, "y": 4.25},
- {"label": "Enter", "matrix": [4, 18], "x": 19.5, "y": 4.25},
-
- {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
- {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
- {"label": "Alt", "matrix": [5, 3], "x": 2.5, "y": 5.25, "w": 1.5},
- {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 6.25},
- {"label": "Alt", "matrix": [5, 10], "x": 10.25, "y": 5.25, "w": 1.25},
- {"label": "GUI", "matrix": [5, 11], "x": 11.5, "y": 5.25, "w": 1.25},
- {"label": "Ctrl", "matrix": [5, 12], "x": 12.75, "y": 5.25, "w": 1.25},
-
- {"label": "\u2190", "matrix": [5, 13], "x": 14.25, "y": 5.5},
- {"label": "\u2193", "matrix": [5, 14], "x": 15.25, "y": 5.5},
- {"label": "\u2192", "matrix": [5, 15], "x": 16.25, "y": 5.5},
-
- {"label": "0", "matrix": [5, 16], "x": 17.5, "y": 5.25},
- {"label": ".", "matrix": [5, 17], "x": 18.5, "y": 5.25},
- {"label": "Enter", "matrix": [5, 18], "x": 19.5, "y": 5.25}
- ]
- },
- "LAYOUT_iso_split_bs_rshift": {
- "layout": [
- {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
-
- {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
- {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
- {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
- {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
-
- {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
- {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
- {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
- {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
-
- {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
- {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
- {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
- {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
-
- {"label": "F13", "matrix": [0, 14], "x": 15.25, "y": 0},
-
- {"label": "Insert", "matrix": [0, 15], "x": 16.5, "y": 0},
- {"label": "Home", "matrix": [0, 16], "x": 17.5, "y": 0},
- {"label": "Page Up", "matrix": [0, 17], "x": 18.5, "y": 0},
- {"label": "Print Screen", "matrix": [0, 18], "x": 19.5, "y": 0},
-
- {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
- {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
- {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
- {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
- {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
- {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
- {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
- {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
- {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
- {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
- {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
- {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
- {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
- {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
- {"label": "Delete", "matrix": [0, 13], "x": 14, "y": 1.25},
-
- {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
-
- {"label": "Num Lock", "matrix": [1, 15], "x": 16.5, "y": 1.25},
- {"label": "/", "matrix": [1, 16], "x": 17.5, "y": 1.25},
- {"label": "*", "matrix": [1, 17], "x": 18.5, "y": 1.25},
- {"label": "Pause", "matrix": [1, 18], "x": 19.5, "y": 1.25},
-
- {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
- {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
- {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
- {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
- {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
- {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
- {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
- {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
- {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
- {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
- {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
- {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
- {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
-
- {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
-
- {"label": "7", "matrix": [2, 15], "x": 16.5, "y": 2.25},
- {"label": "8", "matrix": [2, 16], "x": 17.5, "y": 2.25},
- {"label": "9", "matrix": [2, 17], "x": 18.5, "y": 2.25},
- {"label": "-", "matrix": [2, 18], "x": 19.5, "y": 2.25},
-
- {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
- {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
- {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
- {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
- {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
- {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
- {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
- {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
- {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
- {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
- {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
- {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
- {"label": "#", "matrix": [3, 12], "x": 12.75, "y": 3.25},
- {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
-
- {"label": "4", "matrix": [3, 15], "x": 16.5, "y": 3.25},
- {"label": "5", "matrix": [3, 16], "x": 17.5, "y": 3.25},
- {"label": "6", "matrix": [3, 17], "x": 18.5, "y": 3.25},
- {"label": "+", "matrix": [3, 18], "x": 19.5, "y": 3.25},
-
- {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
- {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 4.25},
- {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
- {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
- {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
- {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
- {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
- {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
- {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
- {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
- {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
- {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
- {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
- {"label": "Shift", "matrix": [4, 13], "x": 14, "y": 4.25},
-
- {"label": "\u2191", "matrix": [4, 14], "x": 15.25, "y": 4.5},
-
- {"label": "1", "matrix": [4, 15], "x": 16.5, "y": 4.25},
- {"label": "2", "matrix": [4, 16], "x": 17.5, "y": 4.25},
- {"label": "3", "matrix": [4, 17], "x": 18.5, "y": 4.25},
- {"label": "Enter", "matrix": [4, 18], "x": 19.5, "y": 4.25},
-
- {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
- {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
- {"label": "Alt", "matrix": [5, 3], "x": 2.5, "y": 5.25, "w": 1.5},
- {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 6.25},
- {"label": "Alt", "matrix": [5, 10], "x": 10.25, "y": 5.25, "w": 1.25},
- {"label": "GUI", "matrix": [5, 11], "x": 11.5, "y": 5.25, "w": 1.25},
- {"label": "Ctrl", "matrix": [5, 12], "x": 12.75, "y": 5.25, "w": 1.25},
-
- {"label": "\u2190", "matrix": [5, 13], "x": 14.25, "y": 5.5},
- {"label": "\u2193", "matrix": [5, 14], "x": 15.25, "y": 5.5},
- {"label": "\u2192", "matrix": [5, 15], "x": 16.25, "y": 5.5},
-
- {"label": "0", "matrix": [5, 16], "x": 17.5, "y": 5.25},
- {"label": ".", "matrix": [5, 17], "x": 18.5, "y": 5.25},
- {"label": "Enter", "matrix": [5, 18], "x": 19.5, "y": 5.25}
- ]
- }
}
}
diff --git a/keyboards/mechlovin/olly/jf/keymaps/via/readme.md b/keyboards/mechlovin/olly/jf/keymaps/via/readme.md
deleted file mode 100644
index 0453b5aef0..0000000000
--- a/keyboards/mechlovin/olly/jf/keymaps/via/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# The VIA keymap for Olly JF
\ No newline at end of file
diff --git a/keyboards/mechlovin/olly/jf/readme.md b/keyboards/mechlovin/olly/jf/readme.md
index fe9cf38cad..c40a8dfd5e 100644
--- a/keyboards/mechlovin/olly/jf/readme.md
+++ b/keyboards/mechlovin/olly/jf/readme.md
@@ -18,7 +18,11 @@ Flashing example for this keyboard:
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).
-**Reset Key:** 3 ways to put the Olly JF into bootloader:
-By keycode: Press the key mapped to `QK_BOOT` if it is available.
-By Bootloader: hold ESC key while plugging in (jump to bootloader)
-By Bootmagic: hold Insert key while pluging in (jump to bootloader and reset EEPROM)
\ No newline at end of file
+## Bootloader
+
+Enter the bootloader in 4 ways:
+
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available.
+* **Bootloader reset**: hold ESC (0,0) key while plugging in (jump to bootloader)
+* **Bootmagic reset**: hold Insert (1,14) key while pluging in (jump to bootloader and reset EEPROM)
+* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
\ No newline at end of file
diff --git a/keyboards/mechlovin/olly/jf/rev1/info.json b/keyboards/mechlovin/olly/jf/rev1/info.json
new file mode 100644
index 0000000000..0b6aec094f
--- /dev/null
+++ b/keyboards/mechlovin/olly/jf/rev1/info.json
@@ -0,0 +1,675 @@
+{
+ "keyboard_name": "Olly JF Rev1",
+ "usb": {
+ "pid": "0xD180",
+ "device_version": "0.0.1"
+ },
+ "features": {
+ "backlight": true
+ },
+ "matrix_pins": {
+ "cols": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
+ "rows": ["D5", "D6", "A5", "A4", "A3", "A6"],
+ "custom_lite": true
+ },
+ "matrix_size": {
+ "cols": 19,
+ "rows": 6
+ },
+ "backlight": {
+ "pin": "D4",
+ "breathing": true
+ },
+ "indicators": {
+ "caps_lock": "B0",
+ "num_lock": "B1",
+ "scroll_lock": "B2"
+ },
+ "ws2812": {
+ "pin": "B3"
+ },
+ "processor": "atmega32a",
+ "bootloader": "usbasploader",
+ "layouts": {
+ "LAYOUT_all": {
+ "layout": [
+ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+ {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
+ {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
+ {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
+ {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
+
+ {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
+ {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
+ {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
+ {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
+
+ {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
+ {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
+ {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
+ {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
+
+ {"label": "F13", "matrix": [0, 14], "x": 15.25, "y": 0},
+
+ {"label": "Insert", "matrix": [0, 15], "x": 16.5, "y": 0},
+ {"label": "Home", "matrix": [0, 16], "x": 17.5, "y": 0},
+ {"label": "Page Up", "matrix": [0, 17], "x": 18.5, "y": 0},
+ {"label": "Print Screen", "matrix": [0, 18], "x": 19.5, "y": 0},
+
+ {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+ {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+ {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+ {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+ {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+ {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+ {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+ {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+ {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+ {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+ {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+ {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+ {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+ {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
+ {"label": "Delete", "matrix": [0, 13], "x": 14, "y": 1.25},
+
+ {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
+
+ {"label": "Num Lock", "matrix": [1, 15], "x": 16.5, "y": 1.25},
+ {"label": "/", "matrix": [1, 16], "x": 17.5, "y": 1.25},
+ {"label": "*", "matrix": [1, 17], "x": 18.5, "y": 1.25},
+ {"label": "Pause", "matrix": [1, 18], "x": 19.5, "y": 1.25},
+
+ {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+ {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+ {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+ {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+ {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+ {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+ {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+ {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+ {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+ {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+ {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+ {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+ {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+ {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+ {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
+
+ {"label": "7", "matrix": [2, 15], "x": 16.5, "y": 2.25},
+ {"label": "8", "matrix": [2, 16], "x": 17.5, "y": 2.25},
+ {"label": "9", "matrix": [2, 17], "x": 18.5, "y": 2.25},
+ {"label": "-", "matrix": [2, 18], "x": 19.5, "y": 2.25},
+
+ {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+ {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+ {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+ {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+ {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+ {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+ {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+ {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+ {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+ {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+ {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+ {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+ {"label": "Enter", "matrix": [3, 12], "x": 12.75, "y": 3.25},
+ {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 3.25, "w": 1.25},
+
+ {"label": "4", "matrix": [3, 15], "x": 16.5, "y": 3.25},
+ {"label": "5", "matrix": [3, 16], "x": 17.5, "y": 3.25},
+ {"label": "6", "matrix": [3, 17], "x": 18.5, "y": 3.25},
+ {"label": "+", "matrix": [3, 18], "x": 19.5, "y": 3.25},
+
+ {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+ {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 4.25},
+ {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+ {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+ {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+ {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+ {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+ {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+ {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+ {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+ {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+ {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+ {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+ {"label": "Shift", "matrix": [4, 13], "x": 14, "y": 4.25},
+
+ {"label": "\u2191", "matrix": [4, 14], "x": 15.25, "y": 4.5},
+
+ {"label": "1", "matrix": [4, 15], "x": 16.5, "y": 4.25},
+ {"label": "2", "matrix": [4, 16], "x": 17.5, "y": 4.25},
+ {"label": "3", "matrix": [4, 17], "x": 18.5, "y": 4.25},
+ {"label": "Enter", "matrix": [4, 18], "x": 19.5, "y": 4.25},
+
+ {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+ {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
+ {"label": "Alt", "matrix": [5, 3], "x": 2.5, "y": 5.25, "w": 1.5},
+ {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 6.25},
+ {"label": "Alt", "matrix": [5, 10], "x": 10.25, "y": 5.25, "w": 1.25},
+ {"label": "GUI", "matrix": [5, 11], "x": 11.5, "y": 5.25, "w": 1.25},
+ {"label": "Ctrl", "matrix": [5, 12], "x": 12.75, "y": 5.25, "w": 1.25},
+
+ {"label": "\u2190", "matrix": [5, 13], "x": 14.25, "y": 5.5},
+ {"label": "\u2193", "matrix": [5, 14], "x": 15.25, "y": 5.5},
+ {"label": "\u2192", "matrix": [5, 15], "x": 16.25, "y": 5.5},
+
+ {"label": "0", "matrix": [5, 16], "x": 17.5, "y": 5.25},
+ {"label": ".", "matrix": [5, 17], "x": 18.5, "y": 5.25},
+ {"label": "Enter", "matrix": [5, 18], "x": 19.5, "y": 5.25}
+ ]
+ },
+ "LAYOUT_ansi": {
+ "layout": [
+ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+ {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
+ {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
+ {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
+ {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
+
+ {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
+ {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
+ {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
+ {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
+
+ {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
+ {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
+ {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
+ {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
+
+ {"label": "F13", "matrix": [0, 14], "x": 15.25, "y": 0},
+
+ {"label": "Insert", "matrix": [0, 15], "x": 16.5, "y": 0},
+ {"label": "Home", "matrix": [0, 16], "x": 17.5, "y": 0},
+ {"label": "Page Up", "matrix": [0, 17], "x": 18.5, "y": 0},
+ {"label": "Print Screen", "matrix": [0, 18], "x": 19.5, "y": 0},
+
+ {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+ {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+ {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+ {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+ {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+ {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+ {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+ {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+ {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+ {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+ {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+ {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+ {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+ {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+ {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
+
+ {"label": "Num Lock", "matrix": [1, 15], "x": 16.5, "y": 1.25},
+ {"label": "/", "matrix": [1, 16], "x": 17.5, "y": 1.25},
+ {"label": "*", "matrix": [1, 17], "x": 18.5, "y": 1.25},
+ {"label": "Pause", "matrix": [1, 18], "x": 19.5, "y": 1.25},
+
+ {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+ {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+ {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+ {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+ {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+ {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+ {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+ {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+ {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+ {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+ {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+ {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+ {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+ {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+ {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
+
+ {"label": "7", "matrix": [2, 15], "x": 16.5, "y": 2.25},
+ {"label": "8", "matrix": [2, 16], "x": 17.5, "y": 2.25},
+ {"label": "9", "matrix": [2, 17], "x": 18.5, "y": 2.25},
+ {"label": "-", "matrix": [2, 18], "x": 19.5, "y": 2.25},
+
+ {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+ {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+ {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+ {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+ {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+ {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+ {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+ {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+ {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+ {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+ {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+ {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+ {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+ {"label": "4", "matrix": [3, 15], "x": 16.5, "y": 3.25},
+ {"label": "5", "matrix": [3, 16], "x": 17.5, "y": 3.25},
+ {"label": "6", "matrix": [3, 17], "x": 18.5, "y": 3.25},
+ {"label": "+", "matrix": [3, 18], "x": 19.5, "y": 3.25},
+
+ {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+ {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+ {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+ {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+ {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+ {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+ {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+ {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+ {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+ {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+ {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+ {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
+
+ {"label": "\u2191", "matrix": [4, 14], "x": 15.25, "y": 4.5},
+
+ {"label": "1", "matrix": [4, 15], "x": 16.5, "y": 4.25},
+ {"label": "2", "matrix": [4, 16], "x": 17.5, "y": 4.25},
+ {"label": "3", "matrix": [4, 17], "x": 18.5, "y": 4.25},
+ {"label": "Enter", "matrix": [4, 18], "x": 19.5, "y": 4.25},
+
+ {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+ {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
+ {"label": "Alt", "matrix": [5, 3], "x": 2.5, "y": 5.25, "w": 1.5},
+ {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 6.25},
+ {"label": "Alt", "matrix": [5, 10], "x": 10.25, "y": 5.25, "w": 1.25},
+ {"label": "GUI", "matrix": [5, 11], "x": 11.5, "y": 5.25, "w": 1.25},
+ {"label": "Ctrl", "matrix": [5, 12], "x": 12.75, "y": 5.25, "w": 1.25},
+
+ {"label": "\u2190", "matrix": [5, 13], "x": 14.25, "y": 5.5},
+ {"label": "\u2193", "matrix": [5, 14], "x": 15.25, "y": 5.5},
+ {"label": "\u2192", "matrix": [5, 15], "x": 16.25, "y": 5.5},
+
+ {"label": "0", "matrix": [5, 16], "x": 17.5, "y": 5.25},
+ {"label": ".", "matrix": [5, 17], "x": 18.5, "y": 5.25},
+ {"label": "Enter", "matrix": [5, 18], "x": 19.5, "y": 5.25}
+ ]
+ },
+ "LAYOUT_ansi_split_bs_rshift": {
+ "layout": [
+ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+ {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
+ {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
+ {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
+ {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
+
+ {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
+ {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
+ {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
+ {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
+
+ {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
+ {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
+ {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
+ {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
+
+ {"label": "F13", "matrix": [0, 14], "x": 15.25, "y": 0},
+
+ {"label": "Insert", "matrix": [0, 15], "x": 16.5, "y": 0},
+ {"label": "Home", "matrix": [0, 16], "x": 17.5, "y": 0},
+ {"label": "Page Up", "matrix": [0, 17], "x": 18.5, "y": 0},
+ {"label": "Print Screen", "matrix": [0, 18], "x": 19.5, "y": 0},
+
+ {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+ {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+ {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+ {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+ {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+ {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+ {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+ {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+ {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+ {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+ {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+ {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+ {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+ {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
+ {"label": "Delete", "matrix": [0, 13], "x": 14, "y": 1.25},
+
+ {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
+
+ {"label": "Num Lock", "matrix": [1, 15], "x": 16.5, "y": 1.25},
+ {"label": "/", "matrix": [1, 16], "x": 17.5, "y": 1.25},
+ {"label": "*", "matrix": [1, 17], "x": 18.5, "y": 1.25},
+ {"label": "Pause", "matrix": [1, 18], "x": 19.5, "y": 1.25},
+
+ {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+ {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+ {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+ {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+ {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+ {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+ {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+ {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+ {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+ {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+ {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+ {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+ {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+ {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+ {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
+
+ {"label": "7", "matrix": [2, 15], "x": 16.5, "y": 2.25},
+ {"label": "8", "matrix": [2, 16], "x": 17.5, "y": 2.25},
+ {"label": "9", "matrix": [2, 17], "x": 18.5, "y": 2.25},
+ {"label": "-", "matrix": [2, 18], "x": 19.5, "y": 2.25},
+
+ {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+ {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+ {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+ {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+ {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+ {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+ {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+ {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+ {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+ {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+ {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+ {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+ {"label": "Enter", "matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+ {"label": "4", "matrix": [3, 15], "x": 16.5, "y": 3.25},
+ {"label": "5", "matrix": [3, 16], "x": 17.5, "y": 3.25},
+ {"label": "6", "matrix": [3, 17], "x": 18.5, "y": 3.25},
+ {"label": "+", "matrix": [3, 18], "x": 19.5, "y": 3.25},
+
+ {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+ {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+ {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+ {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+ {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+ {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+ {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+ {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+ {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+ {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+ {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+ {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+ {"label": "Shift", "matrix": [4, 13], "x": 14, "y": 4.25},
+
+ {"label": "\u2191", "matrix": [4, 14], "x": 15.25, "y": 4.5},
+
+ {"label": "1", "matrix": [4, 15], "x": 16.5, "y": 4.25},
+ {"label": "2", "matrix": [4, 16], "x": 17.5, "y": 4.25},
+ {"label": "3", "matrix": [4, 17], "x": 18.5, "y": 4.25},
+ {"label": "Enter", "matrix": [4, 18], "x": 19.5, "y": 4.25},
+
+ {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+ {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
+ {"label": "Alt", "matrix": [5, 3], "x": 2.5, "y": 5.25, "w": 1.5},
+ {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 6.25},
+ {"label": "Alt", "matrix": [5, 10], "x": 10.25, "y": 5.25, "w": 1.25},
+ {"label": "GUI", "matrix": [5, 11], "x": 11.5, "y": 5.25, "w": 1.25},
+ {"label": "Ctrl", "matrix": [5, 12], "x": 12.75, "y": 5.25, "w": 1.25},
+
+ {"label": "\u2190", "matrix": [5, 13], "x": 14.25, "y": 5.5},
+ {"label": "\u2193", "matrix": [5, 14], "x": 15.25, "y": 5.5},
+ {"label": "\u2192", "matrix": [5, 15], "x": 16.25, "y": 5.5},
+
+ {"label": "0", "matrix": [5, 16], "x": 17.5, "y": 5.25},
+ {"label": ".", "matrix": [5, 17], "x": 18.5, "y": 5.25},
+ {"label": "Enter", "matrix": [5, 18], "x": 19.5, "y": 5.25}
+ ]
+ },
+ "LAYOUT_iso": {
+ "layout": [
+ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+ {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
+ {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
+ {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
+ {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
+
+ {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
+ {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
+ {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
+ {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
+
+ {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
+ {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
+ {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
+ {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
+
+ {"label": "F13", "matrix": [0, 14], "x": 15.25, "y": 0},
+
+ {"label": "Insert", "matrix": [0, 15], "x": 16.5, "y": 0},
+ {"label": "Home", "matrix": [0, 16], "x": 17.5, "y": 0},
+ {"label": "Page Up", "matrix": [0, 17], "x": 18.5, "y": 0},
+ {"label": "Print Screen", "matrix": [0, 18], "x": 19.5, "y": 0},
+
+ {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+ {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+ {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+ {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+ {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+ {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+ {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+ {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+ {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+ {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+ {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+ {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+ {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+ {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+ {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
+
+ {"label": "Num Lock", "matrix": [1, 15], "x": 16.5, "y": 1.25},
+ {"label": "/", "matrix": [1, 16], "x": 17.5, "y": 1.25},
+ {"label": "*", "matrix": [1, 17], "x": 18.5, "y": 1.25},
+ {"label": "Pause", "matrix": [1, 18], "x": 19.5, "y": 1.25},
+
+ {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+ {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+ {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+ {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+ {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+ {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+ {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+ {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+ {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+ {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+ {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+ {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+ {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+
+ {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
+
+ {"label": "7", "matrix": [2, 15], "x": 16.5, "y": 2.25},
+ {"label": "8", "matrix": [2, 16], "x": 17.5, "y": 2.25},
+ {"label": "9", "matrix": [2, 17], "x": 18.5, "y": 2.25},
+ {"label": "-", "matrix": [2, 18], "x": 19.5, "y": 2.25},
+
+ {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+ {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+ {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+ {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+ {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+ {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+ {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+ {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+ {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+ {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+ {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+ {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+ {"label": "#", "matrix": [3, 12], "x": 12.75, "y": 3.25},
+ {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+ {"label": "4", "matrix": [3, 15], "x": 16.5, "y": 3.25},
+ {"label": "5", "matrix": [3, 16], "x": 17.5, "y": 3.25},
+ {"label": "6", "matrix": [3, 17], "x": 18.5, "y": 3.25},
+ {"label": "+", "matrix": [3, 18], "x": 19.5, "y": 3.25},
+
+ {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+ {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 4.25},
+ {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+ {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+ {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+ {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+ {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+ {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+ {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+ {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+ {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+ {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+ {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
+
+ {"label": "\u2191", "matrix": [4, 14], "x": 15.25, "y": 4.5},
+
+ {"label": "1", "matrix": [4, 15], "x": 16.5, "y": 4.25},
+ {"label": "2", "matrix": [4, 16], "x": 17.5, "y": 4.25},
+ {"label": "3", "matrix": [4, 17], "x": 18.5, "y": 4.25},
+ {"label": "Enter", "matrix": [4, 18], "x": 19.5, "y": 4.25},
+
+ {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+ {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
+ {"label": "Alt", "matrix": [5, 3], "x": 2.5, "y": 5.25, "w": 1.5},
+ {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 6.25},
+ {"label": "Alt", "matrix": [5, 10], "x": 10.25, "y": 5.25, "w": 1.25},
+ {"label": "GUI", "matrix": [5, 11], "x": 11.5, "y": 5.25, "w": 1.25},
+ {"label": "Ctrl", "matrix": [5, 12], "x": 12.75, "y": 5.25, "w": 1.25},
+
+ {"label": "\u2190", "matrix": [5, 13], "x": 14.25, "y": 5.5},
+ {"label": "\u2193", "matrix": [5, 14], "x": 15.25, "y": 5.5},
+ {"label": "\u2192", "matrix": [5, 15], "x": 16.25, "y": 5.5},
+
+ {"label": "0", "matrix": [5, 16], "x": 17.5, "y": 5.25},
+ {"label": ".", "matrix": [5, 17], "x": 18.5, "y": 5.25},
+ {"label": "Enter", "matrix": [5, 18], "x": 19.5, "y": 5.25}
+ ]
+ },
+ "LAYOUT_iso_split_bs_rshift": {
+ "layout": [
+ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+
+ {"label": "F1", "matrix": [0, 1], "x": 2, "y": 0},
+ {"label": "F2", "matrix": [0, 2], "x": 3, "y": 0},
+ {"label": "F3", "matrix": [0, 3], "x": 4, "y": 0},
+ {"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
+
+ {"label": "F5", "matrix": [0, 5], "x": 6.5, "y": 0},
+ {"label": "F6", "matrix": [0, 6], "x": 7.5, "y": 0},
+ {"label": "F7", "matrix": [0, 7], "x": 8.5, "y": 0},
+ {"label": "F8", "matrix": [0, 8], "x": 9.5, "y": 0},
+
+ {"label": "F9", "matrix": [0, 9], "x": 11, "y": 0},
+ {"label": "F10", "matrix": [0, 10], "x": 12, "y": 0},
+ {"label": "F11", "matrix": [0, 11], "x": 13, "y": 0},
+ {"label": "F12", "matrix": [0, 12], "x": 14, "y": 0},
+
+ {"label": "F13", "matrix": [0, 14], "x": 15.25, "y": 0},
+
+ {"label": "Insert", "matrix": [0, 15], "x": 16.5, "y": 0},
+ {"label": "Home", "matrix": [0, 16], "x": 17.5, "y": 0},
+ {"label": "Page Up", "matrix": [0, 17], "x": 18.5, "y": 0},
+ {"label": "Print Screen", "matrix": [0, 18], "x": 19.5, "y": 0},
+
+ {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25},
+ {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25},
+ {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25},
+ {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25},
+ {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25},
+ {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25},
+ {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25},
+ {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25},
+ {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25},
+ {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25},
+ {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25},
+ {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25},
+ {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25},
+ {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25},
+ {"label": "Delete", "matrix": [0, 13], "x": 14, "y": 1.25},
+
+ {"label": "Insert", "matrix": [1, 14], "x": 15.25, "y": 1.25},
+
+ {"label": "Num Lock", "matrix": [1, 15], "x": 16.5, "y": 1.25},
+ {"label": "/", "matrix": [1, 16], "x": 17.5, "y": 1.25},
+ {"label": "*", "matrix": [1, 17], "x": 18.5, "y": 1.25},
+ {"label": "Pause", "matrix": [1, 18], "x": 19.5, "y": 1.25},
+
+ {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+ {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25},
+ {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25},
+ {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25},
+ {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25},
+ {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25},
+ {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25},
+ {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25},
+ {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25},
+ {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25},
+ {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25},
+ {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25},
+ {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25},
+
+ {"label": "Delete", "matrix": [2, 14], "x": 15.25, "y": 2.25},
+
+ {"label": "7", "matrix": [2, 15], "x": 16.5, "y": 2.25},
+ {"label": "8", "matrix": [2, 16], "x": 17.5, "y": 2.25},
+ {"label": "9", "matrix": [2, 17], "x": 18.5, "y": 2.25},
+ {"label": "-", "matrix": [2, 18], "x": 19.5, "y": 2.25},
+
+ {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+ {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25},
+ {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25},
+ {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25},
+ {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25},
+ {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25},
+ {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25},
+ {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25},
+ {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25},
+ {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25},
+ {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25},
+ {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25},
+ {"label": "#", "matrix": [3, 12], "x": 12.75, "y": 3.25},
+ {"label": "Enter", "matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+ {"label": "4", "matrix": [3, 15], "x": 16.5, "y": 3.25},
+ {"label": "5", "matrix": [3, 16], "x": 17.5, "y": 3.25},
+ {"label": "6", "matrix": [3, 17], "x": 18.5, "y": 3.25},
+ {"label": "+", "matrix": [3, 18], "x": 19.5, "y": 3.25},
+
+ {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+ {"label": "\\", "matrix": [4, 1], "x": 1.25, "y": 4.25},
+ {"label": "Z", "matrix": [4, 2], "x": 2.25, "y": 4.25},
+ {"label": "X", "matrix": [4, 3], "x": 3.25, "y": 4.25},
+ {"label": "C", "matrix": [4, 4], "x": 4.25, "y": 4.25},
+ {"label": "V", "matrix": [4, 5], "x": 5.25, "y": 4.25},
+ {"label": "B", "matrix": [4, 6], "x": 6.25, "y": 4.25},
+ {"label": "N", "matrix": [4, 7], "x": 7.25, "y": 4.25},
+ {"label": "M", "matrix": [4, 8], "x": 8.25, "y": 4.25},
+ {"label": ",", "matrix": [4, 9], "x": 9.25, "y": 4.25},
+ {"label": ".", "matrix": [4, 10], "x": 10.25, "y": 4.25},
+ {"label": "/", "matrix": [4, 11], "x": 11.25, "y": 4.25},
+ {"label": "Shift", "matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+ {"label": "Shift", "matrix": [4, 13], "x": 14, "y": 4.25},
+
+ {"label": "\u2191", "matrix": [4, 14], "x": 15.25, "y": 4.5},
+
+ {"label": "1", "matrix": [4, 15], "x": 16.5, "y": 4.25},
+ {"label": "2", "matrix": [4, 16], "x": 17.5, "y": 4.25},
+ {"label": "3", "matrix": [4, 17], "x": 18.5, "y": 4.25},
+ {"label": "Enter", "matrix": [4, 18], "x": 19.5, "y": 4.25},
+
+ {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+ {"label": "GUI", "matrix": [5, 1], "x": 1.5, "y": 5.25},
+ {"label": "Alt", "matrix": [5, 3], "x": 2.5, "y": 5.25, "w": 1.5},
+ {"label": "Space", "matrix": [5, 6], "x": 4, "y": 5.25, "w": 6.25},
+ {"label": "Alt", "matrix": [5, 10], "x": 10.25, "y": 5.25, "w": 1.25},
+ {"label": "GUI", "matrix": [5, 11], "x": 11.5, "y": 5.25, "w": 1.25},
+ {"label": "Ctrl", "matrix": [5, 12], "x": 12.75, "y": 5.25, "w": 1.25},
+
+ {"label": "\u2190", "matrix": [5, 13], "x": 14.25, "y": 5.5},
+ {"label": "\u2193", "matrix": [5, 14], "x": 15.25, "y": 5.5},
+ {"label": "\u2192", "matrix": [5, 15], "x": 16.25, "y": 5.5},
+
+ {"label": "0", "matrix": [5, 16], "x": 17.5, "y": 5.25},
+ {"label": ".", "matrix": [5, 17], "x": 18.5, "y": 5.25},
+ {"label": "Enter", "matrix": [5, 18], "x": 19.5, "y": 5.25}
+ ]
+ }
+ }
+}
diff --git a/keyboards/mechlovin/olly/jf/keymaps/default/keymap.c b/keyboards/mechlovin/olly/jf/rev1/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/mechlovin/olly/jf/keymaps/default/keymap.c
rename to keyboards/mechlovin/olly/jf/rev1/keymaps/default/keymap.c
diff --git a/keyboards/mechlovin/olly/jf/keymaps/default/readme.md b/keyboards/mechlovin/olly/jf/rev1/keymaps/default/readme.md
similarity index 100%
rename from keyboards/mechlovin/olly/jf/keymaps/default/readme.md
rename to keyboards/mechlovin/olly/jf/rev1/keymaps/default/readme.md
diff --git a/keyboards/mechlovin/olly/jf/keymaps/default_ansi/keymap.c b/keyboards/mechlovin/olly/jf/rev1/keymaps/default_ansi/keymap.c
similarity index 100%
rename from keyboards/mechlovin/olly/jf/keymaps/default_ansi/keymap.c
rename to keyboards/mechlovin/olly/jf/rev1/keymaps/default_ansi/keymap.c
diff --git a/keyboards/mechlovin/olly/jf/keymaps/default_ansi_split_bs_rshift/keymap.c b/keyboards/mechlovin/olly/jf/rev1/keymaps/default_ansi_split_bs_rshift/keymap.c
similarity index 100%
rename from keyboards/mechlovin/olly/jf/keymaps/default_ansi_split_bs_rshift/keymap.c
rename to keyboards/mechlovin/olly/jf/rev1/keymaps/default_ansi_split_bs_rshift/keymap.c
diff --git a/keyboards/mechlovin/olly/jf/keymaps/default_iso/keymap.c b/keyboards/mechlovin/olly/jf/rev1/keymaps/default_iso/keymap.c
similarity index 100%
rename from keyboards/mechlovin/olly/jf/keymaps/default_iso/keymap.c
rename to keyboards/mechlovin/olly/jf/rev1/keymaps/default_iso/keymap.c
diff --git a/keyboards/mechlovin/olly/jf/keymaps/default_iso_split_bs_rshift/keymap.c b/keyboards/mechlovin/olly/jf/rev1/keymaps/default_iso_split_bs_rshift/keymap.c
similarity index 100%
rename from keyboards/mechlovin/olly/jf/keymaps/default_iso_split_bs_rshift/keymap.c
rename to keyboards/mechlovin/olly/jf/rev1/keymaps/default_iso_split_bs_rshift/keymap.c
diff --git a/keyboards/mechlovin/olly/jf/keymaps/via/config.h b/keyboards/mechlovin/olly/jf/rev1/keymaps/via/config.h
similarity index 100%
rename from keyboards/mechlovin/olly/jf/keymaps/via/config.h
rename to keyboards/mechlovin/olly/jf/rev1/keymaps/via/config.h
diff --git a/keyboards/mechlovin/olly/jf/keymaps/via/keymap.c b/keyboards/mechlovin/olly/jf/rev1/keymaps/via/keymap.c
similarity index 100%
rename from keyboards/mechlovin/olly/jf/keymaps/via/keymap.c
rename to keyboards/mechlovin/olly/jf/rev1/keymaps/via/keymap.c
diff --git a/keyboards/mechlovin/olly/jf/keymaps/via/rules.mk b/keyboards/mechlovin/olly/jf/rev1/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/mechlovin/olly/jf/keymaps/via/rules.mk
rename to keyboards/mechlovin/olly/jf/rev1/keymaps/via/rules.mk
diff --git a/keyboards/mechlovin/olly/jf/matrix.c b/keyboards/mechlovin/olly/jf/rev1/matrix.c
similarity index 100%
rename from keyboards/mechlovin/olly/jf/matrix.c
rename to keyboards/mechlovin/olly/jf/rev1/matrix.c
diff --git a/keyboards/mechlovin/olly/jf/matrix_diagram.md b/keyboards/mechlovin/olly/jf/rev1/matrix_diagram.md
similarity index 99%
rename from keyboards/mechlovin/olly/jf/matrix_diagram.md
rename to keyboards/mechlovin/olly/jf/rev1/matrix_diagram.md
index 6cc49f8b93..63e5476501 100644
--- a/keyboards/mechlovin/olly/jf/matrix_diagram.md
+++ b/keyboards/mechlovin/olly/jf/rev1/matrix_diagram.md
@@ -1,4 +1,4 @@
-# Matrix Diagram for Mechlovin.Studio Olly JF
+# Matrix Diagram for Mechlovin.Studio Olly JF Rev. 1
```
┌───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐┌───┐┌───┬───┬───┬───┐
diff --git a/keyboards/mechlovin/olly/jf/rev1/readme.md b/keyboards/mechlovin/olly/jf/rev1/readme.md
new file mode 100644
index 0000000000..f6c114fee6
--- /dev/null
+++ b/keyboards/mechlovin/olly/jf/rev1/readme.md
@@ -0,0 +1,27 @@
+# Mechlovin Olly JF Rev. 1
+
+![jf](https://i.imgur.com/IrfTGE7h.png)
+
+Olly JF PCB, compatible Duck Jetfire keyboard.
+
+* Keyboard Maintainer: [Mechlovin' Studio](https://mechlovin.studio/)
+* Hardware Supported: Jetfire Korean Kustom
+* Hardware Availability: [Mechlovin' Studio](https://mechlovin.studio/)
+
+Make example for this keyboard (after setting up your build environment):
+
+ make mechlovin/olly/jf/rev1:default
+
+Flashing example for this keyboard:
+
+ make mechlovin/olly/jf/rev1:default:flash
+
+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).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+By keycode: Press the key mapped to `QK_BOOT` if it is available.
+By Bootloader: hold ESC key while plugging in (jump to bootloader)
+By Bootmagic: hold Insert key while pluging in (jump to bootloader and reset EEPROM)
\ No newline at end of file
diff --git a/keyboards/mechlovin/olly/jf/jf.c b/keyboards/mechlovin/olly/jf/rev1/rev1.c
similarity index 100%
rename from keyboards/mechlovin/olly/jf/jf.c
rename to keyboards/mechlovin/olly/jf/rev1/rev1.c
diff --git a/keyboards/mechlovin/olly/jf/rev1/rules.mk b/keyboards/mechlovin/olly/jf/rev1/rules.mk
new file mode 100644
index 0000000000..4442aba67d
--- /dev/null
+++ b/keyboards/mechlovin/olly/jf/rev1/rules.mk
@@ -0,0 +1,4 @@
+# Processor frequency
+F_CPU = 16000000
+
+SRC += matrix.c
diff --git a/keyboards/mechlovin/olly/jf/config.h b/keyboards/mechlovin/olly/jf/rev2/config.h
similarity index 53%
rename from keyboards/mechlovin/olly/jf/config.h
rename to keyboards/mechlovin/olly/jf/rev2/config.h
index 35480dc83c..e1389b1e9a 100644
--- a/keyboards/mechlovin/olly/jf/config.h
+++ b/keyboards/mechlovin/olly/jf/rev2/config.h
@@ -1,5 +1,5 @@
/*
-Copyright 2021 mechlovin
+Copyright 2023 Mechlovin'
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -17,22 +17,15 @@ along with this program. If not, see .
#pragma once
+#define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_SDA
-/* key matrix size */
-#define MATRIX_ROWS 6
-#define MATRIX_COLS 19
+#define I2C_DRIVER I2CD2
+#define I2C1_SCL_PIN B10
+#define I2C1_SDA_PIN B11
+#define LED_MATRIX_LED_COUNT 114
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { D5, D6, A5, A4, A3, A6}
+#define I2C1_CLOCK_SPEED 400000
+#define I2C1_DUTY_CYCLE FAST_DUTY_CYCLE_2
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION ROW2COL
+#define WEAR_LEVELING_BACKING_SIZE 4096
+#define WEAR_LEVELING_LOGICAL_SIZE 2048
diff --git a/keyboards/mechlovin/olly/jf/rev2/halconf.h b/keyboards/mechlovin/olly/jf/rev2/halconf.h
new file mode 100644
index 0000000000..090c0b3d3b
--- /dev/null
+++ b/keyboards/mechlovin/olly/jf/rev2/halconf.h
@@ -0,0 +1,25 @@
+/* Copyright 2023 QMK
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+#pragma once
+
+#define HAL_USE_I2C TRUE
+
+#define HAL_USE_SPI TRUE
+
+
+#include_next
+
diff --git a/keyboards/mechlovin/olly/jf/rev2/info.json b/keyboards/mechlovin/olly/jf/rev2/info.json
new file mode 100644
index 0000000000..da86fbb075
--- /dev/null
+++ b/keyboards/mechlovin/olly/jf/rev2/info.json
@@ -0,0 +1,702 @@
+{
+ "keyboard_name": "Olly JF Rev2",
+ "bootloader": "stm32duino",
+ "features": {
+ "command": true,
+ "console": true,
+ "led_matrix": true,
+ "nkro": true
+ },
+ "led_matrix": {
+ "animations": {
+ "alphas_mods": true,
+ "band": true,
+ "band_pinwheel": true,
+ "band_spiral": true,
+ "breathing": true,
+ "cycle_left_right": true,
+ "cycle_out_in": true,
+ "cycle_up_down": true,
+ "dual_beacon": true,
+ "solid_multisplash": true,
+ "solid_reactive_cross": true,
+ "solid_reactive_multicross": true,
+ "solid_reactive_multinexus": true,
+ "solid_reactive_multiwide": true,
+ "solid_reactive_nexus": true,
+ "solid_reactive_simple": true,
+ "solid_reactive_wide": true,
+ "solid_splash": true,
+ "wave_left_right": true,
+ "wave_up_down": true
+ },
+ "driver": "is31fl3731",
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0, "flags": 4},
+ {"matrix": [0, 2], "x": 24, "y": 0, "flags": 4},
+ {"matrix": [0, 3], "x": 37, "y": 0, "flags": 4},
+ {"matrix": [0, 4], "x": 49, "y": 0, "flags": 4},
+ {"matrix": [0, 5], "x": 62, "y": 0, "flags": 4},
+ {"matrix": [0, 6], "x": 74, "y": 0, "flags": 4},
+ {"matrix": [0, 7], "x": 87, "y": 0, "flags": 4},
+ {"matrix": [0, 8], "x": 99, "y": 0, "flags": 4},
+ {"matrix": [0, 9], "x": 122, "y": 0, "flags": 4},
+ {"matrix": [0, 10], "x": 124, "y": 0, "flags": 4},
+ {"matrix": [0, 11], "x": 137, "y": 0, "flags": 4},
+ {"matrix": [0, 12], "x": 140, "y": 0, "flags": 4},
+ {"matrix": [0, 13], "x": 162, "y": 0, "flags": 4},
+ {"matrix": [0, 14], "x": 174, "y": 0, "flags": 4},
+ {"matrix": [0, 15], "x": 186, "y": 0, "flags": 4},
+ {"matrix": [0, 16], "x": 199, "y": 0, "flags": 4},
+ {"matrix": [0, 17], "x": 211, "y": 0, "flags": 4},
+ {"matrix": [0, 18], "x": 224, "y": 0, "flags": 4},
+ {"matrix": [1, 0], "x": 0, "y": 13, "flags": 4},
+ {"matrix": [1, 1], "x": 12, "y": 13, "flags": 4},
+ {"matrix": [1, 2], "x": 24, "y": 13, "flags": 4},
+ {"matrix": [1, 3], "x": 37, "y": 13, "flags": 4},
+ {"matrix": [1, 4], "x": 49, "y": 13, "flags": 4},
+ {"matrix": [1, 5], "x": 62, "y": 13, "flags": 4},
+ {"matrix": [1, 6], "x": 74, "y": 13, "flags": 4},
+ {"matrix": [1, 7], "x": 87, "y": 13, "flags": 4},
+ {"matrix": [1, 8], "x": 99, "y": 13, "flags": 4},
+ {"matrix": [1, 9], "x": 122, "y": 13, "flags": 4},
+ {"matrix": [1, 10], "x": 124, "y": 13, "flags": 4},
+ {"matrix": [1, 11], "x": 137, "y": 13, "flags": 4},
+ {"matrix": [1, 12], "x": 140, "y": 13, "flags": 4},
+ {"matrix": [1, 13], "x": 162, "y": 13, "flags": 4},
+ {"matrix": [1, 14], "x": 174, "y": 13, "flags": 4},
+ {"matrix": [1, 15], "x": 186, "y": 13, "flags": 4},
+ {"matrix": [1, 16], "x": 199, "y": 13, "flags": 4},
+ {"matrix": [1, 17], "x": 211, "y": 13, "flags": 4},
+ {"matrix": [1, 18], "x": 224, "y": 13, "flags": 4},
+ {"matrix": [2, 0], "x": 0, "y": 25, "flags": 4},
+ {"matrix": [2, 1], "x": 12, "y": 25, "flags": 4},
+ {"matrix": [2, 2], "x": 24, "y": 25, "flags": 4},
+ {"matrix": [2, 3], "x": 37, "y": 25, "flags": 4},
+ {"matrix": [2, 4], "x": 49, "y": 25, "flags": 4},
+ {"matrix": [2, 5], "x": 62, "y": 25, "flags": 4},
+ {"matrix": [2, 6], "x": 74, "y": 25, "flags": 4},
+ {"matrix": [2, 7], "x": 87, "y": 25, "flags": 4},
+ {"matrix": [2, 8], "x": 99, "y": 25, "flags": 4},
+ {"matrix": [2, 9], "x": 122, "y": 25, "flags": 4},
+ {"matrix": [2, 10], "x": 124, "y": 25, "flags": 4},
+ {"matrix": [2, 11], "x": 137, "y": 25, "flags": 4},
+ {"matrix": [2, 12], "x": 140, "y": 25, "flags": 4},
+ {"matrix": [2, 13], "x": 162, "y": 25, "flags": 4},
+ {"matrix": [2, 14], "x": 174, "y": 25, "flags": 4},
+ {"matrix": [2, 15], "x": 186, "y": 25, "flags": 4},
+ {"matrix": [2, 16], "x": 199, "y": 25, "flags": 4},
+ {"matrix": [2, 17], "x": 211, "y": 25, "flags": 4},
+ {"matrix": [2, 18], "x": 224, "y": 25, "flags": 4},
+ {"matrix": [3, 0], "x": 0, "y": 38, "flags": 4},
+ {"matrix": [3, 1], "x": 12, "y": 38, "flags": 4},
+ {"matrix": [3, 2], "x": 24, "y": 38, "flags": 4},
+ {"matrix": [3, 3], "x": 37, "y": 38, "flags": 4},
+ {"matrix": [3, 4], "x": 49, "y": 38, "flags": 4},
+ {"matrix": [3, 5], "x": 62, "y": 38, "flags": 4},
+ {"matrix": [3, 6], "x": 74, "y": 38, "flags": 4},
+ {"matrix": [3, 7], "x": 87, "y": 38, "flags": 4},
+ {"matrix": [3, 8], "x": 99, "y": 38, "flags": 4},
+ {"matrix": [3, 9], "x": 122, "y": 38, "flags": 4},
+ {"matrix": [3, 10], "x": 124, "y": 38, "flags": 4},
+ {"matrix": [3, 11], "x": 137, "y": 38, "flags": 4},
+ {"matrix": [3, 12], "x": 140, "y": 38, "flags": 4},
+ {"matrix": [3, 13], "x": 162, "y": 38, "flags": 4},
+ {"matrix": [3, 15], "x": 186, "y": 38, "flags": 4},
+ {"matrix": [3, 16], "x": 199, "y": 38, "flags": 4},
+ {"matrix": [3, 17], "x": 211, "y": 38, "flags": 4},
+ {"matrix": [3, 18], "x": 224, "y": 38, "flags": 4},
+ {"matrix": [4, 0], "x": 0, "y": 51, "flags": 4},
+ {"matrix": [4, 1], "x": 12, "y": 51, "flags": 4},
+ {"matrix": [4, 2], "x": 24, "y": 51, "flags": 4},
+ {"matrix": [4, 3], "x": 37, "y": 51, "flags": 4},
+ {"matrix": [4, 4], "x": 49, "y": 51, "flags": 4},
+ {"matrix": [4, 5], "x": 62, "y": 51, "flags": 4},
+ {"matrix": [4, 6], "x": 74, "y": 51, "flags": 4},
+ {"matrix": [4, 7], "x": 87, "y": 51, "flags": 4},
+ {"matrix": [4, 8], "x": 99, "y": 51, "flags": 4},
+ {"matrix": [4, 9], "x": 122, "y": 51, "flags": 4},
+ {"matrix": [4, 10], "x": 124, "y": 51, "flags": 4},
+ {"matrix": [4, 11], "x": 137, "y": 51, "flags": 4},
+ {"matrix": [4, 12], "x": 140, "y": 51, "flags": 4},
+ {"matrix": [4, 13], "x": 162, "y": 51, "flags": 4},
+ {"matrix": [4, 14], "x": 174, "y": 51, "flags": 4},
+ {"matrix": [4, 15], "x": 186, "y": 51, "flags": 4},
+ {"matrix": [4, 16], "x": 199, "y": 51, "flags": 4},
+ {"matrix": [4, 17], "x": 211, "y": 51, "flags": 4},
+ {"matrix": [4, 18], "x": 224, "y": 51, "flags": 4},
+ {"matrix": [5, 0], "x": 0, "y": 64, "flags": 4},
+ {"matrix": [5, 1], "x": 12, "y": 64, "flags": 4},
+ {"matrix": [5, 3], "x": 37, "y": 64, "flags": 4},
+ {"matrix": [5, 6], "x": 74, "y": 64, "flags": 4},
+ {"matrix": [5, 10], "x": 124, "y": 64, "flags": 4},
+ {"matrix": [5, 11], "x": 137, "y": 64, "flags": 4},
+ {"matrix": [5, 12], "x": 140, "y": 64, "flags": 4},
+ {"matrix": [5, 13], "x": 162, "y": 64, "flags": 4},
+ {"matrix": [5, 14], "x": 174, "y": 64, "flags": 4},
+ {"matrix": [5, 15], "x": 186, "y": 64, "flags": 4},
+ {"matrix": [5, 16], "x": 199, "y": 64, "flags": 4},
+ {"matrix": [5, 17], "x": 211, "y": 64, "flags": 4},
+ {"matrix": [5, 18], "x": 224, "y": 64, "flags": 4}
+ ]
+ },
+ "matrix_pins": {
+ "cols": ["A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0", "A8", "A15", "B3", "B4", "C15", "C14", "C13", "B9", "B8", "B7", "B6"],
+ "rows": ["B0", "B1", "B2", "B15", "B14", "B13"]
+ },
+ "processor": "STM32F103",
+ "usb": {
+ "device_version": "0.0.2",
+ "pid": "0xD182"
+ },
+ "ws2812": {
+ "driver": "spi",
+ "pin": "B5"
+ },
+ "layouts": {
+ "LAYOUT_all": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 2], "x": 1.5, "y": 0},
+ {"matrix": [0, 3], "x": 2.5, "y": 0},
+ {"matrix": [0, 4], "x": 3.5, "y": 0},
+ {"matrix": [0, 5], "x": 4.5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10.5, "y": 0},
+ {"matrix": [0, 11], "x": 11.5, "y": 0},
+ {"matrix": [0, 12], "x": 12.5, "y": 0},
+ {"matrix": [0, 13], "x": 13.5, "y": 0},
+ {"matrix": [0, 14], "x": 15.25, "y": 0},
+ {"matrix": [0, 15], "x": 16.5, "y": 0},
+ {"matrix": [0, 16], "x": 17.5, "y": 0},
+ {"matrix": [0, 17], "x": 18.5, "y": 0},
+ {"matrix": [0, 18], "x": 19.5, "y": 0},
+ {"matrix": [1, 0], "x": 0, "y": 1.5},
+ {"matrix": [1, 1], "x": 1, "y": 1.5},
+ {"matrix": [1, 2], "x": 2, "y": 1.5},
+ {"matrix": [1, 3], "x": 3, "y": 1.5},
+ {"matrix": [1, 4], "x": 4, "y": 1.5},
+ {"matrix": [1, 5], "x": 5, "y": 1.5},
+ {"matrix": [1, 6], "x": 6, "y": 1.5},
+ {"matrix": [1, 7], "x": 7, "y": 1.5},
+ {"matrix": [1, 8], "x": 8, "y": 1.5},
+ {"matrix": [1, 9], "x": 9, "y": 1.5},
+ {"matrix": [1, 10], "x": 10, "y": 1.5},
+ {"matrix": [1, 11], "x": 11, "y": 1.5},
+ {"matrix": [1, 12], "x": 12, "y": 1.5},
+ {"matrix": [1, 13], "x": 13, "y": 1.5},
+ {"matrix": [2, 13], "x": 14, "y": 1.5},
+ {"matrix": [1, 14], "x": 15.25, "y": 1.5},
+ {"matrix": [1, 15], "x": 16.5, "y": 1.5},
+ {"matrix": [1, 16], "x": 17.5, "y": 1.5},
+ {"matrix": [1, 17], "x": 18.5, "y": 1.5},
+ {"matrix": [1, 18], "x": 19.5, "y": 1.5},
+ {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+ {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+ {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+ {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+ {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+ {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+ {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+ {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+ {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+ {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+ {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+ {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+ {"matrix": [3, 12], "x": 13.5, "y": 2.5, "w": 1.5},
+ {"matrix": [2, 14], "x": 15.25, "y": 2.5},
+ {"matrix": [2, 15], "x": 16.5, "y": 2.5},
+ {"matrix": [2, 16], "x": 17.5, "y": 2.5},
+ {"matrix": [2, 17], "x": 18.5, "y": 2.5},
+ {"matrix": [2, 18], "x": 19.5, "y": 2.5},
+ {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+ {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+ {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+ {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+ {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+ {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+ {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+ {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+ {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+ {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+ {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+ {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+ {"matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 2.25},
+ {"matrix": [3, 15], "x": 16.5, "y": 3.5},
+ {"matrix": [3, 16], "x": 17.5, "y": 3.5},
+ {"matrix": [3, 17], "x": 18.5, "y": 3.5},
+ {"matrix": [3, 18], "x": 19.5, "y": 3.5},
+ {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4.5},
+ {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+ {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+ {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+ {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+ {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+ {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+ {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+ {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+ {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+ {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+ {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 1.75},
+ {"matrix": [4, 13], "x": 14, "y": 4.5},
+ {"matrix": [4, 14], "x": 15.25, "y": 4.75},
+ {"matrix": [4, 15], "x": 16.5, "y": 4.5},
+ {"matrix": [4, 16], "x": 17.5, "y": 4.5},
+ {"matrix": [4, 17], "x": 18.5, "y": 4.5},
+ {"matrix": [4, 18], "x": 19.5, "y": 4.5},
+ {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5},
+ {"matrix": [5, 1], "x": 1.5, "y": 5.5},
+ {"matrix": [5, 3], "x": 2.5, "y": 5.5, "w": 1.5},
+ {"matrix": [5, 6], "x": 4, "y": 5.5, "w": 6.25},
+ {"matrix": [5, 10], "x": 10.25, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 11], "x": 11.5, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 12], "x": 12.75, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 13], "x": 14.25, "y": 5.75},
+ {"matrix": [5, 14], "x": 15.25, "y": 5.75},
+ {"matrix": [5, 15], "x": 16.25, "y": 5.75},
+ {"matrix": [5, 16], "x": 17.5, "y": 5.5},
+ {"matrix": [5, 17], "x": 18.5, "y": 5.5},
+ {"matrix": [5, 18], "x": 19.5, "y": 5.5}
+ ]
+ },
+ "LAYOUT_ansi": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 2], "x": 1.5, "y": 0},
+ {"matrix": [0, 3], "x": 2.5, "y": 0},
+ {"matrix": [0, 4], "x": 3.5, "y": 0},
+ {"matrix": [0, 5], "x": 4.5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10.5, "y": 0},
+ {"matrix": [0, 11], "x": 11.5, "y": 0},
+ {"matrix": [0, 12], "x": 12.5, "y": 0},
+ {"matrix": [0, 13], "x": 13.5, "y": 0},
+ {"matrix": [0, 14], "x": 15.25, "y": 0},
+ {"matrix": [0, 15], "x": 16.5, "y": 0},
+ {"matrix": [0, 16], "x": 17.5, "y": 0},
+ {"matrix": [0, 17], "x": 18.5, "y": 0},
+ {"matrix": [0, 18], "x": 19.5, "y": 0},
+ {"matrix": [1, 0], "x": 0, "y": 1.5},
+ {"matrix": [1, 1], "x": 1, "y": 1.5},
+ {"matrix": [1, 2], "x": 2, "y": 1.5},
+ {"matrix": [1, 3], "x": 3, "y": 1.5},
+ {"matrix": [1, 4], "x": 4, "y": 1.5},
+ {"matrix": [1, 5], "x": 5, "y": 1.5},
+ {"matrix": [1, 6], "x": 6, "y": 1.5},
+ {"matrix": [1, 7], "x": 7, "y": 1.5},
+ {"matrix": [1, 8], "x": 8, "y": 1.5},
+ {"matrix": [1, 9], "x": 9, "y": 1.5},
+ {"matrix": [1, 10], "x": 10, "y": 1.5},
+ {"matrix": [1, 11], "x": 11, "y": 1.5},
+ {"matrix": [1, 12], "x": 12, "y": 1.5},
+ {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
+ {"matrix": [1, 14], "x": 15.25, "y": 1.5},
+ {"matrix": [1, 15], "x": 16.5, "y": 1.5},
+ {"matrix": [1, 16], "x": 17.5, "y": 1.5},
+ {"matrix": [1, 17], "x": 18.5, "y": 1.5},
+ {"matrix": [1, 18], "x": 19.5, "y": 1.5},
+ {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+ {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+ {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+ {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+ {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+ {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+ {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+ {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+ {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+ {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+ {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+ {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+ {"matrix": [3, 12], "x": 13.5, "y": 2.5, "w": 1.5},
+ {"matrix": [2, 14], "x": 15.25, "y": 2.5},
+ {"matrix": [2, 15], "x": 16.5, "y": 2.5},
+ {"matrix": [2, 16], "x": 17.5, "y": 2.5},
+ {"matrix": [2, 17], "x": 18.5, "y": 2.5},
+ {"matrix": [2, 18], "x": 19.5, "y": 2.5},
+ {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+ {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+ {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+ {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+ {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+ {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+ {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+ {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+ {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+ {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+ {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+ {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+ {"matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 2.25},
+ {"matrix": [3, 15], "x": 16.5, "y": 3.5},
+ {"matrix": [3, 16], "x": 17.5, "y": 3.5},
+ {"matrix": [3, 17], "x": 18.5, "y": 3.5},
+ {"matrix": [3, 18], "x": 19.5, "y": 3.5},
+ {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+ {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+ {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+ {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+ {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+ {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+ {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+ {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+ {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+ {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+ {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+ {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 2.75},
+ {"matrix": [4, 14], "x": 15.25, "y": 4.75},
+ {"matrix": [4, 15], "x": 16.5, "y": 4.5},
+ {"matrix": [4, 16], "x": 17.5, "y": 4.5},
+ {"matrix": [4, 17], "x": 18.5, "y": 4.5},
+ {"matrix": [4, 18], "x": 19.5, "y": 4.5},
+ {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5},
+ {"matrix": [5, 1], "x": 1.5, "y": 5.5},
+ {"matrix": [5, 3], "x": 2.5, "y": 5.5, "w": 1.5},
+ {"matrix": [5, 6], "x": 4, "y": 5.5, "w": 6.25},
+ {"matrix": [5, 10], "x": 10.25, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 11], "x": 11.5, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 12], "x": 12.75, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 13], "x": 14.25, "y": 5.75},
+ {"matrix": [5, 14], "x": 15.25, "y": 5.75},
+ {"matrix": [5, 15], "x": 16.25, "y": 5.75},
+ {"matrix": [5, 16], "x": 17.5, "y": 5.5},
+ {"matrix": [5, 17], "x": 18.5, "y": 5.5},
+ {"matrix": [5, 18], "x": 19.5, "y": 5.5}
+ ]
+ },
+ "LAYOUT_ansi_split_bs_rshift": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 2], "x": 1.5, "y": 0},
+ {"matrix": [0, 3], "x": 2.5, "y": 0},
+ {"matrix": [0, 4], "x": 3.5, "y": 0},
+ {"matrix": [0, 5], "x": 4.5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10.5, "y": 0},
+ {"matrix": [0, 11], "x": 11.5, "y": 0},
+ {"matrix": [0, 12], "x": 12.5, "y": 0},
+ {"matrix": [0, 13], "x": 13.5, "y": 0},
+ {"matrix": [0, 14], "x": 15.25, "y": 0},
+ {"matrix": [0, 15], "x": 16.5, "y": 0},
+ {"matrix": [0, 16], "x": 17.5, "y": 0},
+ {"matrix": [0, 17], "x": 18.5, "y": 0},
+ {"matrix": [0, 18], "x": 19.5, "y": 0},
+ {"matrix": [1, 0], "x": 0, "y": 1.5},
+ {"matrix": [1, 1], "x": 1, "y": 1.5},
+ {"matrix": [1, 2], "x": 2, "y": 1.5},
+ {"matrix": [1, 3], "x": 3, "y": 1.5},
+ {"matrix": [1, 4], "x": 4, "y": 1.5},
+ {"matrix": [1, 5], "x": 5, "y": 1.5},
+ {"matrix": [1, 6], "x": 6, "y": 1.5},
+ {"matrix": [1, 7], "x": 7, "y": 1.5},
+ {"matrix": [1, 8], "x": 8, "y": 1.5},
+ {"matrix": [1, 9], "x": 9, "y": 1.5},
+ {"matrix": [1, 10], "x": 10, "y": 1.5},
+ {"matrix": [1, 11], "x": 11, "y": 1.5},
+ {"matrix": [1, 12], "x": 12, "y": 1.5},
+ {"matrix": [1, 13], "x": 13, "y": 1.5},
+ {"matrix": [2, 13], "x": 14, "y": 1.5},
+ {"matrix": [1, 14], "x": 15.25, "y": 1.5},
+ {"matrix": [1, 15], "x": 16.5, "y": 1.5},
+ {"matrix": [1, 16], "x": 17.5, "y": 1.5},
+ {"matrix": [1, 17], "x": 18.5, "y": 1.5},
+ {"matrix": [1, 18], "x": 19.5, "y": 1.5},
+ {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+ {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+ {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+ {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+ {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+ {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+ {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+ {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+ {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+ {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+ {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+ {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+ {"matrix": [3, 12], "x": 13.5, "y": 2.5, "w": 1.5},
+ {"matrix": [2, 14], "x": 15.25, "y": 2.5},
+ {"matrix": [2, 15], "x": 16.5, "y": 2.5},
+ {"matrix": [2, 16], "x": 17.5, "y": 2.5},
+ {"matrix": [2, 17], "x": 18.5, "y": 2.5},
+ {"matrix": [2, 18], "x": 19.5, "y": 2.5},
+ {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+ {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+ {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+ {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+ {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+ {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+ {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+ {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+ {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+ {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+ {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+ {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+ {"matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 2.25},
+ {"matrix": [3, 15], "x": 16.5, "y": 3.5},
+ {"matrix": [3, 16], "x": 17.5, "y": 3.5},
+ {"matrix": [3, 17], "x": 18.5, "y": 3.5},
+ {"matrix": [3, 18], "x": 19.5, "y": 3.5},
+ {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+ {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+ {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+ {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+ {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+ {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+ {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+ {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+ {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+ {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+ {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+ {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 1.75},
+ {"matrix": [4, 13], "x": 14, "y": 4.5},
+ {"matrix": [4, 14], "x": 15.25, "y": 4.75},
+ {"matrix": [4, 15], "x": 16.5, "y": 4.5},
+ {"matrix": [4, 16], "x": 17.5, "y": 4.5},
+ {"matrix": [4, 17], "x": 18.5, "y": 4.5},
+ {"matrix": [4, 18], "x": 19.5, "y": 4.5},
+ {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5},
+ {"matrix": [5, 1], "x": 1.5, "y": 5.5},
+ {"matrix": [5, 3], "x": 2.5, "y": 5.5, "w": 1.5},
+ {"matrix": [5, 6], "x": 4, "y": 5.5, "w": 6.25},
+ {"matrix": [5, 10], "x": 10.25, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 11], "x": 11.5, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 12], "x": 12.75, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 13], "x": 14.25, "y": 5.75},
+ {"matrix": [5, 14], "x": 15.25, "y": 5.75},
+ {"matrix": [5, 15], "x": 16.25, "y": 5.75},
+ {"matrix": [5, 16], "x": 17.5, "y": 5.5},
+ {"matrix": [5, 17], "x": 18.5, "y": 5.5},
+ {"matrix": [5, 18], "x": 19.5, "y": 5.5}
+ ]
+ },
+ "LAYOUT_iso": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 2], "x": 1.5, "y": 0},
+ {"matrix": [0, 3], "x": 2.5, "y": 0},
+ {"matrix": [0, 4], "x": 3.5, "y": 0},
+ {"matrix": [0, 5], "x": 4.5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10.5, "y": 0},
+ {"matrix": [0, 11], "x": 11.5, "y": 0},
+ {"matrix": [0, 12], "x": 12.5, "y": 0},
+ {"matrix": [0, 13], "x": 13.5, "y": 0},
+ {"matrix": [0, 14], "x": 15.25, "y": 0},
+ {"matrix": [0, 15], "x": 16.5, "y": 0},
+ {"matrix": [0, 16], "x": 17.5, "y": 0},
+ {"matrix": [0, 17], "x": 18.5, "y": 0},
+ {"matrix": [0, 18], "x": 19.5, "y": 0},
+ {"matrix": [1, 0], "x": 0, "y": 1.5},
+ {"matrix": [1, 1], "x": 1, "y": 1.5},
+ {"matrix": [1, 2], "x": 2, "y": 1.5},
+ {"matrix": [1, 3], "x": 3, "y": 1.5},
+ {"matrix": [1, 4], "x": 4, "y": 1.5},
+ {"matrix": [1, 5], "x": 5, "y": 1.5},
+ {"matrix": [1, 6], "x": 6, "y": 1.5},
+ {"matrix": [1, 7], "x": 7, "y": 1.5},
+ {"matrix": [1, 8], "x": 8, "y": 1.5},
+ {"matrix": [1, 9], "x": 9, "y": 1.5},
+ {"matrix": [1, 10], "x": 10, "y": 1.5},
+ {"matrix": [1, 11], "x": 11, "y": 1.5},
+ {"matrix": [1, 12], "x": 12, "y": 1.5},
+ {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
+ {"matrix": [1, 14], "x": 15.25, "y": 1.5},
+ {"matrix": [1, 15], "x": 16.5, "y": 1.5},
+ {"matrix": [1, 16], "x": 17.5, "y": 1.5},
+ {"matrix": [1, 17], "x": 18.5, "y": 1.5},
+ {"matrix": [1, 18], "x": 19.5, "y": 1.5},
+ {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+ {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+ {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+ {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+ {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+ {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+ {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+ {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+ {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+ {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+ {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+ {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+ {"matrix": [3, 13], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
+ {"matrix": [2, 14], "x": 15.25, "y": 2.5},
+ {"matrix": [2, 15], "x": 16.5, "y": 2.5},
+ {"matrix": [2, 16], "x": 17.5, "y": 2.5},
+ {"matrix": [2, 17], "x": 18.5, "y": 2.5},
+ {"matrix": [2, 18], "x": 19.5, "y": 2.5},
+ {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+ {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+ {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+ {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+ {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+ {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+ {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+ {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+ {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+ {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+ {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+ {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+ {"matrix": [3, 12], "x": 12.75, "y": 3.5},
+ {"matrix": [3, 15], "x": 16.5, "y": 3.5},
+ {"matrix": [3, 16], "x": 17.5, "y": 3.5},
+ {"matrix": [3, 17], "x": 18.5, "y": 3.5},
+ {"matrix": [3, 18], "x": 19.5, "y": 3.5},
+ {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4.5},
+ {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+ {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+ {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+ {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+ {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+ {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+ {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+ {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+ {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+ {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+ {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 2.75},
+ {"matrix": [4, 14], "x": 15.25, "y": 4.75},
+ {"matrix": [4, 15], "x": 16.5, "y": 4.5},
+ {"matrix": [4, 16], "x": 17.5, "y": 4.5},
+ {"matrix": [4, 17], "x": 18.5, "y": 4.5},
+ {"matrix": [4, 18], "x": 19.5, "y": 4.5},
+ {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5},
+ {"matrix": [5, 1], "x": 1.5, "y": 5.5},
+ {"matrix": [5, 3], "x": 2.5, "y": 5.5, "w": 1.5},
+ {"matrix": [5, 6], "x": 4, "y": 5.5, "w": 6.25},
+ {"matrix": [5, 10], "x": 10.25, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 11], "x": 11.5, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 12], "x": 12.75, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 13], "x": 14.25, "y": 5.75},
+ {"matrix": [5, 14], "x": 15.25, "y": 5.75},
+ {"matrix": [5, 15], "x": 16.25, "y": 5.75},
+ {"matrix": [5, 16], "x": 17.5, "y": 5.5},
+ {"matrix": [5, 17], "x": 18.5, "y": 5.5},
+ {"matrix": [5, 18], "x": 19.5, "y": 5.5}
+ ]
+ },
+ "LAYOUT_iso_split_bs_rshift": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 2], "x": 1.5, "y": 0},
+ {"matrix": [0, 3], "x": 2.5, "y": 0},
+ {"matrix": [0, 4], "x": 3.5, "y": 0},
+ {"matrix": [0, 5], "x": 4.5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10.5, "y": 0},
+ {"matrix": [0, 11], "x": 11.5, "y": 0},
+ {"matrix": [0, 12], "x": 12.5, "y": 0},
+ {"matrix": [0, 13], "x": 13.5, "y": 0},
+ {"matrix": [0, 14], "x": 15.25, "y": 0},
+ {"matrix": [0, 15], "x": 16.5, "y": 0},
+ {"matrix": [0, 16], "x": 17.5, "y": 0},
+ {"matrix": [0, 17], "x": 18.5, "y": 0},
+ {"matrix": [0, 18], "x": 19.5, "y": 0},
+ {"matrix": [1, 0], "x": 0, "y": 1.5},
+ {"matrix": [1, 1], "x": 1, "y": 1.5},
+ {"matrix": [1, 2], "x": 2, "y": 1.5},
+ {"matrix": [1, 3], "x": 3, "y": 1.5},
+ {"matrix": [1, 4], "x": 4, "y": 1.5},
+ {"matrix": [1, 5], "x": 5, "y": 1.5},
+ {"matrix": [1, 6], "x": 6, "y": 1.5},
+ {"matrix": [1, 7], "x": 7, "y": 1.5},
+ {"matrix": [1, 8], "x": 8, "y": 1.5},
+ {"matrix": [1, 9], "x": 9, "y": 1.5},
+ {"matrix": [1, 10], "x": 10, "y": 1.5},
+ {"matrix": [1, 11], "x": 11, "y": 1.5},
+ {"matrix": [1, 12], "x": 12, "y": 1.5},
+ {"matrix": [1, 13], "x": 13, "y": 1.5},
+ {"matrix": [2, 13], "x": 14, "y": 1.5},
+ {"matrix": [1, 14], "x": 15.25, "y": 1.5},
+ {"matrix": [1, 15], "x": 16.5, "y": 1.5},
+ {"matrix": [1, 16], "x": 17.5, "y": 1.5},
+ {"matrix": [1, 17], "x": 18.5, "y": 1.5},
+ {"matrix": [1, 18], "x": 19.5, "y": 1.5},
+ {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+ {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+ {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+ {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+ {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+ {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+ {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+ {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+ {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+ {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+ {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+ {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+ {"matrix": [3, 13], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
+ {"matrix": [2, 14], "x": 15.25, "y": 2.5},
+ {"matrix": [2, 15], "x": 16.5, "y": 2.5},
+ {"matrix": [2, 16], "x": 17.5, "y": 2.5},
+ {"matrix": [2, 17], "x": 18.5, "y": 2.5},
+ {"matrix": [2, 18], "x": 19.5, "y": 2.5},
+ {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+ {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+ {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+ {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+ {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+ {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+ {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+ {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+ {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+ {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+ {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+ {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+ {"matrix": [3, 12], "x": 12.75, "y": 3.5},
+ {"matrix": [3, 15], "x": 16.5, "y": 3.5},
+ {"matrix": [3, 16], "x": 17.5, "y": 3.5},
+ {"matrix": [3, 17], "x": 18.5, "y": 3.5},
+ {"matrix": [3, 18], "x": 19.5, "y": 3.5},
+ {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4.5},
+ {"matrix": [4, 2], "x": 2.25, "y": 4.5},
+ {"matrix": [4, 3], "x": 3.25, "y": 4.5},
+ {"matrix": [4, 4], "x": 4.25, "y": 4.5},
+ {"matrix": [4, 5], "x": 5.25, "y": 4.5},
+ {"matrix": [4, 6], "x": 6.25, "y": 4.5},
+ {"matrix": [4, 7], "x": 7.25, "y": 4.5},
+ {"matrix": [4, 8], "x": 8.25, "y": 4.5},
+ {"matrix": [4, 9], "x": 9.25, "y": 4.5},
+ {"matrix": [4, 10], "x": 10.25, "y": 4.5},
+ {"matrix": [4, 11], "x": 11.25, "y": 4.5},
+ {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 1.75},
+ {"matrix": [4, 13], "x": 14, "y": 4.5},
+ {"matrix": [4, 14], "x": 15.25, "y": 4.75},
+ {"matrix": [4, 15], "x": 16.5, "y": 4.5},
+ {"matrix": [4, 16], "x": 17.5, "y": 4.5},
+ {"matrix": [4, 17], "x": 18.5, "y": 4.5},
+ {"matrix": [4, 18], "x": 19.5, "y": 4.5},
+ {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5},
+ {"matrix": [5, 1], "x": 1.5, "y": 5.5},
+ {"matrix": [5, 3], "x": 2.5, "y": 5.5, "w": 1.5},
+ {"matrix": [5, 6], "x": 4, "y": 5.5, "w": 6.25},
+ {"matrix": [5, 10], "x": 10.25, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 11], "x": 11.5, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 12], "x": 12.75, "y": 5.5, "w": 1.25},
+ {"matrix": [5, 13], "x": 14.25, "y": 5.75},
+ {"matrix": [5, 14], "x": 15.25, "y": 5.75},
+ {"matrix": [5, 15], "x": 16.25, "y": 5.75},
+ {"matrix": [5, 16], "x": 17.5, "y": 5.5},
+ {"matrix": [5, 17], "x": 18.5, "y": 5.5},
+ {"matrix": [5, 18], "x": 19.5, "y": 5.5}
+ ]
+ }
+ }
+}
\ No newline at end of file
diff --git a/keyboards/mechlovin/olly/jf/rev2/keymaps/default/keymap.c b/keyboards/mechlovin/olly/jf/rev2/keymaps/default/keymap.c
new file mode 100644
index 0000000000..e2a5ef0d0d
--- /dev/null
+++ b/keyboards/mechlovin/olly/jf/rev2/keymaps/default/keymap.c
@@ -0,0 +1,27 @@
+/* Copyright 2023 Mechlovin'
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [0] = LAYOUT_all(
+ KC_ESC, 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_F13, KC_HOME, KC_END, KC_PGUP, KC_PGDN,
+ KC_GRV, 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_DEL, KC_INS, KC_NUM, KC_PSLS, KC_PAST, KC_PAUS,
+ 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_P7, KC_P8, KC_P9, KC_PMNS,
+ 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_P4, KC_P5, KC_P6, KC_PPLS,
+ KC_LSFT, KC_NUBS, 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_P1, KC_P2, KC_P3, KC_PENT,
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT, KC_PENT
+ )
+};
diff --git a/keyboards/mechlovin/olly/jf/rev2/keymaps/default_ansi/keymap.c b/keyboards/mechlovin/olly/jf/rev2/keymaps/default_ansi/keymap.c
new file mode 100644
index 0000000000..2cc1518fee
--- /dev/null
+++ b/keyboards/mechlovin/olly/jf/rev2/keymaps/default_ansi/keymap.c
@@ -0,0 +1,28 @@
+/* Copyright 2023 Mechlovin'
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+ [0] = LAYOUT_ansi(
+ KC_ESC, 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_F13, KC_HOME, KC_END, KC_PGUP, KC_PGDN,
+ KC_GRV, 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_NUM, KC_PSLS, KC_PAST, KC_PAUS,
+ 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_P7, KC_P8, KC_P9, KC_PMNS,
+ 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_P4, KC_P5, KC_P6, KC_PPLS,
+ 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_P1, KC_P2, KC_P3, KC_PENT,
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT, KC_PENT
+ )
+};
diff --git a/keyboards/mechlovin/olly/jf/rev2/keymaps/default_ansi_split_bs_rshift/keymap.c b/keyboards/mechlovin/olly/jf/rev2/keymaps/default_ansi_split_bs_rshift/keymap.c
new file mode 100644
index 0000000000..b28913c49b
--- /dev/null
+++ b/keyboards/mechlovin/olly/jf/rev2/keymaps/default_ansi_split_bs_rshift/keymap.c
@@ -0,0 +1,28 @@
+/* Copyright 2023 Mechlovin'
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+ [0] = LAYOUT_ansi_split_bs_rshift(
+ KC_ESC, 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_F13, KC_HOME, KC_END, KC_PGUP, KC_PGDN,
+ KC_GRV, 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_DEL, KC_INS, KC_NUM, KC_PSLS, KC_PAST, KC_PAUS,
+ 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_P7, KC_P8, KC_P9, KC_PMNS,
+ 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_P4, KC_P5, KC_P6, KC_PPLS,
+ 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_P1, KC_P2, KC_P3, KC_PENT,
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT, KC_PENT
+ )
+};
diff --git a/keyboards/mechlovin/olly/jf/rev2/keymaps/default_iso/keymap.c b/keyboards/mechlovin/olly/jf/rev2/keymaps/default_iso/keymap.c
new file mode 100644
index 0000000000..9a59431a64
--- /dev/null
+++ b/keyboards/mechlovin/olly/jf/rev2/keymaps/default_iso/keymap.c
@@ -0,0 +1,28 @@
+/* Copyright 2023 Mechlovin'
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+ [0] = LAYOUT_iso(
+ KC_ESC, 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_F13, KC_HOME, KC_END, KC_PGUP, KC_PGDN,
+ KC_GRV, 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_NUM, KC_PSLS, KC_PAST, KC_PAUS,
+ 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_P7, KC_P8, KC_P9, KC_PMNS,
+ 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_NUHS, KC_ENT, KC_P4, KC_P5, KC_P6, KC_PPLS,
+ KC_LSFT, KC_NUBS, 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_P1, KC_P2, KC_P3, KC_PENT,
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT, KC_PENT
+ )
+};
diff --git a/keyboards/mechlovin/olly/jf/rev2/keymaps/default_iso_split_bs_rshift/keymap.c b/keyboards/mechlovin/olly/jf/rev2/keymaps/default_iso_split_bs_rshift/keymap.c
new file mode 100644
index 0000000000..196b855ceb
--- /dev/null
+++ b/keyboards/mechlovin/olly/jf/rev2/keymaps/default_iso_split_bs_rshift/keymap.c
@@ -0,0 +1,28 @@
+/* Copyright 2023 Mechlovin'
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+ [0] = LAYOUT_iso_split_bs_rshift(
+ KC_ESC, 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_F13, KC_HOME, KC_END, KC_PGUP, KC_PGDN,
+ KC_GRV, 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_DEL, KC_INS, KC_NUM, KC_PSLS, KC_PAST, KC_PAUS,
+ 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_P7, KC_P8, KC_P9, KC_PMNS,
+ 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_NUHS, KC_ENT, KC_P4, KC_P5, KC_P6, KC_PPLS,
+ KC_LSFT, KC_NUBS, 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_P1, KC_P2, KC_P3, KC_PENT,
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT, KC_PENT
+ )
+};
diff --git a/keyboards/mechlovin/olly/jf/rev2/keymaps/via/keymap.c b/keyboards/mechlovin/olly/jf/rev2/keymaps/via/keymap.c
new file mode 100644
index 0000000000..477d7bac2a
--- /dev/null
+++ b/keyboards/mechlovin/olly/jf/rev2/keymaps/via/keymap.c
@@ -0,0 +1,27 @@
+/* Copyright 2023 Mechlovin'
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [0] = LAYOUT_all(
+ KC_ESC, 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_F13, KC_HOME, KC_END, KC_PGUP, KC_PGDN,
+ KC_GRV, 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_DEL, KC_INS, KC_NUM, KC_PSLS, KC_PAST, KC_PAUS,
+ 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_P7, KC_P8, KC_P9, KC_PMNS,
+ 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_P4, KC_P5, KC_P6, KC_PPLS,
+ KC_LSFT, KC_SPC, 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_P1, KC_P2, KC_P3, KC_PENT,
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT, KC_PENT
+ )
+};
diff --git a/keyboards/mechlovin/olly/jf/rev2/keymaps/via/rules.mk b/keyboards/mechlovin/olly/jf/rev2/keymaps/via/rules.mk
new file mode 100644
index 0000000000..36b7ba9cbc
--- /dev/null
+++ b/keyboards/mechlovin/olly/jf/rev2/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
diff --git a/keyboards/mechlovin/olly/jf/rev2/matrix_diagram.md b/keyboards/mechlovin/olly/jf/rev2/matrix_diagram.md
new file mode 100644
index 0000000000..776bba84f8
--- /dev/null
+++ b/keyboards/mechlovin/olly/jf/rev2/matrix_diagram.md
@@ -0,0 +1,37 @@
+# Matrix Diagram for Mechlovin.Studio Olly JF Rev. 2
+
+```
+┌───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐┌───┐┌───┬───┬───┬───┐
+│00 │ │02 │03 │04 │05 │ │06 │07 │08 │09 │ │0A │0B │0C │0D ││0E ││0F │0G │0H │0I │
+└───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘└───┘└───┴───┴───┴───┘
+┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐┌───┐┌───┬───┬───┬───┐ ┌───────┐
+│10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D │2D ││1E ││1F │1G │1H │1I │ │1D │ 2u Backspace
+├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤├───┤├───┼───┼───┼───┤ └─┬─────┤ ┌───┐
+│20 │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │3C ││2E ││2F │2G │2H │2I │ │ │ │ │
+├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤└───┘├───┼───┼───┼───┤ ┌──┴┐3D │ │3I │ 2u Numpad Plus
+│30 │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3D │ │3F │3G │3H │3I │ │3C │ │ │ │
+├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤ ├───┼───┼───┼───┤ └───┴────┘ ├───┤
+│40 │41 │42 │43 │44 │45 │46 │47 │48 │49 │4A │4B │4C │4D │┌───┐│4F │4G │4H │4I │ ISO Enter │ │
+├────┴┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┼───┴┬──┴─┬────┼───┘│4E │└───┼───┼───┼───┤ │5I │ 2u Numpad Enter
+│50 │51 │53 │56 │5A │5B │5C │┌───┼───┼───┐│5G │5H │5I │ │ │
+└─────┴───┴─────┴────────────────────────┴────┴────┴────┘│5D │5E │5F │└───┴───┴───┘ └───┘
+ └───┴───┴───┘
+┌────────┐ ┌──────────┐ ┌───────┐
+│40 │ 2.25u LShift 2.75u RShift │4C │ │5G │ 2u Numpad Zero
+└────────┘ └──────────┘ └───────┘
+┌────┬────┬────┬────────────────────────┬─────┬─────┬───┐
+│50 │51 │53 │56 │5A │5B │5C │
+└────┴────┴────┴────────────────────────┴─────┴─────┴───┘
+┌────┬────┬────┬────────────────────────┬─────┬───┬─────┐
+│50 │51 │53 │56 │5A │5B │5C │
+└────┴────┴────┴────────────────────────┴─────┴───┴─────┘
+┌────┬────┬────┬────────────────────────┬─────┬────┬────┐
+│50 │51 │53 │56 │5A │5B │5C │
+└────┴────┴────┴────────────────────────┴─────┴────┴────┘
+┌────┬────┬────┬────────────────────────┬─────┬─────┬───┐
+│50 │51 │53 │56 │5A │5B │5C │
+└────┴────┴────┴────────────────────────┴─────┴─────┴───┘
+┌─────┬───┬─────┬──────────────────────────┬─────┬──────┐
+│50 │51 │53 │56 │5B │5C │ RWKL
+└─────┴───┴─────┴──────────────────────────┴─────┴──────┘
+```
diff --git a/keyboards/mechlovin/olly/jf/rev2/mcuconf.h b/keyboards/mechlovin/olly/jf/rev2/mcuconf.h
new file mode 100644
index 0000000000..b987f486b9
--- /dev/null
+++ b/keyboards/mechlovin/olly/jf/rev2/mcuconf.h
@@ -0,0 +1,27 @@
+/* Copyright 2023 QMK
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+
+#pragma once
+
+#include_next
+
+
+#undef STM32_SPI_USE_SPI1
+#define STM32_SPI_USE_SPI1 TRUE
+
+#undef STM32_I2C_USE_I2C2
+#define STM32_I2C_USE_I2C2 TRUE
diff --git a/keyboards/mechlovin/olly/jf/rev2/readme.md b/keyboards/mechlovin/olly/jf/rev2/readme.md
new file mode 100644
index 0000000000..b165c35778
--- /dev/null
+++ b/keyboards/mechlovin/olly/jf/rev2/readme.md
@@ -0,0 +1,27 @@
+# Mechlovin Olly jf/rev2
+
+![jf/rev2](https://i.imgur.com/IrfTGE7h.png)
+
+Olly jf/rev2 PCB, compatible Duck Jetfire keyboard.
+
+* Keyboard Maintainer: [Mechlovin' Studio](https://mechlovin.studio/)
+* Hardware Supported: Jetfire Korean Kustom
+* Hardware Availability: [Mechlovin' Studio](https://mechlovin.studio/)
+
+Make example for this keyboard (after setting up your build environment):
+
+ make mechlovin/olly/jf/rev2:default
+
+Flashing example for this keyboard:
+
+ make mechlovin/olly/jf/rev2:default:flash
+
+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).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+By keycode: Press the key mapped to `QK_BOOT` if it is available.
+By Bootloader: hold ESC key while plugging in (jump to bootloader)
+By Bootmagic: hold Insert key while pluging in (jump to bootloader and reset EEPROM)
\ No newline at end of file
diff --git a/keyboards/mechlovin/olly/jf/rev2/rev2.c b/keyboards/mechlovin/olly/jf/rev2/rev2.c
new file mode 100644
index 0000000000..04cf3b836d
--- /dev/null
+++ b/keyboards/mechlovin/olly/jf/rev2/rev2.c
@@ -0,0 +1,92 @@
+/* Copyright 2023 Mechlovin'
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+#include "quantum.h"
+
+void board_init(void) {
+ AFIO->MAPR |= AFIO_MAPR_SPI1_REMAP;
+}
+
+const is31fl3731_led_t PROGMEM g_is31fl3731_leds[IS31FL3731_LED_COUNT] = {
+/* Refer to IS31 manual for these locations
+ * driver
+ * | LED address
+ * | | */
+ { 0, C1_8 }, { 0, C3_8 }, { 0, C4_8 }, { 0, C5_8 }, { 0, C6_8 }, { 0, C7_8 }, { 0, C8_8 }, { 0, C9_8 }, { 0, C1_9 }, { 0, C2_9 }, { 0, C3_9 }, { 0, C4_9 }, { 0, C5_9 }, { 0, C6_9 }, { 0, C7_9 }, { 0, C8_9 }, { 0, C9_9 }, { 0, C1_16 },
+ { 0, C1_7 }, { 0, C2_7 }, { 0, C3_7 }, { 0, C4_7 }, { 0, C5_7 }, { 0, C6_7 }, { 0, C7_7 }, { 0, C8_7 }, { 0, C9_7 }, { 0, C1_10 }, { 0, C2_10 }, { 0, C3_10 }, { 0, C4_10 }, { 0, C5_10 }, { 0, C6_10 }, { 0, C7_10 }, { 0, C8_10 }, { 0, C9_10 }, { 0, C2_16 },
+ { 0, C1_6 }, { 0, C2_6 }, { 0, C3_6 }, { 0, C4_6 }, { 0, C5_6 }, { 0, C6_6 }, { 0, C7_6 }, { 0, C8_6 }, { 0, C9_6 }, { 0, C1_11 }, { 0, C2_11 }, { 0, C3_11 }, { 0, C4_11 }, { 0, C5_11 }, { 0, C6_11 }, { 0, C7_11 }, { 0, C8_11 }, { 0, C9_11 }, { 0, C3_16 },
+ { 0, C1_5 }, { 0, C2_5 }, { 0, C3_5 }, { 0, C4_5 }, { 0, C5_5 }, { 0, C6_5 }, { 0, C7_5 }, { 0, C8_5 }, { 0, C9_5 }, { 0, C1_12 }, { 0, C2_12 }, { 0, C3_12 }, { 0, C4_12 }, { 0, C5_12 }, { 0, C7_12 }, { 0, C8_12 }, { 0, C9_12 }, { 0, C4_16 },
+ { 0, C1_4 }, { 0, C2_4 }, { 0, C3_4 }, { 0, C4_4 }, { 0, C5_4 }, { 0, C6_4 }, { 0, C7_4 }, { 0, C8_4 }, { 0, C9_4 }, { 0, C1_13 }, { 0, C2_13 }, { 0, C3_13 }, { 0, C4_13 }, { 0, C5_13 }, { 0, C6_13 }, { 0, C7_13 }, { 0, C8_13 }, { 0, C9_13 }, { 0, C5_16 },
+ { 0, C1_3 }, { 0, C2_3 }, { 0, C4_3 }, { 0, C7_3 }, { 0, C2_14 }, { 0, C3_14 }, { 0, C4_14 }, { 0, C5_14 }, { 0, C6_14 }, { 0, C7_14 }, { 0, C8_15 }, { 0, C9_15 }, { 0, C7_16 },
+ { 0, C2_1 }, { 0, C1_1 }, { 0, C9_1 }, // Lock LED Indicator
+ { 0, C7_15 }, { 0, C6_15 }, { 0, C9_16 }, { 0, C8_16 }, { 0, C1_15 }, // Layer LED Indicator
+};
+
+
+
+bool led_matrix_indicators_kb(void) {
+ if (!led_matrix_indicators_user()) { return false; }
+ if (host_keyboard_led_state().caps_lock) {
+ led_matrix_set_value(106, 0xFF);
+ led_matrix_set_value(56, 0xFF);
+ } else {
+ led_matrix_set_value(106, 0x00);
+ }
+ if (host_keyboard_led_state().num_lock) {
+ led_matrix_set_value(107, 0xFF);
+ led_matrix_set_value(33, 0xFF);
+ } else {
+ led_matrix_set_value(107, 0x00);
+ }
+ if (host_keyboard_led_state().scroll_lock) {
+ led_matrix_set_value(108, 0xFF);
+ } else {
+ led_matrix_set_value(108, 0x00);
+ }
+ // if on layer 0, turn on L1 LED, otherwise off.
+ if (layer_state_is(0)) {
+ led_matrix_set_value(109, 0xFF);
+ } else {
+ led_matrix_set_value(109, 0x00);
+ }
+ // if on layer 1, turn on L2 LED, otherwise off.
+ if (layer_state_is(1)) {
+ led_matrix_set_value(110, 0xFF);
+ } else {
+ led_matrix_set_value(110, 0x00);
+ }
+
+ // if on layer 2, turn on L3 LED, otherwise off.
+ if (layer_state_is(2)) {
+ led_matrix_set_value(111, 0xFF);
+ } else {
+ led_matrix_set_value(111, 0x00);
+ }
+
+ // if on layer 3, turn on L4 LED, otherwise off.
+ if (layer_state_is(3)) {
+ led_matrix_set_value(112, 0xFF);
+ } else {
+ led_matrix_set_value(112, 0x00);
+ }
+ // if on layer 4, turn on L5 LED, otherwise off.
+ if (layer_state_is(4)) {
+ led_matrix_set_value(113, 0xFF);
+ } else {
+ led_matrix_set_value(114, 0x00);
+ }
+
+ return true;
+}
diff --git a/keyboards/mechlovin/olly/jf/rev2/rules.mk b/keyboards/mechlovin/olly/jf/rev2/rules.mk
new file mode 100644
index 0000000000..6e7633bfe0
--- /dev/null
+++ b/keyboards/mechlovin/olly/jf/rev2/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/mechlovin/olly/jf/rules.mk b/keyboards/mechlovin/olly/jf/rules.mk
index 1d15495eef..fa0eceeb8a 100644
--- a/keyboards/mechlovin/olly/jf/rules.mk
+++ b/keyboards/mechlovin/olly/jf/rules.mk
@@ -1,18 +1 @@
-# Processor frequency
-F_CPU = 16000000
-
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-CUSTOM_MATRIX = lite
-
-SRC += matrix.c
+DEFAULT_FOLDER = mechlovin/olly/jf/rev1