diff options
Diffstat (limited to 'keyboards/percent/skog_lite')
-rw-r--r-- | keyboards/percent/skog_lite/config.h | 6 | ||||
-rw-r--r-- | keyboards/percent/skog_lite/info.json | 563 | ||||
-rw-r--r-- | keyboards/percent/skog_lite/rules.mk | 1 | ||||
-rw-r--r-- | keyboards/percent/skog_lite/skog_lite.c | 17 | ||||
-rw-r--r-- | keyboards/percent/skog_lite/skog_lite.h | 75 |
5 files changed, 304 insertions, 358 deletions
diff --git a/keyboards/percent/skog_lite/config.h b/keyboards/percent/skog_lite/config.h index b00a612cd7..75b78de22d 100644 --- a/keyboards/percent/skog_lite/config.h +++ b/keyboards/percent/skog_lite/config.h @@ -20,12 +20,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define RGBLED_NUM 18 -// 0 1 2 3 4 5 6 7 8 9 A B C D E -#define MATRIX_ROW_PINS { B0, B1, B2, B3, B4, B6, B5 } -#define MATRIX_COL_PINS { C4, C2, D7, C7, C6, A0, A1, A2, A3, A7, A6, A4, A5, C5, C3} - -#define DIODE_DIRECTION COL2ROW - #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/percent/skog_lite/info.json b/keyboards/percent/skog_lite/info.json index 74abc67bdc..4133d5c81b 100644 --- a/keyboards/percent/skog_lite/info.json +++ b/keyboards/percent/skog_lite/info.json @@ -8,9 +8,17 @@ "pid": "0x422D", "device_version": "2.0.0" }, + "matrix_pins": { + "cols": ["C4", "C2", "D7", "C7", "C6", "A0", "A1", "A2", "A3", "A7", "A6", "A4", "A5", "C5", "C3"], + "rows": ["B0", "B1", "B2", "B3", "B4", "B6", "B5"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "D4" }, + "ws2812": { + "driver": "i2c" + }, "indicators": { "caps_lock": "D1", "scroll_lock": "D6" @@ -21,273 +29,310 @@ "layouts": { "LAYOUT_tkl_ansi": { "layout": [ - {"x":0, "y":0}, - {"x":2, "y":0}, - {"x":3, "y":0}, - {"x":4, "y":0}, - {"x":5, "y":0}, - {"x":6.5, "y":0}, - {"x":7.5, "y":0}, - {"x":8.5, "y":0}, - {"x":9.5, "y":0}, - {"x":11, "y":0}, - {"x":12, "y":0}, - {"x":13, "y":0}, - {"x":14, "y":0}, - {"x":15.25, "y":0.5}, - {"x":16.25, "y":0.5}, - {"x":17.25, "y":0.5}, - {"x":0, "y":1.25}, - {"x":1, "y":1.25}, - {"x":2, "y":1.25}, - {"x":3, "y":1.25}, - {"x":4, "y":1.25}, - {"x":5, "y":1.25}, - {"x":6, "y":1.25}, - {"x":7, "y":1.25}, - {"x":8, "y":1.25}, - {"x":9, "y":1.25}, - {"x":10, "y":1.25}, - {"x":11, "y":1.25}, - {"x":12, "y":1.25}, - {"x":13, "y":1.25, "w":2}, - {"x":15.25, "y":1.75}, - {"x":16.25, "y":1.75}, - {"x":17.25, "y":1.75}, - {"x":0, "y":2.25, "w":1.5}, - {"x":1.5, "y":2.25}, - {"x":2.5, "y":2.25}, - {"x":3.5, "y":2.25}, - {"x":4.5, "y":2.25}, - {"x":5.5, "y":2.25}, - {"x":6.5, "y":2.25}, - {"x":7.5, "y":2.25}, - {"x":8.5, "y":2.25}, - {"x":9.5, "y":2.25}, - {"x":10.5, "y":2.25}, - {"x":11.5, "y":2.25}, - {"x":12.5, "y":2.25}, - {"x":13.5, "y":2.25, "w":1.5}, - {"x":15.25, "y":2.75}, - {"x":16.25, "y":2.75}, - {"x":17.25, "y":2.75}, - {"x":0, "y":3.25, "w":1.75}, - {"x":1.75, "y":3.25}, - {"x":2.75, "y":3.25}, - {"x":3.75, "y":3.25}, - {"x":4.75, "y":3.25}, - {"x":5.75, "y":3.25}, - {"x":6.75, "y":3.25}, - {"x":7.75, "y":3.25}, - {"x":8.75, "y":3.25}, - {"x":9.75, "y":3.25}, - {"x":10.75, "y":3.25}, - {"x":11.75, "y":3.25}, - {"x":12.75, "y":3.25, "w":2.25}, - {"x":0, "y":4.25, "w":2.25}, - {"x":2.25, "y":4.25}, - {"x":3.25, "y":4.25}, - {"x":4.25, "y":4.25}, - {"x":5.25, "y":4.25}, - {"x":6.25, "y":4.25}, - {"x":7.25, "y":4.25}, - {"x":8.25, "y":4.25}, - {"x":9.25, "y":4.25}, - {"x":10.25, "y":4.25}, - {"x":11.25, "y":4.25}, - {"x":12.25, "y":4.25, "w":2.75}, - {"x":16.25, "y":4.25}, - {"x":0, "y":5.25, "w":1.25}, - {"x":1.25, "y":5.25, "w":1.25}, - {"x":2.5, "y":5.25, "w":1.25}, - {"x":3.75, "y":5.25, "w":6.25}, - {"x":10, "y":5.25, "w":1.25}, - {"x":11.25, "y":5.25, "w":1.25}, - {"x":12.5, "y":5.25, "w":1.25}, - {"x":13.75, "y":5.25, "w":1.25}, - {"x":15.25, "y":5.25}, - {"x":16.25, "y":5.25}, - {"x":17.25, "y":5.25} + {"matrix": [0, 0], "x": 0, "y": 0}, + + {"matrix": [0, 1], "x": 2, "y": 0}, + {"matrix": [0, 2], "x": 3, "y": 0}, + {"matrix": [0, 3], "x": 4, "y": 0}, + {"matrix": [0, 4], "x": 5, "y": 0}, + + {"matrix": [0, 5], "x": 6.5, "y": 0}, + {"matrix": [0, 6], "x": 7.5, "y": 0}, + {"matrix": [0, 7], "x": 8.5, "y": 0}, + {"matrix": [0, 8], "x": 9.5, "y": 0}, + + {"matrix": [0, 9], "x": 11, "y": 0}, + {"matrix": [0, 10], "x": 12, "y": 0}, + {"matrix": [0, 11], "x": 13, "y": 0}, + {"matrix": [0, 12], "x": 14, "y": 0}, + + {"matrix": [0, 13], "x": 15.25, "y": 0.5}, + {"matrix": [0, 14], "x": 16.25, "y": 0.5}, + {"matrix": [6, 12], "x": 17.25, "y": 0.5}, + + {"matrix": [1, 0], "x": 0, "y": 1.25}, + {"matrix": [1, 14], "x": 1, "y": 1.25}, + {"matrix": [1, 1], "x": 2, "y": 1.25}, + {"matrix": [1, 2], "x": 3, "y": 1.25}, + {"matrix": [1, 3], "x": 4, "y": 1.25}, + {"matrix": [1, 4], "x": 5, "y": 1.25}, + {"matrix": [1, 13], "x": 6, "y": 1.25}, + {"matrix": [1, 5], "x": 7, "y": 1.25}, + {"matrix": [1, 6], "x": 8, "y": 1.25}, + {"matrix": [1, 7], "x": 9, "y": 1.25}, + {"matrix": [1, 8], "x": 10, "y": 1.25}, + {"matrix": [1, 9], "x": 11, "y": 1.25}, + {"matrix": [1, 10], "x": 12, "y": 1.25}, + {"matrix": [1, 11], "x": 13, "y": 1.25, "w": 2}, + + {"matrix": [1, 12], "x": 15.25, "y": 1.75}, + {"matrix": [6, 11], "x": 16.25, "y": 1.75}, + {"matrix": [6, 10], "x": 17.25, "y": 1.75}, + + {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5}, + {"matrix": [2, 14], "x": 1.5, "y": 2.25}, + {"matrix": [2, 1], "x": 2.5, "y": 2.25}, + {"matrix": [2, 2], "x": 3.5, "y": 2.25}, + {"matrix": [2, 3], "x": 4.5, "y": 2.25}, + {"matrix": [2, 4], "x": 5.5, "y": 2.25}, + {"matrix": [2, 13], "x": 6.5, "y": 2.25}, + {"matrix": [2, 5], "x": 7.5, "y": 2.25}, + {"matrix": [2, 6], "x": 8.5, "y": 2.25}, + {"matrix": [2, 7], "x": 9.5, "y": 2.25}, + {"matrix": [2, 8], "x": 10.5, "y": 2.25}, + {"matrix": [2, 9], "x": 11.5, "y": 2.25}, + {"matrix": [2, 10], "x": 12.5, "y": 2.25}, + {"matrix": [2, 11], "x": 13.5, "y": 2.25, "w": 1.5}, + + {"matrix": [2, 12], "x": 15.25, "y": 2.75}, + {"matrix": [6, 9], "x": 16.25, "y": 2.75}, + {"matrix": [6, 8], "x": 17.25, "y": 2.75}, + + {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75}, + {"matrix": [3, 14], "x": 1.75, "y": 3.25}, + {"matrix": [3, 1], "x": 2.75, "y": 3.25}, + {"matrix": [3, 2], "x": 3.75, "y": 3.25}, + {"matrix": [3, 3], "x": 4.75, "y": 3.25}, + {"matrix": [3, 4], "x": 5.75, "y": 3.25}, + {"matrix": [3, 13], "x": 6.75, "y": 3.25}, + {"matrix": [3, 5], "x": 7.75, "y": 3.25}, + {"matrix": [3, 6], "x": 8.75, "y": 3.25}, + {"matrix": [3, 7], "x": 9.75, "y": 3.25}, + {"matrix": [3, 8], "x": 10.75, "y": 3.25}, + {"matrix": [3, 9], "x": 11.75, "y": 3.25}, + {"matrix": [3, 10], "x": 12.75, "y": 3.25, "w": 2.25}, + + {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25}, + {"matrix": [4, 14], "x": 2.25, "y": 4.25}, + {"matrix": [4, 1], "x": 3.25, "y": 4.25}, + {"matrix": [4, 2], "x": 4.25, "y": 4.25}, + {"matrix": [4, 3], "x": 5.25, "y": 4.25}, + {"matrix": [4, 4], "x": 6.25, "y": 4.25}, + {"matrix": [4, 13], "x": 7.25, "y": 4.25}, + {"matrix": [4, 5], "x": 8.25, "y": 4.25}, + {"matrix": [4, 6], "x": 9.25, "y": 4.25}, + {"matrix": [4, 7], "x": 10.25, "y": 4.25}, + {"matrix": [4, 8], "x": 11.25, "y": 4.25}, + {"matrix": [4, 11], "x": 12.25, "y": 4.25, "w": 2.75}, + + {"matrix": [4, 12], "x": 16.25, "y": 4.25}, + + {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25}, + {"matrix": [5, 14], "x": 1.25, "y": 5.25, "w": 1.25}, + {"matrix": [5, 1], "x": 2.5, "y": 5.25, "w": 1.25}, + {"matrix": [5, 4], "x": 3.75, "y": 5.25, "w": 6.25}, + {"matrix": [5, 6], "x": 10, "y": 5.25, "w": 1.25}, + {"matrix": [5, 7], "x": 11.25, "y": 5.25, "w": 1.25}, + {"matrix": [5, 8], "x": 12.5, "y": 5.25, "w": 1.25}, + {"matrix": [5, 11], "x": 13.75, "y": 5.25, "w": 1.25}, + + {"matrix": [5, 10], "x": 15.25, "y": 5.25}, + {"matrix": [5, 12], "x": 16.25, "y": 5.25}, + {"matrix": [6, 7], "x": 17.25, "y": 5.25} ] }, - "LAYOUT_tkl_7u_ansi": { "layout": [ - {"x":0, "y":0}, - {"x":2, "y":0}, - {"x":3, "y":0}, - {"x":4, "y":0}, - {"x":5, "y":0}, - {"x":6.5, "y":0}, - {"x":7.5, "y":0}, - {"x":8.5, "y":0}, - {"x":9.5, "y":0}, - {"x":11, "y":0}, - {"x":12, "y":0}, - {"x":13, "y":0}, - {"x":14, "y":0}, - {"x":15.25, "y":0.5}, - {"x":16.25, "y":0.5}, - {"x":17.25, "y":0.5}, - {"x":0, "y":1.25}, - {"x":1, "y":1.25}, - {"x":2, "y":1.25}, - {"x":3, "y":1.25}, - {"x":4, "y":1.25}, - {"x":5, "y":1.25}, - {"x":6, "y":1.25}, - {"x":7, "y":1.25}, - {"x":8, "y":1.25}, - {"x":9, "y":1.25}, - {"x":10, "y":1.25}, - {"x":11, "y":1.25}, - {"x":12, "y":1.25}, - {"x":13, "y":1.25, "w":2}, - {"x":15.25, "y":1.75}, - {"x":16.25, "y":1.75}, - {"x":17.25, "y":1.75}, - {"x":0, "y":2.25, "w":1.5}, - {"x":1.5, "y":2.25}, - {"x":2.5, "y":2.25}, - {"x":3.5, "y":2.25}, - {"x":4.5, "y":2.25}, - {"x":5.5, "y":2.25}, - {"x":6.5, "y":2.25}, - {"x":7.5, "y":2.25}, - {"x":8.5, "y":2.25}, - {"x":9.5, "y":2.25}, - {"x":10.5, "y":2.25}, - {"x":11.5, "y":2.25}, - {"x":12.5, "y":2.25}, - {"x":13.5, "y":2.25, "w":1.5}, - {"x":15.25, "y":2.75}, - {"x":16.25, "y":2.75}, - {"x":17.25, "y":2.75}, - {"x":0, "y":3.25, "w":1.75}, - {"x":1.75, "y":3.25}, - {"x":2.75, "y":3.25}, - {"x":3.75, "y":3.25}, - {"x":4.75, "y":3.25}, - {"x":5.75, "y":3.25}, - {"x":6.75, "y":3.25}, - {"x":7.75, "y":3.25}, - {"x":8.75, "y":3.25}, - {"x":9.75, "y":3.25}, - {"x":10.75, "y":3.25}, - {"x":11.75, "y":3.25}, - {"x":12.75, "y":3.25, "w":2.25}, - {"x":0, "y":4.25, "w":2.25}, - {"x":2.25, "y":4.25}, - {"x":3.25, "y":4.25}, - {"x":4.25, "y":4.25}, - {"x":5.25, "y":4.25}, - {"x":6.25, "y":4.25}, - {"x":7.25, "y":4.25}, - {"x":8.25, "y":4.25}, - {"x":9.25, "y":4.25}, - {"x":10.25, "y":4.25}, - {"x":11.25, "y":4.25}, - {"x":12.25, "y":4.25, "w":2.75}, - {"x":16.25, "y":4.25}, - {"x":0, "y":5.25, "w":1.5}, - {"x":1.5, "y":5.25}, - {"x":2.5, "y":5.25, "w":1.5}, - {"x":4, "y":5.25, "w":7}, - {"x":11, "y":5.25, "w":1.5}, - {"x":12.5, "y":5.25}, - {"x":13.5, "y":5.25, "w":1.5}, - {"x":15.25, "y":5.25}, - {"x":16.25, "y":5.25}, - {"x":17.25, "y":5.25} + {"matrix": [0, 0], "x": 0, "y": 0}, + + {"matrix": [0, 1], "x": 2, "y": 0}, + {"matrix": [0, 2], "x": 3, "y": 0}, + {"matrix": [0, 3], "x": 4, "y": 0}, + {"matrix": [0, 4], "x": 5, "y": 0}, + + {"matrix": [0, 5], "x": 6.5, "y": 0}, + {"matrix": [0, 6], "x": 7.5, "y": 0}, + {"matrix": [0, 7], "x": 8.5, "y": 0}, + {"matrix": [0, 8], "x": 9.5, "y": 0}, + + {"matrix": [0, 9], "x": 11, "y": 0}, + {"matrix": [0, 10], "x": 12, "y": 0}, + {"matrix": [0, 11], "x": 13, "y": 0}, + {"matrix": [0, 12], "x": 14, "y": 0}, + + {"matrix": [0, 13], "x": 15.25, "y": 0.5}, + {"matrix": [0, 14], "x": 16.25, "y": 0.5}, + {"matrix": [6, 12], "x": 17.25, "y": 0.5}, + + {"matrix": [1, 0], "x": 0, "y": 1.25}, + {"matrix": [1, 14], "x": 1, "y": 1.25}, + {"matrix": [1, 1], "x": 2, "y": 1.25}, + {"matrix": [1, 2], "x": 3, "y": 1.25}, + {"matrix": [1, 3], "x": 4, "y": 1.25}, + {"matrix": [1, 4], "x": 5, "y": 1.25}, + {"matrix": [1, 13], "x": 6, "y": 1.25}, + {"matrix": [1, 5], "x": 7, "y": 1.25}, + {"matrix": [1, 6], "x": 8, "y": 1.25}, + {"matrix": [1, 7], "x": 9, "y": 1.25}, + {"matrix": [1, 8], "x": 10, "y": 1.25}, + {"matrix": [1, 9], "x": 11, "y": 1.25}, + {"matrix": [1, 10], "x": 12, "y": 1.25}, + {"matrix": [1, 11], "x": 13, "y": 1.25, "w": 2}, + + {"matrix": [1, 12], "x": 15.25, "y": 1.75}, + {"matrix": [6, 11], "x": 16.25, "y": 1.75}, + {"matrix": [6, 10], "x": 17.25, "y": 1.75}, + + {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5}, + {"matrix": [2, 14], "x": 1.5, "y": 2.25}, + {"matrix": [2, 1], "x": 2.5, "y": 2.25}, + {"matrix": [2, 2], "x": 3.5, "y": 2.25}, + {"matrix": [2, 3], "x": 4.5, "y": 2.25}, + {"matrix": [2, 4], "x": 5.5, "y": 2.25}, + {"matrix": [2, 13], "x": 6.5, "y": 2.25}, + {"matrix": [2, 5], "x": 7.5, "y": 2.25}, + {"matrix": [2, 6], "x": 8.5, "y": 2.25}, + {"matrix": [2, 7], "x": 9.5, "y": 2.25}, + {"matrix": [2, 8], "x": 10.5, "y": 2.25}, + {"matrix": [2, 9], "x": 11.5, "y": 2.25}, + {"matrix": [2, 10], "x": 12.5, "y": 2.25}, + {"matrix": [2, 11], "x": 13.5, "y": 2.25, "w": 1.5}, + + {"matrix": [2, 12], "x": 15.25, "y": 2.75}, + {"matrix": [6, 9], "x": 16.25, "y": 2.75}, + {"matrix": [6, 8], "x": 17.25, "y": 2.75}, + + {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75}, + {"matrix": [3, 14], "x": 1.75, "y": 3.25}, + {"matrix": [3, 1], "x": 2.75, "y": 3.25}, + {"matrix": [3, 2], "x": 3.75, "y": 3.25}, + {"matrix": [3, 3], "x": 4.75, "y": 3.25}, + {"matrix": [3, 4], "x": 5.75, "y": 3.25}, + {"matrix": [3, 13], "x": 6.75, "y": 3.25}, + {"matrix": [3, 5], "x": 7.75, "y": 3.25}, + {"matrix": [3, 6], "x": 8.75, "y": 3.25}, + {"matrix": [3, 7], "x": 9.75, "y": 3.25}, + {"matrix": [3, 8], "x": 10.75, "y": 3.25}, + {"matrix": [3, 9], "x": 11.75, "y": 3.25}, + {"matrix": [3, 10], "x": 12.75, "y": 3.25, "w": 2.25}, + + {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25}, + {"matrix": [4, 14], "x": 2.25, "y": 4.25}, + {"matrix": [4, 1], "x": 3.25, "y": 4.25}, + {"matrix": [4, 2], "x": 4.25, "y": 4.25}, + {"matrix": [4, 3], "x": 5.25, "y": 4.25}, + {"matrix": [4, 4], "x": 6.25, "y": 4.25}, + {"matrix": [4, 13], "x": 7.25, "y": 4.25}, + {"matrix": [4, 5], "x": 8.25, "y": 4.25}, + {"matrix": [4, 6], "x": 9.25, "y": 4.25}, + {"matrix": [4, 7], "x": 10.25, "y": 4.25}, + {"matrix": [4, 8], "x": 11.25, "y": 4.25}, + {"matrix": [4, 11], "x": 12.25, "y": 4.25, "w": 2.75}, + + {"matrix": [4, 12], "x": 16.25, "y": 4.25}, + + {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5}, + {"matrix": [5, 14], "x": 1.5, "y": 5.25}, + {"matrix": [5, 1], "x": 2.5, "y": 5.25, "w": 1.5}, + {"matrix": [5, 4], "x": 4, "y": 5.25, "w": 7}, + {"matrix": [5, 7], "x": 11, "y": 5.25, "w": 1.5}, + {"matrix": [5, 8], "x": 12.5, "y": 5.25}, + {"matrix": [5, 11], "x": 13.5, "y": 5.25, "w": 1.5}, + + {"matrix": [5, 10], "x": 15.25, "y": 5.25}, + {"matrix": [5, 12], "x": 16.25, "y": 5.25}, + {"matrix": [6, 7], "x": 17.25, "y": 5.25} ] }, - "LAYOUT_tkl_7u_ansi_blocker": { "layout": [ - {"x":0, "y":0}, - {"x":2, "y":0}, - {"x":3, "y":0}, - {"x":4, "y":0}, - {"x":5, "y":0}, - {"x":6.5, "y":0}, - {"x":7.5, "y":0}, - {"x":8.5, "y":0}, - {"x":9.5, "y":0}, - {"x":11, "y":0}, - {"x":12, "y":0}, - {"x":13, "y":0}, - {"x":14, "y":0}, - {"x":15.25, "y":0.5}, - {"x":16.25, "y":0.5}, - {"x":17.25, "y":0.5}, - {"x":0, "y":1.25}, - {"x":1, "y":1.25}, - {"x":2, "y":1.25}, - {"x":3, "y":1.25}, - {"x":4, "y":1.25}, - {"x":5, "y":1.25}, - {"x":6, "y":1.25}, - {"x":7, "y":1.25}, - {"x":8, "y":1.25}, - {"x":9, "y":1.25}, - {"x":10, "y":1.25}, - {"x":11, "y":1.25}, - {"x":12, "y":1.25}, - {"x":13, "y":1.25, "w":2}, - {"x":15.25, "y":1.75}, - {"x":16.25, "y":1.75}, - {"x":17.25, "y":1.75}, - {"x":0, "y":2.25, "w":1.5}, - {"x":1.5, "y":2.25}, - {"x":2.5, "y":2.25}, - {"x":3.5, "y":2.25}, - {"x":4.5, "y":2.25}, - {"x":5.5, "y":2.25}, - {"x":6.5, "y":2.25}, - {"x":7.5, "y":2.25}, - {"x":8.5, "y":2.25}, - {"x":9.5, "y":2.25}, - {"x":10.5, "y":2.25}, - {"x":11.5, "y":2.25}, - {"x":12.5, "y":2.25}, - {"x":13.5, "y":2.25, "w":1.5}, - {"x":15.25, "y":2.75}, - {"x":16.25, "y":2.75}, - {"x":17.25, "y":2.75}, - {"x":0, "y":3.25, "w":1.75}, - {"x":1.75, "y":3.25}, - {"x":2.75, "y":3.25}, - {"x":3.75, "y":3.25}, - {"x":4.75, "y":3.25}, - {"x":5.75, "y":3.25}, - {"x":6.75, "y":3.25}, - {"x":7.75, "y":3.25}, - {"x":8.75, "y":3.25}, - {"x":9.75, "y":3.25}, - {"x":10.75, "y":3.25}, - {"x":11.75, "y":3.25}, - {"x":12.75, "y":3.25, "w":2.25}, - {"x":0, "y":4.25, "w":2.25}, - {"x":2.25, "y":4.25}, - {"x":3.25, "y":4.25}, - {"x":4.25, "y":4.25}, - {"x":5.25, "y":4.25}, - {"x":6.25, "y":4.25}, - {"x":7.25, "y":4.25}, - {"x":8.25, "y":4.25}, - {"x":9.25, "y":4.25}, - {"x":10.25, "y":4.25}, - {"x":11.25, "y":4.25}, - {"x":12.25, "y":4.25, "w":2.75}, - {"x":16.25, "y":4.25}, - {"x":0, "y":5.25, "w":1.5}, - {"x":2.5, "y":5.25, "w":1.5}, - {"x":4, "y":5.25, "w":7}, - {"x":11, "y":5.25, "w":1.5}, - {"x":13.5, "y":5.25, "w":1.5}, - {"x":15.25, "y":5.25}, - {"x":16.25, "y":5.25}, - {"x":17.25, "y":5.25} + {"matrix": [0, 0], "x": 0, "y": 0}, + + {"matrix": [0, 1], "x": 2, "y": 0}, + {"matrix": [0, 2], "x": 3, "y": 0}, + {"matrix": [0, 3], "x": 4, "y": 0}, + {"matrix": [0, 4], "x": 5, "y": 0}, + + {"matrix": [0, 5], "x": 6.5, "y": 0}, + {"matrix": [0, 6], "x": 7.5, "y": 0}, + {"matrix": [0, 7], "x": 8.5, "y": 0}, + {"matrix": [0, 8], "x": 9.5, "y": 0}, + + {"matrix": [0, 9], "x": 11, "y": 0}, + {"matrix": [0, 10], "x": 12, "y": 0}, + {"matrix": [0, 11], "x": 13, "y": 0}, + {"matrix": [0, 12], "x": 14, "y": 0}, + + {"matrix": [0, 13], "x": 15.25, "y": 0.5}, + {"matrix": [0, 14], "x": 16.25, "y": 0.5}, + {"matrix": [6, 12], "x": 17.25, "y": 0.5}, + + {"matrix": [1, 0], "x": 0, "y": 1.25}, + {"matrix": [1, 14], "x": 1, "y": 1.25}, + {"matrix": [1, 1], "x": 2, "y": 1.25}, + {"matrix": [1, 2], "x": 3, "y": 1.25}, + {"matrix": [1, 3], "x": 4, "y": 1.25}, + {"matrix": [1, 4], "x": 5, "y": 1.25}, + {"matrix": [1, 13], "x": 6, "y": 1.25}, + {"matrix": [1, 5], "x": 7, "y": 1.25}, + {"matrix": [1, 6], "x": 8, "y": 1.25}, + {"matrix": [1, 7], "x": 9, "y": 1.25}, + {"matrix": [1, 8], "x": 10, "y": 1.25}, + {"matrix": [1, 9], "x": 11, "y": 1.25}, + {"matrix": [1, 10], "x": 12, "y": 1.25}, + {"matrix": [1, 11], "x": 13, "y": 1.25, "w": 2}, + + {"matrix": [1, 12], "x": 15.25, "y": 1.75}, + {"matrix": [6, 11], "x": 16.25, "y": 1.75}, + {"matrix": [6, 10], "x": 17.25, "y": 1.75}, + + {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5}, + {"matrix": [2, 14], "x": 1.5, "y": 2.25}, + {"matrix": [2, 1], "x": 2.5, "y": 2.25}, + {"matrix": [2, 2], "x": 3.5, "y": 2.25}, + {"matrix": [2, 3], "x": 4.5, "y": 2.25}, + {"matrix": [2, 4], "x": 5.5, "y": 2.25}, + {"matrix": [2, 13], "x": 6.5, "y": 2.25}, + {"matrix": [2, 5], "x": 7.5, "y": 2.25}, + {"matrix": [2, 6], "x": 8.5, "y": 2.25}, + {"matrix": [2, 7], "x": 9.5, "y": 2.25}, + {"matrix": [2, 8], "x": 10.5, "y": 2.25}, + {"matrix": [2, 9], "x": 11.5, "y": 2.25}, + {"matrix": [2, 10], "x": 12.5, "y": 2.25}, + {"matrix": [2, 11], "x": 13.5, "y": 2.25, "w": 1.5}, + + {"matrix": [2, 12], "x": 15.25, "y": 2.75}, + {"matrix": [6, 9], "x": 16.25, "y": 2.75}, + {"matrix": [6, 8], "x": 17.25, "y": 2.75}, + + {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75}, + {"matrix": [3, 14], "x": 1.75, "y": 3.25}, + {"matrix": [3, 1], "x": 2.75, "y": 3.25}, + {"matrix": [3, 2], "x": 3.75, "y": 3.25}, + {"matrix": [3, 3], "x": 4.75, "y": 3.25}, + {"matrix": [3, 4], "x": 5.75, "y": 3.25}, + {"matrix": [3, 13], "x": 6.75, "y": 3.25}, + {"matrix": [3, 5], "x": 7.75, "y": 3.25}, + {"matrix": [3, 6], "x": 8.75, "y": 3.25}, + {"matrix": [3, 7], "x": 9.75, "y": 3.25}, + {"matrix": [3, 8], "x": 10.75, "y": 3.25}, + {"matrix": [3, 9], "x": 11.75, "y": 3.25}, + {"matrix": [3, 10], "x": 12.75, "y": 3.25, "w": 2.25}, + + {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25}, + {"matrix": [4, 14], "x": 2.25, "y": 4.25}, + {"matrix": [4, 1], "x": 3.25, "y": 4.25}, + {"matrix": [4, 2], "x": 4.25, "y": 4.25}, + {"matrix": [4, 3], "x": 5.25, "y": 4.25}, + {"matrix": [4, 4], "x": 6.25, "y": 4.25}, + {"matrix": [4, 13], "x": 7.25, "y": 4.25}, + {"matrix": [4, 5], "x": 8.25, "y": 4.25}, + {"matrix": [4, 6], "x": 9.25, "y": 4.25}, + {"matrix": [4, 7], "x": 10.25, "y": 4.25}, + {"matrix": [4, 8], "x": 11.25, "y": 4.25}, + {"matrix": [4, 11], "x": 12.25, "y": 4.25, "w": 2.75}, + + {"matrix": [4, 12], "x": 16.25, "y": 4.25}, + + {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5}, + {"matrix": [5, 1], "x": 2.5, "y": 5.25, "w": 1.5}, + {"matrix": [5, 4], "x": 4, "y": 5.25, "w": 7}, + {"matrix": [5, 7], "x": 11, "y": 5.25, "w": 1.5}, + {"matrix": [5, 11], "x": 13.5, "y": 5.25, "w": 1.5}, + + {"matrix": [5, 10], "x": 15.25, "y": 5.25}, + {"matrix": [5, 12], "x": 16.25, "y": 5.25}, + {"matrix": [6, 7], "x": 17.25, "y": 5.25} ] } } diff --git a/keyboards/percent/skog_lite/rules.mk b/keyboards/percent/skog_lite/rules.mk index 752df26315..747ea2aae3 100644 --- a/keyboards/percent/skog_lite/rules.mk +++ b/keyboards/percent/skog_lite/rules.mk @@ -8,4 +8,3 @@ CONSOLE_ENABLE = no # Console for debug COMMAND_ENABLE = yes # Commands for debug and configuration BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -WS2812_DRIVER = i2c diff --git a/keyboards/percent/skog_lite/skog_lite.c b/keyboards/percent/skog_lite/skog_lite.c deleted file mode 100644 index c69843e617..0000000000 --- a/keyboards/percent/skog_lite/skog_lite.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2019 mechmerlin - * - * 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 <http://www.gnu.org/licenses/>. - */ - -#include "skog_lite.h" diff --git a/keyboards/percent/skog_lite/skog_lite.h b/keyboards/percent/skog_lite/skog_lite.h deleted file mode 100644 index 16dc70bf67..0000000000 --- a/keyboards/percent/skog_lite/skog_lite.h +++ /dev/null @@ -1,75 +0,0 @@ -/* Copyright 2019 mechmerlin - * - * 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 <http://www.gnu.org/licenses/>. - */ -#pragma once - -#include "quantum.h" - -#define ___ KC_NO - -// This a shortcut to help you visually see your layout. -// The first section contains all of the arguments -// The second converts the arguments into a two-dimensional array - -#define LAYOUT_tkl_ansi( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k6c, \ - k10, k1e, k11, k12, k13, k14, k1d, k15, k16, k17, k18, k19, k1a, k1b, k1c, k6b, k6a, \ - k20, k2e, k21, k22, k23, k24, k2d, k25, k26, k27, k28, k29, k2a, k2b, k2c, k69, k68, \ - k30, k3e, k31, k32, k33, k34, k3d, k35, k36, k37, k38, k39, k3a, \ - k40, k4e, k41, k42, k43, k44, k4d, k45, k46, k47, k48, k4b, k4c, \ - k50, k5e, k51, k54, k56, k57, k58, k5b, k5a, k5c, k67 \ -){ \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e }, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, ___, ___, k3d, k3e }, \ - { k40, k41, k42, k43, k44, k45, k46, k47, k48, ___, ___, k4b, k4c, k4d, k4e }, \ - { k50, k51, ___, ___, k54, ___, k56, k57, k58, ___, k5a, k5b, k5c, ___, k5e }, \ - { ___, ___, ___, ___, ___, ___, ___, k67, k68, k69, k6a, k6b, k6c, ___, ___ }, \ -} - -#define LAYOUT_tkl_7u_ansi( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k6c, \ - k10, k1e, k11, k12, k13, k14, k1d, k15, k16, k17, k18, k19, k1a, k1b, k1c, k6b, k6a, \ - k20, k2e, k21, k22, k23, k24, k2d, k25, k26, k27, k28, k29, k2a, k2b, k2c, k69, k68, \ - k30, k3e, k31, k32, k33, k34, k3d, k35, k36, k37, k38, k39, k3a, \ - k40, k4e, k41, k42, k43, k44, k4d, k45, k46, k47, k48, k4b, k4c, \ - k50, k5e, k51, k54, k57, k58, k5b, k5a, k5c, k67 \ -){ \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e }, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, ___, ___, k3d, k3e }, \ - { k40, k41, k42, k43, k44, k45, k46, k47, k48, ___, ___, k4b, k4c, k4d, k4e }, \ - { k50, k51, ___, ___, k54, ___, ___, k57, k58, ___, k5a, k5b, k5c, ___, k5e }, \ - { ___, ___, ___, ___, ___, ___, ___, k67, k68, k69, k6a, k6b, k6c, ___, ___ }, \ -} - -#define LAYOUT_tkl_7u_ansi_blocker( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k6c, \ - k10, k1e, k11, k12, k13, k14, k1d, k15, k16, k17, k18, k19, k1a, k1b, k1c, k6b, k6a, \ - k20, k2e, k21, k22, k23, k24, k2d, k25, k26, k27, k28, k29, k2a, k2b, k2c, k69, k68, \ - k30, k3e, k31, k32, k33, k34, k3d, k35, k36, k37, k38, k39, k3a, \ - k40, k4e, k41, k42, k43, k44, k4d, k45, k46, k47, k48, k4b, k4c, \ - k50, k51, k54, k57, k5b, k5a, k5c, k67 \ -){ \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e }, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, ___, ___, k3d, k3e }, \ - { k40, k41, k42, k43, k44, k45, k46, k47, k48, ___, ___, k4b, k4c, k4d, k4e }, \ - { k50, k51, ___, ___, k54, ___, ___, k57, ___, ___, k5a, k5b, k5c, ___, ___ }, \ - { ___, ___, ___, ___, ___, ___, ___, k67, k68, k69, k6a, k6b, k6c, ___, ___ }, \ -} |