From 40d0512794651237a182b4f53a2278d0fb2e583e Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Mon, 22 Apr 2024 02:06:41 +0100 Subject: Migrate build target markers to keyboard.json - P (#23565) --- keyboards/peej/rosaline/ortho/info.json | 88 ----------- keyboards/peej/rosaline/ortho/keyboard.json | 94 ++++++++++++ keyboards/peej/rosaline/ortho/rules.mk | 12 -- keyboards/peej/rosaline/staggered/info.json | 189 ----------------------- keyboards/peej/rosaline/staggered/keyboard.json | 195 ++++++++++++++++++++++++ keyboards/peej/rosaline/staggered/rules.mk | 12 -- 6 files changed, 289 insertions(+), 301 deletions(-) delete mode 100644 keyboards/peej/rosaline/ortho/info.json create mode 100644 keyboards/peej/rosaline/ortho/keyboard.json delete mode 100644 keyboards/peej/rosaline/ortho/rules.mk delete mode 100644 keyboards/peej/rosaline/staggered/info.json create mode 100644 keyboards/peej/rosaline/staggered/keyboard.json delete mode 100644 keyboards/peej/rosaline/staggered/rules.mk (limited to 'keyboards/peej') diff --git a/keyboards/peej/rosaline/ortho/info.json b/keyboards/peej/rosaline/ortho/info.json deleted file mode 100644 index 9fb9d3cb40..0000000000 --- a/keyboards/peej/rosaline/ortho/info.json +++ /dev/null @@ -1,88 +0,0 @@ -{ - "keyboard_name": "Rosaline Ortho", - "manufacturer": "Peej", - "url": "https://github.com/peej/rosaline-keyboard", - "maintainer": "Peej", - "usb": { - "vid": "0x706A", - "pid": "0x0003", - "device_version": "0.0.1", - "max_power": 100 - }, - "matrix_pins": { - "cols": ["B0", "D7", "D6", "C2", "D4", "D1", "D0", "C1"], - "rows": ["C0", "B5", "B4", "B3", "B2", "B1", "C3", "D5"] - }, - "diode_direction": "COL2ROW", - "processor": "atmega328p", - "bootloader": "usbasploader", - "layouts": { - "LAYOUT_ortho_4x15": { - "layout": [ - {"matrix": [0, 0], "x": 0, "y": 0}, - {"matrix": [4, 0], "x": 1, "y": 0}, - {"matrix": [0, 1], "x": 2, "y": 0}, - {"matrix": [4, 1], "x": 3, "y": 0}, - {"matrix": [0, 2], "x": 4, "y": 0}, - {"matrix": [4, 2], "x": 5, "y": 0}, - {"matrix": [0, 3], "x": 6, "y": 0}, - {"matrix": [4, 3], "x": 7, "y": 0}, - {"matrix": [0, 4], "x": 8, "y": 0}, - {"matrix": [4, 4], "x": 9, "y": 0}, - {"matrix": [0, 5], "x": 10, "y": 0}, - {"matrix": [4, 5], "x": 11, "y": 0}, - {"matrix": [0, 6], "x": 12, "y": 0}, - {"matrix": [4, 6], "x": 13, "y": 0}, - {"matrix": [0, 7], "x": 14, "y": 0}, - - {"matrix": [1, 0], "x": 0, "y": 1}, - {"matrix": [5, 0], "x": 1, "y": 1}, - {"matrix": [1, 1], "x": 2, "y": 1}, - {"matrix": [5, 1], "x": 3, "y": 1}, - {"matrix": [1, 2], "x": 4, "y": 1}, - {"matrix": [5, 2], "x": 5, "y": 1}, - {"matrix": [1, 3], "x": 6, "y": 1}, - {"matrix": [5, 3], "x": 7, "y": 1}, - {"matrix": [1, 4], "x": 8, "y": 1}, - {"matrix": [5, 4], "x": 9, "y": 1}, - {"matrix": [1, 5], "x": 10, "y": 1}, - {"matrix": [5, 5], "x": 11, "y": 1}, - {"matrix": [1, 6], "x": 12, "y": 1}, - {"matrix": [5, 6], "x": 13, "y": 1}, - {"matrix": [1, 7], "x": 14, "y": 1}, - - {"matrix": [2, 0], "x": 0, "y": 2}, - {"matrix": [6, 0], "x": 1, "y": 2}, - {"matrix": [2, 1], "x": 2, "y": 2}, - {"matrix": [6, 1], "x": 3, "y": 2}, - {"matrix": [2, 2], "x": 4, "y": 2}, - {"matrix": [6, 2], "x": 5, "y": 2}, - {"matrix": [2, 3], "x": 6, "y": 2}, - {"matrix": [6, 3], "x": 7, "y": 2}, - {"matrix": [2, 4], "x": 8, "y": 2}, - {"matrix": [6, 4], "x": 9, "y": 2}, - {"matrix": [2, 5], "x": 10, "y": 2}, - {"matrix": [6, 5], "x": 11, "y": 2}, - {"matrix": [2, 6], "x": 12, "y": 2}, - {"matrix": [6, 6], "x": 13, "y": 2}, - {"matrix": [2, 7], "x": 14, "y": 2}, - - {"matrix": [3, 0], "x": 0, "y": 3}, - {"matrix": [7, 0], "x": 1, "y": 3}, - {"matrix": [3, 1], "x": 2, "y": 3}, - {"matrix": [7, 1], "x": 3, "y": 3}, - {"matrix": [3, 2], "x": 4, "y": 3}, - {"matrix": [7, 2], "x": 5, "y": 3}, - {"matrix": [3, 3], "x": 6, "y": 3}, - {"matrix": [7, 3], "x": 7, "y": 3}, - {"matrix": [3, 4], "x": 8, "y": 3}, - {"matrix": [7, 4], "x": 9, "y": 3}, - {"matrix": [3, 5], "x": 10, "y": 3}, - {"matrix": [7, 5], "x": 11, "y": 3}, - {"matrix": [3, 6], "x": 12, "y": 3}, - {"matrix": [7, 6], "x": 13, "y": 3}, - {"matrix": [3, 7], "x": 14, "y": 3} - ] - } - } -} diff --git a/keyboards/peej/rosaline/ortho/keyboard.json b/keyboards/peej/rosaline/ortho/keyboard.json new file mode 100644 index 0000000000..49c3b9fb92 --- /dev/null +++ b/keyboards/peej/rosaline/ortho/keyboard.json @@ -0,0 +1,94 @@ +{ + "keyboard_name": "Rosaline Ortho", + "manufacturer": "Peej", + "url": "https://github.com/peej/rosaline-keyboard", + "maintainer": "Peej", + "usb": { + "vid": "0x706A", + "pid": "0x0003", + "device_version": "0.0.1", + "max_power": 100 + }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, + "matrix_pins": { + "cols": ["B0", "D7", "D6", "C2", "D4", "D1", "D0", "C1"], + "rows": ["C0", "B5", "B4", "B3", "B2", "B1", "C3", "D5"] + }, + "diode_direction": "COL2ROW", + "processor": "atmega328p", + "bootloader": "usbasploader", + "layouts": { + "LAYOUT_ortho_4x15": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [4, 0], "x": 1, "y": 0}, + {"matrix": [0, 1], "x": 2, "y": 0}, + {"matrix": [4, 1], "x": 3, "y": 0}, + {"matrix": [0, 2], "x": 4, "y": 0}, + {"matrix": [4, 2], "x": 5, "y": 0}, + {"matrix": [0, 3], "x": 6, "y": 0}, + {"matrix": [4, 3], "x": 7, "y": 0}, + {"matrix": [0, 4], "x": 8, "y": 0}, + {"matrix": [4, 4], "x": 9, "y": 0}, + {"matrix": [0, 5], "x": 10, "y": 0}, + {"matrix": [4, 5], "x": 11, "y": 0}, + {"matrix": [0, 6], "x": 12, "y": 0}, + {"matrix": [4, 6], "x": 13, "y": 0}, + {"matrix": [0, 7], "x": 14, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [5, 0], "x": 1, "y": 1}, + {"matrix": [1, 1], "x": 2, "y": 1}, + {"matrix": [5, 1], "x": 3, "y": 1}, + {"matrix": [1, 2], "x": 4, "y": 1}, + {"matrix": [5, 2], "x": 5, "y": 1}, + {"matrix": [1, 3], "x": 6, "y": 1}, + {"matrix": [5, 3], "x": 7, "y": 1}, + {"matrix": [1, 4], "x": 8, "y": 1}, + {"matrix": [5, 4], "x": 9, "y": 1}, + {"matrix": [1, 5], "x": 10, "y": 1}, + {"matrix": [5, 5], "x": 11, "y": 1}, + {"matrix": [1, 6], "x": 12, "y": 1}, + {"matrix": [5, 6], "x": 13, "y": 1}, + {"matrix": [1, 7], "x": 14, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [6, 0], "x": 1, "y": 2}, + {"matrix": [2, 1], "x": 2, "y": 2}, + {"matrix": [6, 1], "x": 3, "y": 2}, + {"matrix": [2, 2], "x": 4, "y": 2}, + {"matrix": [6, 2], "x": 5, "y": 2}, + {"matrix": [2, 3], "x": 6, "y": 2}, + {"matrix": [6, 3], "x": 7, "y": 2}, + {"matrix": [2, 4], "x": 8, "y": 2}, + {"matrix": [6, 4], "x": 9, "y": 2}, + {"matrix": [2, 5], "x": 10, "y": 2}, + {"matrix": [6, 5], "x": 11, "y": 2}, + {"matrix": [2, 6], "x": 12, "y": 2}, + {"matrix": [6, 6], "x": 13, "y": 2}, + {"matrix": [2, 7], "x": 14, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [7, 0], "x": 1, "y": 3}, + {"matrix": [3, 1], "x": 2, "y": 3}, + {"matrix": [7, 1], "x": 3, "y": 3}, + {"matrix": [3, 2], "x": 4, "y": 3}, + {"matrix": [7, 2], "x": 5, "y": 3}, + {"matrix": [3, 3], "x": 6, "y": 3}, + {"matrix": [7, 3], "x": 7, "y": 3}, + {"matrix": [3, 4], "x": 8, "y": 3}, + {"matrix": [7, 4], "x": 9, "y": 3}, + {"matrix": [3, 5], "x": 10, "y": 3}, + {"matrix": [7, 5], "x": 11, "y": 3}, + {"matrix": [3, 6], "x": 12, "y": 3}, + {"matrix": [7, 6], "x": 13, "y": 3}, + {"matrix": [3, 7], "x": 14, "y": 3} + ] + } + } +} diff --git a/keyboards/peej/rosaline/ortho/rules.mk b/keyboards/peej/rosaline/ortho/rules.mk deleted file mode 100644 index ab2c49da70..0000000000 --- a/keyboards/peej/rosaline/ortho/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# 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 = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/peej/rosaline/staggered/info.json b/keyboards/peej/rosaline/staggered/info.json deleted file mode 100644 index 0679203163..0000000000 --- a/keyboards/peej/rosaline/staggered/info.json +++ /dev/null @@ -1,189 +0,0 @@ -{ - "keyboard_name": "Rosaline Staggered", - "manufacturer": "Peej", - "url": "https://github.com/peej/rosaline-keyboard", - "maintainer": "Peej", - "usb": { - "vid": "0x706A", - "pid": "0x0003", - "device_version": "0.0.1", - "max_power": 100 - }, - "matrix_pins": { - "cols": ["B0", "D7", "D6", "C2", "D4", "D1", "D0", "C1"], - "rows": ["C0", "B5", "B4", "B3", "B2", "B1", "C3", "D5"] - }, - "diode_direction": "COL2ROW", - "processor": "atmega328p", - "bootloader": "usbasploader", - "layout_aliases": { - "LAYOUT_staggered_40": "LAYOUT_all" - }, - "layouts": { - "LAYOUT_all": { - "layout": [ - {"label": "Tab", "matrix": [0, 0], "x": 0, "y": 0, "w": 1.5}, - {"label": "Q", "matrix": [1, 0], "x": 1.5, "y": 0}, - {"label": "W", "matrix": [0, 1], "x": 2.5, "y": 0}, - {"label": "E", "matrix": [0, 2], "x": 3.5, "y": 0}, - {"label": "R", "matrix": [1, 2], "x": 4.5, "y": 0}, - {"label": "T", "matrix": [0, 3], "x": 5.5, "y": 0}, - {"label": "Y", "matrix": [1, 3], "x": 6.5, "y": 0}, - {"label": "U", "matrix": [0, 4], "x": 7.5, "y": 0}, - {"label": "I", "matrix": [1, 4], "x": 8.5, "y": 0}, - {"label": "O", "matrix": [0, 5], "x": 9.5, "y": 0}, - {"label": "P", "matrix": [0, 6], "x": 10.5, "y": 0}, - {"label": "[", "matrix": [1, 6], "x": 11.5, "y": 0}, - {"label": "]", "matrix": [0, 7], "x": 12.5, "y": 0}, - {"label": "Backspace", "matrix": [1, 7], "x": 13.5, "y": 0, "w": 1.5}, - - {"label": "Esc", "matrix": [2, 0], "x": 0, "y": 1, "w": 1.75}, - {"label": "A", "matrix": [1, 1], "x": 1.75, "y": 1}, - {"label": "S", "matrix": [2, 1], "x": 2.75, "y": 1}, - {"label": "D", "matrix": [2, 2], "x": 3.75, "y": 1}, - {"label": "F", "matrix": [3, 2], "x": 4.75, "y": 1}, - {"label": "G", "matrix": [2, 3], "x": 5.75, "y": 1}, - {"label": "H", "matrix": [3, 3], "x": 6.75, "y": 1}, - {"label": "J", "matrix": [2, 4], "x": 7.75, "y": 1}, - {"label": "K", "matrix": [1, 5], "x": 8.75, "y": 1}, - {"label": "L", "matrix": [2, 5], "x": 9.75, "y": 1}, - {"label": ";", "matrix": [2, 6], "x": 10.75, "y": 1}, - {"label": "'", "matrix": [3, 6], "x": 11.75, "y": 1}, - {"label": "Enter", "matrix": [2, 7], "x": 12.75, "y": 1, "w": 2.25}, - - {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 2, "w": 2.25}, - {"label": "Z", "matrix": [3, 1], "x": 2.25, "y": 2}, - {"label": "X", "matrix": [4, 1], "x": 3.25, "y": 2}, - {"label": "C", "matrix": [4, 2], "x": 4.25, "y": 2}, - {"label": "V", "matrix": [4, 3], "x": 5.25, "y": 2}, - {"label": "B", "matrix": [5, 3], "x": 6.25, "y": 2}, - {"label": "N", "matrix": [3, 4], "x": 7.25, "y": 2}, - {"label": "M", "matrix": [4, 4], "x": 8.25, "y": 2}, - {"label": ",", "matrix": [3, 5], "x": 9.25, "y": 2}, - {"label": ".", "matrix": [4, 5], "x": 10.25, "y": 2}, - {"label": "/", "matrix": [4, 6], "x": 11.25, "y": 2}, - {"label": "Shift", "matrix": [3, 7], "x": 12.25, "y": 2, "w": 1.75}, - {"label": "Fn", "matrix": [4, 7], "x": 14, "y": 2}, - - {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 3, "w": 1.5}, - {"label": "GUI", "matrix": [5, 0], "x": 1.5, "y": 3}, - {"label": "Alt", "matrix": [5, 1], "x": 2.5, "y": 3, "w": 1.5}, - {"label": "Space", "matrix": [5, 2], "x": 4, "y": 3, "w": 2.75}, - {"label": "Space", "matrix": [5, 4], "x": 6.75, "y": 3}, - {"label": "Alt", "matrix": [5, 5], "x": 7.75, "y": 3, "w": 2.25}, - {"label": "Ctrl", "matrix": [6, 5], "x": 10, "y": 3}, - {"label": "\u2190", "matrix": [5, 6], "x": 11, "y": 3}, - {"label": "\u2193", "matrix": [6, 6], "x": 12, "y": 3}, - {"label": "\u2191", "matrix": [5, 7], "x": 13, "y": 3}, - {"label": "\u2192", "matrix": [6, 7], "x": 14, "y": 3} - ] - }, - "LAYOUT_tsangan": { - "layout": [ - {"label": "Tab", "matrix": [0, 0], "x": 0, "y": 0, "w": 1.5}, - {"label": "Q", "matrix": [1, 0], "x": 1.5, "y": 0}, - {"label": "W", "matrix": [0, 1], "x": 2.5, "y": 0}, - {"label": "E", "matrix": [0, 2], "x": 3.5, "y": 0}, - {"label": "R", "matrix": [1, 2], "x": 4.5, "y": 0}, - {"label": "T", "matrix": [0, 3], "x": 5.5, "y": 0}, - {"label": "Y", "matrix": [1, 3], "x": 6.5, "y": 0}, - {"label": "U", "matrix": [0, 4], "x": 7.5, "y": 0}, - {"label": "I", "matrix": [1, 4], "x": 8.5, "y": 0}, - {"label": "O", "matrix": [0, 5], "x": 9.5, "y": 0}, - {"label": "P", "matrix": [0, 6], "x": 10.5, "y": 0}, - {"label": "[", "matrix": [1, 6], "x": 11.5, "y": 0}, - {"label": "]", "matrix": [0, 7], "x": 12.5, "y": 0}, - {"label": "Backspace", "matrix": [1, 7], "x": 13.5, "y": 0, "w": 1.5}, - - {"label": "Esc", "matrix": [2, 0], "x": 0, "y": 1, "w": 1.75}, - {"label": "A", "matrix": [1, 1], "x": 1.75, "y": 1}, - {"label": "S", "matrix": [2, 1], "x": 2.75, "y": 1}, - {"label": "D", "matrix": [2, 2], "x": 3.75, "y": 1}, - {"label": "F", "matrix": [3, 2], "x": 4.75, "y": 1}, - {"label": "G", "matrix": [2, 3], "x": 5.75, "y": 1}, - {"label": "H", "matrix": [3, 3], "x": 6.75, "y": 1}, - {"label": "J", "matrix": [2, 4], "x": 7.75, "y": 1}, - {"label": "K", "matrix": [1, 5], "x": 8.75, "y": 1}, - {"label": "L", "matrix": [2, 5], "x": 9.75, "y": 1}, - {"label": ";", "matrix": [2, 6], "x": 10.75, "y": 1}, - {"label": "'", "matrix": [3, 6], "x": 11.75, "y": 1}, - {"label": "Enter", "matrix": [2, 7], "x": 12.75, "y": 1, "w": 2.25}, - - {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 2, "w": 2.25}, - {"label": "Z", "matrix": [3, 1], "x": 2.25, "y": 2}, - {"label": "X", "matrix": [4, 1], "x": 3.25, "y": 2}, - {"label": "C", "matrix": [4, 2], "x": 4.25, "y": 2}, - {"label": "V", "matrix": [4, 3], "x": 5.25, "y": 2}, - {"label": "B", "matrix": [5, 3], "x": 6.25, "y": 2}, - {"label": "N", "matrix": [3, 4], "x": 7.25, "y": 2}, - {"label": "M", "matrix": [4, 4], "x": 8.25, "y": 2}, - {"label": ",", "matrix": [3, 5], "x": 9.25, "y": 2}, - {"label": ".", "matrix": [4, 5], "x": 10.25, "y": 2}, - {"label": "/", "matrix": [4, 6], "x": 11.25, "y": 2}, - {"label": "Shift", "matrix": [3, 7], "x": 12.25, "y": 2, "w": 2.75}, - - {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 3, "w": 1.5}, - {"label": "GUI", "matrix": [5, 0], "x": 1.5, "y": 3}, - {"label": "Alt", "matrix": [5, 1], "x": 2.5, "y": 3, "w": 1.5}, - {"label": "Space", "matrix": [5, 4], "x": 4, "y": 3, "w":7}, - {"label": "Alt", "matrix": [5, 6], "x": 11, "y": 3, "w": 1.5}, - {"label": "Fn", "matrix": [6, 6], "x": 12.5, "y": 3}, - {"label": "Ctrl", "matrix": [5, 7], "x": 13.5, "y": 3, "w": 1.5} - ] - }, - "LAYOUT_tsangan_split_rshift": { - "layout": [ - {"label": "Tab", "matrix": [0, 0], "x": 0, "y": 0, "w": 1.5}, - {"label": "Q", "matrix": [1, 0], "x": 1.5, "y": 0}, - {"label": "W", "matrix": [0, 1], "x": 2.5, "y": 0}, - {"label": "E", "matrix": [0, 2], "x": 3.5, "y": 0}, - {"label": "R", "matrix": [1, 2], "x": 4.5, "y": 0}, - {"label": "T", "matrix": [0, 3], "x": 5.5, "y": 0}, - {"label": "Y", "matrix": [1, 3], "x": 6.5, "y": 0}, - {"label": "U", "matrix": [0, 4], "x": 7.5, "y": 0}, - {"label": "I", "matrix": [1, 4], "x": 8.5, "y": 0}, - {"label": "O", "matrix": [0, 5], "x": 9.5, "y": 0}, - {"label": "P", "matrix": [0, 6], "x": 10.5, "y": 0}, - {"label": "[", "matrix": [1, 6], "x": 11.5, "y": 0}, - {"label": "]", "matrix": [0, 7], "x": 12.5, "y": 0}, - {"label": "Backspace", "matrix": [1, 7], "x": 13.5, "y": 0, "w": 1.5}, - - {"label": "Esc", "matrix": [2, 0], "x": 0, "y": 1, "w": 1.75}, - {"label": "A", "matrix": [1, 1], "x": 1.75, "y": 1}, - {"label": "S", "matrix": [2, 1], "x": 2.75, "y": 1}, - {"label": "D", "matrix": [2, 2], "x": 3.75, "y": 1}, - {"label": "F", "matrix": [3, 2], "x": 4.75, "y": 1}, - {"label": "G", "matrix": [2, 3], "x": 5.75, "y": 1}, - {"label": "H", "matrix": [3, 3], "x": 6.75, "y": 1}, - {"label": "J", "matrix": [2, 4], "x": 7.75, "y": 1}, - {"label": "K", "matrix": [1, 5], "x": 8.75, "y": 1}, - {"label": "L", "matrix": [2, 5], "x": 9.75, "y": 1}, - {"label": ";", "matrix": [2, 6], "x": 10.75, "y": 1}, - {"label": "'", "matrix": [3, 6], "x": 11.75, "y": 1}, - {"label": "Enter", "matrix": [2, 7], "x": 12.75, "y": 1, "w": 2.25}, - - {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 2, "w": 2.25}, - {"label": "Z", "matrix": [3, 1], "x": 2.25, "y": 2}, - {"label": "X", "matrix": [4, 1], "x": 3.25, "y": 2}, - {"label": "C", "matrix": [4, 2], "x": 4.25, "y": 2}, - {"label": "V", "matrix": [4, 3], "x": 5.25, "y": 2}, - {"label": "B", "matrix": [5, 3], "x": 6.25, "y": 2}, - {"label": "N", "matrix": [3, 4], "x": 7.25, "y": 2}, - {"label": "M", "matrix": [4, 4], "x": 8.25, "y": 2}, - {"label": ",", "matrix": [3, 5], "x": 9.25, "y": 2}, - {"label": ".", "matrix": [4, 5], "x": 10.25, "y": 2}, - {"label": "/", "matrix": [4, 6], "x": 11.25, "y": 2}, - {"label": "Shift", "matrix": [3, 7], "x": 12.25, "y": 2, "w": 1.75}, - {"label": "Fn", "matrix": [4, 7], "x": 14, "y": 2}, - - {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 3, "w": 1.5}, - {"label": "GUI", "matrix": [5, 0], "x": 1.5, "y": 3}, - {"label": "Alt", "matrix": [5, 1], "x": 2.5, "y": 3, "w": 1.5}, - {"label": "Space", "matrix": [5, 4], "x": 4, "y": 3, "w":7}, - {"label": "Alt", "matrix": [5, 6], "x": 11, "y": 3, "w": 1.5}, - {"label": "Fn", "matrix": [6, 6], "x": 12.5, "y": 3}, - {"label": "Ctrl", "matrix": [5, 7], "x": 13.5, "y": 3, "w": 1.5} - ] - } - } -} diff --git a/keyboards/peej/rosaline/staggered/keyboard.json b/keyboards/peej/rosaline/staggered/keyboard.json new file mode 100644 index 0000000000..ed4de2313f --- /dev/null +++ b/keyboards/peej/rosaline/staggered/keyboard.json @@ -0,0 +1,195 @@ +{ + "keyboard_name": "Rosaline Staggered", + "manufacturer": "Peej", + "url": "https://github.com/peej/rosaline-keyboard", + "maintainer": "Peej", + "usb": { + "vid": "0x706A", + "pid": "0x0003", + "device_version": "0.0.1", + "max_power": 100 + }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": true, + "nkro": false + }, + "matrix_pins": { + "cols": ["B0", "D7", "D6", "C2", "D4", "D1", "D0", "C1"], + "rows": ["C0", "B5", "B4", "B3", "B2", "B1", "C3", "D5"] + }, + "diode_direction": "COL2ROW", + "processor": "atmega328p", + "bootloader": "usbasploader", + "layout_aliases": { + "LAYOUT_staggered_40": "LAYOUT_all" + }, + "layouts": { + "LAYOUT_all": { + "layout": [ + {"label": "Tab", "matrix": [0, 0], "x": 0, "y": 0, "w": 1.5}, + {"label": "Q", "matrix": [1, 0], "x": 1.5, "y": 0}, + {"label": "W", "matrix": [0, 1], "x": 2.5, "y": 0}, + {"label": "E", "matrix": [0, 2], "x": 3.5, "y": 0}, + {"label": "R", "matrix": [1, 2], "x": 4.5, "y": 0}, + {"label": "T", "matrix": [0, 3], "x": 5.5, "y": 0}, + {"label": "Y", "matrix": [1, 3], "x": 6.5, "y": 0}, + {"label": "U", "matrix": [0, 4], "x": 7.5, "y": 0}, + {"label": "I", "matrix": [1, 4], "x": 8.5, "y": 0}, + {"label": "O", "matrix": [0, 5], "x": 9.5, "y": 0}, + {"label": "P", "matrix": [0, 6], "x": 10.5, "y": 0}, + {"label": "[", "matrix": [1, 6], "x": 11.5, "y": 0}, + {"label": "]", "matrix": [0, 7], "x": 12.5, "y": 0}, + {"label": "Backspace", "matrix": [1, 7], "x": 13.5, "y": 0, "w": 1.5}, + + {"label": "Esc", "matrix": [2, 0], "x": 0, "y": 1, "w": 1.75}, + {"label": "A", "matrix": [1, 1], "x": 1.75, "y": 1}, + {"label": "S", "matrix": [2, 1], "x": 2.75, "y": 1}, + {"label": "D", "matrix": [2, 2], "x": 3.75, "y": 1}, + {"label": "F", "matrix": [3, 2], "x": 4.75, "y": 1}, + {"label": "G", "matrix": [2, 3], "x": 5.75, "y": 1}, + {"label": "H", "matrix": [3, 3], "x": 6.75, "y": 1}, + {"label": "J", "matrix": [2, 4], "x": 7.75, "y": 1}, + {"label": "K", "matrix": [1, 5], "x": 8.75, "y": 1}, + {"label": "L", "matrix": [2, 5], "x": 9.75, "y": 1}, + {"label": ";", "matrix": [2, 6], "x": 10.75, "y": 1}, + {"label": "'", "matrix": [3, 6], "x": 11.75, "y": 1}, + {"label": "Enter", "matrix": [2, 7], "x": 12.75, "y": 1, "w": 2.25}, + + {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 2, "w": 2.25}, + {"label": "Z", "matrix": [3, 1], "x": 2.25, "y": 2}, + {"label": "X", "matrix": [4, 1], "x": 3.25, "y": 2}, + {"label": "C", "matrix": [4, 2], "x": 4.25, "y": 2}, + {"label": "V", "matrix": [4, 3], "x": 5.25, "y": 2}, + {"label": "B", "matrix": [5, 3], "x": 6.25, "y": 2}, + {"label": "N", "matrix": [3, 4], "x": 7.25, "y": 2}, + {"label": "M", "matrix": [4, 4], "x": 8.25, "y": 2}, + {"label": ",", "matrix": [3, 5], "x": 9.25, "y": 2}, + {"label": ".", "matrix": [4, 5], "x": 10.25, "y": 2}, + {"label": "/", "matrix": [4, 6], "x": 11.25, "y": 2}, + {"label": "Shift", "matrix": [3, 7], "x": 12.25, "y": 2, "w": 1.75}, + {"label": "Fn", "matrix": [4, 7], "x": 14, "y": 2}, + + {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 3, "w": 1.5}, + {"label": "GUI", "matrix": [5, 0], "x": 1.5, "y": 3}, + {"label": "Alt", "matrix": [5, 1], "x": 2.5, "y": 3, "w": 1.5}, + {"label": "Space", "matrix": [5, 2], "x": 4, "y": 3, "w": 2.75}, + {"label": "Space", "matrix": [5, 4], "x": 6.75, "y": 3}, + {"label": "Alt", "matrix": [5, 5], "x": 7.75, "y": 3, "w": 2.25}, + {"label": "Ctrl", "matrix": [6, 5], "x": 10, "y": 3}, + {"label": "\u2190", "matrix": [5, 6], "x": 11, "y": 3}, + {"label": "\u2193", "matrix": [6, 6], "x": 12, "y": 3}, + {"label": "\u2191", "matrix": [5, 7], "x": 13, "y": 3}, + {"label": "\u2192", "matrix": [6, 7], "x": 14, "y": 3} + ] + }, + "LAYOUT_tsangan": { + "layout": [ + {"label": "Tab", "matrix": [0, 0], "x": 0, "y": 0, "w": 1.5}, + {"label": "Q", "matrix": [1, 0], "x": 1.5, "y": 0}, + {"label": "W", "matrix": [0, 1], "x": 2.5, "y": 0}, + {"label": "E", "matrix": [0, 2], "x": 3.5, "y": 0}, + {"label": "R", "matrix": [1, 2], "x": 4.5, "y": 0}, + {"label": "T", "matrix": [0, 3], "x": 5.5, "y": 0}, + {"label": "Y", "matrix": [1, 3], "x": 6.5, "y": 0}, + {"label": "U", "matrix": [0, 4], "x": 7.5, "y": 0}, + {"label": "I", "matrix": [1, 4], "x": 8.5, "y": 0}, + {"label": "O", "matrix": [0, 5], "x": 9.5, "y": 0}, + {"label": "P", "matrix": [0, 6], "x": 10.5, "y": 0}, + {"label": "[", "matrix": [1, 6], "x": 11.5, "y": 0}, + {"label": "]", "matrix": [0, 7], "x": 12.5, "y": 0}, + {"label": "Backspace", "matrix": [1, 7], "x": 13.5, "y": 0, "w": 1.5}, + + {"label": "Esc", "matrix": [2, 0], "x": 0, "y": 1, "w": 1.75}, + {"label": "A", "matrix": [1, 1], "x": 1.75, "y": 1}, + {"label": "S", "matrix": [2, 1], "x": 2.75, "y": 1}, + {"label": "D", "matrix": [2, 2], "x": 3.75, "y": 1}, + {"label": "F", "matrix": [3, 2], "x": 4.75, "y": 1}, + {"label": "G", "matrix": [2, 3], "x": 5.75, "y": 1}, + {"label": "H", "matrix": [3, 3], "x": 6.75, "y": 1}, + {"label": "J", "matrix": [2, 4], "x": 7.75, "y": 1}, + {"label": "K", "matrix": [1, 5], "x": 8.75, "y": 1}, + {"label": "L", "matrix": [2, 5], "x": 9.75, "y": 1}, + {"label": ";", "matrix": [2, 6], "x": 10.75, "y": 1}, + {"label": "'", "matrix": [3, 6], "x": 11.75, "y": 1}, + {"label": "Enter", "matrix": [2, 7], "x": 12.75, "y": 1, "w": 2.25}, + + {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 2, "w": 2.25}, + {"label": "Z", "matrix": [3, 1], "x": 2.25, "y": 2}, + {"label": "X", "matrix": [4, 1], "x": 3.25, "y": 2}, + {"label": "C", "matrix": [4, 2], "x": 4.25, "y": 2}, + {"label": "V", "matrix": [4, 3], "x": 5.25, "y": 2}, + {"label": "B", "matrix": [5, 3], "x": 6.25, "y": 2}, + {"label": "N", "matrix": [3, 4], "x": 7.25, "y": 2}, + {"label": "M", "matrix": [4, 4], "x": 8.25, "y": 2}, + {"label": ",", "matrix": [3, 5], "x": 9.25, "y": 2}, + {"label": ".", "matrix": [4, 5], "x": 10.25, "y": 2}, + {"label": "/", "matrix": [4, 6], "x": 11.25, "y": 2}, + {"label": "Shift", "matrix": [3, 7], "x": 12.25, "y": 2, "w": 2.75}, + + {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 3, "w": 1.5}, + {"label": "GUI", "matrix": [5, 0], "x": 1.5, "y": 3}, + {"label": "Alt", "matrix": [5, 1], "x": 2.5, "y": 3, "w": 1.5}, + {"label": "Space", "matrix": [5, 4], "x": 4, "y": 3, "w":7}, + {"label": "Alt", "matrix": [5, 6], "x": 11, "y": 3, "w": 1.5}, + {"label": "Fn", "matrix": [6, 6], "x": 12.5, "y": 3}, + {"label": "Ctrl", "matrix": [5, 7], "x": 13.5, "y": 3, "w": 1.5} + ] + }, + "LAYOUT_tsangan_split_rshift": { + "layout": [ + {"label": "Tab", "matrix": [0, 0], "x": 0, "y": 0, "w": 1.5}, + {"label": "Q", "matrix": [1, 0], "x": 1.5, "y": 0}, + {"label": "W", "matrix": [0, 1], "x": 2.5, "y": 0}, + {"label": "E", "matrix": [0, 2], "x": 3.5, "y": 0}, + {"label": "R", "matrix": [1, 2], "x": 4.5, "y": 0}, + {"label": "T", "matrix": [0, 3], "x": 5.5, "y": 0}, + {"label": "Y", "matrix": [1, 3], "x": 6.5, "y": 0}, + {"label": "U", "matrix": [0, 4], "x": 7.5, "y": 0}, + {"label": "I", "matrix": [1, 4], "x": 8.5, "y": 0}, + {"label": "O", "matrix": [0, 5], "x": 9.5, "y": 0}, + {"label": "P", "matrix": [0, 6], "x": 10.5, "y": 0}, + {"label": "[", "matrix": [1, 6], "x": 11.5, "y": 0}, + {"label": "]", "matrix": [0, 7], "x": 12.5, "y": 0}, + {"label": "Backspace", "matrix": [1, 7], "x": 13.5, "y": 0, "w": 1.5}, + + {"label": "Esc", "matrix": [2, 0], "x": 0, "y": 1, "w": 1.75}, + {"label": "A", "matrix": [1, 1], "x": 1.75, "y": 1}, + {"label": "S", "matrix": [2, 1], "x": 2.75, "y": 1}, + {"label": "D", "matrix": [2, 2], "x": 3.75, "y": 1}, + {"label": "F", "matrix": [3, 2], "x": 4.75, "y": 1}, + {"label": "G", "matrix": [2, 3], "x": 5.75, "y": 1}, + {"label": "H", "matrix": [3, 3], "x": 6.75, "y": 1}, + {"label": "J", "matrix": [2, 4], "x": 7.75, "y": 1}, + {"label": "K", "matrix": [1, 5], "x": 8.75, "y": 1}, + {"label": "L", "matrix": [2, 5], "x": 9.75, "y": 1}, + {"label": ";", "matrix": [2, 6], "x": 10.75, "y": 1}, + {"label": "'", "matrix": [3, 6], "x": 11.75, "y": 1}, + {"label": "Enter", "matrix": [2, 7], "x": 12.75, "y": 1, "w": 2.25}, + + {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 2, "w": 2.25}, + {"label": "Z", "matrix": [3, 1], "x": 2.25, "y": 2}, + {"label": "X", "matrix": [4, 1], "x": 3.25, "y": 2}, + {"label": "C", "matrix": [4, 2], "x": 4.25, "y": 2}, + {"label": "V", "matrix": [4, 3], "x": 5.25, "y": 2}, + {"label": "B", "matrix": [5, 3], "x": 6.25, "y": 2}, + {"label": "N", "matrix": [3, 4], "x": 7.25, "y": 2}, + {"label": "M", "matrix": [4, 4], "x": 8.25, "y": 2}, + {"label": ",", "matrix": [3, 5], "x": 9.25, "y": 2}, + {"label": ".", "matrix": [4, 5], "x": 10.25, "y": 2}, + {"label": "/", "matrix": [4, 6], "x": 11.25, "y": 2}, + {"label": "Shift", "matrix": [3, 7], "x": 12.25, "y": 2, "w": 1.75}, + {"label": "Fn", "matrix": [4, 7], "x": 14, "y": 2}, + + {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 3, "w": 1.5}, + {"label": "GUI", "matrix": [5, 0], "x": 1.5, "y": 3}, + {"label": "Alt", "matrix": [5, 1], "x": 2.5, "y": 3, "w": 1.5}, + {"label": "Space", "matrix": [5, 4], "x": 4, "y": 3, "w":7}, + {"label": "Alt", "matrix": [5, 6], "x": 11, "y": 3, "w": 1.5}, + {"label": "Fn", "matrix": [6, 6], "x": 12.5, "y": 3}, + {"label": "Ctrl", "matrix": [5, 7], "x": 13.5, "y": 3, "w": 1.5} + ] + } + } +} diff --git a/keyboards/peej/rosaline/staggered/rules.mk b/keyboards/peej/rosaline/staggered/rules.mk deleted file mode 100644 index ab2c49da70..0000000000 --- a/keyboards/peej/rosaline/staggered/rules.mk +++ /dev/null @@ -1,12 +0,0 @@ -# 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 = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -- cgit v1.2.3