From ace372d90de13dafc815df5d8049497cb351b69b Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 11 Mar 2023 00:34:34 +1100 Subject: Move matrix config to info.json, part 3 (#19991) Co-authored-by: Nick Brassel --- keyboards/trashman/ketch/config.h | 4 ---- keyboards/trashman/ketch/info.json | 5 +++++ 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'keyboards/trashman/ketch') diff --git a/keyboards/trashman/ketch/config.h b/keyboards/trashman/ketch/config.h index 4889ef5c18..f1e3c21e7c 100644 --- a/keyboards/trashman/ketch/config.h +++ b/keyboards/trashman/ketch/config.h @@ -22,10 +22,6 @@ SOFTWARE. #pragma once -#define MATRIX_ROW_PINS { F5, F1, F0, F7, B6, F6 } -#define MATRIX_COL_PINS { D0, D1, D2, D3, D4, D5, D6, D7 } -#define DIODE_DIRECTION COL2ROW - #define USB_MAX_POWER_CONSUMPTION 100 #define RGB_DI_PIN F4 #define RGBLED_NUM 10 diff --git a/keyboards/trashman/ketch/info.json b/keyboards/trashman/ketch/info.json index 57c6289d0d..e624507210 100644 --- a/keyboards/trashman/ketch/info.json +++ b/keyboards/trashman/ketch/info.json @@ -8,6 +8,11 @@ "pid": "0x8947", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7"], + "rows": ["F5", "F1", "F0", "F7", "B6", "F6"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { -- cgit v1.2.3 From 02ccc50e6085a9d0a4f38f252960e2d14ffe4d1f Mon Sep 17 00:00:00 2001 From: Ryan Date: Fri, 17 Mar 2023 14:02:04 +1100 Subject: Remove more empty headers (#20155) --- keyboards/trashman/ketch/ketch.c | 23 ----------------------- 1 file changed, 23 deletions(-) delete mode 100644 keyboards/trashman/ketch/ketch.c (limited to 'keyboards/trashman/ketch') diff --git a/keyboards/trashman/ketch/ketch.c b/keyboards/trashman/ketch/ketch.c deleted file mode 100644 index 5c38f47664..0000000000 --- a/keyboards/trashman/ketch/ketch.c +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright 2021 Evan Sailer, Jetpacktuxedo, & QMK Firmware - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to -deal in the Software without restriction, including without limitation the -rights to use, copy, modify, merge, publish, distribute, sublicense, and/or -sell copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. -*/ - -#include "ketch.h" -- cgit v1.2.3 From 47966dc2a65c88ac90fcd64d12243d72f3f6753b Mon Sep 17 00:00:00 2001 From: Ryan Date: Thu, 6 Apr 2023 18:00:54 +1000 Subject: Migrate `rgblight.pin` and `RGB_DI_PIN` to `ws2812.pin` (#20303) --- keyboards/trashman/ketch/config.h | 1 - keyboards/trashman/ketch/info.json | 3 +++ 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'keyboards/trashman/ketch') diff --git a/keyboards/trashman/ketch/config.h b/keyboards/trashman/ketch/config.h index f1e3c21e7c..64c34a8008 100644 --- a/keyboards/trashman/ketch/config.h +++ b/keyboards/trashman/ketch/config.h @@ -23,7 +23,6 @@ SOFTWARE. #pragma once #define USB_MAX_POWER_CONSUMPTION 100 -#define RGB_DI_PIN F4 #define RGBLED_NUM 10 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/trashman/ketch/info.json b/keyboards/trashman/ketch/info.json index e624507210..6b4ea75bb0 100644 --- a/keyboards/trashman/ketch/info.json +++ b/keyboards/trashman/ketch/info.json @@ -8,6 +8,9 @@ "pid": "0x8947", "device_version": "0.0.1" }, + "ws2812": { + "pin": "F4" + }, "matrix_pins": { "cols": ["D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7"], "rows": ["F5", "F1", "F0", "F7", "B6", "F6"] -- cgit v1.2.3 From a84528f85392ccab60fd7130fecb83972539367f Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 15 Apr 2023 21:07:32 +1000 Subject: Move remaining `LAYOUT`s to data driven (#20422) --- keyboards/trashman/ketch/info.json | 261 +++++++++++++++++++++++++++++++++---- keyboards/trashman/ketch/ketch.h | 96 -------------- 2 files changed, 238 insertions(+), 119 deletions(-) delete mode 100644 keyboards/trashman/ketch/ketch.h (limited to 'keyboards/trashman/ketch') diff --git a/keyboards/trashman/ketch/info.json b/keyboards/trashman/ketch/info.json index 6b4ea75bb0..02dc364a35 100644 --- a/keyboards/trashman/ketch/info.json +++ b/keyboards/trashman/ketch/info.json @@ -21,45 +21,260 @@ "layouts": { "LAYOUT": { "layout": [ - {"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0, "w":1.75}, - {"x":0, "y":1, "w":1.25}, {"x":1.25, "y":1}, {"x":2.25, "y":1}, {"x":3.25, "y":1}, {"x":4.25, "y":1}, {"x":5.25, "y":1}, {"x":6.25, "y":1}, {"x":7.25, "y":1}, {"x":8.25, "y":1}, {"x":9.25, "y":1}, {"x":10.25, "y":1}, {"x":11.25, "y":1, "w":1.5}, - {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, - {"x":0, "y":3, "w":1.25}, {"x":1.25, "y":3, "w":1.5}, {"x":2.75, "y":3, "w":1.25}, {"x":4, "y":3, "w":2.25}, {"x":6.25, "y":3, "w":2}, {"x":8.25, "y":3, "w":1.25}, {"x":9.5, "y":3, "w":1.5}, {"x":11, "y":3, "w":1.75} + {"matrix": [5, 0], "x": 0, "y": 0}, + {"matrix": [5, 1], "x": 1, "y": 0}, + {"matrix": [5, 2], "x": 2, "y": 0}, + {"matrix": [5, 3], "x": 3, "y": 0}, + {"matrix": [0, 0], "x": 4, "y": 0}, + {"matrix": [0, 1], "x": 5, "y": 0}, + {"matrix": [0, 2], "x": 6, "y": 0}, + {"matrix": [0, 3], "x": 7, "y": 0}, + {"matrix": [0, 4], "x": 8, "y": 0}, + {"matrix": [0, 5], "x": 9, "y": 0}, + {"matrix": [0, 6], "x": 10, "y": 0}, + {"matrix": [0, 7], "x": 11, "y": 0, "w": 1.75}, + + {"matrix": [4, 0], "x": 0, "y": 1, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 1}, + {"matrix": [4, 2], "x": 2.25, "y": 1}, + {"matrix": [4, 3], "x": 3.25, "y": 1}, + {"matrix": [1, 0], "x": 4.25, "y": 1}, + {"matrix": [1, 1], "x": 5.25, "y": 1}, + {"matrix": [1, 2], "x": 6.25, "y": 1}, + {"matrix": [1, 3], "x": 7.25, "y": 1}, + {"matrix": [1, 4], "x": 8.25, "y": 1}, + {"matrix": [1, 5], "x": 9.25, "y": 1}, + {"matrix": [1, 6], "x": 10.25, "y": 1}, + {"matrix": [1, 7], "x": 11.25, "y": 1, "w": 1.5}, + + {"matrix": [4, 6], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [5, 6], "x": 1.75, "y": 2}, + {"matrix": [5, 5], "x": 2.75, "y": 2}, + {"matrix": [4, 4], "x": 3.75, "y": 2}, + {"matrix": [2, 0], "x": 4.75, "y": 2}, + {"matrix": [2, 1], "x": 5.75, "y": 2}, + {"matrix": [2, 2], "x": 6.75, "y": 2}, + {"matrix": [2, 3], "x": 7.75, "y": 2}, + {"matrix": [2, 4], "x": 8.75, "y": 2}, + {"matrix": [2, 5], "x": 9.75, "y": 2}, + {"matrix": [2, 6], "x": 10.75, "y": 2}, + {"matrix": [2, 7], "x": 11.75, "y": 2}, + + {"matrix": [4, 5], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [5, 4], "x": 1.25, "y": 3, "w": 1.5}, + {"matrix": [3, 1], "x": 2.75, "y": 3, "w": 1.25}, + {"matrix": [3, 2], "x": 4, "y": 3, "w": 2.25}, + {"matrix": [3, 3], "x": 6.25, "y": 3, "w": 2}, + {"matrix": [3, 4], "x": 8.25, "y": 3, "w": 1.25}, + {"matrix": [3, 5], "x": 9.5, "y": 3, "w": 1.5}, + {"matrix": [3, 7], "x": 11, "y": 3, "w": 1.75} ] }, - "LAYOUT_arrow": { "layout": [ - {"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0, "w":1.75}, - {"x":0, "y":1, "w":1.25}, {"x":1.25, "y":1}, {"x":2.25, "y":1}, {"x":3.25, "y":1}, {"x":4.25, "y":1}, {"x":5.25, "y":1}, {"x":6.25, "y":1}, {"x":7.25, "y":1}, {"x":8.25, "y":1}, {"x":9.25, "y":1}, {"x":10.25, "y":1}, {"x":11.25, "y":1, "w":1.5}, - {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, - {"x":0, "y":3, "w":1.25}, {"x":1.25, "y":3, "w":1.5}, {"x":2.75, "y":3, "w":1.25}, {"x":4, "y":3, "w":2.25}, {"x":6.25, "y":3, "w":2}, {"x":8.25, "y":3, "w":1.5}, {"x":9.75, "y":3}, {"x":10.75, "y":3}, {"x":11.75, "y":3} + {"matrix": [5, 0], "x": 0, "y": 0}, + {"matrix": [5, 1], "x": 1, "y": 0}, + {"matrix": [5, 2], "x": 2, "y": 0}, + {"matrix": [5, 3], "x": 3, "y": 0}, + {"matrix": [0, 0], "x": 4, "y": 0}, + {"matrix": [0, 1], "x": 5, "y": 0}, + {"matrix": [0, 2], "x": 6, "y": 0}, + {"matrix": [0, 3], "x": 7, "y": 0}, + {"matrix": [0, 4], "x": 8, "y": 0}, + {"matrix": [0, 5], "x": 9, "y": 0}, + {"matrix": [0, 6], "x": 10, "y": 0}, + {"matrix": [0, 7], "x": 11, "y": 0, "w": 1.75}, + + {"matrix": [4, 0], "x": 0, "y": 1, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 1}, + {"matrix": [4, 2], "x": 2.25, "y": 1}, + {"matrix": [4, 3], "x": 3.25, "y": 1}, + {"matrix": [1, 0], "x": 4.25, "y": 1}, + {"matrix": [1, 1], "x": 5.25, "y": 1}, + {"matrix": [1, 2], "x": 6.25, "y": 1}, + {"matrix": [1, 3], "x": 7.25, "y": 1}, + {"matrix": [1, 4], "x": 8.25, "y": 1}, + {"matrix": [1, 5], "x": 9.25, "y": 1}, + {"matrix": [1, 6], "x": 10.25, "y": 1}, + {"matrix": [1, 7], "x": 11.25, "y": 1, "w": 1.5}, + + {"matrix": [4, 6], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [5, 6], "x": 1.75, "y": 2}, + {"matrix": [5, 5], "x": 2.75, "y": 2}, + {"matrix": [4, 4], "x": 3.75, "y": 2}, + {"matrix": [2, 0], "x": 4.75, "y": 2}, + {"matrix": [2, 1], "x": 5.75, "y": 2}, + {"matrix": [2, 2], "x": 6.75, "y": 2}, + {"matrix": [2, 3], "x": 7.75, "y": 2}, + {"matrix": [2, 4], "x": 8.75, "y": 2}, + {"matrix": [2, 5], "x": 9.75, "y": 2}, + {"matrix": [2, 6], "x": 10.75, "y": 2}, + {"matrix": [2, 7], "x": 11.75, "y": 2}, + + {"matrix": [4, 5], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [5, 4], "x": 1.25, "y": 3, "w": 1.5}, + {"matrix": [3, 0], "x": 2.75, "y": 3, "w": 1.25}, + {"matrix": [3, 2], "x": 4, "y": 3, "w": 2.25}, + {"matrix": [3, 3], "x": 6.25, "y": 3, "w": 2}, + {"matrix": [3, 4], "x": 8.25, "y": 3, "w": 1.5}, + {"matrix": [3, 5], "x": 9.75, "y": 3}, + {"matrix": [3, 6], "x": 10.75, "y": 3}, + {"matrix": [3, 7], "x": 11.75, "y": 3} ] }, - "LAYOUT_command": { "layout": [ - {"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0, "w":1.75}, - {"x":0, "y":1, "w":1.25}, {"x":1.25, "y":1}, {"x":2.25, "y":1}, {"x":3.25, "y":1}, {"x":4.25, "y":1}, {"x":5.25, "y":1}, {"x":6.25, "y":1}, {"x":7.25, "y":1}, {"x":8.25, "y":1}, {"x":9.25, "y":1}, {"x":10.25, "y":1}, {"x":11.25, "y":1, "w":1.5}, - {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, - {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3, "w":2.25}, {"x":6.25, "y":3, "w":2}, {"x":8.25, "y":3, "w":1.25}, {"x":9.5, "y":3, "w":1.5}, {"x":11, "y":3, "w":1.75} + {"matrix": [5, 0], "x": 0, "y": 0}, + {"matrix": [5, 1], "x": 1, "y": 0}, + {"matrix": [5, 2], "x": 2, "y": 0}, + {"matrix": [5, 3], "x": 3, "y": 0}, + {"matrix": [0, 0], "x": 4, "y": 0}, + {"matrix": [0, 1], "x": 5, "y": 0}, + {"matrix": [0, 2], "x": 6, "y": 0}, + {"matrix": [0, 3], "x": 7, "y": 0}, + {"matrix": [0, 4], "x": 8, "y": 0}, + {"matrix": [0, 5], "x": 9, "y": 0}, + {"matrix": [0, 6], "x": 10, "y": 0}, + {"matrix": [0, 7], "x": 11, "y": 0, "w": 1.75}, + + {"matrix": [4, 0], "x": 0, "y": 1, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 1}, + {"matrix": [4, 2], "x": 2.25, "y": 1}, + {"matrix": [4, 3], "x": 3.25, "y": 1}, + {"matrix": [1, 0], "x": 4.25, "y": 1}, + {"matrix": [1, 1], "x": 5.25, "y": 1}, + {"matrix": [1, 2], "x": 6.25, "y": 1}, + {"matrix": [1, 3], "x": 7.25, "y": 1}, + {"matrix": [1, 4], "x": 8.25, "y": 1}, + {"matrix": [1, 5], "x": 9.25, "y": 1}, + {"matrix": [1, 6], "x": 10.25, "y": 1}, + {"matrix": [1, 7], "x": 11.25, "y": 1, "w": 1.5}, + + {"matrix": [4, 6], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [5, 6], "x": 1.75, "y": 2}, + {"matrix": [5, 5], "x": 2.75, "y": 2}, + {"matrix": [4, 4], "x": 3.75, "y": 2}, + {"matrix": [2, 0], "x": 4.75, "y": 2}, + {"matrix": [2, 1], "x": 5.75, "y": 2}, + {"matrix": [2, 2], "x": 6.75, "y": 2}, + {"matrix": [2, 3], "x": 7.75, "y": 2}, + {"matrix": [2, 4], "x": 8.75, "y": 2}, + {"matrix": [2, 5], "x": 9.75, "y": 2}, + {"matrix": [2, 6], "x": 10.75, "y": 2}, + {"matrix": [2, 7], "x": 11.75, "y": 2}, + + {"matrix": [4, 5], "x": 0, "y": 3}, + {"matrix": [5, 4], "x": 1, "y": 3}, + {"matrix": [3, 0], "x": 2, "y": 3}, + {"matrix": [3, 1], "x": 3, "y": 3}, + {"matrix": [3, 2], "x": 4, "y": 3, "w": 2.25}, + {"matrix": [3, 3], "x": 6.25, "y": 3, "w": 2}, + {"matrix": [3, 4], "x": 8.25, "y": 3, "w": 1.25}, + {"matrix": [3, 5], "x": 9.5, "y": 3, "w": 1.5}, + {"matrix": [3, 7], "x": 11, "y": 3, "w": 1.75} ] }, - "LAYOUT_all": { "layout": [ - {"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0, "w":1.75}, - {"x":0, "y":1, "w":1.25}, {"x":1.25, "y":1}, {"x":2.25, "y":1}, {"x":3.25, "y":1}, {"x":4.25, "y":1}, {"x":5.25, "y":1}, {"x":6.25, "y":1}, {"x":7.25, "y":1}, {"x":8.25, "y":1}, {"x":9.25, "y":1}, {"x":10.25, "y":1}, {"x":11.25, "y":1, "w":1.5}, - {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, - {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3, "w":2.25}, {"x":6.25, "y":3, "w":2}, {"x":8.25, "y":3, "w":1.5}, {"x":9.75, "y":3}, {"x":10.75, "y":3}, {"x":11.75, "y":3} + {"matrix": [5, 0], "x": 0, "y": 0}, + {"matrix": [5, 1], "x": 1, "y": 0}, + {"matrix": [5, 2], "x": 2, "y": 0}, + {"matrix": [5, 3], "x": 3, "y": 0}, + {"matrix": [0, 0], "x": 4, "y": 0}, + {"matrix": [0, 1], "x": 5, "y": 0}, + {"matrix": [0, 2], "x": 6, "y": 0}, + {"matrix": [0, 3], "x": 7, "y": 0}, + {"matrix": [0, 4], "x": 8, "y": 0}, + {"matrix": [0, 5], "x": 9, "y": 0}, + {"matrix": [0, 6], "x": 10, "y": 0}, + {"matrix": [0, 7], "x": 11, "y": 0, "w": 1.75}, + + {"matrix": [4, 0], "x": 0, "y": 1, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 1}, + {"matrix": [4, 2], "x": 2.25, "y": 1}, + {"matrix": [4, 3], "x": 3.25, "y": 1}, + {"matrix": [1, 0], "x": 4.25, "y": 1}, + {"matrix": [1, 1], "x": 5.25, "y": 1}, + {"matrix": [1, 2], "x": 6.25, "y": 1}, + {"matrix": [1, 3], "x": 7.25, "y": 1}, + {"matrix": [1, 4], "x": 8.25, "y": 1}, + {"matrix": [1, 5], "x": 9.25, "y": 1}, + {"matrix": [1, 6], "x": 10.25, "y": 1}, + {"matrix": [1, 7], "x": 11.25, "y": 1, "w": 1.5}, + + {"matrix": [4, 6], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [5, 6], "x": 1.75, "y": 2}, + {"matrix": [5, 5], "x": 2.75, "y": 2}, + {"matrix": [4, 4], "x": 3.75, "y": 2}, + {"matrix": [2, 0], "x": 4.75, "y": 2}, + {"matrix": [2, 1], "x": 5.75, "y": 2}, + {"matrix": [2, 2], "x": 6.75, "y": 2}, + {"matrix": [2, 3], "x": 7.75, "y": 2}, + {"matrix": [2, 4], "x": 8.75, "y": 2}, + {"matrix": [2, 5], "x": 9.75, "y": 2}, + {"matrix": [2, 6], "x": 10.75, "y": 2}, + {"matrix": [2, 7], "x": 11.75, "y": 2}, + + {"matrix": [4, 5], "x": 0, "y": 3}, + {"matrix": [5, 4], "x": 1, "y": 3}, + {"matrix": [3, 0], "x": 2, "y": 3}, + {"matrix": [3, 1], "x": 3, "y": 3}, + {"matrix": [3, 2], "x": 4, "y": 3, "w": 2.25}, + {"matrix": [3, 3], "x": 6.25, "y": 3, "w": 2}, + {"matrix": [3, 4], "x": 8.25, "y": 3, "w": 1.5}, + {"matrix": [3, 5], "x": 9.75, "y": 3}, + {"matrix": [3, 6], "x": 10.75, "y": 3}, + {"matrix": [3, 7], "x": 11.75, "y": 3} ] }, "LAYOUT_jetvan": { "layout": [ - {"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0, "w":1.75}, - {"x":0, "y":1, "w":1.25}, {"x":1.25, "y":1}, {"x":2.25, "y":1}, {"x":3.25, "y":1}, {"x":4.25, "y":1}, {"x":5.25, "y":1}, {"x":6.25, "y":1}, {"x":7.25, "y":1}, {"x":8.25, "y":1}, {"x":9.25, "y":1}, {"x":10.25, "y":1}, {"x":11.25, "y":1, "w":1.5}, - {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, - {"x":0, "y":3, "w":1.25}, {"x":1.25, "y":3}, {"x":2.25, "y":3, "w":1.25}, {"x":3.5, "w":6.25, "y":3}, {"x":9.75, "y":3}, {"x":10.75, "y":3}, {"x":11.75, "y":3} + {"matrix": [5, 0], "x": 0, "y": 0}, + {"matrix": [5, 1], "x": 1, "y": 0}, + {"matrix": [5, 2], "x": 2, "y": 0}, + {"matrix": [5, 3], "x": 3, "y": 0}, + {"matrix": [0, 0], "x": 4, "y": 0}, + {"matrix": [0, 1], "x": 5, "y": 0}, + {"matrix": [0, 2], "x": 6, "y": 0}, + {"matrix": [0, 3], "x": 7, "y": 0}, + {"matrix": [0, 4], "x": 8, "y": 0}, + {"matrix": [0, 5], "x": 9, "y": 0}, + {"matrix": [0, 6], "x": 10, "y": 0}, + {"matrix": [0, 7], "x": 11, "y": 0, "w": 1.75}, + + {"matrix": [4, 0], "x": 0, "y": 1, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 1}, + {"matrix": [4, 2], "x": 2.25, "y": 1}, + {"matrix": [4, 3], "x": 3.25, "y": 1}, + {"matrix": [1, 0], "x": 4.25, "y": 1}, + {"matrix": [1, 1], "x": 5.25, "y": 1}, + {"matrix": [1, 2], "x": 6.25, "y": 1}, + {"matrix": [1, 3], "x": 7.25, "y": 1}, + {"matrix": [1, 4], "x": 8.25, "y": 1}, + {"matrix": [1, 5], "x": 9.25, "y": 1}, + {"matrix": [1, 6], "x": 10.25, "y": 1}, + {"matrix": [1, 7], "x": 11.25, "y": 1, "w": 1.5}, + + {"matrix": [4, 6], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [5, 6], "x": 1.75, "y": 2}, + {"matrix": [5, 5], "x": 2.75, "y": 2}, + {"matrix": [4, 4], "x": 3.75, "y": 2}, + {"matrix": [2, 0], "x": 4.75, "y": 2}, + {"matrix": [2, 1], "x": 5.75, "y": 2}, + {"matrix": [2, 2], "x": 6.75, "y": 2}, + {"matrix": [2, 3], "x": 7.75, "y": 2}, + {"matrix": [2, 4], "x": 8.75, "y": 2}, + {"matrix": [2, 5], "x": 9.75, "y": 2}, + {"matrix": [2, 6], "x": 10.75, "y": 2}, + {"matrix": [2, 7], "x": 11.75, "y": 2}, + + {"matrix": [4, 5], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [5, 4], "x": 1.25, "y": 3}, + {"matrix": [3, 0], "x": 2.25, "y": 3, "w": 1.25}, + {"matrix": [3, 3], "x": 3.5, "y": 3, "w": 6.25}, + {"matrix": [3, 5], "x": 9.75, "y": 3}, + {"matrix": [3, 6], "x": 10.75, "y": 3}, + {"matrix": [3, 7], "x": 11.75, "y": 3} ] } } diff --git a/keyboards/trashman/ketch/ketch.h b/keyboards/trashman/ketch/ketch.h deleted file mode 100644 index 25be7cf8f9..0000000000 --- a/keyboards/trashman/ketch/ketch.h +++ /dev/null @@ -1,96 +0,0 @@ -/* -Copyright 2021 Evan Sailer, Jetpacktuxedo, & QMK Firmware - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to -deal in the Software without restriction, including without limitation the -rights to use, copy, modify, merge, publish, distribute, sublicense, and/or -sell copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. -*/ - -#pragma once -#include "quantum.h" - -#define LAYOUT(\ - K39, K40, K41, K42, K0, K1, K2, K3, K4, K5, K6, K7,\ - K32, K33, K34, K35, K8, K9, K10, K11, K12, K13, K14, K15,\ - K38, K45, K44, K36, K16, K17, K18, K19, K20, K21, K22, K23,\ - K37, K43, K24, K26, K27, K28, K29, K31\ -) {\ - { K0, K1, K2, K3, K4, K5, K6, K7 },\ - { K8, K9, K10, K11, K12, K13, K14, K15 },\ - { K16, K17, K18, K19, K20, K21, K22, K23 },\ - { KC_NO, K24, K26, K27, K28, K29, KC_NO, K31 },\ - { K32, K33, K34, K35, K36, K37, K38, KC_NO },\ - { K39, K40, K41, K42, K43, K44, K45, KC_NO }\ -} - -#define LAYOUT_arrow(\ - K39, K40, K41, K42, K0, K1, K2, K3, K4, K5, K6, K7,\ - K32, K33, K34, K35, K8, K9, K10, K11, K12, K13, K14, K15,\ - K38, K45, K44, K36, K16, K17, K18, K19, K20, K21, K22, K23,\ - K37, K43, K24, K26, K27, K28, K29, K30, K31\ -) {\ - { K0, K1, K2, K3, K4, K5, K6, K7 }, \ - { K8, K9, K10, K11, K12, K13, K14, K15 }, \ - { K16, K17, K18, K19, K20, K21, K22, K23 }, \ - { K24, KC_NO, K26, K27, K28, K29, K30, K31 }, \ - { K32, K33, K34, K35, K36, K37, K38, KC_NO }, \ - { K39, K40, K41, K42, K43, K44, K45, KC_NO } \ -} - -#define LAYOUT_command(\ - K39, K40, K41, K42, K0, K1, K2, K3, K4, K5, K6, K7,\ - K32, K33, K34, K35, K8, K9, K10, K11, K12, K13, K14, K15,\ - K38, K45, K44, K36, K16, K17, K18, K19, K20, K21, K22, K23,\ - K37, K43, K24, K25, K26, K27, K28, K29, K31\ -) {\ - { K0, K1, K2, K3, K4, K5, K6, K7 }, \ - { K8, K9, K10, K11, K12, K13, K14, K15 }, \ - { K16, K17, K18, K19, K20, K21, K22, K23 }, \ - { K24, K25, K26, K27, K28, K29, KC_NO, K31 }, \ - { K32, K33, K34, K35, K36, K37, K38, KC_NO }, \ - { K39, K40, K41, K42, K43, K44, K45, KC_NO } \ -} - -// This layout is typically called "southpaw_arrow" or "southpaw + arrow", but -// using "all" here to match typical qmk conventions -#define LAYOUT_all(\ - K39, K40, K41, K42, K0, K1, K2, K3, K4, K5, K6, K7,\ - K32, K33, K34, K35, K8, K9, K10, K11, K12, K13, K14, K15,\ - K38, K45, K44, K36, K16, K17, K18, K19, K20, K21, K22, K23,\ - K37, K43, K24, K25, K26, K27, K28, K29, K30, K31\ -) {\ - { K0, K1, K2, K3, K4, K5, K6, K7 }, \ - { K8, K9, K10, K11, K12, K13, K14, K15 }, \ - { K16, K17, K18, K19, K20, K21, K22, K23 }, \ - { K24, K25, K26, K27, K28, K29, K30, K31 }, \ - { K32, K33, K34, K35, K36, K37, K38, KC_NO }, \ - { K39, K40, K41, K42, K43, K44, K45, KC_NO } \ -} - -#define LAYOUT_jetvan(\ - K39, K40, K41, K42, K0, K1, K2, K3, K4, K5, K6, K7,\ - K32, K33, K34, K35, K8, K9, K10, K11, K12, K13, K14, K15,\ - K38, K45, K44, K36, K16, K17, K18, K19, K20, K21, K22, K23,\ - K37, K43, K24, K27, K29, K30, K31\ -) {\ - { K0, K1, K2, K3, K4, K5, K6, K7 }, \ - { K8, K9, K10, K11, K12, K13, K14, K15 }, \ - { K16, K17, K18, K19, K20, K21, K22, K23 }, \ - { K24, KC_NO, KC_NO, K27, KC_NO, K29, K30, K31 }, \ - { K32, K33, K34, K35, K36, K37, K38, KC_NO }, \ - { K39, K40, K41, K42, K43, K44, K45, KC_NO } \ -} -- cgit v1.2.3 From 2944e938703e2049bb6262a0ab31e701d27e8ab3 Mon Sep 17 00:00:00 2001 From: Ryan Date: Mon, 1 May 2023 17:37:12 +1000 Subject: Move `USB_MAX_POWER_CONSUMPTION` to data driven (#20648) --- keyboards/trashman/ketch/config.h | 1 - keyboards/trashman/ketch/info.json | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'keyboards/trashman/ketch') diff --git a/keyboards/trashman/ketch/config.h b/keyboards/trashman/ketch/config.h index 64c34a8008..0f391f70ba 100644 --- a/keyboards/trashman/ketch/config.h +++ b/keyboards/trashman/ketch/config.h @@ -22,7 +22,6 @@ SOFTWARE. #pragma once -#define USB_MAX_POWER_CONSUMPTION 100 #define RGBLED_NUM 10 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/trashman/ketch/info.json b/keyboards/trashman/ketch/info.json index 02dc364a35..21f3bb7ec3 100644 --- a/keyboards/trashman/ketch/info.json +++ b/keyboards/trashman/ketch/info.json @@ -6,7 +6,8 @@ "usb": { "vid": "0xFEAE", "pid": "0x8947", - "device_version": "0.0.1" + "device_version": "0.0.1", + "max_power": 100 }, "ws2812": { "pin": "F4" -- cgit v1.2.3