From de92e8b3b02a8bb5440b344b0a270512fc4b514c Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Thu, 8 Dec 2022 09:01:56 -0800 Subject: [PATCH] Idobao ID80 V2: Partial Data-Driven Conversion (#19247) --- keyboards/idobao/id80/v2/ansi/info.json | 91 +++++++++++ keyboards/idobao/id80/v2/ansi/rules.mk | 3 +- keyboards/idobao/id80/v2/info.json | 193 ++---------------------- keyboards/idobao/id80/v2/iso/info.json | 92 +++++++++++ keyboards/idobao/id80/v2/iso/rules.mk | 3 +- keyboards/idobao/id80/v2/rules.mk | 19 --- keyboards/idobao/id80/v2/v2.c | 17 --- keyboards/idobao/id80/v2/v2.h | 57 ------- 8 files changed, 198 insertions(+), 277 deletions(-) delete mode 100644 keyboards/idobao/id80/v2/rules.mk delete mode 100644 keyboards/idobao/id80/v2/v2.c delete mode 100644 keyboards/idobao/id80/v2/v2.h diff --git a/keyboards/idobao/id80/v2/ansi/info.json b/keyboards/idobao/id80/v2/ansi/info.json index 09ddaa1b5f..0e19a2b10b 100644 --- a/keyboards/idobao/id80/v2/ansi/info.json +++ b/keyboards/idobao/id80/v2/ansi/info.json @@ -2,5 +2,96 @@ "keyboard_name": "ID80 ANSI", "usb": { "pid": "0x0080" + }, + "layouts": { + "LAYOUT_ansi": { + "layout": [ + {"label":"Esc", "matrix":[0, 5], "x":0, "y":0}, + {"label":"F1", "matrix":[1, 5], "x":1.25, "y":0}, + {"label":"F2", "matrix":[2, 5], "x":2.25, "y":0}, + {"label":"F3", "matrix":[3, 5], "x":3.25, "y":0}, + {"label":"F4", "matrix":[4, 5], "x":4.25, "y":0}, + {"label":"F5", "matrix":[5, 5], "x":5.5, "y":0}, + {"label":"F6", "matrix":[6, 5], "x":6.5, "y":0}, + {"label":"F7", "matrix":[7, 5], "x":7.5, "y":0}, + {"label":"F8", "matrix":[8, 5], "x":8.5, "y":0}, + {"label":"F9", "matrix":[7, 10], "x":9.75, "y":0}, + {"label":"F10", "matrix":[5, 10], "x":10.75, "y":0}, + {"label":"F11", "matrix":[4, 10], "x":11.75, "y":0}, + {"label":"F12", "matrix":[3, 10], "x":12.75, "y":0}, + {"label":"Fn", "matrix":[6, 10], "x":14, "y":0}, + {"label":"Insert", "matrix":[2, 10], "x":15.25, "y":0}, + + {"label":"`", "matrix":[0, 4], "x":0, "y":1.25}, + {"label":"1", "matrix":[1, 4], "x":1, "y":1.25}, + {"label":"2", "matrix":[2, 4], "x":2, "y":1.25}, + {"label":"3", "matrix":[3, 4], "x":3, "y":1.25}, + {"label":"4", "matrix":[4, 4], "x":4, "y":1.25}, + {"label":"5", "matrix":[5, 4], "x":5, "y":1.25}, + {"label":"6", "matrix":[6, 4], "x":6, "y":1.25}, + {"label":"7", "matrix":[7, 4], "x":7, "y":1.25}, + {"label":"8", "matrix":[8, 4], "x":8, "y":1.25}, + {"label":"9", "matrix":[8, 9], "x":9, "y":1.25}, + {"label":"0", "matrix":[7, 9], "x":10, "y":1.25}, + {"label":"-", "matrix":[5, 9], "x":11, "y":1.25}, + {"label":"=", "matrix":[4, 9], "x":12, "y":1.25}, + {"label":"Backspace", "matrix":[6, 9], "x":13, "y":1.25, "w":2}, + {"label":"Home", "matrix":[2, 9], "x":15.25, "y":1.25}, + + {"label":"Tab", "matrix":[0, 3], "x":0, "y":2.2, "w":1.55}, + {"label":"Q", "matrix":[1, 3], "x":1.5, "y":2.25}, + {"label":"W", "matrix":[2, 3], "x":2.5, "y":2.25}, + {"label":"E", "matrix":[3, 3], "x":3.5, "y":2.25}, + {"label":"R", "matrix":[4, 3], "x":4.5, "y":2.25}, + {"label":"T", "matrix":[5, 3], "x":5.5, "y":2.25}, + {"label":"Y", "matrix":[6, 3], "x":6.5, "y":2.25}, + {"label":"U", "matrix":[7, 3], "x":7.5, "y":2.25}, + {"label":"I", "matrix":[8, 3], "x":8.5, "y":2.25}, + {"label":"O", "matrix":[8, 8], "x":9.5, "y":2.25}, + {"label":"P", "matrix":[7, 8], "x":10.5, "y":2.25}, + {"label":"[", "matrix":[5, 8], "x":11.5, "y":2.25}, + {"label":"]", "matrix":[4, 8], "x":12.5, "y":2.25}, + {"label":"\\", "matrix":[3, 8], "x":13.5, "y":2.25, "w":1.5}, + {"label":"Delete", "matrix":[2, 8], "x":15.25, "y":2.25}, + + {"label":"Caps Lock", "matrix":[0, 2], "x":0, "y":3.25, "w":1.75}, + {"label":"A", "matrix":[1, 2], "x":1.75, "y":3.25}, + {"label":"S", "matrix":[2, 2], "x":2.75, "y":3.25}, + {"label":"D", "matrix":[3, 2], "x":3.75, "y":3.25}, + {"label":"F", "matrix":[4, 2], "x":4.75, "y":3.25}, + {"label":"G", "matrix":[5, 2], "x":5.75, "y":3.25}, + {"label":"H", "matrix":[6, 2], "x":6.75, "y":3.25}, + {"label":"J", "matrix":[7, 2], "x":7.75, "y":3.25}, + {"label":"K", "matrix":[8, 2], "x":8.75, "y":3.25}, + {"label":"L", "matrix":[8, 7], "x":9.75, "y":3.25}, + {"label":";", "matrix":[7, 7], "x":10.75, "y":3.25}, + {"label":"'", "matrix":[5, 7], "x":11.75, "y":3.25}, + {"label":"Enter", "matrix":[4, 7], "x":12.75, "y":3.25 , "w":2.25}, + + {"label":"Shift", "matrix":[0, 1], "x":0, "y":4.25 , "w":2.25}, + {"label":"Z", "matrix":[2, 1], "x":2.25, "y":4.25}, + {"label":"X", "matrix":[3, 1], "x":3.25, "y":4.25}, + {"label":"C", "matrix":[4, 1], "x":4.25, "y":4.25}, + {"label":"V", "matrix":[5, 1], "x":5.25, "y":4.25}, + {"label":"B", "matrix":[6, 1], "x":6.25, "y":4.25}, + {"label":"N", "matrix":[7, 1], "x":7.25, "y":4.25}, + {"label":"M", "matrix":[8, 1], "x":8.25, "y":4.25}, + {"label":",", "matrix":[8, 6], "x":9.25, "y":4.25}, + {"label":".", "matrix":[7, 6], "x":10.25, "y":4.25}, + {"label":"/", "matrix":[5, 6], "x":11.25, "y":4.25}, + {"label":"Shift", "matrix":[4, 6], "x":12.25, "y":4.25 , "w":1.75}, + {"label":"\u2191", "matrix":[3, 6], "x":14.25, "y":4.5}, + + {"label":"Ctrl", "matrix":[0, 0], "x":0, "y":5.25 , "w":1.25}, + {"label":"Win", "matrix":[1, 0], "x":1.25, "y":5.25 , "w":1.25}, + {"label":"Alt", "matrix":[2, 0], "x":2.5, "y":5.25 , "w":1.25}, + {"label":"K06", "matrix":[6, 0], "x":3.75, "y":5.25 , "w":6.25}, + {"label":"Alt", "matrix":[8, 0], "x":10, "y":5.25 , "w":1.5}, + {"label":"Ctrl", "matrix":[7, 0], "x":11.5, "y":5.25 , "w":1.5}, + {"label":"\u2190", "matrix":[5, 0], "x":13.25, "y":5.5}, + {"label":"\u2193", "matrix":[4, 0], "x":14.25, "y":5.5}, + {"label":"\u2192", "matrix":[3, 0], "x":15.25, "y":5.5} + ] + } } } diff --git a/keyboards/idobao/id80/v2/ansi/rules.mk b/keyboards/idobao/id80/v2/ansi/rules.mk index 323c12fc6e..5fa6d2f3d0 100644 --- a/keyboards/idobao/id80/v2/ansi/rules.mk +++ b/keyboards/idobao/id80/v2/ansi/rules.mk @@ -1 +1,2 @@ -# see common rules.mk +# This file intentionally left blank +# see common info.json diff --git a/keyboards/idobao/id80/v2/info.json b/keyboards/idobao/id80/v2/info.json index 391460b3b2..5d874014a6 100644 --- a/keyboards/idobao/id80/v2/info.json +++ b/keyboards/idobao/id80/v2/info.json @@ -6,187 +6,16 @@ "vid": "0x6964", "device_version": "0.0.1" }, - "layouts": { - "LAYOUT_ansi": { - "layout": [ - {"label":"Esc", "x":0, "y":0}, - {"label":"F1", "x":1.25, "y":0}, - {"label":"F2", "x":2.25, "y":0}, - {"label":"F3", "x":3.25, "y":0}, - {"label":"F4", "x":4.25, "y":0}, - {"label":"F5", "x":5.5, "y":0}, - {"label":"F6", "x":6.5, "y":0}, - {"label":"F7", "x":7.5, "y":0}, - {"label":"F8", "x":8.5, "y":0}, - {"label":"F9", "x":9.75, "y":0}, - {"label":"F10", "x":10.75, "y":0}, - {"label":"F11", "x":11.75, "y":0}, - {"label":"F12", "x":12.75, "y":0}, - {"label":"Fn", "x":14, "y":0}, - {"label":"Insert", "x":15.25, "y":0}, - - {"label":"`", "x":0, "y":1.25}, - {"label":"1", "x":1, "y":1.25}, - {"label":"2", "x":2, "y":1.25}, - {"label":"3", "x":3, "y":1.25}, - {"label":"4", "x":4, "y":1.25}, - {"label":"5", "x":5, "y":1.25}, - {"label":"6", "x":6, "y":1.25}, - {"label":"7", "x":7, "y":1.25}, - {"label":"8", "x":8, "y":1.25}, - {"label":"9", "x":9, "y":1.25}, - {"label":"0", "x":10, "y":1.25}, - {"label":"-", "x":11, "y":1.25}, - {"label":"=", "x":12, "y":1.25}, - {"label":"Backspace", "x":13, "y":1.25, "w":2}, - {"label":"Home", "x":15.25, "y":1.25}, - - {"label":"Tab", "x":0, "y":2.25, "w":1.5}, - {"label":"Q", "x":1.5, "y":2.25}, - {"label":"W", "x":2.5, "y":2.25}, - {"label":"E", "x":3.5, "y":2.25}, - {"label":"R", "x":4.5, "y":2.25}, - {"label":"T", "x":5.5, "y":2.25}, - {"label":"Y", "x":6.5, "y":2.25}, - {"label":"U", "x":7.5, "y":2.25}, - {"label":"I", "x":8.5, "y":2.25}, - {"label":"O", "x":9.5, "y":2.25}, - {"label":"P", "x":10.5, "y":2.25}, - {"label":"[", "x":11.5, "y":2.25}, - {"label":"]", "x":12.5, "y":2.25}, - {"label":"\\", "x":13.5, "y":2.25, "w":1.5}, - {"label":"Delete", "x":15.25, "y":2.25}, - - {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75}, - {"label":"A", "x":1.75, "y":3.25}, - {"label":"S", "x":2.75, "y":3.25}, - {"label":"D", "x":3.75, "y":3.25}, - {"label":"F", "x":4.75, "y":3.25}, - {"label":"G", "x":5.75, "y":3.25}, - {"label":"H", "x":6.75, "y":3.25}, - {"label":"J", "x":7.75, "y":3.25}, - {"label":"K", "x":8.75, "y":3.25}, - {"label":"L", "x":9.75, "y":3.25}, - {"label":";", "x":10.75, "y":3.25}, - {"label":"'", "x":11.75, "y":3.25}, - {"label":"Enter", "x":12.75, "y":3.25, "w":2.25}, - - {"label":"Shift", "x":0, "y":4.25, "w":2.25}, - {"label":"Z", "x":2.25, "y":4.25}, - {"label":"X", "x":3.25, "y":4.25}, - {"label":"C", "x":4.25, "y":4.25}, - {"label":"V", "x":5.25, "y":4.25}, - {"label":"B", "x":6.25, "y":4.25}, - {"label":"N", "x":7.25, "y":4.25}, - {"label":"M", "x":8.25, "y":4.25}, - {"label":",", "x":9.25, "y":4.25}, - {"label":".", "x":10.25, "y":4.25}, - {"label":"/", "x":11.25, "y":4.25}, - {"label":"Shift", "x":12.25, "y":4.25, "w":1.75}, - {"label":"\u2191", "x":14.25, "y":4.5}, - - {"label":"Ctrl", "x":0, "y":5.25, "w":1.25}, - {"label":"Win", "x":1.25, "y":5.25, "w":1.25}, - {"label":"Alt", "x":2.5, "y":5.25, "w":1.25}, - {"x":3.75, "y":5.25, "w":6.25}, - {"label":"Alt", "x":10, "y":5.25, "w":1.5}, - {"label":"Ctrl", "x":11.5, "y":5.25, "w":1.5}, - {"label":"\u2190", "x":13.25, "y":5.5}, - {"label":"\u2193", "x":14.25, "y":5.5}, - {"label":"\u2192", "x":15.25, "y":5.5} - ] - }, - - "LAYOUT_iso": { - "layout": [ - {"label":"Esc", "x":0, "y":0}, - {"label":"F1", "x":1.25, "y":0}, - {"label":"F2", "x":2.25, "y":0}, - {"label":"F3", "x":3.25, "y":0}, - {"label":"F4", "x":4.25, "y":0}, - {"label":"F5", "x":5.5, "y":0}, - {"label":"F6", "x":6.5, "y":0}, - {"label":"F7", "x":7.5, "y":0}, - {"label":"F8", "x":8.5, "y":0}, - {"label":"F9", "x":9.75, "y":0}, - {"label":"F10", "x":10.75, "y":0}, - {"label":"F11", "x":11.75, "y":0}, - {"label":"F12", "x":12.75, "y":0}, - {"label":"Fn", "x":14, "y":0}, - {"label":"Insert", "x":15.25, "y":0}, - - {"label":"`", "x":0, "y":1.25}, - {"label":"1", "x":1, "y":1.25}, - {"label":"2", "x":2, "y":1.25}, - {"label":"3", "x":3, "y":1.25}, - {"label":"4", "x":4, "y":1.25}, - {"label":"5", "x":5, "y":1.25}, - {"label":"6", "x":6, "y":1.25}, - {"label":"7", "x":7, "y":1.25}, - {"label":"8", "x":8, "y":1.25}, - {"label":"9", "x":9, "y":1.25}, - {"label":"0", "x":10, "y":1.25}, - {"label":"-", "x":11, "y":1.25}, - {"label":"=", "x":12, "y":1.25}, - {"label":"Backspace", "x":13, "y":1.25, "w":2}, - {"label":"Home", "x":15.25, "y":1.25}, - - {"label":"Tab", "x":0, "y":2.25, "w":1.5}, - {"label":"Q", "x":1.5, "y":2.25}, - {"label":"W", "x":2.5, "y":2.25}, - {"label":"E", "x":3.5, "y":2.25}, - {"label":"R", "x":4.5, "y":2.25}, - {"label":"T", "x":5.5, "y":2.25}, - {"label":"Y", "x":6.5, "y":2.25}, - {"label":"U", "x":7.5, "y":2.25}, - {"label":"I", "x":8.5, "y":2.25}, - {"label":"O", "x":9.5, "y":2.25}, - {"label":"P", "x":10.5, "y":2.25}, - {"label":"[", "x":11.5, "y":2.25}, - {"label":"]", "x":12.5, "y":2.25}, - {"label":"Delete", "x":15.25, "y":2.25}, - - {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75}, - {"label":"A", "x":1.75, "y":3.25}, - {"label":"S", "x":2.75, "y":3.25}, - {"label":"D", "x":3.75, "y":3.25}, - {"label":"F", "x":4.75, "y":3.25}, - {"label":"G", "x":5.75, "y":3.25}, - {"label":"H", "x":6.75, "y":3.25}, - {"label":"J", "x":7.75, "y":3.25}, - {"label":"K", "x":8.75, "y":3.25}, - {"label":"L", "x":9.75, "y":3.25}, - {"label":";", "x":10.75, "y":3.25}, - {"label":"'", "x":11.75, "y":3.25}, - {"label":"ISO #", "x":12.75, "y":3.25}, - {"label":"Enter", "x":13.75, "y":2.25, "w":1.25, "h":2}, - - {"label":"Shift", "x":0, "y":4.25, "w":1.25}, - {"label":"ISO \\", "x":1.25, "y":4.25}, - {"label":"Z", "x":2.25, "y":4.25}, - {"label":"X", "x":3.25, "y":4.25}, - {"label":"C", "x":4.25, "y":4.25}, - {"label":"V", "x":5.25, "y":4.25}, - {"label":"B", "x":6.25, "y":4.25}, - {"label":"N", "x":7.25, "y":4.25}, - {"label":"M", "x":8.25, "y":4.25}, - {"label":",", "x":9.25, "y":4.25}, - {"label":".", "x":10.25, "y":4.25}, - {"label":"/", "x":11.25, "y":4.25}, - {"label":"Shift", "x":12.25, "y":4.25, "w":1.75}, - {"label":"Up", "x":14.25, "y":4.5}, - - {"label":"Ctrl", "x":0, "y":5.25, "w":1.25}, - {"label":"GUI", "x":1.25, "y":5.25, "w":1.25}, - {"label":"Alt", "x":2.5, "y":5.25, "w":1.25}, - {"label":"Space", "x":3.75, "y":5.25, "w":6.25}, - {"label":"Alt", "x":10, "y":5.25, "w":1.5}, - {"label":"Ctrl", "x":11.5, "y":5.25, "w":1.5}, - - {"label":"Left", "x":13.25, "y":5.5}, - {"label":"Down", "x":14.25, "y":5.5}, - {"label":"Right", "x":15.25, "y":5.5} - ] - } + "processor": "atmega32u4", + "bootloader": "atmel-dfu", + "features": { + "bootmagic": true, + "mousekey": true, + "extrakey": true, + "console": false, + "command": false, + "nkro": true, + "backlight": true, + "rgblight": true } } diff --git a/keyboards/idobao/id80/v2/iso/info.json b/keyboards/idobao/id80/v2/iso/info.json index 5825c27da2..b35f559e48 100644 --- a/keyboards/idobao/id80/v2/iso/info.json +++ b/keyboards/idobao/id80/v2/iso/info.json @@ -2,5 +2,97 @@ "keyboard_name": "ID80 ISO", "usb": { "pid": "0x0081" + }, + "layouts": { + "LAYOUT_iso": { + "layout": [ + {"label":"Esc", "matrix":[0, 5], "x":0, "y":0}, + {"label":"F1", "matrix":[1, 5], "x":1.25, "y":0}, + {"label":"F2", "matrix":[2, 5], "x":2.25, "y":0}, + {"label":"F3", "matrix":[3, 5], "x":3.25, "y":0}, + {"label":"F4", "matrix":[4, 5], "x":4.25, "y":0}, + {"label":"F5", "matrix":[5, 5], "x":5.5, "y":0}, + {"label":"F6", "matrix":[6, 5], "x":6.5, "y":0}, + {"label":"F7", "matrix":[7, 5], "x":7.5, "y":0}, + {"label":"F8", "matrix":[8, 5], "x":8.5, "y":0}, + {"label":"F9", "matrix":[7, 10], "x":9.75, "y":0}, + {"label":"F10", "matrix":[5, 10], "x":10.75, "y":0}, + {"label":"F11", "matrix":[4, 10], "x":11.75, "y":0}, + {"label":"F12", "matrix":[3, 10], "x":12.75, "y":0}, + {"label":"Fn", "matrix":[6, 10], "x":14, "y":0}, + {"label":"Insert", "matrix":[2, 10], "x":15.25, "y":0}, + + {"label":"`", "matrix":[0, 4], "x":0, "y":1.25}, + {"label":"1", "matrix":[1, 4], "x":1, "y":1.25}, + {"label":"2", "matrix":[2, 4], "x":2, "y":1.25}, + {"label":"3", "matrix":[3, 4], "x":3, "y":1.25}, + {"label":"4", "matrix":[4, 4], "x":4, "y":1.25}, + {"label":"5", "matrix":[5, 4], "x":5, "y":1.25}, + {"label":"6", "matrix":[6, 4], "x":6, "y":1.25}, + {"label":"7", "matrix":[7, 4], "x":7, "y":1.25}, + {"label":"8", "matrix":[8, 4], "x":8, "y":1.25}, + {"label":"9", "matrix":[8, 9], "x":9, "y":1.25}, + {"label":"0", "matrix":[7, 9], "x":10, "y":1.25}, + {"label":"-", "matrix":[5, 9], "x":11, "y":1.25}, + {"label":"=", "matrix":[4, 9], "x":12, "y":1.25}, + {"label":"Backspace", "matrix":[6, 9], "x":13, "y":1.25, "w":2}, + {"label":"Home", "matrix":[2, 9], "x":15.25, "y":1.25}, + + {"label":"Tab", "matrix":[0, 3], "x":0, "y":2.25, "w":1.5}, + {"label":"Q", "matrix":[1, 3], "x":1.5, "y":2.25}, + {"label":"W", "matrix":[2, 3], "x":2.5, "y":2.25}, + {"label":"E", "matrix":[3, 3], "x":3.5, "y":2.25}, + {"label":"R", "matrix":[4, 3], "x":4.5, "y":2.25}, + {"label":"T", "matrix":[5, 3], "x":5.5, "y":2.25}, + {"label":"Y", "matrix":[6, 3], "x":6.5, "y":2.25}, + {"label":"U", "matrix":[7, 3], "x":7.5, "y":2.25}, + {"label":"I", "matrix":[8, 3], "x":8.5, "y":2.25}, + {"label":"O", "matrix":[8, 8], "x":9.5, "y":2.25}, + {"label":"P", "matrix":[7, 8], "x":10.5, "y":2.25}, + {"label":"[", "matrix":[5, 8], "x":11.5, "y":2.25}, + {"label":"]", "matrix":[4, 8], "x":12.5, "y":2.25}, + {"label":"Delete", "matrix":[2, 8], "x":15.25, "y":2.25}, + + {"label":"Caps Lock", "matrix":[0, 2], "x":0, "y":3.25, "w":1.75}, + {"label":"A", "matrix":[1, 2], "x":1.75, "y":3.25}, + {"label":"S", "matrix":[2, 2], "x":2.75, "y":3.25}, + {"label":"D", "matrix":[3, 2], "x":3.75, "y":3.25}, + {"label":"F", "matrix":[4, 2], "x":4.75, "y":3.25}, + {"label":"G", "matrix":[5, 2], "x":5.75, "y":3.25}, + {"label":"H", "matrix":[6, 2], "x":6.75, "y":3.25}, + {"label":"J", "matrix":[7, 2], "x":7.75, "y":3.25}, + {"label":"K", "matrix":[8, 2], "x":8.75, "y":3.25}, + {"label":"L", "matrix":[8, 7], "x":9.75, "y":3.25}, + {"label":";", "matrix":[7, 7], "x":10.75, "y":3.25}, + {"label":"'", "matrix":[5, 7], "x":11.75, "y":3.25}, + {"label":"ISO #", "matrix":[4, 7], "x":12.75, "y":3.25}, + {"label":"Enter", "matrix":[3, 8], "x":13.75, "y":2.25, "w":1.25, "h":2}, + + {"label":"Shift", "matrix":[0, 1], "x":0, "y":4.25, "w":1.25}, + {"label":"ISO \\", "matrix":[1, 1], "x":1.25, "y":4.25}, + {"label":"Z", "matrix":[2, 1], "x":2.25, "y":4.25}, + {"label":"X", "matrix":[3, 1], "x":3.25, "y":4.25}, + {"label":"C", "matrix":[4, 1], "x":4.25, "y":4.25}, + {"label":"V", "matrix":[5, 1], "x":5.25, "y":4.25}, + {"label":"B", "matrix":[6, 1], "x":6.25, "y":4.25}, + {"label":"N", "matrix":[7, 1], "x":7.25, "y":4.25}, + {"label":"M", "matrix":[8, 1], "x":8.25, "y":4.25}, + {"label":",", "matrix":[8, 6], "x":9.25, "y":4.25}, + {"label":".", "matrix":[7, 6], "x":10.25, "y":4.25}, + {"label":"/", "matrix":[5, 6], "x":11.25, "y":4.25}, + {"label":"Shift", "matrix":[4, 6], "x":12.25, "y":4.25, "w":1.75}, + {"label":"Up", "matrix":[3, 6], "x":14.25, "y":4.5}, + + {"label":"Ctrl", "matrix":[0, 0], "x":0, "y":5.25, "w":1.25}, + {"label":"GUI", "matrix":[1, 0], "x":1.25, "y":5.25, "w":1.25}, + {"label":"Alt", "matrix":[2, 0], "x":2.5, "y":5.25, "w":1.25}, + {"label":"Space", "matrix":[6, 0], "x":3.75, "y":5.25, "w":6.25}, + {"label":"Alt", "matrix":[8, 0], "x":10, "y":5.25, "w":1.5}, + {"label":"Ctrl", "matrix":[7, 0], "x":11.5, "y":5.25, "w":1.5}, + {"label":"Left", "matrix":[5, 0], "x":13.25, "y":5.5}, + {"label":"Down", "matrix":[4, 0], "x":14.25, "y":5.5}, + {"label":"Right", "matrix":[3, 0], "x":15.25, "y":5.5} + ] + } } } diff --git a/keyboards/idobao/id80/v2/iso/rules.mk b/keyboards/idobao/id80/v2/iso/rules.mk index 323c12fc6e..5fa6d2f3d0 100644 --- a/keyboards/idobao/id80/v2/iso/rules.mk +++ b/keyboards/idobao/id80/v2/iso/rules.mk @@ -1 +1,2 @@ -# see common rules.mk +# This file intentionally left blank +# see common info.json diff --git a/keyboards/idobao/id80/v2/rules.mk b/keyboards/idobao/id80/v2/rules.mk deleted file mode 100644 index 3966212230..0000000000 --- a/keyboards/idobao/id80/v2/rules.mk +++ /dev/null @@ -1,19 +0,0 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - -# 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 = yes # Enable N-Key Rollover -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -BACKLIGHT_ENABLE = yes # Enable underkey LED backlight - -DEFAULT_FOLDER = idobao/id80/v2/ansi diff --git a/keyboards/idobao/id80/v2/v2.c b/keyboards/idobao/id80/v2/v2.c deleted file mode 100644 index f92f5e0629..0000000000 --- a/keyboards/idobao/id80/v2/v2.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 Sergey Vlasov - * - * 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 "v2.h" diff --git a/keyboards/idobao/id80/v2/v2.h b/keyboards/idobao/id80/v2/v2.h deleted file mode 100644 index d45b75853b..0000000000 --- a/keyboards/idobao/id80/v2/v2.h +++ /dev/null @@ -1,57 +0,0 @@ -/* Copyright 2020 Sergey Vlasov - * - * 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 "quantum.h" - -#define LAYOUT_ansi( \ - K50, K51, K52, K53, K54, K55, K56, K57, K58, KA7, KA5, KA4, KA3, KA6, KA2, \ - K40, K41, K42, K43, K44, K45, K46, K47, K48, K98, K97, K95, K94, K96, K92, \ - K30, K31, K32, K33, K34, K35, K36, K37, K38, K88, K87, K85, K84, K83, K82, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K78, K77, K75, K74, \ - K10, K12, K13, K14, K15, K16, K17, K18, K68, K67, K65, K64, K63, \ - K00, K01, K02, K06, K08, K07, K05, K04, K03 \ -) { \ - { K00, K10, K20, K30, K40, K50, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \ - { K01, KC_NO, K21, K31, K41, K51, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \ - { K02, K12, K22, K32, K42, K52, KC_NO, KC_NO, K82, K92, KA2 }, \ - { K03, K13, K23, K33, K43, K53, K63, KC_NO, K83, KC_NO, KA3 }, \ - { K04, K14, K24, K34, K44, K54, K64, K74, K84, K94, KA4 }, \ - { K05, K15, K25, K35, K45, K55, K65, K75, K85, K95, KA5 }, \ - { K06, K16, K26, K36, K46, K56, KC_NO, KC_NO, KC_NO, K96, KA6 }, \ - { K07, K17, K27, K37, K47, K57, K67, K77, K87, K97, KA7 }, \ - { K08, K18, K28, K38, K48, K58, K68, K78, K88, K98, KC_NO }, \ -} - -#define LAYOUT_iso( \ - K50, K51, K52, K53, K54, K55, K56, K57, K58, KA7, KA5, KA4, KA3, KA6, KA2, \ - K40, K41, K42, K43, K44, K45, K46, K47, K48, K98, K97, K95, K94, K96, K92, \ - K30, K31, K32, K33, K34, K35, K36, K37, K38, K88, K87, K85, K84, K82, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K78, K77, K75, K74, K83, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K68, K67, K65, K64, K63, \ - K00, K01, K02, K06, K08, K07, K05, K04, K03 \ -) { \ - { K00, K10, K20, K30, K40, K50, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \ - { K01, K11, K21, K31, K41, K51, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \ - { K02, K12, K22, K32, K42, K52, KC_NO, KC_NO, K82, K92, KA2 }, \ - { K03, K13, K23, K33, K43, K53, K63, KC_NO, K83, KC_NO, KA3 }, \ - { K04, K14, K24, K34, K44, K54, K64, K74, K84, K94, KA4 }, \ - { K05, K15, K25, K35, K45, K55, K65, K75, K85, K95, KA5 }, \ - { K06, K16, K26, K36, K46, K56, KC_NO, KC_NO, KC_NO, K96, KA6 }, \ - { K07, K17, K27, K37, K47, K57, K67, K77, K87, K97, KA7 }, \ - { K08, K18, K28, K38, K48, K58, K68, K78, K88, K98, KC_NO }, \ -}