From 23c365b023e409885e6f201f12df56e5145dde47 Mon Sep 17 00:00:00 2001 From: Ryan Date: Mon, 6 Mar 2023 09:53:52 +1100 Subject: Move matrix config to info.json, part 1 (#19985) --- keyboards/giabalanai/config.h | 19 ------------------- keyboards/giabalanai/info.json | 11 +++++++++++ 2 files changed, 11 insertions(+), 19 deletions(-) (limited to 'keyboards/giabalanai') diff --git a/keyboards/giabalanai/config.h b/keyboards/giabalanai/config.h index 01e84b4cdd..1b2a8bdf5b 100644 --- a/keyboards/giabalanai/config.h +++ b/keyboards/giabalanai/config.h @@ -17,25 +17,6 @@ along with this program. If not, see . #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { B5, B4, E6, D7, C6, D4 } -#define MATRIX_COL_PINS { B1, F7, F6, F5, F4, B3, B2, B6, D0, D1 } -#define MATRIX_ROW_PINS_RIGHT { D1, D0, D4, C6, D7, E6 } -#define MATRIX_COL_PINS_RIGHT { F4, F5, F6, F7, B1, B3, B2, C7, B7, F1 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define SELECT_SOFT_SERIAL_SPEED 1 /*Sets the protocol speed when using serial communication*/ //Speeds: diff --git a/keyboards/giabalanai/info.json b/keyboards/giabalanai/info.json index 30bd26159f..31c0c3366d 100644 --- a/keyboards/giabalanai/info.json +++ b/keyboards/giabalanai/info.json @@ -8,6 +8,11 @@ "pid": "0xF4B0", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B1", "F7", "F6", "F5", "F4", "B3", "B2", "B6", "D0", "D1"], + "rows": ["B5", "B4", "E6", "D7", "C6", "D4"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [] }, @@ -19,6 +24,12 @@ {"pin_a": "B4", "pin_b": "B6"} ] } + }, + "matrix_pins": { + "right": { + "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "C7", "B7", "F1"], + "rows": ["D1", "D0", "D4", "C6", "D7", "E6"] + } } }, "processor": "atmega32u4", -- 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/giabalanai/config.h | 3 --- keyboards/giabalanai/info.json | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'keyboards/giabalanai') diff --git a/keyboards/giabalanai/config.h b/keyboards/giabalanai/config.h index c18e61b967..f058b3afc4 100644 --- a/keyboards/giabalanai/config.h +++ b/keyboards/giabalanai/config.h @@ -33,9 +33,6 @@ along with this program. If not, see . // for "Generic" Promicro to be detected correctly as lefthand side (slave) #define SPLIT_USB_DETECT -/* ws2812 RGB LED */ -#define RGB_DI_PIN D3 - #ifdef RGBLIGHT_ENABLE # define RGBLED_NUM 123 diff --git a/keyboards/giabalanai/info.json b/keyboards/giabalanai/info.json index eba0da004c..094c02af09 100644 --- a/keyboards/giabalanai/info.json +++ b/keyboards/giabalanai/info.json @@ -27,6 +27,9 @@ "encoder": { "rotary": [] }, + "ws2812": { + "pin": "D3" + }, "split": { "enabled": true, "soft_serial_pin": "D2", -- cgit v1.2.3 From 522048725f6b076bdad1251243c65dd2acf6595d Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 8 Apr 2023 18:08:08 +1000 Subject: Move `RGB_MATRIX_DRIVER` to data driven (#20350) --- keyboards/giabalanai/info.json | 3 +++ keyboards/giabalanai/rules.mk | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'keyboards/giabalanai') diff --git a/keyboards/giabalanai/info.json b/keyboards/giabalanai/info.json index 094c02af09..f8962415cb 100644 --- a/keyboards/giabalanai/info.json +++ b/keyboards/giabalanai/info.json @@ -8,6 +8,9 @@ "pid": "0xF4B0", "device_version": "0.0.1" }, + "rgb_matrix": { + "driver": "WS2812" + }, "matrix_pins": { "cols": ["B1", "F7", "F6", "F5", "F4", "B3", "B2", "B6", "D0", "D1"], "rows": ["B5", "B4", "E6", "D7", "C6", "D4"] diff --git a/keyboards/giabalanai/rules.mk b/keyboards/giabalanai/rules.mk index d0e8dc4f24..90ba252d26 100644 --- a/keyboards/giabalanai/rules.mk +++ b/keyboards/giabalanai/rules.mk @@ -5,6 +5,5 @@ COMMAND_ENABLE = no # Commands for debug and configuration BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality # RGB_MATRIX_ENABLE is not suitable for giabalanai keyboard on the right side (there are dulpicate keys). RGB_MATRIX_ENABLE = no # Use RGB matrix (Don't enable this when RGBLIGHT_ENABLE is used.) -RGB_MATRIX_DRIVER = WS2812 # 2021/01/23 added. LTO_ENABLE = yes -- 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/giabalanai/giabalanai.h | 64 -------- keyboards/giabalanai/info.json | 324 ++++++++++++++++++++++++++------------ 2 files changed, 224 insertions(+), 164 deletions(-) (limited to 'keyboards/giabalanai') diff --git a/keyboards/giabalanai/giabalanai.h b/keyboards/giabalanai/giabalanai.h index df4759f00f..199dac37d9 100644 --- a/keyboards/giabalanai/giabalanai.h +++ b/keyboards/giabalanai/giabalanai.h @@ -18,70 +18,6 @@ #include "quantum.h" -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT( \ - l00, l01, l02, l03, l04, l05, l06, l07, l08, l09, l0a, l0b, \ - l10, l11, l12, l13, l14, l15, l16, l17, l18, l19, l1a, l1b, \ - l20, l21, l22, l23, l24, l25, l26, l27, l28, l29, l2a, l2b, \ - l30, l31, l32, l33, l34, l35, l36, l37, l38, l39, l3a, l3b, \ - l40, l41, l42, l43, l44, l45, l46, l47, l48, l49, l4a, l4b, \ - \ - r20, \ - r00, r01, r02, r03, r04, r05, r06, r07, r08, r09, r0a, r0b, renc, \ - r10, r11, r12, r13, r14, r15, r16, r17, r18, r19, r1a, r1b, r1c, \ - r21, r22, r23, r24, r25, r26, r27, r28, r29, r2a, r2b, r2c \ -) { \ - { l00, l10, l20, l30, l40, l0b, l1b, l2b, l3b, l4b }, \ - { l01, l11, l21, l31, l41, l0a, l1a, l2a, l3a, l4a }, \ - { l02, l12, l22, l32, l42, l09, l19, l29, l39, l49 }, \ - { l03, l13, l23, l33, l43, l08, l18, l28, l38, l48 }, \ - { l04, l14, l24, l34, l44, l07, l17, l27, l37, l47 }, \ - { l05, l15, l25, l35, l45, l06, l16, l26, l36, l46 }, \ - \ - { r00, r01, r02, r03, r04, r05, r06, KC_NO, KC_NO, KC_NO }, \ - { r10, r11, r12, r13, r14, r15, r16, KC_NO, KC_NO, KC_NO }, \ - { r20, r21, r22, r23, r24, r25, r26, KC_NO, KC_NO, KC_NO }, \ - { KC_NO, renc, r0b, r0a, r09, r08, r07, KC_NO, KC_NO, KC_NO }, \ - { KC_NO, r1c, r1b, r1a, r19, r18, r17, KC_NO, KC_NO, KC_NO }, \ - { KC_NO, r2c, r2b, r2a, r29, r28, r27, KC_NO, KC_NO, KC_NO } \ -} - -#define LAYOUT_giabarinaix2( \ - l00, l01, l02, l03, l04, l05, l06, l07, l08, l09, l0a, l0b, \ - l10, l11, l12, l13, l14, l15, l16, l17, l18, l19, l1a, l1b, \ - l20, l21, l22, l23, l24, l25, l26, l27, l28, l29, l2a, l2b, \ - l30, l31, l32, l33, l34, l35, l36, l37, l38, l39, l3a, l3b, \ - l40, l41, l42, l43, l44, l45, l46, l47, l48, l49, l4a, l4b, \ - \ - r00, r01, r02, r03, r04, r05, r06, r07, r08, r09, r0a, r0b, \ - r10, r11, r12, r13, r14, r15, r16, r17, r18, r19, r1a, r1b, \ - r20, r21, r22, r23, r24, r25, r26, r27, r28, r29, r2a, r2b, \ - r30, r31, r32, r33, r34, r35, r36, r37, r38, r39, r3a, r3b, \ - r40, r41, r42, r43, r44, r45, r46, r47, r48, r49, r4a, r4b \ -) { \ - { l00, l10, l20, l30, l40, l0b, l1b, l2b, l3b, l4b }, \ - { l01, l11, l21, l31, l41, l0a, l1a, l2a, l3a, l4a }, \ - { l02, l12, l22, l32, l42, l09, l19, l29, l39, l49 }, \ - { l03, l13, l23, l33, l43, l08, l18, l28, l38, l48 }, \ - { l04, l14, l24, l34, l44, l07, l17, l27, l37, l47 }, \ - { l05, l15, l25, l35, l45, l06, l16, l26, l36, l46 }, \ - \ - { r4b, r3b, r2b, r1b, r0b, r40, r30, r20, r10, r00 }, \ - { r4a, r3a, r2a, r1a, r0a, r41, r31, r21, r11, r01 }, \ - { r49, r39, r29, r19, r09, r42, r32, r22, r12, r02 }, \ - { r48, r38, r28, r18, r08, r43, r33, r23, r13, r03 }, \ - { r47, r37, r27, r17, r07, r44, r34, r24, r14, r04 }, \ - { r46, r36, r26, r16, r06, r45, r35, r25, r15, r05 } \ -} - - #define _________________QWERTY_L1_________________ KC_Q, KC_W, KC_E, KC_R, KC_T #define _________________QWERTY_L2_________________ KC_A, KC_S, KC_D, KC_F, KC_G #define _________________QWERTY_L3_________________ KC_Z, KC_X, KC_C, KC_V, KC_B diff --git a/keyboards/giabalanai/info.json b/keyboards/giabalanai/info.json index f8962415cb..e572e8f36d 100644 --- a/keyboards/giabalanai/info.json +++ b/keyboards/giabalanai/info.json @@ -54,115 +54,239 @@ "bootloader": "caterina", "layouts": { "LAYOUT": { - "layout": [ - {"label": "l00", "x": 0, "y": 0}, - {"label": "l01", "x": 1, "y": 0}, - {"label": "l02", "x": 2, "y": 0}, - {"label": "l03", "x": 3, "y": 0}, - {"label": "l04", "x": 4, "y": 0}, - {"label": "l05", "x": 5, "y": 0}, - {"label": "l06", "x": 6, "y": 0}, - {"label": "l07", "x": 7, "y": 0}, - {"label": "l08", "x": 8, "y": 0}, - {"label": "l09", "x": 9, "y": 0}, - {"label": "l0a", "x": 10, "y": 0}, - {"label": "l0b", "x": 11, "y": 0}, + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [1, 0], "x": 1, "y": 0}, + {"matrix": [2, 0], "x": 2, "y": 0}, + {"matrix": [3, 0], "x": 3, "y": 0}, + {"matrix": [4, 0], "x": 4, "y": 0}, + {"matrix": [5, 0], "x": 5, "y": 0}, + {"matrix": [5, 5], "x": 6, "y": 0}, + {"matrix": [4, 5], "x": 7, "y": 0}, + {"matrix": [3, 5], "x": 8, "y": 0}, + {"matrix": [2, 5], "x": 9, "y": 0}, + {"matrix": [1, 5], "x": 10, "y": 0}, + {"matrix": [0, 5], "x": 11, "y": 0}, - {"label": "l10", "x": 0.5, "y": 1}, - {"label": "l11", "x": 1.5, "y": 1}, - {"label": "l12", "x": 2.5, "y": 1}, - {"label": "l13", "x": 3.5, "y": 1}, - {"label": "l14", "x": 4.5, "y": 1}, - {"label": "l15", "x": 5.5, "y": 1}, - {"label": "l16", "x": 6.5, "y": 1}, - {"label": "l17", "x": 7.5, "y": 1}, - {"label": "l18", "x": 8.5, "y": 1}, - {"label": "l19", "x": 9.5, "y": 1}, - {"label": "l1a", "x": 10.5, "y": 1}, - {"label": "l1b", "x": 11.5, "y": 1}, + {"matrix": [0, 1], "x": 0.5, "y": 1}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [2, 1], "x": 2.5, "y": 1}, + {"matrix": [3, 1], "x": 3.5, "y": 1}, + {"matrix": [4, 1], "x": 4.5, "y": 1}, + {"matrix": [5, 1], "x": 5.5, "y": 1}, + {"matrix": [5, 6], "x": 6.5, "y": 1}, + {"matrix": [4, 6], "x": 7.5, "y": 1}, + {"matrix": [3, 6], "x": 8.5, "y": 1}, + {"matrix": [2, 6], "x": 9.5, "y": 1}, + {"matrix": [1, 6], "x": 10.5, "y": 1}, + {"matrix": [0, 6], "x": 11.5, "y": 1}, - {"label": "r20", "x": 14.5, "y": 1}, + {"matrix": [0, 2], "x": 14.5, "y": 1}, - {"label": "l20", "x": 1, "y": 2}, - {"label": "l21", "x": 2, "y": 2}, - {"label": "l22", "x": 3, "y": 2}, - {"label": "l23", "x": 4, "y": 2}, - {"label": "l24", "x": 5, "y": 2}, - {"label": "l25", "x": 6, "y": 2}, - {"label": "l26", "x": 7, "y": 2}, - {"label": "l27", "x": 8, "y": 2}, - {"label": "l28", "x": 9, "y": 2}, - {"label": "l29", "x": 10, "y": 2}, - {"label": "l2a", "x": 11, "y": 2}, - {"label": "l2b", "x": 12, "y": 2}, + {"matrix": [1, 2], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [3, 2], "x": 3, "y": 2}, + {"matrix": [4, 2], "x": 4, "y": 2}, + {"matrix": [5, 2], "x": 5, "y": 2}, + {"matrix": [5, 7], "x": 6, "y": 2}, + {"matrix": [4, 7], "x": 7, "y": 2}, + {"matrix": [3, 7], "x": 8, "y": 2}, + {"matrix": [2, 7], "x": 9, "y": 2}, + {"matrix": [1, 7], "x": 10, "y": 2}, + {"matrix": [0, 7], "x": 11, "y": 2}, + {"matrix": [0, 3], "x": 12, "y": 2}, - {"label": "r00", "x": 15, "y": 2}, - {"label": "r01", "x": 16, "y": 2}, - {"label": "r02", "x": 17, "y": 2}, - {"label": "r03", "x": 18, "y": 2}, - {"label": "r04", "x": 19, "y": 2}, - {"label": "r05", "x": 20, "y": 2}, - {"label": "r06", "x": 21, "y": 2}, - {"label": "r07", "x": 22, "y": 2}, - {"label": "r08", "x": 23, "y": 2}, - {"label": "r09", "x": 24, "y": 2}, - {"label": "r0a", "x": 25, "y": 2}, - {"label": "r0b", "x": 26, "y": 2}, + {"matrix": [1, 3], "x": 15, "y": 2}, + {"matrix": [2, 3], "x": 16, "y": 2}, + {"matrix": [3, 3], "x": 17, "y": 2}, + {"matrix": [4, 3], "x": 18, "y": 2}, + {"matrix": [5, 3], "x": 19, "y": 2}, + {"matrix": [5, 8], "x": 20, "y": 2}, + {"matrix": [4, 8], "x": 21, "y": 2}, + {"matrix": [3, 8], "x": 22, "y": 2}, + {"matrix": [2, 8], "x": 23, "y": 2}, + {"matrix": [1, 8], "x": 24, "y": 2}, + {"matrix": [0, 8], "x": 25, "y": 2}, + {"matrix": [0, 4], "x": 26, "y": 2}, - {"label": "renc", "x": 27.5, "y": 2}, + {"matrix": [1, 4], "x": 27.5, "y": 2}, - {"label": "l30", "x": 1.5, "y": 3}, - {"label": "l31", "x": 2.5, "y": 3}, - {"label": "l32", "x": 3.5, "y": 3}, - {"label": "l33", "x": 4.5, "y": 3}, - {"label": "l34", "x": 5.5, "y": 3}, - {"label": "l35", "x": 6.5, "y": 3}, - {"label": "l36", "x": 7.5, "y": 3}, - {"label": "l37", "x": 8.5, "y": 3}, - {"label": "l38", "x": 9.5, "y": 3}, - {"label": "l39", "x": 10.5, "y": 3}, - {"label": "l3a", "x": 11.5, "y": 3}, - {"label": "l3b", "x": 12.5, "y": 3}, + {"matrix": [2, 4], "x": 1.5, "y": 3}, + {"matrix": [3, 4], "x": 2.5, "y": 3}, + {"matrix": [4, 4], "x": 3.5, "y": 3}, + {"matrix": [5, 4], "x": 4.5, "y": 3}, + {"matrix": [5, 9], "x": 5.5, "y": 3}, + {"matrix": [4, 9], "x": 6.5, "y": 3}, + {"matrix": [3, 9], "x": 7.5, "y": 3}, + {"matrix": [2, 9], "x": 8.5, "y": 3}, + {"matrix": [1, 9], "x": 9.5, "y": 3}, + {"matrix": [0, 9], "x": 10.5, "y": 3}, + {"matrix": [8, 0], "x": 11.5, "y": 3}, + {"matrix": [6, 0], "x": 12.5, "y": 3}, - {"label": "r10", "x": 14.5, "y": 3}, - {"label": "r11", "x": 15.5, "y": 3}, - {"label": "r12", "x": 16.5, "y": 3}, - {"label": "r13", "x": 17.5, "y": 3}, - {"label": "r14", "x": 18.5, "y": 3}, - {"label": "r15", "x": 19.5, "y": 3}, - {"label": "r16", "x": 20.5, "y": 3}, - {"label": "r17", "x": 21.5, "y": 3}, - {"label": "r18", "x": 22.5, "y": 3}, - {"label": "r19", "x": 23.5, "y": 3}, - {"label": "r1a", "x": 24.5, "y": 3}, - {"label": "r1b", "x": 25.5, "y": 3}, - {"label": "r1c", "x": 26.5, "y": 3}, + {"matrix": [6, 1], "x": 14.5, "y": 3}, + {"matrix": [6, 2], "x": 15.5, "y": 3}, + {"matrix": [6, 3], "x": 16.5, "y": 3}, + {"matrix": [6, 4], "x": 17.5, "y": 3}, + {"matrix": [6, 5], "x": 18.5, "y": 3}, + {"matrix": [6, 6], "x": 19.5, "y": 3}, + {"matrix": [9, 6], "x": 20.5, "y": 3}, + {"matrix": [9, 5], "x": 21.5, "y": 3}, + {"matrix": [9, 4], "x": 22.5, "y": 3}, + {"matrix": [9, 3], "x": 23.5, "y": 3}, + {"matrix": [9, 2], "x": 24.5, "y": 3}, + {"matrix": [9, 1], "x": 25.5, "y": 3}, + {"matrix": [7, 0], "x": 26.5, "y": 3}, - {"label": "l40", "x": 2, "y": 4}, - {"label": "l41", "x": 3, "y": 4}, - {"label": "l42", "x": 4, "y": 4}, - {"label": "l43", "x": 5, "y": 4}, - {"label": "l44", "x": 6, "y": 4}, - {"label": "l45", "x": 7, "y": 4}, - {"label": "l46", "x": 8, "y": 4}, - {"label": "l47", "x": 9, "y": 4}, - {"label": "l48", "x": 10, "y": 4}, - {"label": "l49", "x": 11, "y": 4}, - {"label": "l4a", "x": 12, "y": 4}, - {"label": "l4b", "x": 13, "y": 4}, + {"matrix": [7, 1], "x": 2, "y": 4}, + {"matrix": [7, 2], "x": 3, "y": 4}, + {"matrix": [7, 3], "x": 4, "y": 4}, + {"matrix": [7, 4], "x": 5, "y": 4}, + {"matrix": [7, 5], "x": 6, "y": 4}, + {"matrix": [7, 6], "x": 7, "y": 4}, + {"matrix": [10, 6], "x": 8, "y": 4}, + {"matrix": [10, 5], "x": 9, "y": 4}, + {"matrix": [10, 4], "x": 10, "y": 4}, + {"matrix": [10, 3], "x": 11, "y": 4}, + {"matrix": [10, 2], "x": 12, "y": 4}, + {"matrix": [10, 1], "x": 13, "y": 4}, - {"label": "r21", "x": 15, "y": 4}, - {"label": "r22", "x": 16, "y": 4}, - {"label": "r23", "x": 17, "y": 4}, - {"label": "r24", "x": 18, "y": 4}, - {"label": "r25", "x": 19, "y": 4}, - {"label": "r26", "x": 20, "y": 4}, - {"label": "r27", "x": 21, "y": 4}, - {"label": "r28", "x": 22, "y": 4}, - {"label": "r29", "x": 23, "y": 4}, - {"label": "r2a", "x": 24, "y": 4}, - {"label": "r2b", "x": 25, "y": 4}, - {"label": "r2c", "x": 26, "y": 4} + {"matrix": [8, 1], "x": 15, "y": 4}, + {"matrix": [8, 2], "x": 16, "y": 4}, + {"matrix": [8, 3], "x": 17, "y": 4}, + {"matrix": [8, 4], "x": 18, "y": 4}, + {"matrix": [8, 5], "x": 19, "y": 4}, + {"matrix": [8, 6], "x": 20, "y": 4}, + {"matrix": [11, 6], "x": 21, "y": 4}, + {"matrix": [11, 5], "x": 22, "y": 4}, + {"matrix": [11, 4], "x": 23, "y": 4}, + {"matrix": [11, 3], "x": 24, "y": 4}, + {"matrix": [11, 2], "x": 25, "y": 4}, + {"matrix": [11, 1], "x": 26, "y": 4} + ] + }, + "LAYOUT_giabarinaix2": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [1, 0], "x": 1, "y": 0}, + {"matrix": [2, 0], "x": 2, "y": 0}, + {"matrix": [3, 0], "x": 3, "y": 0}, + {"matrix": [4, 0], "x": 4, "y": 0}, + {"matrix": [5, 0], "x": 5, "y": 0}, + {"matrix": [5, 5], "x": 6, "y": 0}, + {"matrix": [4, 5], "x": 7, "y": 0}, + {"matrix": [3, 5], "x": 8, "y": 0}, + {"matrix": [2, 5], "x": 9, "y": 0}, + {"matrix": [1, 5], "x": 10, "y": 0}, + {"matrix": [0, 5], "x": 11, "y": 0}, + {"matrix": [0, 1], "x": 12, "y": 0}, + {"matrix": [1, 1], "x": 13, "y": 0}, + {"matrix": [2, 1], "x": 14, "y": 0}, + {"matrix": [3, 1], "x": 15, "y": 0}, + {"matrix": [4, 1], "x": 16, "y": 0}, + {"matrix": [5, 1], "x": 17, "y": 0}, + {"matrix": [5, 6], "x": 18, "y": 0}, + {"matrix": [4, 6], "x": 19, "y": 0}, + {"matrix": [3, 6], "x": 20, "y": 0}, + {"matrix": [2, 6], "x": 21, "y": 0}, + {"matrix": [1, 6], "x": 22, "y": 0}, + {"matrix": [0, 6], "x": 23, "y": 0}, + {"matrix": [0, 2], "x": 24, "y": 0}, + {"matrix": [1, 2], "x": 25, "y": 0}, + {"matrix": [2, 2], "x": 26, "y": 0}, + {"matrix": [3, 2], "x": 27, "y": 0}, + {"matrix": [4, 2], "x": 28, "y": 0}, + {"matrix": [5, 2], "x": 29, "y": 0}, + {"matrix": [5, 7], "x": 30, "y": 0}, + {"matrix": [4, 7], "x": 31, "y": 0}, + {"matrix": [3, 7], "x": 32, "y": 0}, + {"matrix": [2, 7], "x": 33, "y": 0}, + {"matrix": [1, 7], "x": 34, "y": 0}, + {"matrix": [0, 7], "x": 35, "y": 0}, + {"matrix": [0, 3], "x": 36, "y": 0}, + {"matrix": [1, 3], "x": 37, "y": 0}, + {"matrix": [2, 3], "x": 38, "y": 0}, + {"matrix": [3, 3], "x": 39, "y": 0}, + {"matrix": [4, 3], "x": 40, "y": 0}, + {"matrix": [5, 3], "x": 41, "y": 0}, + {"matrix": [5, 8], "x": 42, "y": 0}, + {"matrix": [4, 8], "x": 43, "y": 0}, + {"matrix": [3, 8], "x": 44, "y": 0}, + {"matrix": [2, 8], "x": 45, "y": 0}, + {"matrix": [1, 8], "x": 46, "y": 0}, + {"matrix": [0, 8], "x": 47, "y": 0}, + {"matrix": [0, 4], "x": 48, "y": 0}, + {"matrix": [1, 4], "x": 49, "y": 0}, + {"matrix": [2, 4], "x": 50, "y": 0}, + {"matrix": [3, 4], "x": 51, "y": 0}, + {"matrix": [4, 4], "x": 52, "y": 0}, + {"matrix": [5, 4], "x": 53, "y": 0}, + {"matrix": [5, 9], "x": 54, "y": 0}, + {"matrix": [4, 9], "x": 55, "y": 0}, + {"matrix": [3, 9], "x": 56, "y": 0}, + {"matrix": [2, 9], "x": 57, "y": 0}, + {"matrix": [1, 9], "x": 58, "y": 0}, + {"matrix": [0, 9], "x": 59, "y": 0}, + {"matrix": [6, 9], "x": 60, "y": 0}, + {"matrix": [7, 9], "x": 61, "y": 0}, + {"matrix": [8, 9], "x": 62, "y": 0}, + {"matrix": [9, 9], "x": 63, "y": 0}, + {"matrix": [10, 9], "x": 64, "y": 0}, + {"matrix": [11, 9], "x": 65, "y": 0}, + {"matrix": [11, 4], "x": 66, "y": 0}, + {"matrix": [10, 4], "x": 67, "y": 0}, + {"matrix": [9, 4], "x": 68, "y": 0}, + {"matrix": [8, 4], "x": 69, "y": 0}, + {"matrix": [7, 4], "x": 70, "y": 0}, + {"matrix": [6, 4], "x": 71, "y": 0}, + {"matrix": [6, 8], "x": 72, "y": 0}, + {"matrix": [7, 8], "x": 73, "y": 0}, + {"matrix": [8, 8], "x": 74, "y": 0}, + {"matrix": [9, 8], "x": 75, "y": 0}, + {"matrix": [10, 8], "x": 76, "y": 0}, + {"matrix": [11, 8], "x": 77, "y": 0}, + {"matrix": [11, 3], "x": 78, "y": 0}, + {"matrix": [10, 3], "x": 79, "y": 0}, + {"matrix": [9, 3], "x": 80, "y": 0}, + {"matrix": [8, 3], "x": 81, "y": 0}, + {"matrix": [7, 3], "x": 82, "y": 0}, + {"matrix": [6, 3], "x": 83, "y": 0}, + {"matrix": [6, 7], "x": 84, "y": 0}, + {"matrix": [7, 7], "x": 85, "y": 0}, + {"matrix": [8, 7], "x": 86, "y": 0}, + {"matrix": [9, 7], "x": 87, "y": 0}, + {"matrix": [10, 7], "x": 88, "y": 0}, + {"matrix": [11, 7], "x": 89, "y": 0}, + {"matrix": [11, 2], "x": 90, "y": 0}, + {"matrix": [10, 2], "x": 91, "y": 0}, + {"matrix": [9, 2], "x": 92, "y": 0}, + {"matrix": [8, 2], "x": 93, "y": 0}, + {"matrix": [7, 2], "x": 94, "y": 0}, + {"matrix": [6, 2], "x": 95, "y": 0}, + {"matrix": [6, 6], "x": 96, "y": 0}, + {"matrix": [7, 6], "x": 97, "y": 0}, + {"matrix": [8, 6], "x": 98, "y": 0}, + {"matrix": [9, 6], "x": 99, "y": 0}, + {"matrix": [10, 6], "x": 100, "y": 0}, + {"matrix": [11, 6], "x": 101, "y": 0}, + {"matrix": [11, 1], "x": 102, "y": 0}, + {"matrix": [10, 1], "x": 103, "y": 0}, + {"matrix": [9, 1], "x": 104, "y": 0}, + {"matrix": [8, 1], "x": 105, "y": 0}, + {"matrix": [7, 1], "x": 106, "y": 0}, + {"matrix": [6, 1], "x": 107, "y": 0}, + {"matrix": [6, 5], "x": 108, "y": 0}, + {"matrix": [7, 5], "x": 109, "y": 0}, + {"matrix": [8, 5], "x": 110, "y": 0}, + {"matrix": [9, 5], "x": 111, "y": 0}, + {"matrix": [10, 5], "x": 112, "y": 0}, + {"matrix": [11, 5], "x": 113, "y": 0}, + {"matrix": [11, 0], "x": 114, "y": 0}, + {"matrix": [10, 0], "x": 115, "y": 0}, + {"matrix": [9, 0], "x": 116, "y": 0}, + {"matrix": [8, 0], "x": 117, "y": 0}, + {"matrix": [7, 0], "x": 118, "y": 0}, + {"matrix": [6, 0], "x": 119, "y": 0} ] } } -- cgit v1.2.3 From c9f619124d41637ece157570703423c3890cb6c2 Mon Sep 17 00:00:00 2001 From: Nick Brassel Date: Sun, 16 Apr 2023 01:18:44 +1000 Subject: Encodermap direction define. (#20454) --- keyboards/giabalanai/keymaps/2firmware/keymap.c | 2 +- keyboards/giabalanai/keymaps/3araht/keymap.c | 2 +- keyboards/giabalanai/keymaps/default/keymap.c | 2 +- keyboards/giabalanai/keymaps/default_giabarinaix2/keymap.c | 2 +- keyboards/giabalanai/keymaps/giabarinaix2led/keymap.c | 2 +- keyboards/giabalanai/keymaps/party/keymap.c | 2 +- keyboards/giabalanai/keymaps/via/keymap.c | 2 +- keyboards/giabalanai/keymaps/via_giabarinaix2/keymap.c | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) (limited to 'keyboards/giabalanai') diff --git a/keyboards/giabalanai/keymaps/2firmware/keymap.c b/keyboards/giabalanai/keymaps/2firmware/keymap.c index 34eb2299a7..8e95b89a91 100644 --- a/keyboards/giabalanai/keymaps/2firmware/keymap.c +++ b/keyboards/giabalanai/keymaps/2firmware/keymap.c @@ -339,7 +339,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [_C_SYSTEM_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [_FAKE_B_SYSTEM] = { ENCODER_CCW_CW(_______, _______) }, [_C_SYSTEM_BASS2ROW] = { ENCODER_CCW_CW(_______, _______) }, diff --git a/keyboards/giabalanai/keymaps/3araht/keymap.c b/keyboards/giabalanai/keymaps/3araht/keymap.c index ca7be05088..daa31ffa7b 100644 --- a/keyboards/giabalanai/keymaps/3araht/keymap.c +++ b/keyboards/giabalanai/keymaps/3araht/keymap.c @@ -370,7 +370,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [_C_SYSTEM_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [_FAKE_B_SYSTEM] = { ENCODER_CCW_CW(_______, _______) }, [_C_SYSTEM_BASS2ROW] = { ENCODER_CCW_CW(_______, _______) }, diff --git a/keyboards/giabalanai/keymaps/default/keymap.c b/keyboards/giabalanai/keymaps/default/keymap.c index 1cc7ee5077..42874025f3 100644 --- a/keyboards/giabalanai/keymaps/default/keymap.c +++ b/keyboards/giabalanai/keymaps/default/keymap.c @@ -192,7 +192,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [_C_SYSTEM_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [_QWERTY] = { ENCODER_CCW_CW(_______, _______) }, [_FN] = { ENCODER_CCW_CW(_______, _______) }, diff --git a/keyboards/giabalanai/keymaps/default_giabarinaix2/keymap.c b/keyboards/giabalanai/keymaps/default_giabarinaix2/keymap.c index 3ed4754df4..ca9ac38555 100644 --- a/keyboards/giabalanai/keymaps/default_giabarinaix2/keymap.c +++ b/keyboards/giabalanai/keymaps/default_giabarinaix2/keymap.c @@ -195,7 +195,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [_C_SYSTEM_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [_QWERTY] = { ENCODER_CCW_CW(_______, _______) }, [_FN] = { ENCODER_CCW_CW(_______, _______) }, diff --git a/keyboards/giabalanai/keymaps/giabarinaix2led/keymap.c b/keyboards/giabalanai/keymaps/giabarinaix2led/keymap.c index e28a78b016..c134c9eeeb 100644 --- a/keyboards/giabalanai/keymaps/giabarinaix2led/keymap.c +++ b/keyboards/giabalanai/keymaps/giabarinaix2led/keymap.c @@ -253,7 +253,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [_C_SYSTEM_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [_C_SYSTEM_BASS2ROW] = { ENCODER_CCW_CW(_______, _______) }, [_C_SYSTEM_ENTIRELY] = { ENCODER_CCW_CW(_______, _______) }, diff --git a/keyboards/giabalanai/keymaps/party/keymap.c b/keyboards/giabalanai/keymaps/party/keymap.c index fdd9c2d527..ea3000c010 100644 --- a/keyboards/giabalanai/keymaps/party/keymap.c +++ b/keyboards/giabalanai/keymaps/party/keymap.c @@ -370,7 +370,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [_C_SYSTEM_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [_FAKE_B_SYSTEM] = { ENCODER_CCW_CW(_______, _______) }, [_C_SYSTEM_BASS2ROW] = { ENCODER_CCW_CW(_______, _______) }, diff --git a/keyboards/giabalanai/keymaps/via/keymap.c b/keyboards/giabalanai/keymaps/via/keymap.c index 812f4967c8..332ad45e3c 100644 --- a/keyboards/giabalanai/keymaps/via/keymap.c +++ b/keyboards/giabalanai/keymaps/via/keymap.c @@ -192,7 +192,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [_C_SYSTEM_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [_QWERTY] = { ENCODER_CCW_CW(_______, _______) }, [_FN] = { ENCODER_CCW_CW(_______, _______) }, diff --git a/keyboards/giabalanai/keymaps/via_giabarinaix2/keymap.c b/keyboards/giabalanai/keymaps/via_giabarinaix2/keymap.c index 88b032209f..fcf6a35ff2 100644 --- a/keyboards/giabalanai/keymaps/via_giabarinaix2/keymap.c +++ b/keyboards/giabalanai/keymaps/via_giabarinaix2/keymap.c @@ -195,7 +195,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [_C_SYSTEM_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [_QWERTY] = { ENCODER_CCW_CW(_______, _______) }, [_FN] = { ENCODER_CCW_CW(_______, _______) }, -- cgit v1.2.3 From 79aa31994698c9050141714f77c0177edbcd9488 Mon Sep 17 00:00:00 2001 From: Ryan Date: Tue, 2 May 2023 08:25:15 +1000 Subject: `info.json` whitespace cleanups (#20651) --- .../keymaps/default_giabarinaix2/info.json | 158 ++++++++++----------- .../giabalanai/keymaps/giabarinaix2led/info.json | 158 ++++++++++----------- .../giabalanai/keymaps/via_giabarinaix2/info.json | 158 ++++++++++----------- 3 files changed, 237 insertions(+), 237 deletions(-) (limited to 'keyboards/giabalanai') diff --git a/keyboards/giabalanai/keymaps/default_giabarinaix2/info.json b/keyboards/giabalanai/keymaps/default_giabarinaix2/info.json index 20a52326dd..6581733dd1 100644 --- a/keyboards/giabalanai/keymaps/default_giabarinaix2/info.json +++ b/keyboards/giabalanai/keymaps/default_giabarinaix2/info.json @@ -11,18 +11,18 @@ "layouts": { "LAYOUT": { "layout": [ - {"label": "l00", "x": 0, "y": 0}, - {"label": "l01", "x": 1, "y": 0}, - {"label": "l02", "x": 2, "y": 0}, - {"label": "l03", "x": 3, "y": 0}, - {"label": "l04", "x": 4, "y": 0}, - {"label": "l05", "x": 5, "y": 0}, - {"label": "l06", "x": 6, "y": 0}, - {"label": "l07", "x": 7, "y": 0}, - {"label": "l08", "x": 8, "y": 0}, - {"label": "l09", "x": 9, "y": 0}, - {"label": "l0a", "x": 10, "y": 0}, - {"label": "l0b", "x": 11, "y": 0}, + {"label": "l00", "x": 0, "y": 0}, + {"label": "l01", "x": 1, "y": 0}, + {"label": "l02", "x": 2, "y": 0}, + {"label": "l03", "x": 3, "y": 0}, + {"label": "l04", "x": 4, "y": 0}, + {"label": "l05", "x": 5, "y": 0}, + {"label": "l06", "x": 6, "y": 0}, + {"label": "l07", "x": 7, "y": 0}, + {"label": "l08", "x": 8, "y": 0}, + {"label": "l09", "x": 9, "y": 0}, + {"label": "l0a", "x": 10, "y": 0}, + {"label": "l0b", "x": 11, "y": 0}, {"label": "r00", "x": 14.5, "y": 0}, {"label": "r01", "x": 15.5, "y": 0}, @@ -37,44 +37,44 @@ {"label": "r0a", "x": 24.5, "y": 0}, {"label": "r0b", "x": 25.5, "y": 0}, - {"label": "l10", "x": 0.5, "y": 1}, - {"label": "l11", "x": 1.5, "y": 1}, - {"label": "l12", "x": 2.5, "y": 1}, - {"label": "l13", "x": 3.5, "y": 1}, - {"label": "l14", "x": 4.5, "y": 1}, - {"label": "l15", "x": 5.5, "y": 1}, - {"label": "l16", "x": 6.5, "y": 1}, - {"label": "l17", "x": 7.5, "y": 1}, - {"label": "l18", "x": 8.5, "y": 1}, - {"label": "l19", "x": 9.5, "y": 1}, + {"label": "l10", "x": 0.5, "y": 1}, + {"label": "l11", "x": 1.5, "y": 1}, + {"label": "l12", "x": 2.5, "y": 1}, + {"label": "l13", "x": 3.5, "y": 1}, + {"label": "l14", "x": 4.5, "y": 1}, + {"label": "l15", "x": 5.5, "y": 1}, + {"label": "l16", "x": 6.5, "y": 1}, + {"label": "l17", "x": 7.5, "y": 1}, + {"label": "l18", "x": 8.5, "y": 1}, + {"label": "l19", "x": 9.5, "y": 1}, {"label": "l1a", "x": 10.5, "y": 1}, {"label": "l1b", "x": 11.5, "y": 1}, - {"label": "r10", "x": 15, "y": 1}, - {"label": "r11", "x": 16, "y": 1}, - {"label": "r12", "x": 17, "y": 1}, - {"label": "r13", "x": 18, "y": 1}, - {"label": "r14", "x": 19, "y": 1}, - {"label": "r15", "x": 20, "y": 1}, - {"label": "r16", "x": 21, "y": 1}, - {"label": "r17", "x": 22, "y": 1}, - {"label": "r18", "x": 23, "y": 1}, - {"label": "r19", "x": 24, "y": 1}, - {"label": "r1a", "x": 25, "y": 1}, - {"label": "r1b", "x": 26, "y": 1}, + {"label": "r10", "x": 15, "y": 1}, + {"label": "r11", "x": 16, "y": 1}, + {"label": "r12", "x": 17, "y": 1}, + {"label": "r13", "x": 18, "y": 1}, + {"label": "r14", "x": 19, "y": 1}, + {"label": "r15", "x": 20, "y": 1}, + {"label": "r16", "x": 21, "y": 1}, + {"label": "r17", "x": 22, "y": 1}, + {"label": "r18", "x": 23, "y": 1}, + {"label": "r19", "x": 24, "y": 1}, + {"label": "r1a", "x": 25, "y": 1}, + {"label": "r1b", "x": 26, "y": 1}, - {"label": "l20", "x": 1, "y": 2}, - {"label": "l21", "x": 2, "y": 2}, - {"label": "l22", "x": 3, "y": 2}, - {"label": "l23", "x": 4, "y": 2}, - {"label": "l24", "x": 5, "y": 2}, - {"label": "l25", "x": 6, "y": 2}, - {"label": "l26", "x": 7, "y": 2}, - {"label": "l27", "x": 8, "y": 2}, - {"label": "l28", "x": 9, "y": 2}, - {"label": "l29", "x": 10, "y": 2}, - {"label": "l2a", "x": 11, "y": 2}, - {"label": "l2b", "x": 12, "y": 2}, + {"label": "l20", "x": 1, "y": 2}, + {"label": "l21", "x": 2, "y": 2}, + {"label": "l22", "x": 3, "y": 2}, + {"label": "l23", "x": 4, "y": 2}, + {"label": "l24", "x": 5, "y": 2}, + {"label": "l25", "x": 6, "y": 2}, + {"label": "l26", "x": 7, "y": 2}, + {"label": "l27", "x": 8, "y": 2}, + {"label": "l28", "x": 9, "y": 2}, + {"label": "l29", "x": 10, "y": 2}, + {"label": "l2a", "x": 11, "y": 2}, + {"label": "l2b", "x": 12, "y": 2}, {"label": "r20", "x": 15.5, "y": 2}, {"label": "r21", "x": 16.5, "y": 2}, @@ -89,44 +89,44 @@ {"label": "r2a", "x": 25.5, "y": 2}, {"label": "r2b", "x": 26.5, "y": 2}, - {"label": "l30", "x": 1.5, "y": 3}, - {"label": "l31", "x": 2.5, "y": 3}, - {"label": "l32", "x": 3.5, "y": 3}, - {"label": "l33", "x": 4.5, "y": 3}, - {"label": "l34", "x": 5.5, "y": 3}, - {"label": "l35", "x": 6.5, "y": 3}, - {"label": "l36", "x": 7.5, "y": 3}, - {"label": "l37", "x": 8.5, "y": 3}, - {"label": "l38", "x": 9.5, "y": 3}, + {"label": "l30", "x": 1.5, "y": 3}, + {"label": "l31", "x": 2.5, "y": 3}, + {"label": "l32", "x": 3.5, "y": 3}, + {"label": "l33", "x": 4.5, "y": 3}, + {"label": "l34", "x": 5.5, "y": 3}, + {"label": "l35", "x": 6.5, "y": 3}, + {"label": "l36", "x": 7.5, "y": 3}, + {"label": "l37", "x": 8.5, "y": 3}, + {"label": "l38", "x": 9.5, "y": 3}, {"label": "l39", "x": 10.5, "y": 3}, {"label": "l3a", "x": 11.5, "y": 3}, {"label": "l3b", "x": 12.5, "y": 3}, - {"label": "r30", "x": 16, "y": 3}, - {"label": "r31", "x": 17, "y": 3}, - {"label": "r32", "x": 18, "y": 3}, - {"label": "r33", "x": 19, "y": 3}, - {"label": "r34", "x": 20, "y": 3}, - {"label": "r35", "x": 21, "y": 3}, - {"label": "r36", "x": 22, "y": 3}, - {"label": "r37", "x": 23, "y": 3}, - {"label": "r38", "x": 24, "y": 3}, - {"label": "r39", "x": 25, "y": 3}, - {"label": "r3a", "x": 26, "y": 3}, - {"label": "r3b", "x": 27, "y": 3}, + {"label": "r30", "x": 16, "y": 3}, + {"label": "r31", "x": 17, "y": 3}, + {"label": "r32", "x": 18, "y": 3}, + {"label": "r33", "x": 19, "y": 3}, + {"label": "r34", "x": 20, "y": 3}, + {"label": "r35", "x": 21, "y": 3}, + {"label": "r36", "x": 22, "y": 3}, + {"label": "r37", "x": 23, "y": 3}, + {"label": "r38", "x": 24, "y": 3}, + {"label": "r39", "x": 25, "y": 3}, + {"label": "r3a", "x": 26, "y": 3}, + {"label": "r3b", "x": 27, "y": 3}, - {"label": "l40", "x": 2, "y": 4}, - {"label": "l41", "x": 3, "y": 4}, - {"label": "l42", "x": 4, "y": 4}, - {"label": "l43", "x": 5, "y": 4}, - {"label": "l44", "x": 6, "y": 4}, - {"label": "l45", "x": 7, "y": 4}, - {"label": "l46", "x": 8, "y": 4}, - {"label": "l47", "x": 9, "y": 4}, - {"label": "l48", "x": 10, "y": 4}, - {"label": "l49", "x": 11, "y": 4}, - {"label": "l4a", "x": 12, "y": 4}, - {"label": "l4b", "x": 13, "y": 4}, + {"label": "l40", "x": 2, "y": 4}, + {"label": "l41", "x": 3, "y": 4}, + {"label": "l42", "x": 4, "y": 4}, + {"label": "l43", "x": 5, "y": 4}, + {"label": "l44", "x": 6, "y": 4}, + {"label": "l45", "x": 7, "y": 4}, + {"label": "l46", "x": 8, "y": 4}, + {"label": "l47", "x": 9, "y": 4}, + {"label": "l48", "x": 10, "y": 4}, + {"label": "l49", "x": 11, "y": 4}, + {"label": "l4a", "x": 12, "y": 4}, + {"label": "l4b", "x": 13, "y": 4}, {"label": "r40", "x": 16.5, "y": 4}, {"label": "r41", "x": 17.5, "y": 4}, diff --git a/keyboards/giabalanai/keymaps/giabarinaix2led/info.json b/keyboards/giabalanai/keymaps/giabarinaix2led/info.json index 20a52326dd..6581733dd1 100644 --- a/keyboards/giabalanai/keymaps/giabarinaix2led/info.json +++ b/keyboards/giabalanai/keymaps/giabarinaix2led/info.json @@ -11,18 +11,18 @@ "layouts": { "LAYOUT": { "layout": [ - {"label": "l00", "x": 0, "y": 0}, - {"label": "l01", "x": 1, "y": 0}, - {"label": "l02", "x": 2, "y": 0}, - {"label": "l03", "x": 3, "y": 0}, - {"label": "l04", "x": 4, "y": 0}, - {"label": "l05", "x": 5, "y": 0}, - {"label": "l06", "x": 6, "y": 0}, - {"label": "l07", "x": 7, "y": 0}, - {"label": "l08", "x": 8, "y": 0}, - {"label": "l09", "x": 9, "y": 0}, - {"label": "l0a", "x": 10, "y": 0}, - {"label": "l0b", "x": 11, "y": 0}, + {"label": "l00", "x": 0, "y": 0}, + {"label": "l01", "x": 1, "y": 0}, + {"label": "l02", "x": 2, "y": 0}, + {"label": "l03", "x": 3, "y": 0}, + {"label": "l04", "x": 4, "y": 0}, + {"label": "l05", "x": 5, "y": 0}, + {"label": "l06", "x": 6, "y": 0}, + {"label": "l07", "x": 7, "y": 0}, + {"label": "l08", "x": 8, "y": 0}, + {"label": "l09", "x": 9, "y": 0}, + {"label": "l0a", "x": 10, "y": 0}, + {"label": "l0b", "x": 11, "y": 0}, {"label": "r00", "x": 14.5, "y": 0}, {"label": "r01", "x": 15.5, "y": 0}, @@ -37,44 +37,44 @@ {"label": "r0a", "x": 24.5, "y": 0}, {"label": "r0b", "x": 25.5, "y": 0}, - {"label": "l10", "x": 0.5, "y": 1}, - {"label": "l11", "x": 1.5, "y": 1}, - {"label": "l12", "x": 2.5, "y": 1}, - {"label": "l13", "x": 3.5, "y": 1}, - {"label": "l14", "x": 4.5, "y": 1}, - {"label": "l15", "x": 5.5, "y": 1}, - {"label": "l16", "x": 6.5, "y": 1}, - {"label": "l17", "x": 7.5, "y": 1}, - {"label": "l18", "x": 8.5, "y": 1}, - {"label": "l19", "x": 9.5, "y": 1}, + {"label": "l10", "x": 0.5, "y": 1}, + {"label": "l11", "x": 1.5, "y": 1}, + {"label": "l12", "x": 2.5, "y": 1}, + {"label": "l13", "x": 3.5, "y": 1}, + {"label": "l14", "x": 4.5, "y": 1}, + {"label": "l15", "x": 5.5, "y": 1}, + {"label": "l16", "x": 6.5, "y": 1}, + {"label": "l17", "x": 7.5, "y": 1}, + {"label": "l18", "x": 8.5, "y": 1}, + {"label": "l19", "x": 9.5, "y": 1}, {"label": "l1a", "x": 10.5, "y": 1}, {"label": "l1b", "x": 11.5, "y": 1}, - {"label": "r10", "x": 15, "y": 1}, - {"label": "r11", "x": 16, "y": 1}, - {"label": "r12", "x": 17, "y": 1}, - {"label": "r13", "x": 18, "y": 1}, - {"label": "r14", "x": 19, "y": 1}, - {"label": "r15", "x": 20, "y": 1}, - {"label": "r16", "x": 21, "y": 1}, - {"label": "r17", "x": 22, "y": 1}, - {"label": "r18", "x": 23, "y": 1}, - {"label": "r19", "x": 24, "y": 1}, - {"label": "r1a", "x": 25, "y": 1}, - {"label": "r1b", "x": 26, "y": 1}, + {"label": "r10", "x": 15, "y": 1}, + {"label": "r11", "x": 16, "y": 1}, + {"label": "r12", "x": 17, "y": 1}, + {"label": "r13", "x": 18, "y": 1}, + {"label": "r14", "x": 19, "y": 1}, + {"label": "r15", "x": 20, "y": 1}, + {"label": "r16", "x": 21, "y": 1}, + {"label": "r17", "x": 22, "y": 1}, + {"label": "r18", "x": 23, "y": 1}, + {"label": "r19", "x": 24, "y": 1}, + {"label": "r1a", "x": 25, "y": 1}, + {"label": "r1b", "x": 26, "y": 1}, - {"label": "l20", "x": 1, "y": 2}, - {"label": "l21", "x": 2, "y": 2}, - {"label": "l22", "x": 3, "y": 2}, - {"label": "l23", "x": 4, "y": 2}, - {"label": "l24", "x": 5, "y": 2}, - {"label": "l25", "x": 6, "y": 2}, - {"label": "l26", "x": 7, "y": 2}, - {"label": "l27", "x": 8, "y": 2}, - {"label": "l28", "x": 9, "y": 2}, - {"label": "l29", "x": 10, "y": 2}, - {"label": "l2a", "x": 11, "y": 2}, - {"label": "l2b", "x": 12, "y": 2}, + {"label": "l20", "x": 1, "y": 2}, + {"label": "l21", "x": 2, "y": 2}, + {"label": "l22", "x": 3, "y": 2}, + {"label": "l23", "x": 4, "y": 2}, + {"label": "l24", "x": 5, "y": 2}, + {"label": "l25", "x": 6, "y": 2}, + {"label": "l26", "x": 7, "y": 2}, + {"label": "l27", "x": 8, "y": 2}, + {"label": "l28", "x": 9, "y": 2}, + {"label": "l29", "x": 10, "y": 2}, + {"label": "l2a", "x": 11, "y": 2}, + {"label": "l2b", "x": 12, "y": 2}, {"label": "r20", "x": 15.5, "y": 2}, {"label": "r21", "x": 16.5, "y": 2}, @@ -89,44 +89,44 @@ {"label": "r2a", "x": 25.5, "y": 2}, {"label": "r2b", "x": 26.5, "y": 2}, - {"label": "l30", "x": 1.5, "y": 3}, - {"label": "l31", "x": 2.5, "y": 3}, - {"label": "l32", "x": 3.5, "y": 3}, - {"label": "l33", "x": 4.5, "y": 3}, - {"label": "l34", "x": 5.5, "y": 3}, - {"label": "l35", "x": 6.5, "y": 3}, - {"label": "l36", "x": 7.5, "y": 3}, - {"label": "l37", "x": 8.5, "y": 3}, - {"label": "l38", "x": 9.5, "y": 3}, + {"label": "l30", "x": 1.5, "y": 3}, + {"label": "l31", "x": 2.5, "y": 3}, + {"label": "l32", "x": 3.5, "y": 3}, + {"label": "l33", "x": 4.5, "y": 3}, + {"label": "l34", "x": 5.5, "y": 3}, + {"label": "l35", "x": 6.5, "y": 3}, + {"label": "l36", "x": 7.5, "y": 3}, + {"label": "l37", "x": 8.5, "y": 3}, + {"label": "l38", "x": 9.5, "y": 3}, {"label": "l39", "x": 10.5, "y": 3}, {"label": "l3a", "x": 11.5, "y": 3}, {"label": "l3b", "x": 12.5, "y": 3}, - {"label": "r30", "x": 16, "y": 3}, - {"label": "r31", "x": 17, "y": 3}, - {"label": "r32", "x": 18, "y": 3}, - {"label": "r33", "x": 19, "y": 3}, - {"label": "r34", "x": 20, "y": 3}, - {"label": "r35", "x": 21, "y": 3}, - {"label": "r36", "x": 22, "y": 3}, - {"label": "r37", "x": 23, "y": 3}, - {"label": "r38", "x": 24, "y": 3}, - {"label": "r39", "x": 25, "y": 3}, - {"label": "r3a", "x": 26, "y": 3}, - {"label": "r3b", "x": 27, "y": 3}, + {"label": "r30", "x": 16, "y": 3}, + {"label": "r31", "x": 17, "y": 3}, + {"label": "r32", "x": 18, "y": 3}, + {"label": "r33", "x": 19, "y": 3}, + {"label": "r34", "x": 20, "y": 3}, + {"label": "r35", "x": 21, "y": 3}, + {"label": "r36", "x": 22, "y": 3}, + {"label": "r37", "x": 23, "y": 3}, + {"label": "r38", "x": 24, "y": 3}, + {"label": "r39", "x": 25, "y": 3}, + {"label": "r3a", "x": 26, "y": 3}, + {"label": "r3b", "x": 27, "y": 3}, - {"label": "l40", "x": 2, "y": 4}, - {"label": "l41", "x": 3, "y": 4}, - {"label": "l42", "x": 4, "y": 4}, - {"label": "l43", "x": 5, "y": 4}, - {"label": "l44", "x": 6, "y": 4}, - {"label": "l45", "x": 7, "y": 4}, - {"label": "l46", "x": 8, "y": 4}, - {"label": "l47", "x": 9, "y": 4}, - {"label": "l48", "x": 10, "y": 4}, - {"label": "l49", "x": 11, "y": 4}, - {"label": "l4a", "x": 12, "y": 4}, - {"label": "l4b", "x": 13, "y": 4}, + {"label": "l40", "x": 2, "y": 4}, + {"label": "l41", "x": 3, "y": 4}, + {"label": "l42", "x": 4, "y": 4}, + {"label": "l43", "x": 5, "y": 4}, + {"label": "l44", "x": 6, "y": 4}, + {"label": "l45", "x": 7, "y": 4}, + {"label": "l46", "x": 8, "y": 4}, + {"label": "l47", "x": 9, "y": 4}, + {"label": "l48", "x": 10, "y": 4}, + {"label": "l49", "x": 11, "y": 4}, + {"label": "l4a", "x": 12, "y": 4}, + {"label": "l4b", "x": 13, "y": 4}, {"label": "r40", "x": 16.5, "y": 4}, {"label": "r41", "x": 17.5, "y": 4}, diff --git a/keyboards/giabalanai/keymaps/via_giabarinaix2/info.json b/keyboards/giabalanai/keymaps/via_giabarinaix2/info.json index 20a52326dd..6581733dd1 100644 --- a/keyboards/giabalanai/keymaps/via_giabarinaix2/info.json +++ b/keyboards/giabalanai/keymaps/via_giabarinaix2/info.json @@ -11,18 +11,18 @@ "layouts": { "LAYOUT": { "layout": [ - {"label": "l00", "x": 0, "y": 0}, - {"label": "l01", "x": 1, "y": 0}, - {"label": "l02", "x": 2, "y": 0}, - {"label": "l03", "x": 3, "y": 0}, - {"label": "l04", "x": 4, "y": 0}, - {"label": "l05", "x": 5, "y": 0}, - {"label": "l06", "x": 6, "y": 0}, - {"label": "l07", "x": 7, "y": 0}, - {"label": "l08", "x": 8, "y": 0}, - {"label": "l09", "x": 9, "y": 0}, - {"label": "l0a", "x": 10, "y": 0}, - {"label": "l0b", "x": 11, "y": 0}, + {"label": "l00", "x": 0, "y": 0}, + {"label": "l01", "x": 1, "y": 0}, + {"label": "l02", "x": 2, "y": 0}, + {"label": "l03", "x": 3, "y": 0}, + {"label": "l04", "x": 4, "y": 0}, + {"label": "l05", "x": 5, "y": 0}, + {"label": "l06", "x": 6, "y": 0}, + {"label": "l07", "x": 7, "y": 0}, + {"label": "l08", "x": 8, "y": 0}, + {"label": "l09", "x": 9, "y": 0}, + {"label": "l0a", "x": 10, "y": 0}, + {"label": "l0b", "x": 11, "y": 0}, {"label": "r00", "x": 14.5, "y": 0}, {"label": "r01", "x": 15.5, "y": 0}, @@ -37,44 +37,44 @@ {"label": "r0a", "x": 24.5, "y": 0}, {"label": "r0b", "x": 25.5, "y": 0}, - {"label": "l10", "x": 0.5, "y": 1}, - {"label": "l11", "x": 1.5, "y": 1}, - {"label": "l12", "x": 2.5, "y": 1}, - {"label": "l13", "x": 3.5, "y": 1}, - {"label": "l14", "x": 4.5, "y": 1}, - {"label": "l15", "x": 5.5, "y": 1}, - {"label": "l16", "x": 6.5, "y": 1}, - {"label": "l17", "x": 7.5, "y": 1}, - {"label": "l18", "x": 8.5, "y": 1}, - {"label": "l19", "x": 9.5, "y": 1}, + {"label": "l10", "x": 0.5, "y": 1}, + {"label": "l11", "x": 1.5, "y": 1}, + {"label": "l12", "x": 2.5, "y": 1}, + {"label": "l13", "x": 3.5, "y": 1}, + {"label": "l14", "x": 4.5, "y": 1}, + {"label": "l15", "x": 5.5, "y": 1}, + {"label": "l16", "x": 6.5, "y": 1}, + {"label": "l17", "x": 7.5, "y": 1}, + {"label": "l18", "x": 8.5, "y": 1}, + {"label": "l19", "x": 9.5, "y": 1}, {"label": "l1a", "x": 10.5, "y": 1}, {"label": "l1b", "x": 11.5, "y": 1}, - {"label": "r10", "x": 15, "y": 1}, - {"label": "r11", "x": 16, "y": 1}, - {"label": "r12", "x": 17, "y": 1}, - {"label": "r13", "x": 18, "y": 1}, - {"label": "r14", "x": 19, "y": 1}, - {"label": "r15", "x": 20, "y": 1}, - {"label": "r16", "x": 21, "y": 1}, - {"label": "r17", "x": 22, "y": 1}, - {"label": "r18", "x": 23, "y": 1}, - {"label": "r19", "x": 24, "y": 1}, - {"label": "r1a", "x": 25, "y": 1}, - {"label": "r1b", "x": 26, "y": 1}, + {"label": "r10", "x": 15, "y": 1}, + {"label": "r11", "x": 16, "y": 1}, + {"label": "r12", "x": 17, "y": 1}, + {"label": "r13", "x": 18, "y": 1}, + {"label": "r14", "x": 19, "y": 1}, + {"label": "r15", "x": 20, "y": 1}, + {"label": "r16", "x": 21, "y": 1}, + {"label": "r17", "x": 22, "y": 1}, + {"label": "r18", "x": 23, "y": 1}, + {"label": "r19", "x": 24, "y": 1}, + {"label": "r1a", "x": 25, "y": 1}, + {"label": "r1b", "x": 26, "y": 1}, - {"label": "l20", "x": 1, "y": 2}, - {"label": "l21", "x": 2, "y": 2}, - {"label": "l22", "x": 3, "y": 2}, - {"label": "l23", "x": 4, "y": 2}, - {"label": "l24", "x": 5, "y": 2}, - {"label": "l25", "x": 6, "y": 2}, - {"label": "l26", "x": 7, "y": 2}, - {"label": "l27", "x": 8, "y": 2}, - {"label": "l28", "x": 9, "y": 2}, - {"label": "l29", "x": 10, "y": 2}, - {"label": "l2a", "x": 11, "y": 2}, - {"label": "l2b", "x": 12, "y": 2}, + {"label": "l20", "x": 1, "y": 2}, + {"label": "l21", "x": 2, "y": 2}, + {"label": "l22", "x": 3, "y": 2}, + {"label": "l23", "x": 4, "y": 2}, + {"label": "l24", "x": 5, "y": 2}, + {"label": "l25", "x": 6, "y": 2}, + {"label": "l26", "x": 7, "y": 2}, + {"label": "l27", "x": 8, "y": 2}, + {"label": "l28", "x": 9, "y": 2}, + {"label": "l29", "x": 10, "y": 2}, + {"label": "l2a", "x": 11, "y": 2}, + {"label": "l2b", "x": 12, "y": 2}, {"label": "r20", "x": 15.5, "y": 2}, {"label": "r21", "x": 16.5, "y": 2}, @@ -89,44 +89,44 @@ {"label": "r2a", "x": 25.5, "y": 2}, {"label": "r2b", "x": 26.5, "y": 2}, - {"label": "l30", "x": 1.5, "y": 3}, - {"label": "l31", "x": 2.5, "y": 3}, - {"label": "l32", "x": 3.5, "y": 3}, - {"label": "l33", "x": 4.5, "y": 3}, - {"label": "l34", "x": 5.5, "y": 3}, - {"label": "l35", "x": 6.5, "y": 3}, - {"label": "l36", "x": 7.5, "y": 3}, - {"label": "l37", "x": 8.5, "y": 3}, - {"label": "l38", "x": 9.5, "y": 3}, + {"label": "l30", "x": 1.5, "y": 3}, + {"label": "l31", "x": 2.5, "y": 3}, + {"label": "l32", "x": 3.5, "y": 3}, + {"label": "l33", "x": 4.5, "y": 3}, + {"label": "l34", "x": 5.5, "y": 3}, + {"label": "l35", "x": 6.5, "y": 3}, + {"label": "l36", "x": 7.5, "y": 3}, + {"label": "l37", "x": 8.5, "y": 3}, + {"label": "l38", "x": 9.5, "y": 3}, {"label": "l39", "x": 10.5, "y": 3}, {"label": "l3a", "x": 11.5, "y": 3}, {"label": "l3b", "x": 12.5, "y": 3}, - {"label": "r30", "x": 16, "y": 3}, - {"label": "r31", "x": 17, "y": 3}, - {"label": "r32", "x": 18, "y": 3}, - {"label": "r33", "x": 19, "y": 3}, - {"label": "r34", "x": 20, "y": 3}, - {"label": "r35", "x": 21, "y": 3}, - {"label": "r36", "x": 22, "y": 3}, - {"label": "r37", "x": 23, "y": 3}, - {"label": "r38", "x": 24, "y": 3}, - {"label": "r39", "x": 25, "y": 3}, - {"label": "r3a", "x": 26, "y": 3}, - {"label": "r3b", "x": 27, "y": 3}, + {"label": "r30", "x": 16, "y": 3}, + {"label": "r31", "x": 17, "y": 3}, + {"label": "r32", "x": 18, "y": 3}, + {"label": "r33", "x": 19, "y": 3}, + {"label": "r34", "x": 20, "y": 3}, + {"label": "r35", "x": 21, "y": 3}, + {"label": "r36", "x": 22, "y": 3}, + {"label": "r37", "x": 23, "y": 3}, + {"label": "r38", "x": 24, "y": 3}, + {"label": "r39", "x": 25, "y": 3}, + {"label": "r3a", "x": 26, "y": 3}, + {"label": "r3b", "x": 27, "y": 3}, - {"label": "l40", "x": 2, "y": 4}, - {"label": "l41", "x": 3, "y": 4}, - {"label": "l42", "x": 4, "y": 4}, - {"label": "l43", "x": 5, "y": 4}, - {"label": "l44", "x": 6, "y": 4}, - {"label": "l45", "x": 7, "y": 4}, - {"label": "l46", "x": 8, "y": 4}, - {"label": "l47", "x": 9, "y": 4}, - {"label": "l48", "x": 10, "y": 4}, - {"label": "l49", "x": 11, "y": 4}, - {"label": "l4a", "x": 12, "y": 4}, - {"label": "l4b", "x": 13, "y": 4}, + {"label": "l40", "x": 2, "y": 4}, + {"label": "l41", "x": 3, "y": 4}, + {"label": "l42", "x": 4, "y": 4}, + {"label": "l43", "x": 5, "y": 4}, + {"label": "l44", "x": 6, "y": 4}, + {"label": "l45", "x": 7, "y": 4}, + {"label": "l46", "x": 8, "y": 4}, + {"label": "l47", "x": 9, "y": 4}, + {"label": "l48", "x": 10, "y": 4}, + {"label": "l49", "x": 11, "y": 4}, + {"label": "l4a", "x": 12, "y": 4}, + {"label": "l4b", "x": 13, "y": 4}, {"label": "r40", "x": 16.5, "y": 4}, {"label": "r41", "x": 17.5, "y": 4}, -- cgit v1.2.3 From 17de141c9248a7a1a1814d96d1f12f36df3d6a8f Mon Sep 17 00:00:00 2001 From: Ryan Date: Tue, 16 May 2023 17:00:08 +1000 Subject: Add missing layout data for a handful of boards (#20931) * Add missing layout data for a handful of boards * typo * Add missing layouts for stoutgat * Add missing layout for j80 * Replace missing layout with alias for wraith * Add missing layout for matrix/me * Add missing layout for satisfaction75/prototype * Apply suggestions from code review * Rename wt80-a layouts * Rename rosa layouts * Add missing layouts for naked48 * Add missing layouts for naked60 * Add missing layouts for uma * Remove unused and pointless `LAYOUT_stack` for buzzard * Add missing layout for keyboardio/model01 * Add missing layout for smk65 revf * Fix via keymap for h60 * Add missing layout for jabberwocky/v1 * Apply suggestions from code review * Add missing layout for m3n3van * Add missing layout for giabalanai * Add missing layouts for treadstone48/rev1 * Add missing layouts for squiggle * Update keyboards/marksard/treadstone48/rev1/info.json --- keyboards/giabalanai/info.json | 225 +++++++++++++++++++++-------------------- 1 file changed, 117 insertions(+), 108 deletions(-) (limited to 'keyboards/giabalanai') diff --git a/keyboards/giabalanai/info.json b/keyboards/giabalanai/info.json index e572e8f36d..125bade43e 100644 --- a/keyboards/giabalanai/info.json +++ b/keyboards/giabalanai/info.json @@ -179,114 +179,123 @@ {"matrix": [2, 5], "x": 9, "y": 0}, {"matrix": [1, 5], "x": 10, "y": 0}, {"matrix": [0, 5], "x": 11, "y": 0}, - {"matrix": [0, 1], "x": 12, "y": 0}, - {"matrix": [1, 1], "x": 13, "y": 0}, - {"matrix": [2, 1], "x": 14, "y": 0}, - {"matrix": [3, 1], "x": 15, "y": 0}, - {"matrix": [4, 1], "x": 16, "y": 0}, - {"matrix": [5, 1], "x": 17, "y": 0}, - {"matrix": [5, 6], "x": 18, "y": 0}, - {"matrix": [4, 6], "x": 19, "y": 0}, - {"matrix": [3, 6], "x": 20, "y": 0}, - {"matrix": [2, 6], "x": 21, "y": 0}, - {"matrix": [1, 6], "x": 22, "y": 0}, - {"matrix": [0, 6], "x": 23, "y": 0}, - {"matrix": [0, 2], "x": 24, "y": 0}, - {"matrix": [1, 2], "x": 25, "y": 0}, - {"matrix": [2, 2], "x": 26, "y": 0}, - {"matrix": [3, 2], "x": 27, "y": 0}, - {"matrix": [4, 2], "x": 28, "y": 0}, - {"matrix": [5, 2], "x": 29, "y": 0}, - {"matrix": [5, 7], "x": 30, "y": 0}, - {"matrix": [4, 7], "x": 31, "y": 0}, - {"matrix": [3, 7], "x": 32, "y": 0}, - {"matrix": [2, 7], "x": 33, "y": 0}, - {"matrix": [1, 7], "x": 34, "y": 0}, - {"matrix": [0, 7], "x": 35, "y": 0}, - {"matrix": [0, 3], "x": 36, "y": 0}, - {"matrix": [1, 3], "x": 37, "y": 0}, - {"matrix": [2, 3], "x": 38, "y": 0}, - {"matrix": [3, 3], "x": 39, "y": 0}, - {"matrix": [4, 3], "x": 40, "y": 0}, - {"matrix": [5, 3], "x": 41, "y": 0}, - {"matrix": [5, 8], "x": 42, "y": 0}, - {"matrix": [4, 8], "x": 43, "y": 0}, - {"matrix": [3, 8], "x": 44, "y": 0}, - {"matrix": [2, 8], "x": 45, "y": 0}, - {"matrix": [1, 8], "x": 46, "y": 0}, - {"matrix": [0, 8], "x": 47, "y": 0}, - {"matrix": [0, 4], "x": 48, "y": 0}, - {"matrix": [1, 4], "x": 49, "y": 0}, - {"matrix": [2, 4], "x": 50, "y": 0}, - {"matrix": [3, 4], "x": 51, "y": 0}, - {"matrix": [4, 4], "x": 52, "y": 0}, - {"matrix": [5, 4], "x": 53, "y": 0}, - {"matrix": [5, 9], "x": 54, "y": 0}, - {"matrix": [4, 9], "x": 55, "y": 0}, - {"matrix": [3, 9], "x": 56, "y": 0}, - {"matrix": [2, 9], "x": 57, "y": 0}, - {"matrix": [1, 9], "x": 58, "y": 0}, - {"matrix": [0, 9], "x": 59, "y": 0}, - {"matrix": [6, 9], "x": 60, "y": 0}, - {"matrix": [7, 9], "x": 61, "y": 0}, - {"matrix": [8, 9], "x": 62, "y": 0}, - {"matrix": [9, 9], "x": 63, "y": 0}, - {"matrix": [10, 9], "x": 64, "y": 0}, - {"matrix": [11, 9], "x": 65, "y": 0}, - {"matrix": [11, 4], "x": 66, "y": 0}, - {"matrix": [10, 4], "x": 67, "y": 0}, - {"matrix": [9, 4], "x": 68, "y": 0}, - {"matrix": [8, 4], "x": 69, "y": 0}, - {"matrix": [7, 4], "x": 70, "y": 0}, - {"matrix": [6, 4], "x": 71, "y": 0}, - {"matrix": [6, 8], "x": 72, "y": 0}, - {"matrix": [7, 8], "x": 73, "y": 0}, - {"matrix": [8, 8], "x": 74, "y": 0}, - {"matrix": [9, 8], "x": 75, "y": 0}, - {"matrix": [10, 8], "x": 76, "y": 0}, - {"matrix": [11, 8], "x": 77, "y": 0}, - {"matrix": [11, 3], "x": 78, "y": 0}, - {"matrix": [10, 3], "x": 79, "y": 0}, - {"matrix": [9, 3], "x": 80, "y": 0}, - {"matrix": [8, 3], "x": 81, "y": 0}, - {"matrix": [7, 3], "x": 82, "y": 0}, - {"matrix": [6, 3], "x": 83, "y": 0}, - {"matrix": [6, 7], "x": 84, "y": 0}, - {"matrix": [7, 7], "x": 85, "y": 0}, - {"matrix": [8, 7], "x": 86, "y": 0}, - {"matrix": [9, 7], "x": 87, "y": 0}, - {"matrix": [10, 7], "x": 88, "y": 0}, - {"matrix": [11, 7], "x": 89, "y": 0}, - {"matrix": [11, 2], "x": 90, "y": 0}, - {"matrix": [10, 2], "x": 91, "y": 0}, - {"matrix": [9, 2], "x": 92, "y": 0}, - {"matrix": [8, 2], "x": 93, "y": 0}, - {"matrix": [7, 2], "x": 94, "y": 0}, - {"matrix": [6, 2], "x": 95, "y": 0}, - {"matrix": [6, 6], "x": 96, "y": 0}, - {"matrix": [7, 6], "x": 97, "y": 0}, - {"matrix": [8, 6], "x": 98, "y": 0}, - {"matrix": [9, 6], "x": 99, "y": 0}, - {"matrix": [10, 6], "x": 100, "y": 0}, - {"matrix": [11, 6], "x": 101, "y": 0}, - {"matrix": [11, 1], "x": 102, "y": 0}, - {"matrix": [10, 1], "x": 103, "y": 0}, - {"matrix": [9, 1], "x": 104, "y": 0}, - {"matrix": [8, 1], "x": 105, "y": 0}, - {"matrix": [7, 1], "x": 106, "y": 0}, - {"matrix": [6, 1], "x": 107, "y": 0}, - {"matrix": [6, 5], "x": 108, "y": 0}, - {"matrix": [7, 5], "x": 109, "y": 0}, - {"matrix": [8, 5], "x": 110, "y": 0}, - {"matrix": [9, 5], "x": 111, "y": 0}, - {"matrix": [10, 5], "x": 112, "y": 0}, - {"matrix": [11, 5], "x": 113, "y": 0}, - {"matrix": [11, 0], "x": 114, "y": 0}, - {"matrix": [10, 0], "x": 115, "y": 0}, - {"matrix": [9, 0], "x": 116, "y": 0}, - {"matrix": [8, 0], "x": 117, "y": 0}, - {"matrix": [7, 0], "x": 118, "y": 0}, - {"matrix": [6, 0], "x": 119, "y": 0} + + {"matrix": [0, 1], "x": 0.5, "y": 1}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [2, 1], "x": 2.5, "y": 1}, + {"matrix": [3, 1], "x": 3.5, "y": 1}, + {"matrix": [4, 1], "x": 4.5, "y": 1}, + {"matrix": [5, 1], "x": 5.5, "y": 1}, + {"matrix": [5, 6], "x": 6.5, "y": 1}, + {"matrix": [4, 6], "x": 7.5, "y": 1}, + {"matrix": [3, 6], "x": 8.5, "y": 1}, + {"matrix": [2, 6], "x": 9.5, "y": 1}, + {"matrix": [1, 6], "x": 10.5, "y": 1}, + {"matrix": [0, 6], "x": 11.5, "y": 1}, + + {"matrix": [0, 2], "x": 1, "y": 2}, + {"matrix": [1, 2], "x": 2, "y": 2}, + {"matrix": [2, 2], "x": 3, "y": 2}, + {"matrix": [3, 2], "x": 4, "y": 2}, + {"matrix": [4, 2], "x": 5, "y": 2}, + {"matrix": [5, 2], "x": 6, "y": 2}, + {"matrix": [5, 7], "x": 7, "y": 2}, + {"matrix": [4, 7], "x": 8, "y": 2}, + {"matrix": [3, 7], "x": 9, "y": 2}, + {"matrix": [2, 7], "x": 10, "y": 2}, + {"matrix": [1, 7], "x": 11, "y": 2}, + {"matrix": [0, 7], "x": 12, "y": 2}, + + {"matrix": [0, 3], "x": 1.5, "y": 3}, + {"matrix": [1, 3], "x": 2.5, "y": 3}, + {"matrix": [2, 3], "x": 3.5, "y": 3}, + {"matrix": [3, 3], "x": 4.5, "y": 3}, + {"matrix": [4, 3], "x": 5.5, "y": 3}, + {"matrix": [5, 3], "x": 6.5, "y": 3}, + {"matrix": [5, 8], "x": 7.5, "y": 3}, + {"matrix": [4, 8], "x": 8.5, "y": 3}, + {"matrix": [3, 8], "x": 9.5, "y": 3}, + {"matrix": [2, 8], "x": 10.5, "y": 3}, + {"matrix": [1, 8], "x": 11.5, "y": 3}, + {"matrix": [0, 8], "x": 12.5, "y": 3}, + + {"matrix": [0, 4], "x": 2, "y": 4}, + {"matrix": [1, 4], "x": 3, "y": 4}, + {"matrix": [2, 4], "x": 4, "y": 4}, + {"matrix": [3, 4], "x": 5, "y": 4}, + {"matrix": [4, 4], "x": 6, "y": 4}, + {"matrix": [5, 4], "x": 7, "y": 4}, + {"matrix": [5, 9], "x": 8, "y": 4}, + {"matrix": [4, 9], "x": 9, "y": 4}, + {"matrix": [3, 9], "x": 10, "y": 4}, + {"matrix": [2, 9], "x": 11, "y": 4}, + {"matrix": [1, 9], "x": 12, "y": 4}, + {"matrix": [0, 9], "x": 13, "y": 4}, + + {"matrix": [6, 9], "x": 0, "y": 6}, + {"matrix": [7, 9], "x": 1, "y": 6}, + {"matrix": [8, 9], "x": 2, "y": 6}, + {"matrix": [9, 9], "x": 3, "y": 6}, + {"matrix": [10, 9], "x": 4, "y": 6}, + {"matrix": [11, 9], "x": 5, "y": 6}, + {"matrix": [11, 4], "x": 6, "y": 6}, + {"matrix": [10, 4], "x": 7, "y": 6}, + {"matrix": [9, 4], "x": 8, "y": 6}, + {"matrix": [8, 4], "x": 9, "y": 6}, + {"matrix": [7, 4], "x": 10, "y": 6}, + {"matrix": [6, 4], "x": 11, "y": 6}, + + {"matrix": [6, 8], "x": 0.5, "y": 7}, + {"matrix": [7, 8], "x": 1.5, "y": 7}, + {"matrix": [8, 8], "x": 2.5, "y": 7}, + {"matrix": [9, 8], "x": 3.5, "y": 7}, + {"matrix": [10, 8], "x": 4.5, "y": 7}, + {"matrix": [11, 8], "x": 5.5, "y": 7}, + {"matrix": [11, 3], "x": 6.5, "y": 7}, + {"matrix": [10, 3], "x": 7.5, "y": 7}, + {"matrix": [9, 3], "x": 8.5, "y": 7}, + {"matrix": [8, 3], "x": 9.5, "y": 7}, + {"matrix": [7, 3], "x": 10.5, "y": 7}, + {"matrix": [6, 3], "x": 11.5, "y": 7}, + + {"matrix": [6, 7], "x": 1, "y": 8}, + {"matrix": [7, 7], "x": 2, "y": 8}, + {"matrix": [8, 7], "x": 3, "y": 8}, + {"matrix": [9, 7], "x": 4, "y": 8}, + {"matrix": [10, 7], "x": 5, "y": 8}, + {"matrix": [11, 7], "x": 6, "y": 8}, + {"matrix": [11, 2], "x": 7, "y": 8}, + {"matrix": [10, 2], "x": 8, "y": 8}, + {"matrix": [9, 2], "x": 9, "y": 8}, + {"matrix": [8, 2], "x": 10, "y": 8}, + {"matrix": [7, 2], "x": 11, "y": 8}, + {"matrix": [6, 2], "x": 12, "y": 8}, + + {"matrix": [6, 6], "x": 1.5, "y": 9}, + {"matrix": [7, 6], "x": 2.5, "y": 9}, + {"matrix": [8, 6], "x": 3.5, "y": 9}, + {"matrix": [9, 6], "x": 4.5, "y": 9}, + {"matrix": [10, 6], "x": 5.5, "y": 9}, + {"matrix": [11, 6], "x": 6.5, "y": 9}, + {"matrix": [11, 1], "x": 7.5, "y": 9}, + {"matrix": [10, 1], "x": 8.5, "y": 9}, + {"matrix": [9, 1], "x": 9.5, "y": 9}, + {"matrix": [8, 1], "x": 10.5, "y": 9}, + {"matrix": [7, 1], "x": 11.5, "y": 9}, + {"matrix": [6, 1], "x": 12.5, "y": 9}, + + {"matrix": [6, 5], "x": 2, "y": 10}, + {"matrix": [7, 5], "x": 3, "y": 10}, + {"matrix": [8, 5], "x": 4, "y": 10}, + {"matrix": [9, 5], "x": 5, "y": 10}, + {"matrix": [10, 5], "x": 6, "y": 10}, + {"matrix": [11, 5], "x": 7, "y": 10}, + {"matrix": [11, 0], "x": 8, "y": 10}, + {"matrix": [10, 0], "x": 9, "y": 10}, + {"matrix": [9, 0], "x": 10, "y": 10}, + {"matrix": [8, 0], "x": 11, "y": 10}, + {"matrix": [7, 0], "x": 12, "y": 10}, + {"matrix": [6, 0], "x": 13, "y": 10} ] } } -- cgit v1.2.3 From 363bfdbfda5ea9fa996390920a9e8982535b76c8 Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 27 May 2023 12:27:44 +1000 Subject: Move `RGBLIGHT_LIMIT_VAL` to data driven (#20974) Co-authored-by: Nick Brassel --- keyboards/giabalanai/config.h | 1 - keyboards/giabalanai/info.json | 3 +++ 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'keyboards/giabalanai') diff --git a/keyboards/giabalanai/config.h b/keyboards/giabalanai/config.h index f058b3afc4..aa0095aebd 100644 --- a/keyboards/giabalanai/config.h +++ b/keyboards/giabalanai/config.h @@ -41,7 +41,6 @@ along with this program. If not, see . // Not sure but rgblight_sethsv_at() might not support RGBLED_SPLIT yet. // Instead, LED data is tranferred from right side to the left via TRRS cable. -# define RGBLIGHT_LIMIT_VAL 80 # define RGBLIGHT_LAYERS // By default, LEDs of the buttons which are pressed turn on. diff --git a/keyboards/giabalanai/info.json b/keyboards/giabalanai/info.json index 125bade43e..7c2fa72047 100644 --- a/keyboards/giabalanai/info.json +++ b/keyboards/giabalanai/info.json @@ -11,6 +11,9 @@ "rgb_matrix": { "driver": "WS2812" }, + "rgblight": { + "max_brightness": 80 + }, "matrix_pins": { "cols": ["B1", "F7", "F6", "F5", "F4", "B3", "B2", "B6", "D0", "D1"], "rows": ["B5", "B4", "E6", "D7", "C6", "D4"] -- cgit v1.2.3