summaryrefslogtreecommitdiff
path: root/keyboards/1upkeyboards
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/1upkeyboards')
-rw-r--r--keyboards/1upkeyboards/1up60hse/1up60hse.c16
-rw-r--r--keyboards/1upkeyboards/1up60hse/1up60hse.h37
-rw-r--r--keyboards/1upkeyboards/1up60hse/config.h20
-rw-r--r--keyboards/1upkeyboards/1up60hse/info.json76
-rw-r--r--keyboards/1upkeyboards/1up60hte/1up60hte.c18
-rw-r--r--keyboards/1upkeyboards/1up60hte/1up60hte.h49
-rw-r--r--keyboards/1upkeyboards/1up60hte/config.h11
-rw-r--r--keyboards/1upkeyboards/1up60hte/info.json252
-rw-r--r--keyboards/1upkeyboards/1up60rgb/1up60rgb.c1
-rw-r--r--keyboards/1upkeyboards/1up60rgb/1up60rgb.h109
-rw-r--r--keyboards/1upkeyboards/1up60rgb/config.h11
-rw-r--r--keyboards/1upkeyboards/1up60rgb/info.json516
-rw-r--r--keyboards/1upkeyboards/1up60rgb/keymaps/iso/keymap.c2
-rw-r--r--keyboards/1upkeyboards/1up60rgb/keymaps/tsangan/keymap.c2
-rw-r--r--keyboards/1upkeyboards/pi40/config.h4
-rw-r--r--keyboards/1upkeyboards/pi40/grid_v1_1/info.json207
-rw-r--r--keyboards/1upkeyboards/pi40/keymaps/default/keymap.c2
-rw-r--r--keyboards/1upkeyboards/pi40/keymaps/via/keymap.c2
-rw-r--r--keyboards/1upkeyboards/pi40/mit_v1_0/info.json205
-rw-r--r--keyboards/1upkeyboards/pi40/mit_v1_1/info.json205
-rw-r--r--keyboards/1upkeyboards/pi40/rules.mk2
-rw-r--r--keyboards/1upkeyboards/pi50/config.h60
-rw-r--r--keyboards/1upkeyboards/pi50/info.json56
-rw-r--r--keyboards/1upkeyboards/pi50/keymaps/default/keymap.c2
-rw-r--r--keyboards/1upkeyboards/pi50/keymaps/via/keymap.c2
-rw-r--r--keyboards/1upkeyboards/pi50/rules.mk6
-rw-r--r--keyboards/1upkeyboards/pi60/config.h1
-rw-r--r--keyboards/1upkeyboards/pi60/info.json199
-rw-r--r--keyboards/1upkeyboards/pi60/keymaps/default/keymap.c2
-rw-r--r--keyboards/1upkeyboards/pi60/keymaps/via/keymap.c2
-rw-r--r--keyboards/1upkeyboards/pi60/rules.mk1
-rw-r--r--keyboards/1upkeyboards/pi60_hse/config.h1
-rw-r--r--keyboards/1upkeyboards/pi60_hse/info.json164
-rw-r--r--keyboards/1upkeyboards/pi60_hse/rules.mk1
-rw-r--r--keyboards/1upkeyboards/pi60_rgb/config.h2
-rw-r--r--keyboards/1upkeyboards/pi60_rgb/info.json250
-rw-r--r--keyboards/1upkeyboards/pi60_rgb/rules.mk1
-rw-r--r--keyboards/1upkeyboards/super16/config.h23
-rw-r--r--keyboards/1upkeyboards/super16/info.json52
-rw-r--r--keyboards/1upkeyboards/super16/rules.mk1
-rw-r--r--keyboards/1upkeyboards/super16/super16.c2
-rw-r--r--keyboards/1upkeyboards/super16/super16.h51
-rw-r--r--keyboards/1upkeyboards/super16v2/config.h22
-rw-r--r--keyboards/1upkeyboards/super16v2/info.json33
-rw-r--r--keyboards/1upkeyboards/super16v2/rules.mk1
-rw-r--r--keyboards/1upkeyboards/super16v2/super16v2.c2
-rw-r--r--keyboards/1upkeyboards/super16v2/super16v2.h39
-rw-r--r--keyboards/1upkeyboards/sweet16/info.json42
-rw-r--r--keyboards/1upkeyboards/sweet16/keymaps/dlaroe/keymap.c2
-rw-r--r--keyboards/1upkeyboards/sweet16/sweet16.c1
-rw-r--r--keyboards/1upkeyboards/sweet16/sweet16.h30
-rw-r--r--keyboards/1upkeyboards/sweet16/v1/config.h11
-rw-r--r--keyboards/1upkeyboards/sweet16/v1/info.json8
-rw-r--r--keyboards/1upkeyboards/sweet16/v1/v1.c1
-rw-r--r--keyboards/1upkeyboards/sweet16/v1/v1.h30
-rw-r--r--keyboards/1upkeyboards/sweet16v2/kb2040/config.h1
-rw-r--r--keyboards/1upkeyboards/sweet16v2/kb2040/info.json90
-rw-r--r--keyboards/1upkeyboards/sweet16v2/kb2040/rules.mk1
-rw-r--r--keyboards/1upkeyboards/sweet16v2/keymaps/default/keymap.c2
-rw-r--r--keyboards/1upkeyboards/sweet16v2/keymaps/via/keymap.c2
-rw-r--r--keyboards/1upkeyboards/sweet16v2/pro_micro/config.h1
-rw-r--r--keyboards/1upkeyboards/sweet16v2/pro_micro/info.json87
62 files changed, 1586 insertions, 1446 deletions
diff --git a/keyboards/1upkeyboards/1up60hse/1up60hse.c b/keyboards/1upkeyboards/1up60hse/1up60hse.c
deleted file mode 100644
index fa62f52e64..0000000000
--- a/keyboards/1upkeyboards/1up60hse/1up60hse.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2018 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 "1up60hse.h"
diff --git a/keyboards/1upkeyboards/1up60hse/1up60hse.h b/keyboards/1upkeyboards/1up60hse/1up60hse.h
deleted file mode 100644
index f1b4f5e43e..0000000000
--- a/keyboards/1upkeyboards/1up60hse/1up60hse.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* Copyright 2018 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"
-
-// This 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_60_ansi( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, \
- K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3D, \
- K40, K41, K42, K45, K49, K4A, K4B, K4D \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, KC_NO, K2D }, \
- { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, KC_NO, KC_NO, K3D }, \
- { K40, K41, K42, KC_NO, KC_NO, K45, KC_NO, KC_NO, KC_NO, K49, K4A, K4B, KC_NO, K4D } \
-}
diff --git a/keyboards/1upkeyboards/1up60hse/config.h b/keyboards/1upkeyboards/1up60hse/config.h
index b58eef1085..bc0d7f0c4b 100644
--- a/keyboards/1upkeyboards/1up60hse/config.h
+++ b/keyboards/1upkeyboards/1up60hse/config.h
@@ -17,25 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#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 { B3, B2, B1, B0, D4 }
-#define MATRIX_COL_PINS { C7, F7, F6, F5, F4, F1, E6, D1, D0, D2, D3, D5, D6, D7 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN F0
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -51,7 +32,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
#define RGBLIGHT_SLEEP
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/1upkeyboards/1up60hse/info.json b/keyboards/1upkeyboards/1up60hse/info.json
index 07f35c7340..475a935123 100644
--- a/keyboards/1upkeyboards/1up60hse/info.json
+++ b/keyboards/1upkeyboards/1up60hse/info.json
@@ -8,17 +8,91 @@
"pid": "0x6873",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["C7", "F7", "F6", "F5", "F4", "F1", "E6", "D1", "D0", "D2", "D3", "D5", "D6", "D7"],
+ "rows": ["B3", "B2", "B1", "B0", "D4"]
+ },
+ "diode_direction": "COL2ROW",
"backlight": {
"pin": "B7",
"levels": 5,
"breathing": true
},
+ "ws2812": {
+ "pin": "F0"
+ },
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"community_layouts": ["60_ansi"],
"layouts": {
"LAYOUT_60_ansi": {
- "layout": [{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Backspace", "x":13, "y":0, "w":2}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":2.75}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"label":"Alt", "x":10, "y":4, "w":1.25}, {"label":"Win", "x":11.25, "y":4, "w":1.25}, {"label":"Menu", "x":12.5, "y":4, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}]
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 1], "x": 2.25, "y": 3},
+ {"matrix": [3, 2], "x": 3.25, "y": 3},
+ {"matrix": [3, 3], "x": 4.25, "y": 3},
+ {"matrix": [3, 4], "x": 5.25, "y": 3},
+ {"matrix": [3, 5], "x": 6.25, "y": 3},
+ {"matrix": [3, 6], "x": 7.25, "y": 3},
+ {"matrix": [3, 7], "x": 8.25, "y": 3},
+ {"matrix": [3, 8], "x": 9.25, "y": 3},
+ {"matrix": [3, 9], "x": 10.25, "y": 3},
+ {"matrix": [3, 10], "x": 11.25, "y": 3},
+ {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+ ]
}
}
}
diff --git a/keyboards/1upkeyboards/1up60hte/1up60hte.c b/keyboards/1upkeyboards/1up60hte/1up60hte.c
deleted file mode 100644
index 460e42a0e5..0000000000
--- a/keyboards/1upkeyboards/1up60hte/1up60hte.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-Copyright 2019 Bubnick
-
-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 "1up60hte.h"
diff --git a/keyboards/1upkeyboards/1up60hte/1up60hte.h b/keyboards/1upkeyboards/1up60hte/1up60hte.h
deleted file mode 100644
index c64bcb124d..0000000000
--- a/keyboards/1upkeyboards/1up60hte/1up60hte.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
-Copyright 2019 Bubnick
-
-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 LAYOUT_60_tsangan_hhkb( \
- K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K413, \
- K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, \
- K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, \
- K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, \
- K400, K401, K402, K406, K410, K411, K412 \
-) { \
- { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013 }, \
- { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113 }, \
- { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, KC_NO }, \
- { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, KC_NO }, \
- { K400, K401, K402, KC_NO, KC_NO, KC_NO, K406, KC_NO, KC_NO, KC_NO, K410, K411, K412, K413 } \
-}
-
-/* HHKB Variant */
-#define LAYOUT_60_hhkb( \
- K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K413, \
- K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, \
- K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, \
- K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, \
- K401, K402, K406, K410, K411 \
-) { \
- { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013 }, \
- { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113 }, \
- { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, KC_NO }, \
- { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, KC_NO }, \
- { KC_NO, K401, K402, KC_NO, KC_NO, KC_NO, K406, KC_NO, KC_NO, KC_NO, K410, K411, KC_NO, K413 } \
-}
diff --git a/keyboards/1upkeyboards/1up60hte/config.h b/keyboards/1upkeyboards/1up60hte/config.h
index ff5f010cbe..aeda8afd33 100644
--- a/keyboards/1upkeyboards/1up60hte/config.h
+++ b/keyboards/1upkeyboards/1up60hte/config.h
@@ -18,22 +18,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B3, B2, B1, B0, D4 }
-#define MATRIX_COL_PINS { F6, F5, F4, F1, E6, D0, D1, D2, D3, D5, D6, D7, B4, B5 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE
-#define RGB_DI_PIN F0
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -48,4 +38,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/1upkeyboards/1up60hte/info.json b/keyboards/1upkeyboards/1up60hte/info.json
index 98a9082989..712999df32 100644
--- a/keyboards/1upkeyboards/1up60hte/info.json
+++ b/keyboards/1upkeyboards/1up60hte/info.json
@@ -8,6 +8,11 @@
"pid": "0x6874",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["F6", "F5", "F4", "F1", "E6", "D0", "D1", "D2", "D3", "D5", "D6", "D7", "B4", "B5"],
+ "rows": ["B3", "B2", "B1", "B0", "D4"]
+ },
+ "diode_direction": "COL2ROW",
"backlight": {
"pin": "B7"
},
@@ -15,6 +20,9 @@
"caps_lock": "B6",
"on_state": 0
},
+ "ws2812": {
+ "pin": "F0"
+ },
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layout_aliases": {
@@ -24,140 +32,140 @@
"layouts": {
"LAYOUT_60_tsangan_hhkb": {
"layout": [
- {"label":"Esc", "x":0, "y":0},
- {"label":"!", "x":1, "y":0},
- {"label":"@", "x":2, "y":0},
- {"label":"#", "x":3, "y":0},
- {"label":"$", "x":4, "y":0},
- {"label":"%", "x":5, "y":0},
- {"label":"^", "x":6, "y":0},
- {"label":"&", "x":7, "y":0},
- {"label":"*", "x":8, "y":0},
- {"label":"(", "x":9, "y":0},
- {"label":")", "x":10, "y":0},
- {"label":"_", "x":11, "y":0},
- {"label":"+", "x":12, "y":0},
- {"label":"|", "x":13, "y":0},
- {"label":"~", "x":14, "y":0},
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [4, 13], "x": 14, "y": 0},
- {"label":"Tab", "x":0, "y":1, "w":1.5},
- {"label":"Q", "x":1.5, "y":1},
- {"label":"W", "x":2.5, "y":1},
- {"label":"E", "x":3.5, "y":1},
- {"label":"R", "x":4.5, "y":1},
- {"label":"T", "x":5.5, "y":1},
- {"label":"Y", "x":6.5, "y":1},
- {"label":"U", "x":7.5, "y":1},
- {"label":"I", "x":8.5, "y":1},
- {"label":"O", "x":9.5, "y":1},
- {"label":"P", "x":10.5, "y":1},
- {"label":"{", "x":11.5, "y":1},
- {"label":"}", "x":12.5, "y":1},
- {"label":"|", "x":13.5, "y":1, "w":1.5},
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
- {"label":"Control", "x":0, "y":2, "w":1.75},
- {"label":"A", "x":1.75, "y":2},
- {"label":"S", "x":2.75, "y":2},
- {"label":"D", "x":3.75, "y":2},
- {"label":"F", "x":4.75, "y":2},
- {"label":"G", "x":5.75, "y":2},
- {"label":"H", "x":6.75, "y":2},
- {"label":"J", "x":7.75, "y":2},
- {"label":"K", "x":8.75, "y":2},
- {"label":"L", "x":9.75, "y":2},
- {"label":":", "x":10.75, "y":2},
- {"label":"\"", "x":11.75, "y":2},
- {"label":"Enter", "x":12.75, "y":2, "w":2.25},
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
- {"label":"Shift", "x":0, "y":3, "w":2.25},
- {"label":"Z", "x":2.25, "y":3},
- {"label":"X", "x":3.25, "y":3},
- {"label":"C", "x":4.25, "y":3},
- {"label":"V", "x":5.25, "y":3},
- {"label":"B", "x":6.25, "y":3},
- {"label":"N", "x":7.25, "y":3},
- {"label":"M", "x":8.25, "y":3},
- {"label":"<", "x":9.25, "y":3},
- {"label":">", "x":10.25, "y":3},
- {"label":"?", "x":11.25, "y":3},
- {"label":"Shift", "x":12.25, "y":3, "w":1.75},
- {"label":"Fn", "x":14, "y":3},
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 1], "x": 2.25, "y": 3},
+ {"matrix": [3, 2], "x": 3.25, "y": 3},
+ {"matrix": [3, 3], "x": 4.25, "y": 3},
+ {"matrix": [3, 4], "x": 5.25, "y": 3},
+ {"matrix": [3, 5], "x": 6.25, "y": 3},
+ {"matrix": [3, 6], "x": 7.25, "y": 3},
+ {"matrix": [3, 7], "x": 8.25, "y": 3},
+ {"matrix": [3, 8], "x": 9.25, "y": 3},
+ {"matrix": [3, 9], "x": 10.25, "y": 3},
+ {"matrix": [3, 10], "x": 11.25, "y": 3},
+ {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 12], "x": 14, "y": 3},
- {"label":"Ctrl", "x":0, "y":4, "w":1.5},
- {"label":"Alt", "x":1.5, "y":4},
- {"label":"Meta", "x":2.5, "y":4, "w":1.5},
- {"x":4, "y":4, "w":7},
- {"label":"Meta", "x":11, "y":4, "w":1.5},
- {"label":"Alt", "x":12.5, "y":4},
- {"label":"Ctrl", "x":13.5, "y":4, "w":1.5}
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+ {"matrix": [4, 1], "x": 1.5, "y": 4},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+ {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+ {"matrix": [4, 11], "x": 12.5, "y": 4},
+ {"matrix": [4, 12], "x": 13.5, "y": 4, "w": 1.5}
]
},
"LAYOUT_60_hhkb": {
"layout": [
- {"label":"Esc", "x":0, "y":0},
- {"label":"!", "x":1, "y":0},
- {"label":"@", "x":2, "y":0},
- {"label":"#", "x":3, "y":0},
- {"label":"$", "x":4, "y":0},
- {"label":"%", "x":5, "y":0},
- {"label":"^", "x":6, "y":0},
- {"label":"&", "x":7, "y":0},
- {"label":"*", "x":8, "y":0},
- {"label":"(", "x":9, "y":0},
- {"label":")", "x":10, "y":0},
- {"label":"_", "x":11, "y":0},
- {"label":"+", "x":12, "y":0},
- {"label":"|", "x":13, "y":0},
- {"label":"~", "x":14, "y":0},
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [4, 13], "x": 14, "y": 0},
- {"label":"Tab", "x":0, "y":1, "w":1.5},
- {"label":"Q", "x":1.5, "y":1},
- {"label":"W", "x":2.5, "y":1},
- {"label":"E", "x":3.5, "y":1},
- {"label":"R", "x":4.5, "y":1},
- {"label":"T", "x":5.5, "y":1},
- {"label":"Y", "x":6.5, "y":1},
- {"label":"U", "x":7.5, "y":1},
- {"label":"I", "x":8.5, "y":1},
- {"label":"O", "x":9.5, "y":1},
- {"label":"P", "x":10.5, "y":1},
- {"label":"{", "x":11.5, "y":1},
- {"label":"}", "x":12.5, "y":1},
- {"label":"|", "x":13.5, "y":1, "w":1.5},
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
- {"label":"Control", "x":0, "y":2, "w":1.75},
- {"label":"A", "x":1.75, "y":2},
- {"label":"S", "x":2.75, "y":2},
- {"label":"D", "x":3.75, "y":2},
- {"label":"F", "x":4.75, "y":2},
- {"label":"G", "x":5.75, "y":2},
- {"label":"H", "x":6.75, "y":2},
- {"label":"J", "x":7.75, "y":2},
- {"label":"K", "x":8.75, "y":2},
- {"label":"L", "x":9.75, "y":2},
- {"label":":", "x":10.75, "y":2},
- {"label":"\"", "x":11.75, "y":2},
- {"label":"Enter", "x":12.75, "y":2, "w":2.25},
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
- {"label":"Shift", "x":0, "y":3, "w":2.25},
- {"label":"Z", "x":2.25, "y":3},
- {"label":"X", "x":3.25, "y":3},
- {"label":"C", "x":4.25, "y":3},
- {"label":"V", "x":5.25, "y":3},
- {"label":"B", "x":6.25, "y":3},
- {"label":"N", "x":7.25, "y":3},
- {"label":"M", "x":8.25, "y":3},
- {"label":"<", "x":9.25, "y":3},
- {"label":">", "x":10.25, "y":3},
- {"label":"?", "x":11.25, "y":3},
- {"label":"Shift", "x":12.25, "y":3, "w":1.75},
- {"label":"Fn", "x":14, "y":3},
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 1], "x": 2.25, "y": 3},
+ {"matrix": [3, 2], "x": 3.25, "y": 3},
+ {"matrix": [3, 3], "x": 4.25, "y": 3},
+ {"matrix": [3, 4], "x": 5.25, "y": 3},
+ {"matrix": [3, 5], "x": 6.25, "y": 3},
+ {"matrix": [3, 6], "x": 7.25, "y": 3},
+ {"matrix": [3, 7], "x": 8.25, "y": 3},
+ {"matrix": [3, 8], "x": 9.25, "y": 3},
+ {"matrix": [3, 9], "x": 10.25, "y": 3},
+ {"matrix": [3, 10], "x": 11.25, "y": 3},
+ {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 12], "x": 14, "y": 3},
- {"label":"Alt", "x":1.5, "y":4},
- {"label":"Meta", "x":2.5, "y":4, "w":1.5},
- {"x":4, "y":4, "w":7},
- {"label":"Meta", "x":11, "y":4, "w":1.5},
- {"label":"Alt", "x":12.5, "y":4}
+ {"matrix": [4, 1], "x": 1.5, "y": 4},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+ {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+ {"matrix": [4, 11], "x": 12.5, "y": 4}
]
}
}
diff --git a/keyboards/1upkeyboards/1up60rgb/1up60rgb.c b/keyboards/1upkeyboards/1up60rgb/1up60rgb.c
deleted file mode 100644
index 4ba631c797..0000000000
--- a/keyboards/1upkeyboards/1up60rgb/1up60rgb.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "1up60rgb.h"
diff --git a/keyboards/1upkeyboards/1up60rgb/1up60rgb.h b/keyboards/1upkeyboards/1up60rgb/1up60rgb.h
deleted file mode 100644
index 5ee6c12bcf..0000000000
--- a/keyboards/1upkeyboards/1up60rgb/1up60rgb.h
+++ /dev/null
@@ -1,109 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-#define LAYOUT_all( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, \
- k10, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, \
- k20, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, \
- k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3D, k3E, \
- k40, k41, k43, k46, k4A, k4B, k4D, k4E \
-) { \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E }, \
- { k10, XXX, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E }, \
- { k20, XXX, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E }, \
- { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, XXX, k3D, k3E }, \
- { k40, k41, XXX, k43, XXX, XXX, k46, XXX, XXX, XXX, k4A, k4B, XXX, k4D, k4E } \
-}
-
-/* ANSI variant. No extra keys for ISO */
-#define LAYOUT_60_ansi( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, \
- k10, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, \
- k20, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2E, \
- k30, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3D, \
- k40, k41, k43, k46, k4A, k4B, k4D, k4E \
-) { \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, XXX }, \
- { k10, XXX, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E }, \
- { k20, XXX, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2E, XXX }, \
- { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, XXX, k3D, XXX }, \
- { k40, k41, XXX, k43, XXX, XXX, k46, XXX, XXX, XXX, k4A, k4B, XXX, k4D, k4E } \
-}
-
-/* ANSI-Tsangan variant, with split right shift key */
-#define LAYOUT_60_ansi_tsangan_split_rshift( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, \
- k10, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, \
- k20, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2E, \
- k30, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3D, k3E, \
- k40, k41, k43, k46, k4B, k4D, k4E \
-) { \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0D }, \
- { k10, XXX, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E }, \
- { k20, XXX, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2E, XXX }, \
- { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, XXX, k3D, k3E }, \
- { k40, k41, XXX, k43, XXX, XXX, k46, XXX, XXX, XXX, XXX, k4B, XXX, k4D, k4E } \
-}
-
-/* ISO variant. Remove useless ANSI keys */
-#define LAYOUT_60_iso( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, \
- k10, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, \
- k20, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, \
- k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3D, \
- k40, k41, k43, k46, k4A, k4B, k4D, k4E \
-) { \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, XXX }, \
- { k10, XXX, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k2D }, \
- { k20, XXX, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2E, XXX }, \
- { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, XXX, k3D, XXX }, \
- { k40, k41, XXX, k43, XXX, XXX, k46, XXX, XXX, XXX, k4A, k4B, XXX, k4D, k4E } \
-}
-
-/* HHKB Variant */
-#define LAYOUT_60_ansi_split_bs_rshift( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, \
- k10, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, \
- k20, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2E, \
- k30, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3D, k3E, \
- k40, k41, k43, k46, k4A, k4B, k4D, k4E \
-) { \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E }, \
- { k10, XXX, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E }, \
- { k20, XXX, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2E, XXX }, \
- { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, XXX, k3D, k3E }, \
- { k40, k41, XXX, k43, XXX, XXX, k46, XXX, XXX, XXX, k4A, k4B, XXX, k4D, k4E } \
-}
-
-/* ANSI Variant */
-#define LAYOUT_60_ansi_split_rshift( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, \
- k10, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, \
- k20, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2E, \
- k30, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3D, k3E, \
- k40, k41, k43, k46, k4A, k4B, k4D, k4E \
-) { \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0D }, \
- { k10, XXX, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E }, \
- { k20, XXX, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2E, XXX }, \
- { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, XXX, k3D, k3E }, \
- { k40, k41, XXX, k43, XXX, XXX, k46, XXX, XXX, XXX, k4A, k4B, XXX, k4D, k4E } \
-}
-
-/* HHKB Variant */
-#define LAYOUT_60_hhkb( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, \
- k10, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, \
- k20, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2E, \
- k30, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3D, k3E, \
- k41, k43, k46, k4B, k4D \
-) { \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E }, \
- { k10, XXX, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E }, \
- { k20, XXX, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2E, XXX }, \
- { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, XXX, k3D, k3E }, \
- { XXX, k41, XXX, k43, XXX, XXX, k46, XXX, XXX, XXX, XXX, k4B, XXX, k4D, XXX } \
-}
diff --git a/keyboards/1upkeyboards/1up60rgb/config.h b/keyboards/1upkeyboards/1up60rgb/config.h
index 806f23075f..8bbb646e40 100644
--- a/keyboards/1upkeyboards/1up60rgb/config.h
+++ b/keyboards/1upkeyboards/1up60rgb/config.h
@@ -1,21 +1,11 @@
#pragma once
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 }
-#define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B7, D4, B1, B0, B5, B4, D7, D6, B3, F4 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE
-#define RGB_DI_PIN E2
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -30,4 +20,3 @@
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/1upkeyboards/1up60rgb/info.json b/keyboards/1upkeyboards/1up60rgb/info.json
index 57a0143544..ee6914a4e5 100644
--- a/keyboards/1upkeyboards/1up60rgb/info.json
+++ b/keyboards/1upkeyboards/1up60rgb/info.json
@@ -8,77 +8,511 @@
"pid": "0x7267",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["F0", "F1", "E6", "C7", "C6", "B7", "D4", "B1", "B0", "B5", "B4", "D7", "D6", "B3", "F4"],
+ "rows": ["D0", "D1", "D2", "D3", "D5"]
+ },
+ "diode_direction": "COL2ROW",
"backlight": {
"pin": "B6",
"levels": 5
},
+ "ws2812": {
+ "pin": "E2"
+ },
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"community_layouts": ["60_ansi", "60_iso", "60_ansi_split_bs_rshift", "60_hhkb"],
"layouts": {
"LAYOUT_all": {
"layout": [
- {"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"~", "x":13, "y":0}, {"label":"Del", "x":14, "y":0},
- {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5},
- {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"x":12.75, "y":2}, {"label":"Enter", "x":13.75, "y":2, "w":1.25},
- {"label":"Shift", "x":0, "y":3, "w":1.25}, {"x":1.25, "y":3}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"Fn", "x":14, "y":3},
- {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"label":"Alt", "x":10, "y":4, "w":1.25}, {"label":"Win", "x":11.25, "y":4, "w":1.25}, {"label":"Menu", "x":12.5, "y":4, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}]
- },
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [0, 14], "x": 14, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 2], "x": 1.5, "y": 1},
+ {"matrix": [1, 3], "x": 2.5, "y": 1},
+ {"matrix": [1, 4], "x": 3.5, "y": 1},
+ {"matrix": [1, 5], "x": 4.5, "y": 1},
+ {"matrix": [1, 6], "x": 5.5, "y": 1},
+ {"matrix": [1, 7], "x": 6.5, "y": 1},
+ {"matrix": [1, 8], "x": 7.5, "y": 1},
+ {"matrix": [1, 9], "x": 8.5, "y": 1},
+ {"matrix": [1, 10], "x": 9.5, "y": 1},
+ {"matrix": [1, 11], "x": 10.5, "y": 1},
+ {"matrix": [1, 12], "x": 11.5, "y": 1},
+ {"matrix": [1, 13], "x": 12.5, "y": 1},
+ {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 2], "x": 1.75, "y": 2},
+ {"matrix": [2, 3], "x": 2.75, "y": 2},
+ {"matrix": [2, 4], "x": 3.75, "y": 2},
+ {"matrix": [2, 5], "x": 4.75, "y": 2},
+ {"matrix": [2, 6], "x": 5.75, "y": 2},
+ {"matrix": [2, 7], "x": 6.75, "y": 2},
+ {"matrix": [2, 8], "x": 7.75, "y": 2},
+ {"matrix": [2, 9], "x": 8.75, "y": 2},
+ {"matrix": [2, 10], "x": 9.75, "y": 2},
+ {"matrix": [2, 11], "x": 10.75, "y": 2},
+ {"matrix": [2, 12], "x": 11.75, "y": 2},
+ {"matrix": [2, 13], "x": 12.75, "y": 2},
+ {"matrix": [2, 14], "x": 13.75, "y": 2, "w": 1.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 3},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 14], "x": 14, "y": 3},
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 13], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 14], "x": 13.75, "y": 4, "w": 1.25}
+ ]
+ },
"LAYOUT_60_ansi": {
"layout": [
- {"x":0, "y":0, "label":"~"}, {"x":1, "y":0, "label":"!"}, {"x":2, "y":0, "label":"@"}, {"x":3, "y":0, "label":"#"}, {"x":4, "y":0, "label":"$"}, {"x":5, "y":0, "label":"%"}, {"x":6, "y":0, "label":"^"}, {"x":7, "y":0, "label":"&"}, {"x":8, "y":0, "label":"*"}, {"x":9, "y":0, "label":"("}, {"x":10, "y":0, "label":")"}, {"x":11, "y":0, "label":"_"}, {"x":12, "y":0, "label":"+"}, {"x":13, "y":0, "label":"Backspace", "w":2},
- {"x":0, "y":1, "label":"Tab", "w":1.5}, {"x":1.5, "y":1, "label":"Q"}, {"x":2.5, "y":1, "label":"W"}, {"x":3.5, "y":1, "label":"E"}, {"x":4.5, "y":1, "label":"R"}, {"x":5.5, "y":1, "label":"T"}, {"x":6.5, "y":1, "label":"Y"}, {"x":7.5, "y":1, "label":"U"}, {"x":8.5, "y":1, "label":"I"}, {"x":9.5, "y":1, "label":"O"}, {"x":10.5, "y":1, "label":"P"}, {"x":11.5, "y":1, "label":"{"}, {"x":12.5, "y":1, "label":"}"}, {"x":13.5, "y":1, "label":"|", "w":1.5},
- {"x":0, "y":2, "label":"Caps Lock", "w":1.75}, {"x":1.75, "y":2, "label":"A"}, {"x":2.75, "y":2, "label":"S"}, {"x":3.75, "y":2, "label":"D"}, {"x":4.75, "y":2, "label":"F"}, {"x":5.75, "y":2, "label":"G"}, {"x":6.75, "y":2, "label":"H"}, {"x":7.75, "y":2, "label":"J"}, {"x":8.75, "y":2, "label":"K"}, {"x":9.75, "y":2, "label":"L"}, {"x":10.75, "y":2, "label":":"}, {"x":11.75, "y":2, "label":"\""}, {"x":12.75, "y":2, "label":"Enter", "w":2.25},
- {"x":0, "y":3, "label":"Shift", "w":2.25}, {"x":2.25, "y":3, "label":"Z"}, {"x":3.25, "y":3, "label":"X"}, {"x":4.25, "y":3, "label":"C"}, {"x":5.25, "y":3, "label":"V"}, {"x":6.25, "y":3, "label":"B"}, {"x":7.25, "y":3, "label":"N"}, {"x":8.25, "y":3, "label":"M"}, {"x":9.25, "y":3, "label":"<"}, {"x":10.25, "y":3, "label":">"}, {"x":11.25, "y":3, "label":"?"}, {"x":12.25, "y":3, "label":"Shift", "w":2.75},
- {"x":0, "y":4, "label":"Ctrl", "w":1.25}, {"x":1.25, "y":4, "label":"Win", "w":1.25}, {"x":2.5, "y":4, "label":"Alt", "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"x":10, "y":4, "label":"Alt", "w":1.25}, {"x":11.25, "y":4, "label":"Win", "w":1.25}, {"x":12.5, "y":4, "label":"Menu", "w":1.25}, {"x":13.75, "y":4, "label":"Ctrl", "w":1.25}]
- },
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 2], "x": 1.5, "y": 1},
+ {"matrix": [1, 3], "x": 2.5, "y": 1},
+ {"matrix": [1, 4], "x": 3.5, "y": 1},
+ {"matrix": [1, 5], "x": 4.5, "y": 1},
+ {"matrix": [1, 6], "x": 5.5, "y": 1},
+ {"matrix": [1, 7], "x": 6.5, "y": 1},
+ {"matrix": [1, 8], "x": 7.5, "y": 1},
+ {"matrix": [1, 9], "x": 8.5, "y": 1},
+ {"matrix": [1, 10], "x": 9.5, "y": 1},
+ {"matrix": [1, 11], "x": 10.5, "y": 1},
+ {"matrix": [1, 12], "x": 11.5, "y": 1},
+ {"matrix": [1, 13], "x": 12.5, "y": 1},
+ {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 2], "x": 1.75, "y": 2},
+ {"matrix": [2, 3], "x": 2.75, "y": 2},
+ {"matrix": [2, 4], "x": 3.75, "y": 2},
+ {"matrix": [2, 5], "x": 4.75, "y": 2},
+ {"matrix": [2, 6], "x": 5.75, "y": 2},
+ {"matrix": [2, 7], "x": 6.75, "y": 2},
+ {"matrix": [2, 8], "x": 7.75, "y": 2},
+ {"matrix": [2, 9], "x": 8.75, "y": 2},
+ {"matrix": [2, 10], "x": 9.75, "y": 2},
+ {"matrix": [2, 11], "x": 10.75, "y": 2},
+ {"matrix": [2, 12], "x": 11.75, "y": 2},
+ {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 13], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 14], "x": 13.75, "y": 4, "w": 1.25}
+ ]
+ },
"LAYOUT_60_iso": {
"layout": [
- {"label":"\u00ac", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"\"", "x":2, "y":0}, {"label":"\u00a3", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Backspace", "x":13, "y":0, "w":2},
- {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1},
- {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"@", "x":11.75, "y":2}, {"label":"~", "x":12.75, "y":2}, {"label":"Enter", "x":13.75, "y":1, "w":1.25, "h":2},
- {"label":"Shift", "x":0, "y":3, "w":1.25}, {"label":"|", "x":1.25, "y":3}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":2.75},
- {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"label":"AltGr", "x":10, "y":4, "w":1.25}, {"label":"Win", "x":11.25, "y":4, "w":1.25}, {"label":"Menu", "x":12.5, "y":4, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}]
- },
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 2], "x": 1.5, "y": 1},
+ {"matrix": [1, 3], "x": 2.5, "y": 1},
+ {"matrix": [1, 4], "x": 3.5, "y": 1},
+ {"matrix": [1, 5], "x": 4.5, "y": 1},
+ {"matrix": [1, 6], "x": 5.5, "y": 1},
+ {"matrix": [1, 7], "x": 6.5, "y": 1},
+ {"matrix": [1, 8], "x": 7.5, "y": 1},
+ {"matrix": [1, 9], "x": 8.5, "y": 1},
+ {"matrix": [1, 10], "x": 9.5, "y": 1},
+ {"matrix": [1, 11], "x": 10.5, "y": 1},
+ {"matrix": [1, 12], "x": 11.5, "y": 1},
+ {"matrix": [1, 13], "x": 12.5, "y": 1},
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 2], "x": 1.75, "y": 2},
+ {"matrix": [2, 3], "x": 2.75, "y": 2},
+ {"matrix": [2, 4], "x": 3.75, "y": 2},
+ {"matrix": [2, 5], "x": 4.75, "y": 2},
+ {"matrix": [2, 6], "x": 5.75, "y": 2},
+ {"matrix": [2, 7], "x": 6.75, "y": 2},
+ {"matrix": [2, 8], "x": 7.75, "y": 2},
+ {"matrix": [2, 9], "x": 8.75, "y": 2},
+ {"matrix": [2, 10], "x": 9.75, "y": 2},
+ {"matrix": [2, 11], "x": 10.75, "y": 2},
+ {"matrix": [2, 12], "x": 11.75, "y": 2},
+ {"matrix": [2, 13], "x": 12.75, "y": 2},
+ {"matrix": [2, 14], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 3},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 13], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 14], "x": 13.75, "y": 4, "w": 1.25}
+ ]
+ },
"LAYOUT_60_ansi_split_bs_rshift": {
"layout": [
- {"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0},
- {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5},
- {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25},
- {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"x":14, "y":3},
- {"label":"Ctrl", "x":0, "y":4, "w":1.5}, {"label":"Win", "x":1.5, "y":4}, {"label":"Alt", "x":2.5, "y":4, "w":1.5}, {"x":4, "y":4, "w":6}, {"label":"Alt", "x":10, "y":4, "w":1.5}, {"label":"Win", "x":11.5, "y":4}, {"label":"Menu", "x":12.5, "y":4}, {"label":"Ctrl", "x":13.5, "y":4, "w":1.5}]
- },
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [0, 14], "x": 14, "y": 0},
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 2], "x": 1.5, "y": 1},
+ {"matrix": [1, 3], "x": 2.5, "y": 1},
+ {"matrix": [1, 4], "x": 3.5, "y": 1},
+ {"matrix": [1, 5], "x": 4.5, "y": 1},
+ {"matrix": [1, 6], "x": 5.5, "y": 1},
+ {"matrix": [1, 7], "x": 6.5, "y": 1},
+ {"matrix": [1, 8], "x": 7.5, "y": 1},
+ {"matrix": [1, 9], "x": 8.5, "y": 1},
+ {"matrix": [1, 10], "x": 9.5, "y": 1},
+ {"matrix": [1, 11], "x": 10.5, "y": 1},
+ {"matrix": [1, 12], "x": 11.5, "y": 1},
+ {"matrix": [1, 13], "x": 12.5, "y": 1},
+ {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 2], "x": 1.75, "y": 2},
+ {"matrix": [2, 3], "x": 2.75, "y": 2},
+ {"matrix": [2, 4], "x": 3.75, "y": 2},
+ {"matrix": [2, 5], "x": 4.75, "y": 2},
+ {"matrix": [2, 6], "x": 5.75, "y": 2},
+ {"matrix": [2, 7], "x": 6.75, "y": 2},
+ {"matrix": [2, 8], "x": 7.75, "y": 2},
+ {"matrix": [2, 9], "x": 8.75, "y": 2},
+ {"matrix": [2, 10], "x": 9.75, "y": 2},
+ {"matrix": [2, 11], "x": 10.75, "y": 2},
+ {"matrix": [2, 12], "x": 11.75, "y": 2},
+ {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 14], "x": 14, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+ {"matrix": [4, 1], "x": 1.5, "y": 4},
+ {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 6], "x": 4, "y": 4, "w": 6},
+ {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.5},
+ {"matrix": [4, 11], "x": 11.5, "y": 4},
+ {"matrix": [4, 13], "x": 12.5, "y": 4},
+ {"matrix": [4, 14], "x": 13.5, "y": 4, "w": 1.5}
+ ]
+ },
"LAYOUT_60_ansi_split_rshift": {
"layout": [
- {"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"x":13, "y":0, "w":2},
- {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5},
- {"label":"Esc", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25},
- {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"x":14, "y":3},
- {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Alt", "x":1.25, "y":4, "w": 1.25}, {"label":"Gui", "x":2.5, "y":4, "w":1.25}, {"label": "Space", "x":3.75, "y":4, "w":6.25}, {"label":"Fn", "x":10, "y":4, "w":1.25}, {"label":"Gui", "x":11.25, "y":4, "w": 1.25}, {"label":"Alt", "x":12.5, "y":4, "w": 1.25}, {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 2], "x": 1.5, "y": 1},
+ {"matrix": [1, 3], "x": 2.5, "y": 1},
+ {"matrix": [1, 4], "x": 3.5, "y": 1},
+ {"matrix": [1, 5], "x": 4.5, "y": 1},
+ {"matrix": [1, 6], "x": 5.5, "y": 1},
+ {"matrix": [1, 7], "x": 6.5, "y": 1},
+ {"matrix": [1, 8], "x": 7.5, "y": 1},
+ {"matrix": [1, 9], "x": 8.5, "y": 1},
+ {"matrix": [1, 10], "x": 9.5, "y": 1},
+ {"matrix": [1, 11], "x": 10.5, "y": 1},
+ {"matrix": [1, 12], "x": 11.5, "y": 1},
+ {"matrix": [1, 13], "x": 12.5, "y": 1},
+ {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 2], "x": 1.75, "y": 2},
+ {"matrix": [2, 3], "x": 2.75, "y": 2},
+ {"matrix": [2, 4], "x": 3.75, "y": 2},
+ {"matrix": [2, 5], "x": 4.75, "y": 2},
+ {"matrix": [2, 6], "x": 5.75, "y": 2},
+ {"matrix": [2, 7], "x": 6.75, "y": 2},
+ {"matrix": [2, 8], "x": 7.75, "y": 2},
+ {"matrix": [2, 9], "x": 8.75, "y": 2},
+ {"matrix": [2, 10], "x": 9.75, "y": 2},
+ {"matrix": [2, 11], "x": 10.75, "y": 2},
+ {"matrix": [2, 12], "x": 11.75, "y": 2},
+ {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 14], "x": 14, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 13], "x": 12.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 14], "x": 13.75, "y": 4, "w": 1.25}
]
},
-
"LAYOUT_60_ansi_tsangan_split_rshift": {
"layout": [
- {"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label": "Bksp", "x":13, "y":0, "w":2},
- {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5},
- {"label":"Esc", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25},
- {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label": "Alt Gr", "x":14, "y":3},
- {"label":"Ctrl", "x":0, "y":4, "w":1.5}, {"label":"Alt", "x":1.5, "y":4}, {"label":"GUI", "x":2.5, "y":4, "w":1.5}, {"label":"space", "x":4, "y":4, "w":7}, {"label":"Fn", "x":11, "y":4, "w":1.5}, {"label":"Alt", "x":12.5, "y":4}, {"label":"GUI", "x":13.5, "y":4, "w": 1.5}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 2], "x": 1.5, "y": 1},
+ {"matrix": [1, 3], "x": 2.5, "y": 1},
+ {"matrix": [1, 4], "x": 3.5, "y": 1},
+ {"matrix": [1, 5], "x": 4.5, "y": 1},
+ {"matrix": [1, 6], "x": 5.5, "y": 1},
+ {"matrix": [1, 7], "x": 6.5, "y": 1},
+ {"matrix": [1, 8], "x": 7.5, "y": 1},
+ {"matrix": [1, 9], "x": 8.5, "y": 1},
+ {"matrix": [1, 10], "x": 9.5, "y": 1},
+ {"matrix": [1, 11], "x": 10.5, "y": 1},
+ {"matrix": [1, 12], "x": 11.5, "y": 1},
+ {"matrix": [1, 13], "x": 12.5, "y": 1},
+ {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 2], "x": 1.75, "y": 2},
+ {"matrix": [2, 3], "x": 2.75, "y": 2},
+ {"matrix": [2, 4], "x": 3.75, "y": 2},
+ {"matrix": [2, 5], "x": 4.75, "y": 2},
+ {"matrix": [2, 6], "x": 5.75, "y": 2},
+ {"matrix": [2, 7], "x": 6.75, "y": 2},
+ {"matrix": [2, 8], "x": 7.75, "y": 2},
+ {"matrix": [2, 9], "x": 8.75, "y": 2},
+ {"matrix": [2, 10], "x": 9.75, "y": 2},
+ {"matrix": [2, 11], "x": 10.75, "y": 2},
+ {"matrix": [2, 12], "x": 11.75, "y": 2},
+ {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 14], "x": 14, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+ {"matrix": [4, 1], "x": 1.5, "y": 4},
+ {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+ {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+ {"matrix": [4, 13], "x": 12.5, "y": 4},
+ {"matrix": [4, 14], "x": 13.5, "y": 4, "w": 1.5}
]
},
-
"LAYOUT_60_hhkb": {
"layout": [
- {"label":"Esc", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"|", "x":13, "y":0}, {"label":"~", "x":14, "y":0},
- {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"Delete", "x":13.5, "y":1, "w":1.5},
- {"label":"Control", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25},
- {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"Fn", "x":14, "y":3},
- {"label":"Os", "x":1.5, "y":4}, {"label":"Alt", "x":2.5, "y":4, "w":1.5}, {"x":4, "y":4, "w":7}, {"label":"Alt", "x":11, "y":4, "w":1.5}, {"label":"Os", "x":12.5, "y":4}]
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [0, 14], "x": 14, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 2], "x": 1.5, "y": 1},
+ {"matrix": [1, 3], "x": 2.5, "y": 1},
+ {"matrix": [1, 4], "x": 3.5, "y": 1},
+ {"matrix": [1, 5], "x": 4.5, "y": 1},
+ {"matrix": [1, 6], "x": 5.5, "y": 1},
+ {"matrix": [1, 7], "x": 6.5, "y": 1},
+ {"matrix": [1, 8], "x": 7.5, "y": 1},
+ {"matrix": [1, 9], "x": 8.5, "y": 1},
+ {"matrix": [1, 10], "x": 9.5, "y": 1},
+ {"matrix": [1, 11], "x": 10.5, "y": 1},
+ {"matrix": [1, 12], "x": 11.5, "y": 1},
+ {"matrix": [1, 13], "x": 12.5, "y": 1},
+ {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 2], "x": 1.75, "y": 2},
+ {"matrix": [2, 3], "x": 2.75, "y": 2},
+ {"matrix": [2, 4], "x": 3.75, "y": 2},
+ {"matrix": [2, 5], "x": 4.75, "y": 2},
+ {"matrix": [2, 6], "x": 5.75, "y": 2},
+ {"matrix": [2, 7], "x": 6.75, "y": 2},
+ {"matrix": [2, 8], "x": 7.75, "y": 2},
+ {"matrix": [2, 9], "x": 8.75, "y": 2},
+ {"matrix": [2, 10], "x": 9.75, "y": 2},
+ {"matrix": [2, 11], "x": 10.75, "y": 2},
+ {"matrix": [2, 12], "x": 11.75, "y": 2},
+ {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 14], "x": 14, "y": 3},
+
+ {"matrix": [4, 1], "x": 1.5, "y": 4},
+ {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 6], "x": 4, "y": 4, "w": 7},
+ {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5},
+ {"matrix": [4, 13], "x": 12.5, "y": 4}
+ ]
}
}
}
diff --git a/keyboards/1upkeyboards/1up60rgb/keymaps/iso/keymap.c b/keyboards/1upkeyboards/1up60rgb/keymaps/iso/keymap.c
index b67de0b0c2..fd6087a238 100644
--- a/keyboards/1upkeyboards/1up60rgb/keymaps/iso/keymap.c
+++ b/keyboards/1upkeyboards/1up60rgb/keymaps/iso/keymap.c
@@ -1,4 +1,4 @@
-#include "1up60rgb.h"
+#include QMK_KEYBOARD_H
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
diff --git a/keyboards/1upkeyboards/1up60rgb/keymaps/tsangan/keymap.c b/keyboards/1upkeyboards/1up60rgb/keymaps/tsangan/keymap.c
index c8b2f84b72..a45947de54 100644
--- a/keyboards/1upkeyboards/1up60rgb/keymaps/tsangan/keymap.c
+++ b/keyboards/1upkeyboards/1up60rgb/keymaps/tsangan/keymap.c
@@ -1,4 +1,4 @@
-#include "1up60rgb.h"
+#include QMK_KEYBOARD_H
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
diff --git a/keyboards/1upkeyboards/pi40/config.h b/keyboards/1upkeyboards/pi40/config.h
index 5d3841ae85..361982d153 100644
--- a/keyboards/1upkeyboards/pi40/config.h
+++ b/keyboards/1upkeyboards/pi40/config.h
@@ -10,10 +10,8 @@
#define OLED_BRIGHTNESS 128
#define OLED_FONT_H "keyboards/1upkeyboards/pi40/lib/glcdfont.c"
-#define RGB_DI_PIN GP0
# define RGB_MATRIX_KEYPRESSES // reacts to keypresses
-# define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-# define RGBLIGHT_LIMIT_VAL 150
+# define RGB_MATRIX_FRAMEBUFFER_EFFECTS
#ifdef RGB_MATRIX_ENABLE
# define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150
diff --git a/keyboards/1upkeyboards/pi40/grid_v1_1/info.json b/keyboards/1upkeyboards/pi40/grid_v1_1/info.json
index b3c64f7dd4..695d5cb9b7 100644
--- a/keyboards/1upkeyboards/pi40/grid_v1_1/info.json
+++ b/keyboards/1upkeyboards/pi40/grid_v1_1/info.json
@@ -13,6 +13,10 @@
"dynamic_keymap": {
"layer_count": 10
},
+ "ws2812": {
+ "pin": "GP0",
+ "driver": "vendor"
+ },
"features": {
"audio": false,
"backlight": false,
@@ -26,123 +30,120 @@
"rgblight": false
},
"matrix_pins": {
- "rows": [ "GP21", "GP20", "GP19", "GP18" ],
- "cols": [ "GP1", "GP2", "GP3", "GP4", "GP5", "GP6", "GP7", "GP8", "GP9", "GP10", "GP11", "GP12", "GP22" ]
+ "rows": ["GP21", "GP20", "GP19", "GP18"],
+ "cols": ["GP1", "GP2", "GP3", "GP4", "GP5", "GP6", "GP7", "GP8", "GP9", "GP10", "GP11", "GP12", "GP22"]
},
"encoder": {
"enabled": true,
"rotary": [
- {
- "pin_a": "GP14",
- "pin_b": "GP13"
- }
+ {"pin_a": "GP14", "pin_b": "GP13"}
]
},
"rgb_matrix": {
"driver": "WS2812",
"layout": [
- { "flags": 1, "matrix": [0, 0], "x": 9, "y": 8 },
- { "flags": 4, "matrix": [0, 1], "x": 28, "y": 8 },
- { "flags": 4, "matrix": [0, 2], "x": 46, "y": 8 },
- { "flags": 4, "matrix": [0, 3], "x": 65, "y": 8 },
- { "flags": 4, "matrix": [0, 4], "x": 84, "y": 8 },
- { "flags": 4, "matrix": [0, 5], "x": 102, "y": 8 },
- { "flags": 4, "matrix": [0, 6], "x": 121, "y": 8 },
- { "flags": 4, "matrix": [0, 7], "x": 140, "y": 8 },
- { "flags": 4, "matrix": [0, 8], "x": 159, "y": 8 },
- { "flags": 4, "matrix": [0, 9], "x": 177, "y": 8 },
- { "flags": 4, "matrix": [0, 10], "x": 196, "y": 8 },
- { "flags": 1, "matrix": [0, 11], "x": 215, "y": 8 },
- { "flags": 1, "matrix": [1, 11], "x": 215, "y": 24 },
- { "flags": 4, "matrix": [1, 10], "x": 196, "y": 24 },
- { "flags": 4, "matrix": [1, 9], "x": 177, "y": 24 },
- { "flags": 4, "matrix": [1, 8], "x": 159, "y": 24 },
- { "flags": 4, "matrix": [1, 7], "x": 140, "y": 24 },
- { "flags": 4, "matrix": [1, 6], "x": 121, "y": 24 },
- { "flags": 4, "matrix": [1, 5], "x": 102, "y": 24 },
- { "flags": 4, "matrix": [1, 4], "x": 84, "y": 24 },
- { "flags": 4, "matrix": [1, 3], "x": 65, "y": 24 },
- { "flags": 4, "matrix": [1, 2], "x": 46, "y": 24 },
- { "flags": 4, "matrix": [1, 1], "x": 28, "y": 24 },
- { "flags": 1, "matrix": [1, 0], "x": 9, "y": 24 },
- { "flags": 1, "matrix": [2, 0], "x": 9, "y": 40 },
- { "flags": 4, "matrix": [2, 1], "x": 28, "y": 40 },
- { "flags": 4, "matrix": [2, 2], "x": 46, "y": 40 },
- { "flags": 4, "matrix": [2, 3], "x": 65, "y": 40 },
- { "flags": 4, "matrix": [2, 4], "x": 84, "y": 40 },
- { "flags": 4, "matrix": [2, 5], "x": 102, "y": 40 },
- { "flags": 4, "matrix": [2, 6], "x": 121, "y": 40 },
- { "flags": 4, "matrix": [2, 7], "x": 140, "y": 40 },
- { "flags": 4, "matrix": [2, 8], "x": 159, "y": 40 },
- { "flags": 4, "matrix": [2, 9], "x": 177, "y": 40 },
- { "flags": 4, "matrix": [2, 10], "x": 196, "y": 40 },
- { "flags": 1, "matrix": [2, 11], "x": 215, "y": 40 },
- { "flags": 1, "matrix": [3, 11], "x": 215, "y": 56 },
- { "flags": 1, "matrix": [3, 10], "x": 196, "y": 56 },
- { "flags": 1, "matrix": [3, 9], "x": 177, "y": 56 },
- { "flags": 1, "matrix": [3, 8], "x": 159, "y": 56 },
- { "flags": 1, "matrix": [3, 7], "x": 140, "y": 56 },
- { "flags": 1, "matrix": [3, 6], "x": 121, "y": 56 },
- { "flags": 1, "matrix": [3, 4], "x": 84, "y": 56 },
- { "flags": 1, "matrix": [3, 3], "x": 65, "y": 56 },
- { "flags": 1, "matrix": [3, 2], "x": 46, "y": 56 },
- { "flags": 1, "matrix": [3, 1], "x": 28, "y": 56 },
- { "flags": 1, "matrix": [3, 0], "x": 9, "y": 56 },
- { "flags": 1, "matrix": [3, 5], "x": 102, "y": 56 }
+ {"flags": 1, "matrix": [0, 0], "x": 9, "y": 8},
+ {"flags": 4, "matrix": [0, 1], "x": 28, "y": 8},
+ {"flags": 4, "matrix": [0, 2], "x": 46, "y": 8},
+ {"flags": 4, "matrix": [0, 3], "x": 65, "y": 8},
+ {"flags": 4, "matrix": [0, 4], "x": 84, "y": 8},
+ {"flags": 4, "matrix": [0, 5], "x": 102, "y": 8},
+ {"flags": 4, "matrix": [0, 6], "x": 121, "y": 8},
+ {"flags": 4, "matrix": [0, 7], "x": 140, "y": 8},
+ {"flags": 4, "matrix": [0, 8], "x": 159, "y": 8},
+ {"flags": 4, "matrix": [0, 9], "x": 177, "y": 8},
+ {"flags": 4, "matrix": [0, 10], "x": 196, "y": 8},
+ {"flags": 1, "matrix": [0, 11], "x": 215, "y": 8},
+ {"flags": 1, "matrix": [1, 11], "x": 215, "y": 24},
+ {"flags": 4, "matrix": [1, 10], "x": 196, "y": 24},
+ {"flags": 4, "matrix": [1, 9], "x": 177, "y": 24},
+ {"flags": 4, "matrix": [1, 8], "x": 159, "y": 24},
+ {"flags": 4, "matrix": [1, 7], "x": 140, "y": 24},
+ {"flags": 4, "matrix": [1, 6], "x": 121, "y": 24},
+ {"flags": 4, "matrix": [1, 5], "x": 102, "y": 24},
+ {"flags": 4, "matrix": [1, 4], "x": 84, "y": 24},
+ {"flags": 4, "matrix": [1, 3], "x": 65, "y": 24},
+ {"flags": 4, "matrix": [1, 2], "x": 46, "y": 24},
+ {"flags": 4, "matrix": [1, 1], "x": 28, "y": 24},
+ {"flags": 1, "matrix": [1, 0], "x": 9, "y": 24},
+ {"flags": 1, "matrix": [2, 0], "x": 9, "y": 40},
+ {"flags": 4, "matrix": [2, 1], "x": 28, "y": 40},
+ {"flags": 4, "matrix": [2, 2], "x": 46, "y": 40},
+ {"flags": 4, "matrix": [2, 3], "x": 65, "y": 40},
+ {"flags": 4, "matrix": [2, 4], "x": 84, "y": 40},
+ {"flags": 4, "matrix": [2, 5], "x": 102, "y": 40},
+ {"flags": 4, "matrix": [2, 6], "x": 121, "y": 40},
+ {"flags": 4, "matrix": [2, 7], "x": 140, "y": 40},
+ {"flags": 4, "matrix": [2, 8], "x": 159, "y": 40},
+ {"flags": 4, "matrix": [2, 9], "x": 177, "y": 40},
+ {"flags": 4, "matrix": [2, 10], "x": 196, "y": 40},
+ {"flags": 1, "matrix": [2, 11], "x": 215, "y": 40},
+ {"flags": 1, "matrix": [3, 11], "x": 215, "y": 56},
+ {"flags": 1, "matrix": [3, 10], "x": 196, "y": 56},
+ {"flags": 1, "matrix": [3, 9], "x": 177, "y": 56},
+ {"flags": 1, "matrix": [3, 8], "x": 159, "y": 56},
+ {"flags": 1, "matrix": [3, 7], "x": 140, "y": 56},
+ {"flags": 1, "matrix": [3, 6], "x": 121, "y": 56},
+ {"flags": 1, "matrix": [3, 4], "x": 84, "y": 56},
+ {"flags": 1, "matrix": [3, 3], "x": 65, "y": 56},
+ {"flags": 1, "matrix": [3, 2], "x": 46, "y": 56},
+ {"flags": 1, "matrix": [3, 1], "x": 28, "y": 56},
+ {"flags": 1, "matrix": [3, 0], "x": 9, "y": 56},
+ {"flags": 1, "matrix": [3, 5], "x": 102, "y": 56}
]
},
"layouts": {
"LAYOUT_ortho_4x12": {
"layout": [
- { "matrix": [0, 12], "x": 11, "y": 0 },
- { "matrix": [0, 0], "x": 0, "y": 1 },
- { "matrix": [0, 1], "x": 1, "y": 1 },
- { "matrix": [0, 2], "x": 2, "y": 1 },
- { "matrix": [0, 3], "x": 3, "y": 1 },
- { "matrix": [0, 4], "x": 4, "y": 1 },
- { "matrix": [0, 5], "x": 5, "y": 1 },
- { "matrix": [0, 6], "x": 6, "y": 1 },
- { "matrix": [0, 7], "x": 7, "y": 1 },
- { "matrix": [0, 8], "x": 8, "y": 1 },
- { "matrix": [0, 9], "x": 9, "y": 1 },
- { "matrix": [0, 10], "x": 10, "y": 1 },
- { "matrix": [0, 11], "x": 11, "y": 1 },
- { "matrix": [1, 0], "x": 0, "y": 2 },
- { "matrix": [1, 1], "x": 1, "y": 2 },
- { "matrix": [1, 2], "x": 2, "y": 2 },
- { "matrix": [1, 3], "x": 3, "y": 2 },
- { "matrix": [1, 4], "x": 4, "y": 2 },
- { "matrix": [1, 5], "x": 5, "y": 2 },
- { "matrix": [1, 6], "x": 6, "y": 2 },
- { "matrix": [1, 7], "x": 7, "y": 2 },
- { "matrix": [1, 8], "x": 8, "y": 2 },
- { "matrix": [1, 9], "x": 9, "y": 2 },
- { "matrix": [1, 10], "x": 10, "y": 2 },
- { "matrix": [1, 11], "x": 11, "y": 2 },
- { "matrix": [2, 0], "x": 0, "y": 3 },
- { "matrix": [2, 1], "x": 1, "y": 3 },
- { "matrix": [2, 2], "x": 2, "y": 3 },
- { "matrix": [2, 3], "x": 3, "y": 3 },
- { "matrix": [2, 4], "x": 4, "y": 3 },
- { "matrix": [2, 5], "x": 5, "y": 3 },
- { "matrix": [2, 6], "x": 6, "y": 3 },
- { "matrix": [2, 7], "x": 7, "y": 3 },
- { "matrix": [2, 8], "x": 8, "y": 3 },
- { "matrix": [2, 9], "x": 9, "y": 3 },
- { "matrix": [2, 10], "x": 10, "y": 3 },
- { "matrix": [2, 11], "x": 11, "y": 3 },
- { "matrix": [3, 0], "x": 0, "y": 4 },
- { "matrix": [3, 1], "x": 1, "y": 4 },
- { "matrix": [3, 2], "x": 2, "y": 4 },
- { "matrix": [3, 3], "x": 3, "y": 4 },
- { "matrix": [3, 4], "x": 4, "y": 4 },
- { "matrix": [3, 5], "x": 5, "y": 4 },
- { "matrix": [3, 6], "x": 6, "y": 4 },
- { "matrix": [3, 7], "x": 7, "y": 4 },
- { "matrix": [3, 8], "x": 8, "y": 4 },
- { "matrix": [3, 9], "x": 9, "y": 4 },
- { "matrix": [3, 10], "x": 10, "y": 4 },
- { "matrix": [3, 11], "x": 11, "y": 4 }
+ {"matrix": [0, 12], "x": 11, "y": 0},
+ {"matrix": [0, 0], "x": 0, "y": 1},
+ {"matrix": [0, 1], "x": 1, "y": 1},
+ {"matrix": [0, 2], "x": 2, "y": 1},
+ {"matrix": [0, 3], "x": 3, "y": 1},
+ {"matrix": [0, 4], "x": 4, "y": 1},
+ {"matrix": [0, 5], "x": 5, "y": 1},
+ {"matrix": [0, 6], "x": 6, "y": 1},
+ {"matrix": [0, 7], "x": 7, "y": 1},
+ {"matrix": [0, 8], "x": 8, "y": 1},
+ {"matrix": [0, 9], "x": 9, "y": 1},
+ {"matrix": [0, 10], "x": 10, "y": 1},
+ {"matrix": [0, 11], "x": 11, "y": 1},
+ {"matrix": [1, 0], "x": 0, "y": 2},
+ {"matrix": [1, 1], "x": 1, "y": 2},
+ {"matrix": [1, 2], "x": 2, "y": 2},
+ {"matrix": [1, 3], "x": 3, "y": 2},
+ {"matrix": [1, 4], "x": 4, "y": 2},
+ {"matrix": [1, 5], "x": 5, "y": 2},
+ {"matrix": [1, 6], "x": 6, "y": 2},
+ {"matrix": [1, 7], "x": 7, "y": 2},
+ {"matrix": [1, 8], "x": 8, "y": 2},
+ {"matrix": [1, 9], "x": 9, "y": 2},
+ {"matrix": [1, 10], "x": 10, "y": 2},
+ {"matrix": [1, 11], "x": 11, "y": 2},
+ {"matrix": [2, 0], "x": 0, "y": 3},
+ {"matrix": [2, 1], "x": 1, "y": 3},
+ {"matrix": [2, 2], "x": 2, "y": 3},
+ {"matrix": [2, 3], "x": 3, "y": 3},
+ {"matrix": [2, 4], "x": 4, "y": 3},
+ {"matrix": [2, 5], "x": 5, "y": 3},
+ {"matrix": [2, 6], "x": 6, "y": 3},
+ {"matrix": [2, 7], "x": 7, "y": 3},
+ {"matrix": [2, 8], "x": 8, "y": 3},
+ {"matrix": [2, 9], "x": 9, "y": 3},
+ {"matrix": [2, 10], "x": 10, "y": 3},
+ {"matrix": [2, 11], "x": 11, "y": 3},
+ {"matrix": [3, 0], "x": 0, "y": 4},
+ {"matrix": [3, 1], "x": 1, "y": 4},
+ {"matrix": [3, 2], "x": 2, "y": 4},
+ {"matrix": [3, 3], "x": 3, "y": 4},
+ {"matrix": [3, 4], "x": 4, "y": 4},
+ {"matrix": [3, 5], "x": 5, "y": 4},
+ {"matrix": [3, 6], "x": 6, "y": 4},
+ {"matrix": [3, 7], "x": 7, "y": 4},
+ {"matrix": [3, 8], "x": 8, "y": 4},
+ {"matrix": [3, 9], "x": 9, "y": 4},
+ {"matrix": [3, 10], "x": 10, "y": 4},
+ {"matrix": [3, 11], "x": 11, "y": 4}
]
}
}
diff --git a/keyboards/1upkeyboards/pi40/keymaps/default/keymap.c b/keyboards/1upkeyboards/pi40/keymaps/default/keymap.c
index 9aeaccb754..bc0d37eca0 100644
--- a/keyboards/1upkeyboards/pi40/keymaps/default/keymap.c
+++ b/keyboards/1upkeyboards/pi40/keymaps/default/keymap.c
@@ -115,7 +115,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] = {
[_ONE] = { ENCODER_CCW_CW(RGB_RMOD, RGB_MOD) },
[_TWO] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
[_THREE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
diff --git a/keyboards/1upkeyboards/pi40/keymaps/via/keymap.c b/keyboards/1upkeyboards/pi40/keymaps/via/keymap.c
index 8f5226ddf8..e8a14d493f 100644
--- a/keyboards/1upkeyboards/pi40/keymaps/via/keymap.c
+++ b/keyboards/1upkeyboards/pi40/keymaps/via/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] = {
[_ONE] = { ENCODER_CCW_CW(RGB_RMOD, RGB_MOD) },
[_TWO] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
[_THREE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
diff --git a/keyboards/1upkeyboards/pi40/mit_v1_0/info.json b/keyboards/1upkeyboards/pi40/mit_v1_0/info.json
index d476109f79..ebd5d64931 100644
--- a/keyboards/1upkeyboards/pi40/mit_v1_0/info.json
+++ b/keyboards/1upkeyboards/pi40/mit_v1_0/info.json
@@ -13,6 +13,10 @@
"dynamic_keymap": {
"layer_count": 10
},
+ "ws2812": {
+ "pin": "GP0",
+ "driver": "vendor"
+ },
"features": {
"audio": false,
"backlight": false,
@@ -26,122 +30,119 @@
"rgblight": false
},
"matrix_pins": {
- "rows": [ "GP21", "GP20", "GP19", "GP18" ],
- "cols": [ "GP1", "GP2", "GP3", "GP4", "GP5", "GP6", "GP7", "GP8", "GP9", "GP10", "GP11", "GP12", "GP22" ]
+ "rows": ["GP21", "GP20", "GP19", "GP18"],
+ "cols": ["GP1", "GP2", "GP3", "GP4", "GP5", "GP6", "GP7", "GP8", "GP9", "GP10", "GP11", "GP12", "GP22"]
},
"encoder": {
"enabled": true,
"rotary": [
- {
- "pin_a": "GP14",
- "pin_b": "GP13"
- }
+ {"pin_a": "GP14", "pin_b": "GP13"}
]
},
"rgb_matrix": {
"driver": "WS2812",
"layout": [
- { "flags": 1, "matrix": [0, 0], "x": 9, "y": 8 },
- { "flags": 4, "matrix": [0, 1], "x": 28, "y": 8 },
- { "flags": 4, "matrix": [0, 2], "x": 46, "y": 8 },
- { "flags": 4, "matrix": [0, 3], "x": 65, "y": 8 },
- { "flags": 4, "matrix": [0, 4], "x": 84, "y": 8 },
- { "flags": 4, "matrix": [0, 5], "x": 102, "y": 8 },
- { "flags": 4, "matrix": [0, 6], "x": 121, "y": 8 },
- { "flags": 4, "matrix": [0, 7], "x": 140, "y": 8 },
- { "flags": 4, "matrix": [0, 8], "x": 159, "y": 8 },
- { "flags": 4, "matrix": [0, 9], "x": 177, "y": 8 },
- { "flags": 4, "matrix": [0, 10], "x": 196, "y": 8 },
- { "flags": 1, "matrix": [0, 11], "x": 215, "y": 8 },
- { "flags": 1, "matrix": [1, 11], "x": 215, "y": 24 },
- { "flags": 4, "matrix": [1, 10], "x": 196, "y": 24 },
- { "flags": 4, "matrix": [1, 9], "x": 177, "y": 24 },
- { "flags": 4, "matrix": [1, 8], "x": 159, "y": 24 },
- { "flags": 4, "matrix": [1, 7], "x": 140, "y": 24 },
- { "flags": 4, "matrix": [1, 6], "x": 121, "y": 24 },
- { "flags": 4, "matrix": [1, 5], "x": 102, "y": 24 },
- { "flags": 4, "matrix": [1, 4], "x": 84, "y": 24 },
- { "flags": 4, "matrix": [1, 3], "x": 65, "y": 24 },
- { "flags": 4, "matrix": [1, 2], "x": 46, "y": 24 },
- { "flags": 4, "matrix": [1, 1], "x": 28, "y": 24 },
- { "flags": 1, "matrix": [1, 0], "x": 9, "y": 24 },
- { "flags": 1, "matrix": [2, 0], "x": 9, "y": 40 },
- { "flags": 4, "matrix": [2, 1], "x": 28, "y": 40 },
- { "flags": 4, "matrix": [2, 2], "x": 46, "y": 40 },
- { "flags": 4, "matrix": [2, 3], "x": 65, "y": 40 },
- { "flags": 4, "matrix": [2, 4], "x": 84, "y": 40 },
- { "flags": 4, "matrix": [2, 5], "x": 102, "y": 40 },
- { "flags": 4, "matrix": [2, 6], "x": 121, "y": 40 },
- { "flags": 4, "matrix": [2, 7], "x": 140, "y": 40 },
- { "flags": 4, "matrix": [2, 8], "x": 159, "y": 40 },
- { "flags": 4, "matrix": [2, 9], "x": 177, "y": 40 },
- { "flags": 4, "matrix": [2, 10], "x": 196, "y": 40 },
- { "flags": 1, "matrix": [2, 11], "x": 215, "y": 40 },
- { "flags": 1, "matrix": [3, 11], "x": 215, "y": 56 },
- { "flags": 1, "matrix": [3, 10], "x": 196, "y": 56 },
- { "flags": 1, "matrix": [3, 9], "x": 177, "y": 56 },
- { "flags": 1, "matrix": [3, 8], "x": 159, "y": 56 },
- { "flags": 1, "matrix": [3, 7], "x": 140, "y": 56 },
- { "flags": 1, "matrix": [3, 5], "x": 112, "y": 56 },
- { "flags": 1, "matrix": [3, 4], "x": 84, "y": 56 },
- { "flags": 1, "matrix": [3, 3], "x": 65, "y": 56 },
- { "flags": 1, "matrix": [3, 2], "x": 46, "y": 56 },
- { "flags": 1, "matrix": [3, 1], "x": 28, "y": 56 },
- { "flags": 1, "matrix": [3, 0], "x": 9, "y": 56 }
+ {"flags": 1, "matrix": [0, 0], "x": 9, "y": 8},
+ {"flags": 4, "matrix": [0, 1], "x": 28, "y": 8},
+ {"flags": 4, "matrix": [0, 2], "x": 46, "y": 8},
+ {"flags": 4, "matrix": [0, 3], "x": 65, "y": 8},
+ {"flags": 4, "matrix": [0, 4], "x": 84, "y": 8},
+ {"flags": 4, "matrix": [0, 5], "x": 102, "y": 8},
+ {"flags": 4, "matrix": [0, 6], "x": 121, "y": 8},
+ {"flags": 4, "matrix": [0, 7], "x": 140, "y": 8},
+ {"flags": 4, "matrix": [0, 8], "x": 159, "y": 8},
+ {"flags": 4, "matrix": [0, 9], "x": 177, "y": 8},
+ {"flags": 4, "matrix": [0, 10], "x": 196, "y": 8},
+ {"flags": 1, "matrix": [0, 11], "x": 215, "y": 8},
+ {"flags": 1, "matrix": [1, 11], "x": 215, "y": 24},
+ {"flags": 4, "matrix": [1, 10], "x": 196, "y": 24},
+ {"flags": 4, "matrix": [1, 9], "x": 177, "y": 24},
+ {"flags": 4, "matrix": [1, 8], "x": 159, "y": 24},
+ {"flags": 4, "matrix": [1, 7], "x": 140, "y": 24},
+ {"flags": 4, "matrix": [1, 6], "x": 121, "y": 24},
+ {"flags": 4, "matrix": [1, 5], "x": 102, "y": 24},
+ {"flags": 4, "matrix": [1, 4], "x": 84, "y": 24},
+ {"flags": 4, "matrix": [1, 3], "x": 65, "y": 24},
+ {"flags": 4, "matrix": [1, 2], "x": 46, "y": 24},
+ {"flags": 4, "matrix": [1, 1], "x": 28, "y": 24},
+ {"flags": 1, "matrix": [1, 0], "x": 9, "y": 24},
+ {"flags": 1, "matrix": [2, 0], "x": 9, "y": 40},
+ {"flags": 4, "matrix": [2, 1], "x": 28, "y": 40},
+ {"flags": 4, "matrix": [2, 2], "x": 46, "y": 40},
+ {"flags": 4, "matrix": [2, 3], "x": 65, "y": 40},
+ {"flags": 4, "matrix": [2, 4], "x": 84, "y": 40},
+ {"flags": 4, "matrix": [2, 5], "x": 102, "y": 40},
+ {"flags": 4, "matrix": [2, 6], "x": 121, "y": 40},
+ {"flags": 4, "matrix": [2, 7], "x": 140, "y": 40},
+ {"flags": 4, "matrix": [2, 8], "x": 159, "y": 40},
+ {"flags": 4, "matrix": [2, 9], "x": 177, "y": 40},
+ {"flags": 4, "matrix": [2, 10], "x": 196, "y": 40},
+ {"flags": 1, "matrix": [2, 11], "x": 215, "y": 40},
+ {"flags": 1, "matrix": [3, 11], "x": 215, "y": 56},
+ {"flags": 1, "matrix": [3, 10], "x": 196, "y": 56},
+ {"flags": 1, "matrix": [3, 9], "x": 177, "y": 56},
+ {"flags": 1, "matrix": [3, 8], "x": 159, "y": 56},
+ {"flags": 1, "matrix": [3, 7], "x": 140, "y": 56},
+ {"flags": 1, "matrix": [3, 5], "x": 112, "y": 56},
+ {"flags": 1, "matrix": [3, 4], "x": 84, "y": 56},
+ {"flags": 1, "matrix": [3, 3], "x": 65, "y": 56},
+ {"flags": 1, "matrix": [3, 2], "x": 46, "y": 56},
+ {"flags": 1, "matrix": [3, 1], "x": 28, "y": 56},
+ {"flags": 1, "matrix": [3, 0], "x": 9, "y": 56}
]
},
"layouts": {
"LAYOUT_ortho_4x12": {
"layout": [
- { "matrix": [3, 6], "x": 11, "y": 0 },
- { "matrix": [0, 0], "x": 0, "y": 1 },
- { "matrix": [0, 1], "x": 1, "y": 1 },
- { "matrix": [0, 2], "x": 2, "y": 1 },
- { "matrix": [0, 3], "x": 3, "y": 1 },
- { "matrix": [0, 4], "x": 4, "y": 1 },
- { "matrix": [0, 5], "x": 5, "y": 1 },
- { "matrix": [0, 6], "x": 6, "y": 1 },
- { "matrix": [0, 7], "x": 7, "y": 1 },
- { "matrix": [0, 8], "x": 8, "y": 1 },
- { "matrix": [0, 9], "x": 9, "y": 1 },
- { "matrix": [0, 10], "x": 10, "y": 1 },
- { "matrix": [0, 11], "x": 11, "y": 1 },
- { "matrix": [1, 0], "x": 0, "y": 2 },
- { "matrix": [1, 1], "x": 1, "y": 2 },
- { "matrix": [1, 2], "x": 2, "y": 2 },
- { "matrix": [1, 3], "x": 3, "y": 2 },
- { "matrix": [1, 4], "x": 4, "y": 2 },
- { "matrix": [1, 5], "x": 5, "y": 2 },
- { "matrix": [1, 6], "x": 6, "y": 2 },
- { "matrix": [1, 7], "x": 7, "y": 2 },
- { "matrix": [1, 8], "x": 8, "y": 2 },
- { "matrix": [1, 9], "x": 9, "y": 2 },
- { "matrix": [1, 10], "x": 10, "y": 2 },
- { "matrix": [1, 11], "x": 11, "y": 2 },
- { "matrix": [2, 0], "x": 0, "y": 3 },
- { "matrix": [2, 1], "x": 1, "y": 3 },
- { "matrix": [2, 2], "x": 2, "y": 3 },
- { "matrix": [2, 3], "x": 3, "y": 3 },
- { "matrix": [2, 4], "x": 4, "y": 3 },
- { "matrix": [2, 5], "x": 5, "y": 3 },
- { "matrix": [2, 6], "x": 6, "y": 3 },
- { "matrix": [2, 7], "x": 7, "y": 3 },
- { "matrix": [2, 8], "x": 8, "y": 3 },
- { "matrix": [2, 9], "x": 9, "y": 3 },
- { "matrix": [2, 10], "x": 10, "y": 3 },
- { "matrix": [2, 11], "x": 11, "y": 3 },
- { "matrix": [3, 0], "x": 0, "y": 4 },
- { "matrix": [3, 1], "x": 1, "y": 4 },
- { "matrix": [3, 2], "x": 2, "y": 4 },
- { "matrix": [3, 3], "x": 3, "y": 4 },
- { "matrix": [3, 4], "x": 4, "y": 4 },
- { "matrix": [3, 5], "x": 5, "y": 4 },
- { "matrix": [0, 12], "x": 6, "y": 4 },
- { "matrix": [3, 7], "x": 7, "y": 4 },
- { "matrix": [3, 8], "x": 8, "y": 4 },
- { "matrix": [3, 9], "x": 9, "y": 4 },
- { "matrix": [3, 10], "x": 10, "y": 4 },
- { "matrix": [3, 11], "x": 11, "y": 4 }
+ {"matrix": [3, 6], "x": 11, "y": 0},
+ {"matrix": [0, 0], "x": 0, "y": 1},
+ {"matrix": [0, 1], "x": 1, "y": 1},
+ {"matrix": [0, 2], "x": 2, "y": 1},
+ {"matrix": [0, 3], "x": 3, "y": 1},
+ {"matrix": [0, 4], "x": 4, "y": 1},
+ {"matrix": [0, 5], "x": 5, "y": 1},
+ {"matrix": [0, 6], "x": 6, "y": 1},
+ {"matrix": [0, 7], "x": 7, "y": 1},
+ {"matrix": [0, 8], "x": 8, "y": 1},
+ {"matrix": [0, 9], "x": 9, "y": 1},
+ {"matrix": [0, 10], "x": 10, "y": 1},
+ {"matrix": [0, 11], "x": 11, "y": 1},
+ {"matrix": [1, 0], "x": 0, "y": 2},
+ {"matrix": [1, 1], "x": 1, "y": 2},
+ {"matrix": [1, 2], "x": 2, "y": 2},
+ {"matrix": [1, 3], "x": 3, "y": 2},
+ {"matrix": [1, 4], "x": 4, "y": 2},
+ {"matrix": [1, 5], "x": 5, "y": 2},
+ {"matrix": [1, 6], "x": 6, "y": 2},
+ {"matrix": [1, 7], "x": 7, "y": 2},
+ {"matrix": [1, 8], "x": 8, "y": 2},
+ {"matrix": [1, 9], "x": 9, "y": 2},
+ {"matrix": [1, 10], "x": 10, "y": 2},
+ {"matrix": [1, 11], "x": 11, "y": 2},
+ {"matrix": [2, 0], "x": 0, "y": 3},
+ {"matrix": [2, 1], "x": 1, "y": 3},
+ {"matrix": [2, 2], "x": 2, "y": 3},
+ {"matrix": [2, 3], "x": 3, "y": 3},
+ {"matrix": [2, 4], "x": 4, "y": 3},
+ {"matrix": [2, 5], "x": 5, "y": 3},
+ {"matrix": [2, 6], "x": 6, "y": 3},
+ {"matrix": [2, 7], "x": 7, "y": 3},
+ {"matrix": [2, 8], "x": 8, "y": 3},
+ {"matrix": [2, 9], "x": 9, "y": 3},
+ {"matrix": [2, 10], "x": 10, "y": 3},
+ {"matrix": [2, 11], "x": 11, "y": 3},
+ {"matrix": [3, 0], "x": 0, "y": 4},
+ {"matrix": [3, 1], "x": 1, "y": 4},
+ {"matrix": [3, 2], "x": 2, "y": 4},
+ {"matrix": [3, 3], "x": 3, "y": 4},
+ {"matrix": [3, 4], "x": 4, "y": 4},
+ {"matrix": [3, 5], "x": 5, "y": 4},
+ {"matrix": [0, 12], "x": 6, "y": 4},
+ {"matrix": [3, 7], "x": 7, "y": 4},
+ {"matrix": [3, 8], "x": 8, "y": 4},
+ {"matrix": [3, 9], "x": 9, "y": 4},
+ {"matrix": [3, 10], "x": 10, "y": 4},
+ {"matrix": [3, 11], "x": 11, "y": 4}
]
}
}
diff --git a/keyboards/1upkeyboards/pi40/mit_v1_1/info.json b/keyboards/1upkeyboards/pi40/mit_v1_1/info.json
index 9e01928554..3ee2e738f1 100644
--- a/keyboards/1upkeyboards/pi40/mit_v1_1/info.json
+++ b/keyboards/1upkeyboards/pi40/mit_v1_1/info.json
@@ -13,6 +13,10 @@
"dynamic_keymap": {
"layer_count": 10
},
+ "ws2812": {
+ "pin": "GP0",
+ "driver": "vendor"
+ },
"features": {
"audio": false,
"backlight": false,
@@ -26,122 +30,119 @@
"rgblight": false
},
"matrix_pins": {
- "rows": [ "GP21", "GP20", "GP19", "GP18" ],
- "cols": [ "GP1", "GP2", "GP3", "GP4", "GP5", "GP6", "GP7", "GP8", "GP9", "GP10", "GP11", "GP12", "GP22" ]
+ "rows": ["GP21", "GP20", "GP19", "GP18"],
+ "cols": ["GP1", "GP2", "GP3", "GP4", "GP5", "GP6", "GP7", "GP8", "GP9", "GP10", "GP11", "GP12", "GP22"]
},
"encoder": {
"enabled": true,
"rotary": [
- {
- "pin_a": "GP14",
- "pin_b": "GP13"
- }
+ {"pin_a": "GP14", "pin_b": "GP13"}
]
},
"rgb_matrix": {
"driver": "WS2812",
"layout": [
- { "flags": 1, "matrix": [0, 0], "x": 9, "y": 8 },
- { "flags": 4, "matrix": [0, 1], "x": 28, "y": 8 },
- { "flags": 4, "matrix": [0, 2], "x": 46, "y": 8 },
- { "flags": 4, "matrix": [0, 3], "x": 65, "y": 8 },
- { "flags": 4, "matrix": [0, 4], "x": 84, "y": 8 },
- { "flags": 4, "matrix": [0, 5], "x": 102, "y": 8 },
- { "flags": 4, "matrix": [0, 6], "x": 121, "y": 8 },
- { "flags": 4, "matrix": [0, 7], "x": 140, "y": 8 },
- { "flags": 4, "matrix": [0, 8], "x": 159, "y": 8 },
- { "flags": 4, "matrix": [0, 9], "x": 177, "y": 8 },
- { "flags": 4, "matrix": [0, 10], "x": 196, "y": 8 },
- { "flags": 1, "matrix": [0, 11], "x": 215, "y": 8 },
- { "flags": 1, "matrix": [1, 11], "x": 215, "y": 24 },
- { "flags": 4, "matrix": [1, 10], "x": 196, "y": 24 },
- { "flags": 4, "matrix": [1, 9], "x": 177, "y": 24 },
- { "flags": 4, "matrix": [1, 8], "x": 159, "y": 24 },
- { "flags": 4, "matrix": [1, 7], "x": 140, "y": 24 },
- { "flags": 4, "matrix": [1, 6], "x": 121, "y": 24 },
- { "flags": 4, "matrix": [1, 5], "x": 102, "y": 24 },
- { "flags": 4, "matrix": [1, 4], "x": 84, "y": 24 },
- { "flags": 4, "matrix": [1, 3], "x": 65, "y": 24 },
- { "flags": 4, "matrix": [1, 2], "x": 46, "y": 24 },
- { "flags": 4, "matrix": [1, 1], "x": 28, "y": 24 },
- { "flags": 1, "matrix": [1, 0], "x": 9, "y": 24 },
- { "flags": 1, "matrix": [2, 0], "x": 9, "y": 40 },
- { "flags": 4, "matrix": [2, 1], "x": 28, "y": 40 },
- { "flags": 4, "matrix": [2, 2], "x": 46, "y": 40 },
- { "flags": 4, "matrix": [2, 3], "x": 65, "y": 40 },
- { "flags": 4, "matrix": [2, 4], "x": 84, "y": 40 },
- { "flags": 4, "matrix": [2, 5], "x": 102, "y": 40 },
- { "flags": 4, "matrix": [2, 6], "x": 121, "y": 40 },
- { "flags": 4, "matrix": [2, 7], "x": 140, "y": 40 },
- { "flags": 4, "matrix": [2, 8], "x": 159, "y": 40 },
- { "flags": 4, "matrix": [2, 9], "x": 177, "y": 40 },
- { "flags": 4, "matrix": [2, 10], "x": 196, "y": 40 },
- { "flags": 1, "matrix": [2, 11], "x": 215, "y": 40 },
- { "flags": 1, "matrix": [3, 11], "x": 215, "y": 56 },
- { "flags": 1, "matrix": [3, 10], "x": 196, "y": 56 },
- { "flags": 1, "matrix": [3, 9], "x": 177, "y": 56 },
- { "flags": 1, "matrix": [3, 8], "x": 159, "y": 56 },
- { "flags": 1, "matrix": [3, 7], "x": 140, "y": 56 },
- { "flags": 1, "matrix": [3, 5], "x": 112, "y": 56 },
- { "flags": 1, "matrix": [3, 4], "x": 84, "y": 56 },
- { "flags": 1, "matrix": [3, 3], "x": 65, "y": 56 },
- { "flags": 1, "matrix": [3, 2], "x": 46, "y": 56 },
- { "flags": 1, "matrix": [3, 1], "x": 28, "y": 56 },
- { "flags": 1, "matrix": [3, 0], "x": 9, "y": 56 }
+ {"flags": 1, "matrix": [0, 0], "x": 9, "y": 8},
+ {"flags": 4, "matrix": [0, 1], "x": 28, "y": 8},
+ {"flags": 4, "matrix": [0, 2], "x": 46, "y": 8},
+ {"flags": 4, "matrix": [0, 3], "x": 65, "y": 8},
+ {"flags": 4, "matrix": [0, 4], "x": 84, "y": 8},
+ {"flags": 4, "matrix": [0, 5], "x": 102, "y": 8},
+ {"flags": 4, "matrix": [0, 6], "x": 121, "y": 8},
+ {"flags": 4, "matrix": [0, 7], "x": 140, "y": 8},
+ {"flags": 4, "matrix": [0, 8], "x": 159, "y": 8},
+ {"flags": 4, "matrix": [0, 9], "x": 177, "y": 8},
+ {"flags": 4, "matrix": [0, 10], "x": 196, "y": 8},
+ {"flags": 1, "matrix": [0, 11], "x": 215, "y": 8},
+ {"flags": 1, "matrix": [1, 11], "x": 215, "y": 24},
+ {"flags": 4, "matrix": [1, 10], "x": 196, "y": 24},
+ {"flags": 4, "matrix": [1, 9], "x": 177, "y": 24},
+ {"flags": 4, "matrix": [1, 8], "x": 159, "y": 24},
+ {"flags": 4, "matrix": [1, 7], "x": 140, "y": 24},
+ {"flags": 4, "matrix": [1, 6], "x": 121, "y": 24},
+ {"flags": 4, "matrix": [1, 5], "x": 102, "y": 24},
+ {"flags": 4, "matrix": [1, 4], "x": 84, "y": 24},
+ {"flags": 4, "matrix": [1, 3], "x": 65, "y": 24},
+ {"flags": 4, "matrix": [1, 2], "x": 46, "y": 24},
+ {"flags": 4, "matrix": [1, 1], "x": 28, "y": 24},
+ {"flags": 1, "matrix": [1, 0], "x": 9, "y": 24},
+ {"flags": 1, "matrix": [2, 0], "x": 9, "y": 40},
+ {"flags": 4, "matrix": [2, 1], "x": 28, "y": 40},
+ {"flags": 4, "matrix": [2, 2], "x": 46, "y": 40},
+ {"flags": 4, "matrix": [2, 3], "x": 65, "y": 40},
+ {"flags": 4, "matrix": [2, 4], "x": 84, "y": 40},
+ {"flags": 4, "matrix": [2, 5], "x": 102, "y": 40},
+ {"flags": 4, "matrix": [2, 6], "x": 121, "y": 40},
+ {"flags": 4, "matrix": [2, 7], "x": 140, "y": 40},
+ {"flags": 4, "matrix": [2, 8], "x": 159, "y": 40},
+ {"flags": 4, "matrix": [2, 9], "x": 177, "y": 40},
+ {"flags": 4, "matrix": [2, 10], "x": 196, "y": 40},
+ {"flags": 1, "matrix": [2, 11], "x": 215, "y": 40},
+ {"flags": 1, "matrix": [3, 11], "x": 215, "y": 56},
+ {"flags": 1, "matrix": [3, 10], "x": 196, "y": 56},
+ {"flags": 1, "matrix": [3, 9], "x": 177, "y": 56},
+ {"flags": 1, "matrix": [3, 8], "x": 159, "y": 56},
+ {"flags": 1, "matrix": [3, 7], "x": 140, "y": 56},
+ {"flags": 1, "matrix": [3, 5], "x": 112, "y": 56},
+ {"flags": 1, "matrix": [3, 4], "x": 84, "y": 56},
+ {"flags": 1, "matrix": [3, 3], "x": 65, "y": 56},
+ {"flags": 1, "matrix": [3, 2], "x": 46, "y": 56},
+ {"flags": 1, "matrix": [3, 1], "x": 28, "y": 56},
+ {"flags": 1, "matrix": [3, 0], "x": 9, "y": 56}
]
},
"layouts": {
"LAYOUT_ortho_4x12": {
"layout": [
- { "matrix": [0, 12], "x": 11, "y": 0 },
- { "matrix": [0, 0], "x": 0, "y": 1 },
- { "matrix": [0, 1], "x": 1, "y": 1 },
- { "matrix": [0, 2], "x": 2, "y": 1 },
- { "matrix": [0, 3], "x": 3, "y": 1 },
- { "matrix": [0, 4], "x": 4, "y": 1 },
- { "matrix": [0, 5], "x": 5, "y": 1 },
- { "matrix": [0, 6], "x": 6, "y": 1 },
- { "matrix": [0, 7], "x": 7, "y": 1 },
- { "matrix": [0, 8], "x": 8, "y": 1 },
- { "matrix": [0, 9], "x": 9, "y": 1 },
- { "matrix": [0, 10], "x": 10, "y": 1 },
- { "matrix": [0, 11], "x": 11, "y": 1 },
- { "matrix": [1, 0], "x": 0, "y": 2 },
- { "matrix": [1, 1], "x": 1, "y": 2 },
- { "matrix": [1, 2], "x": 2, "y": 2 },
- { "matrix": [1, 3], "x": 3, "y": 2 },
- { "matrix": [1, 4], "x": 4, "y": 2 },
- { "matrix": [1, 5], "x": 5, "y": 2 },
- { "matrix": [1, 6], "x": 6, "y": 2 },
- { "matrix": [1, 7], "x": 7, "y": 2 },
- { "matrix": [1, 8], "x": 8, "y": 2 },
- { "matrix": [1, 9], "x": 9, "y": 2 },
- { "matrix": [1, 10], "x": 10, "y": 2 },
- { "matrix": [1, 11], "x": 11, "y": 2 },
- { "matrix": [2, 0], "x": 0, "y": 3 },
- { "matrix": [2, 1], "x": 1, "y": 3 },
- { "matrix": [2, 2], "x": 2, "y": 3 },
- { "matrix": [2, 3], "x": 3, "y": 3 },
- { "matrix": [2, 4], "x": 4, "y": 3 },
- { "matrix": [2, 5], "x": 5, "y": 3 },
- { "matrix": [2, 6], "x": 6, "y": 3 },
- { "matrix": [2, 7], "x": 7, "y": 3 },
- { "matrix": [2, 8], "x": 8, "y": 3 },
- { "matrix": [2, 9], "x": 9, "y": 3 },
- { "matrix": [2, 10], "x": 10, "y": 3 },
- { "matrix": [2, 11], "x": 11, "y": 3 },
- { "matrix": [3, 0], "x": 0, "y": 4 },
- { "matrix": [3, 1], "x": 1, "y": 4 },
- { "matrix": [3, 2], "x": 2, "y": 4 },
- { "matrix": [3, 3], "x": 3, "y": 4 },
- { "matrix": [3, 4], "x": 4, "y": 4 },
- { "matrix": [3, 5], "x": 5, "y": 4 },
- { "matrix": [3, 6], "x": 6, "y": 4 },
- { "matrix": [3, 7], "x": 7, "y": 4 },
- { "matrix": [3, 8], "x": 8, "y": 4 },
- { "matrix": [3, 9], "x": 9, "y": 4 },
- { "matrix": [3, 10], "x": 10, "y": 4 },
- { "matrix": [3, 11], "x": 11, "y": 4 }
+ {"matrix": [0, 12], "x": 11, "y": 0},
+ {"matrix": [0, 0], "x": 0, "y": 1},
+ {"matrix": [0, 1], "x": 1, "y": 1},
+ {"matrix": [0, 2], "x": 2, "y": 1},
+ {"matrix": [0, 3], "x": 3, "y": 1},
+ {"matrix": [0, 4], "x": 4, "y": 1},
+ {"matrix": [0, 5], "x": 5, "y": 1},
+ {"matrix": [0, 6], "x": 6, "y": 1},
+ {"matrix": [0, 7], "x": 7, "y": 1},
+ {"matrix": [0, 8], "x": 8, "y": 1},
+ {"matrix": [0, 9], "x": 9, "y": 1},
+ {"matrix": [0, 10], "x": 10, "y": 1},
+ {"matrix": [0, 11], "x": 11, "y": 1},
+ {"matrix": [1, 0], "x": 0, "y": 2},
+ {"matrix": [1, 1], "x": 1, "y": 2},
+ {"matrix": [1, 2], "x": 2, "y": 2},
+ {"matrix": [1, 3], "x": 3, "y": 2},
+ {"matrix": [1, 4], "x": 4, "y": 2},
+ {"matrix": [1, 5], "x": 5, "y": 2},
+ {"matrix": [1, 6], "x": 6, "y": 2},
+ {"matrix": [1, 7], "x": 7, "y": 2},
+ {"matrix": [1, 8], "x": 8, "y": 2},
+ {"matrix": [1, 9], "x": 9, "y": 2},
+ {"matrix": [1, 10], "x": 10, "y": 2},
+ {"matrix": [1, 11], "x": 11, "y": 2},
+ {"matrix": [2, 0], "x": 0, "y": 3},
+ {"matrix": [2, 1], "x": 1, "y": 3},
+ {"matrix": [2, 2], "x": 2, "y": 3},
+ {"matrix": [2, 3], "x": 3, "y": 3},
+ {"matrix": [2, 4], "x": 4, "y": 3},
+ {"matrix": [2, 5], "x": 5, "y": 3},
+ {"matrix": [2, 6], "x": 6, "y": 3},
+ {"matrix": [2, 7], "x": 7, "y": 3},
+ {"matrix": [2, 8], "x": 8, "y": 3},
+ {"matrix": [2, 9], "x": 9, "y": 3},
+ {"matrix": [2, 10], "x": 10, "y": 3},
+ {"matrix": [2, 11], "x": 11, "y": 3},
+ {"matrix": [3, 0], "x": 0, "y": 4},
+ {"matrix": [3, 1], "x": 1, "y": 4},
+ {"matrix": [3, 2], "x": 2, "y": 4},
+ {"matrix": [3, 3], "x": 3, "y": 4},
+ {"matrix": [3, 4], "x": 4, "y": 4},
+ {"matrix": [3, 5], "x": 5, "y": 4},
+ {"matrix": [3, 6], "x": 6, "y": 4},
+ {"matrix": [3, 7], "x": 7, "y": 4},
+ {"matrix": [3, 8], "x": 8, "y": 4},
+ {"matrix": [3, 9], "x": 9, "y": 4},
+ {"matrix": [3, 10], "x": 10, "y": 4},
+ {"matrix": [3, 11], "x": 11, "y": 4}
]
}
}
diff --git a/keyboards/1upkeyboards/pi40/rules.mk b/keyboards/1upkeyboards/pi40/rules.mk
index 75f06c3f2b..e858deae6a 100644
--- a/keyboards/1upkeyboards/pi40/rules.mk
+++ b/keyboards/1upkeyboards/pi40/rules.mk
@@ -1,5 +1,3 @@
-WS2812_DRIVER = vendor
-
OLED_ENABLE = yes
OLED_DRIVER = SSD1306
diff --git a/keyboards/1upkeyboards/pi50/config.h b/keyboards/1upkeyboards/pi50/config.h
index 2ef22f12d0..4c17e6a4f0 100644
--- a/keyboards/1upkeyboards/pi50/config.h
+++ b/keyboards/1upkeyboards/pi50/config.h
@@ -3,69 +3,17 @@
#pragma once
-#define OLED_DISPLAY_128X32
#define I2C1_SCL_PIN GP11
#define I2C1_SDA_PIN GP10
#define I2C_DRIVER I2CD1
#define OLED_BRIGHTNESS 128
#define OLED_FONT_H "keyboards/1upkeyboards/pi50/lib/glcdfont.c"
-#define RGB_DI_PIN GP0
-# define RGB_MATRIX_KEYPRESSES // reacts to keypresses
-# define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-# define RGBLIGHT_LIMIT_VAL 150
-# define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
-# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150
-// RGB Matrix Animation modes. Explicitly enabled
-// For full list of effects, see:
-// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
-# define ENABLE_RGB_MATRIX_ALPHAS_MODS
-# define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
-# define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
-# define ENABLE_RGB_MATRIX_BREATHING
-# define ENABLE_RGB_MATRIX_BAND_SAT
-# define ENABLE_RGB_MATRIX_BAND_VAL
-# define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
-# define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
-# define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
-# define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
-# define ENABLE_RGB_MATRIX_CYCLE_ALL
-# define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
-# define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
-# define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
-# define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
-# define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
-# define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
-# define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
-# define ENABLE_RGB_MATRIX_DUAL_BEACON
-# define ENABLE_RGB_MATRIX_RAINBOW_BEACON
-# define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
-# define ENABLE_RGB_MATRIX_RAINDROPS
-# define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
-# define ENABLE_RGB_MATRIX_HUE_BREATHING
-# define ENABLE_RGB_MATRIX_HUE_PENDULUM
-# define ENABLE_RGB_MATRIX_HUE_WAVE
-# define ENABLE_RGB_MATRIX_PIXEL_RAIN
-# define ENABLE_RGB_MATRIX_PIXEL_FLOW
-# define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
-// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined
-# define ENABLE_RGB_MATRIX_TYPING_HEATMAP
-# define ENABLE_RGB_MATRIX_DIGITAL_RAIN
-// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined
-# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
-# define ENABLE_RGB_MATRIX_SOLID_REACTIVE
-# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
-# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
-# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
-# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
-# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
-# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
-# define ENABLE_RGB_MATRIX_SPLASH
-# define ENABLE_RGB_MATRIX_MULTISPLASH
-# define ENABLE_RGB_MATRIX_SOLID_SPLASH
-# define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
+#define RGB_MATRIX_KEYPRESSES // reacts to keypresses
+#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
+#define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE \ No newline at end of file
+#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/1upkeyboards/pi50/info.json b/keyboards/1upkeyboards/pi50/info.json
index c34db68509..1880c78d44 100644
--- a/keyboards/1upkeyboards/pi50/info.json
+++ b/keyboards/1upkeyboards/pi50/info.json
@@ -24,7 +24,8 @@
"mousekey": true,
"nkro": false,
"rgb_matrix": true,
- "rgblight": false
+ "rgblight": false,
+ "oled": true
},
"matrix_pins": {
"rows": ["GP20", "GP15", "GP19", "GP14", "GP18", "GP13", "GP17", "GP12", "GP16", "GP21"],
@@ -37,6 +38,57 @@
]
},
"rgb_matrix": {
- "driver": "WS2812"
+ "driver": "WS2812",
+ "max_brightness": 150,
+ "animations": {
+ "solid_color": true,
+ "alphas_mods": true,
+ "gradient_up_down": true,
+ "gradient_left_right": true,
+ "breathing": true,
+ "band_sat": true,
+ "band_val": true,
+ "band_pinwheel_sat": true,
+ "band_pinwheel_val": true,
+ "band_spiral_sat": true,
+ "band_spiral_val": true,
+ "cycle_all": true,
+ "cycle_left_right": true,
+ "cycle_up_down": true,
+ "cycle_out_in": true,
+ "cycle_out_in_dual": true,
+ "rainbow_moving_chevron": true,
+ "cycle_pinwheel": true,
+ "cycle_spiral": true,
+ "dual_beacon": true,
+ "rainbow_beacon": true,
+ "rainbow_pinwheels": true,
+ "raindrops": true,
+ "jellybean_raindrops": true,
+ "hue_breathing": true,
+ "hue_pendulum": true,
+ "hue_wave": true,
+ "pixel_fractal": true,
+ "pixel_flow": true,
+ "pixel_rain": true,
+ "typing_heatmap": true,
+ "digital_rain": true,
+ "solid_reactive_simple": true,
+ "solid_reactive": true,
+ "solid_reactive_wide": true,
+ "solid_reactive_multiwide": true,
+ "solid_reactive_cross": true,
+ "solid_reactive_multicross": true,
+ "solid_reactive_nexus": true,
+ "solid_reactive_multinexus": true,
+ "splash": true,
+ "multisplash": true,
+ "solid_splash": true,
+ "solid_multisplash": true
+ }
+ },
+ "ws2812": {
+ "pin": "GP0",
+ "driver": "vendor"
}
}
diff --git a/keyboards/1upkeyboards/pi50/keymaps/default/keymap.c b/keyboards/1upkeyboards/pi50/keymaps/default/keymap.c
index 8df3a613fb..bd66c00bff 100644
--- a/keyboards/1upkeyboards/pi50/keymaps/default/keymap.c
+++ b/keyboards/1upkeyboards/pi50/keymaps/default/keymap.c
@@ -127,7 +127,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] = {
[_ONE] = { ENCODER_CCW_CW(RGB_RMOD, RGB_MOD) },
[_TWO] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
[_THREE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
diff --git a/keyboards/1upkeyboards/pi50/keymaps/via/keymap.c b/keyboards/1upkeyboards/pi50/keymaps/via/keymap.c
index ff4cb35f5a..b800a9a68b 100644
--- a/keyboards/1upkeyboards/pi50/keymaps/via/keymap.c
+++ b/keyboards/1upkeyboards/pi50/keymaps/via/keymap.c
@@ -271,7 +271,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] = {
[_ONE] = { ENCODER_CCW_CW(RGB_RMOD, RGB_MOD) },
[_TWO] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
[_THREE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
diff --git a/keyboards/1upkeyboards/pi50/rules.mk b/keyboards/1upkeyboards/pi50/rules.mk
index ac7fc4203b..a9660074af 100644
--- a/keyboards/1upkeyboards/pi50/rules.mk
+++ b/keyboards/1upkeyboards/pi50/rules.mk
@@ -1,5 +1 @@
-WS2812_DRIVER = vendor
-
-OLED_ENABLE = yes
-
-DEFAULT_FOLDER = 1upkeyboards/pi50/grid \ No newline at end of file
+DEFAULT_FOLDER = 1upkeyboards/pi50/grid
diff --git a/keyboards/1upkeyboards/pi60/config.h b/keyboards/1upkeyboards/pi60/config.h
index 3ba6144e59..8940acb004 100644
--- a/keyboards/1upkeyboards/pi60/config.h
+++ b/keyboards/1upkeyboards/pi60/config.h
@@ -5,7 +5,6 @@
#define DYNAMIC_KEYMAP_LAYER_COUNT 10
-#define RGB_DI_PIN GP17
#define RGB_MATRIX_LED_COUNT 21
//#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
//#define RGB_MATRIX_KEYPRESSES
diff --git a/keyboards/1upkeyboards/pi60/info.json b/keyboards/1upkeyboards/pi60/info.json
index d8a63123cf..00d32ec973 100644
--- a/keyboards/1upkeyboards/pi60/info.json
+++ b/keyboards/1upkeyboards/pi60/info.json
@@ -24,6 +24,10 @@
"rgb_matrix": true,
"rgblight": false
},
+ "ws2812": {
+ "pin": "GP17",
+ "driver": "vendor"
+ },
"matrix_pins": {
"cols": ["GP5", "GP8", "GP11", "GP6", "GP7", "GP0", "GP26", "GP10", "GP9", "GP1", "GP18", "GP20", "GP21", "GP27", "GP28", "GP19"],
"rows": ["GP12", "GP13", "GP16", "GP25", "GP29"]
@@ -31,118 +35,109 @@
"encoder": {
"enabled": true,
"rotary": [
- {
- "pin_a": "GP4",
- "pin_b": "GP3"
- },
- {
- "pin_a": "GP22",
- "pin_b": "GP2"
- },
- {
- "pin_a": "GP23",
- "pin_b": "GP24"
- }
+ {"pin_a": "GP4", "pin_b": "GP3"},
+ {"pin_a": "GP22", "pin_b": "GP2"},
+ {"pin_a": "GP23", "pin_b": "GP24"}
]
},
"rgb_matrix": {
"driver": "WS2812",
"layout": [
- { "flags": 2, "x": 17, "y": 50 },
- { "flags": 2, "x": 37, "y": 50 },
- { "flags": 2, "x": 56, "y": 50 },
- { "flags": 2, "x": 77, "y": 50 },
- { "flags": 2, "x": 94, "y": 50 },
- { "flags": 2, "x": 114, "y": 50 },
- { "flags": 2, "x": 131, "y": 50 },
- { "flags": 2, "x": 148, "y": 50 },
- { "flags": 2, "x": 168, "y": 50 },
- { "flags": 2, "x": 188, "y": 50 },
- { "flags": 2, "x": 209, "y": 50 },
- { "flags": 2, "x": 209, "y": 13 },
- { "flags": 2, "x": 187, "y": 13 },
- { "flags": 2, "x": 166, "y": 13 },
- { "flags": 2, "x": 145, "y": 13 },
- { "flags": 2, "x": 126, "y": 13 },
- { "flags": 2, "x": 109, "y": 13 },
- { "flags": 2, "x": 90, "y": 13 },
- { "flags": 2, "x": 71, "y": 13 },
- { "flags": 2, "x": 54, "y": 13 },
- { "flags": 2, "x": 20, "y": 13 }
+ {"flags": 2, "x": 17, "y": 50},
+ {"flags": 2, "x": 37, "y": 50},
+ {"flags": 2, "x": 56, "y": 50},
+ {"flags": 2, "x": 77, "y": 50},
+ {"flags": 2, "x": 94, "y": 50},
+ {"flags": 2, "x": 114, "y": 50},
+ {"flags": 2, "x": 131, "y": 50},
+ {"flags": 2, "x": 148, "y": 50},
+ {"flags": 2, "x": 168, "y": 50},
+ {"flags": 2, "x": 188, "y": 50},
+ {"flags": 2, "x": 209, "y": 50},
+ {"flags": 2, "x": 209, "y": 13},
+ {"flags": 2, "x": 187, "y": 13},
+ {"flags": 2, "x": 166, "y": 13},
+ {"flags": 2, "x": 145, "y": 13},
+ {"flags": 2, "x": 126, "y": 13},
+ {"flags": 2, "x": 109, "y": 13},
+ {"flags": 2, "x": 90, "y": 13},
+ {"flags": 2, "x": 71, "y": 13},
+ {"flags": 2, "x": 54, "y": 13},
+ {"flags": 2, "x": 20, "y": 13}
]
},
"layouts": {
"LAYOUT_60_ansi": {
"layout": [
- { "label": "Esc", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
- { "label": "1", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 },
- { "label": "2", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 },
- { "label": "3", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 },
- { "label": "4", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 },
- { "label": "5", "matrix": [0, 5], "w": 1, "x": 5, "y": 0 },
- { "label": "6", "matrix": [0, 6], "w": 1, "x": 6, "y": 0 },
- { "label": "7", "matrix": [0, 7], "w": 1, "x": 7, "y": 0 },
- { "label": "8", "matrix": [0, 8], "w": 1, "x": 8, "y": 0 },
- { "label": "9", "matrix": [0, 9], "w": 1, "x": 9, "y": 0 },
- { "label": "0", "matrix": [0, 10], "w": 1, "x": 10, "y": 0 },
- { "label": "-", "matrix": [0, 11], "w": 1, "x": 11, "y": 0 },
- { "label": "=", "matrix": [0, 12], "w": 1, "x": 12, "y": 0 },
- { "label": "BS", "matrix": [0, 13], "w": 1, "x": 13, "y": 0 },
- { "label": "~", "matrix": [0, 14], "w": 1, "x": 14, "y": 0 },
- { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
- { "label": "Q", "matrix": [1, 1], "w": 1, "x": 1.5, "y": 1 },
- { "label": "W", "matrix": [1, 2], "w": 1, "x": 2.5, "y": 1 },
- { "label": "E", "matrix": [1, 3], "w": 1, "x": 3.5, "y": 1 },
- { "label": "R", "matrix": [1, 4], "w": 1, "x": 4.5, "y": 1 },
- { "label": "T", "matrix": [1, 5], "w": 1, "x": 5.5, "y": 1 },
- { "label": "Y", "matrix": [1, 6], "w": 1, "x": 6.5, "y": 1 },
- { "label": "U", "matrix": [1, 7], "w": 1, "x": 7.5, "y": 1 },
- { "label": "I", "matrix": [1, 8], "w": 1, "x": 8.5, "y": 1 },
- { "label": "O", "matrix": [1, 9], "w": 1, "x": 9.5, "y": 1 },
- { "label": "P", "matrix": [1, 10], "w": 1, "x": 10.5, "y": 1 },
- { "label": "[", "matrix": [1, 11], "w": 1, "x": 11.5, "y": 1 },
- { "label": "]", "matrix": [1, 12], "w": 1, "x": 12.5, "y": 1 },
- { "label": "|", "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1 },
- { "label": "Caps", "matrix": [2, 15], "w": 1.75, "x": 0, "y": 2 },
- { "label": "A", "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2 },
- { "label": "S", "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2 },
- { "label": "D", "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2 },
- { "label": "F", "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2 },
- { "label": "G", "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2 },
- { "label": "H", "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2 },
- { "label": "J", "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2 },
- { "label": "K", "matrix": [2, 8], "w": 1, "x": 8.75, "y": 2 },
- { "label": "L", "matrix": [2, 9], "w": 1, "x": 9.75, "y": 2 },
- { "label": ";", "matrix": [2, 10], "w": 1, "x": 10.75, "y": 2 },
- { "label": "'", "matrix": [2, 11], "w": 1, "x": 11.75, "y": 2 },
- { "label": "ISO'", "matrix": [2, 12], "w": 1, "x": 12.75, "y": 2 },
- { "label": "Enter", "matrix": [2, 13], "w": 1.25, "x": 13.75, "y": 2 },
- { "label": "LShift", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3 },
- { "label": "ISO<>", "matrix": [3, 1], "w": 1, "x": 1.25, "y": 3 },
- { "label": "Z", "matrix": [3, 2], "w": 1, "x": 2.25, "y": 3 },
- { "label": "X", "matrix": [3, 3], "w": 1, "x": 3.25, "y": 3 },
- { "label": "C", "matrix": [3, 4], "w": 1, "x": 4.25, "y": 3 },
- { "label": "V", "matrix": [3, 5], "w": 1, "x": 5.25, "y": 3 },
- { "label": "B", "matrix": [3, 6], "w": 1, "x": 6.25, "y": 3 },
- { "label": "N", "matrix": [3, 7], "w": 1, "x": 7.25, "y": 3 },
- { "label": "M", "matrix": [3, 8], "w": 1, "x": 8.25, "y": 3 },
- { "label": ",", "matrix": [3, 9], "w": 1, "x": 9.25, "y": 3 },
- { "label": ".", "matrix": [3, 10], "w": 1, "x": 10.25, "y": 3 },
- { "label": "/", "matrix": [3, 11], "w": 1.75, "x": 11.25, "y": 3 },
- { "label": "RShift", "matrix": [3, 12], "w": 1, "x": 13, "y": 3 },
- { "label": "FN", "matrix": [3, 14], "w": 1, "x": 14, "y": 3 },
- { "label": "LCtrl", "matrix": [4, 15], "w": 1.25, "x": 0, "y": 4 },
- { "label": "LGui", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 },
- { "label": "LAlt", "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 },
- { "label": "LSpace", "matrix": [4, 4], "w": 2.75, "x": 3.75, "y": 4 },
- { "label": "CSpace", "matrix": [4, 6], "w": 1.25, "x": 6.5, "y": 4 },
- { "label": "RSpace", "matrix": [4, 8], "w": 2.25, "x": 7.75, "y": 4 },
- { "label": "RAlt", "matrix": [4, 10], "w": 1, "x": 10, "y": 4 },
- { "label": "FN", "matrix": [4, 11], "w": 1, "x": 11, "y": 4 },
- { "label": "Mid1U", "matrix": [4, 12], "w": 1, "x": 12, "y": 4 },
- { "label": "Menu", "matrix": [4, 13], "w": 1, "x": 13, "y": 4 },
- { "label": "RCtrl", "matrix": [4, 14], "w": 1, "x": 14, "y": 4 }
+ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+ {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+ {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+ {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+ {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+ {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+ {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+ {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+ {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+ {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+ {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+ {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+ {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+ {"label": "BS", "matrix": [0, 13], "x": 13, "y": 0},
+ {"label": "~", "matrix": [0, 14], "x": 14, "y": 0},
+ {"label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1},
+ {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+ {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+ {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+ {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+ {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+ {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+ {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+ {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+ {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+ {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+ {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+ {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+ {"label": "|", "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1},
+ {"label": "Caps", "matrix": [2, 15], "w": 1.75, "x": 0, "y": 2},
+ {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+ {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+ {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+ {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+ {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+ {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+ {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+ {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+ {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+ {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+ {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+ {"label": "ISO'", "matrix": [2, 12], "x": 12.75, "y": 2},
+ {"label": "Enter", "matrix": [2, 13], "w": 1.25, "x": 13.75, "y": 2},
+ {"label": "LShift", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3},
+ {"label": "ISO<>", "matrix": [3, 1], "x": 1.25, "y": 3},
+ {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3},
+ {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3},
+ {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3},
+ {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3},
+ {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3},
+ {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3},
+ {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3},
+ {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3},
+ {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3},
+ {"label": "/", "matrix": [3, 11], "w": 1.75, "x": 11.25, "y": 3},
+ {"label": "RShift", "matrix": [3, 12], "x": 13, "y": 3},
+ {"label": "FN", "matrix": [3, 14], "x": 14, "y": 3},
+ {"label": "LCtrl", "matrix": [4, 15], "w": 1.25, "x": 0, "y": 4},
+ {"label": "LGui", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4},
+ {"label": "LAlt", "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4},
+ {"label": "LSpace", "matrix": [4, 4], "w": 2.75, "x": 3.75, "y": 4},
+ {"label": "CSpace", "matrix": [4, 6], "w": 1.25, "x": 6.5, "y": 4},
+ {"label": "RSpace", "matrix": [4, 8], "w": 2.25, "x": 7.75, "y": 4},
+ {"label": "RAlt", "matrix": [4, 10], "x": 10, "y": 4},
+ {"label": "FN", "matrix": [4, 11], "x": 11, "y": 4},
+ {"label": "Mid1U", "matrix": [4, 12], "x": 12, "y": 4},
+ {"label": "Menu", "matrix": [4, 13], "x": 13, "y": 4},
+ {"label": "RCtrl", "matrix": [4, 14], "x": 14, "y": 4}
]
}
}
-} \ No newline at end of file
+}
diff --git a/keyboards/1upkeyboards/pi60/keymaps/default/keymap.c b/keyboards/1upkeyboards/pi60/keymaps/default/keymap.c
index fb11a271d7..15b593362d 100644
--- a/keyboards/1upkeyboards/pi60/keymaps/default/keymap.c
+++ b/keyboards/1upkeyboards/pi60/keymaps/default/keymap.c
@@ -52,7 +52,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] = {
[0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
[1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
[2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
diff --git a/keyboards/1upkeyboards/pi60/keymaps/via/keymap.c b/keyboards/1upkeyboards/pi60/keymaps/via/keymap.c
index 70739d2e9e..f9187727eb 100644
--- a/keyboards/1upkeyboards/pi60/keymaps/via/keymap.c
+++ b/keyboards/1upkeyboards/pi60/keymaps/via/keymap.c
@@ -100,7 +100,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] = {
[0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
[1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
[2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
diff --git a/keyboards/1upkeyboards/pi60/rules.mk b/keyboards/1upkeyboards/pi60/rules.mk
index 8e853e0af7..e69de29bb2 100644
--- a/keyboards/1upkeyboards/pi60/rules.mk
+++ b/keyboards/1upkeyboards/pi60/rules.mk
@@ -1 +0,0 @@
-WS2812_DRIVER = vendor \ No newline at end of file
diff --git a/keyboards/1upkeyboards/pi60_hse/config.h b/keyboards/1upkeyboards/pi60_hse/config.h
index 1bfa848547..02100955e4 100644
--- a/keyboards/1upkeyboards/pi60_hse/config.h
+++ b/keyboards/1upkeyboards/pi60_hse/config.h
@@ -5,7 +5,6 @@
#define DYNAMIC_KEYMAP_LAYER_COUNT 10
-#define RGB_DI_PIN GP15
#define RGB_MATRIX_LED_COUNT 16
#define RGBLED_NUM 16
#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
diff --git a/keyboards/1upkeyboards/pi60_hse/info.json b/keyboards/1upkeyboards/pi60_hse/info.json
index 2fb271382f..01b0236975 100644
--- a/keyboards/1upkeyboards/pi60_hse/info.json
+++ b/keyboards/1upkeyboards/pi60_hse/info.json
@@ -23,6 +23,10 @@
"rgb_matrix": true,
"rgblight": false
},
+ "ws2812": {
+ "pin": "GP15",
+ "driver": "vendor"
+ },
"matrix_pins": {
"cols": ["GP9", "GP8", "GP6", "GP5", "GP14", "GP20", "GP13", "GP12", "GP11", "GP16", "GP17", "GP10", "GP19", "GP18"],
"rows": ["GP4", "GP3", "GP2", "GP1", "GP0", "GP21"]
@@ -30,22 +34,22 @@
"rgb_matrix": {
"driver": "WS2812",
"layout": [
- { "flags": 2, "x": 98, "y": 51 },
- { "flags": 2, "x": 68, "y": 51 },
- { "flags": 2, "x": 41, "y": 51 },
- { "flags": 2, "x": 12, "y": 51 },
- { "flags": 2, "x": 12, "y": 13 },
- { "flags": 2, "x": 41, "y": 13 },
- { "flags": 2, "x": 69, "y": 13 },
- { "flags": 2, "x": 98, "y": 13 },
- { "flags": 2, "x": 126, "y": 13 },
- { "flags": 2, "x": 155, "y": 13 },
- { "flags": 2, "x": 183, "y": 13 },
- { "flags": 2, "x": 212, "y": 13 },
- { "flags": 2, "x": 208, "y": 51 },
- { "flags": 2, "x": 183, "y": 51 },
- { "flags": 2, "x": 157, "y": 51 },
- { "flags": 2, "x": 126, "y": 51 }
+ {"flags": 2, "x": 98, "y": 51},
+ {"flags": 2, "x": 68, "y": 51},
+ {"flags": 2, "x": 41, "y": 51},
+ {"flags": 2, "x": 12, "y": 51},
+ {"flags": 2, "x": 12, "y": 13},
+ {"flags": 2, "x": 41, "y": 13},
+ {"flags": 2, "x": 69, "y": 13},
+ {"flags": 2, "x": 98, "y": 13},
+ {"flags": 2, "x": 126, "y": 13},
+ {"flags": 2, "x": 155, "y": 13},
+ {"flags": 2, "x": 183, "y": 13},
+ {"flags": 2, "x": 212, "y": 13},
+ {"flags": 2, "x": 208, "y": 51},
+ {"flags": 2, "x": 183, "y": 51},
+ {"flags": 2, "x": 157, "y": 51},
+ {"flags": 2, "x": 126, "y": 51}
]
},
"community_layouts": [
@@ -54,70 +58,70 @@
"layouts": {
"LAYOUT_60_ansi_split_bs_rshift": {
"layout": [
- { "label": "Esc", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
- { "label": "1", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 },
- { "label": "2", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 },
- { "label": "3", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 },
- { "label": "4", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 },
- { "label": "5", "matrix": [0, 5], "w": 1, "x": 5, "y": 0 },
- { "label": "6", "matrix": [0, 6], "w": 1, "x": 6, "y": 0 },
- { "label": "7", "matrix": [0, 7], "w": 1, "x": 7, "y": 0 },
- { "label": "8", "matrix": [0, 8], "w": 1, "x": 8, "y": 0 },
- { "label": "9", "matrix": [0, 9], "w": 1, "x": 9, "y": 0 },
- { "label": "0", "matrix": [0, 10], "w": 1, "x": 10, "y": 0 },
- { "label": "-", "matrix": [0, 11], "w": 1, "x": 11, "y": 0 },
- { "label": "=", "matrix": [0, 12], "w": 1, "x": 12, "y": 0 },
- { "label": "BS", "matrix": [0, 13], "w": 1, "x": 13, "y": 0 },
- { "label": "~", "matrix": [1, 13], "w": 1, "x": 14, "y": 0 },
- { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
- { "label": "Q", "matrix": [1, 1], "w": 1, "x": 1.5, "y": 1 },
- { "label": "W", "matrix": [1, 2], "w": 1, "x": 2.5, "y": 1 },
- { "label": "E", "matrix": [1, 3], "w": 1, "x": 3.5, "y": 1 },
- { "label": "R", "matrix": [1, 4], "w": 1, "x": 4.5, "y": 1 },
- { "label": "T", "matrix": [1, 5], "w": 1, "x": 5.5, "y": 1 },
- { "label": "Y", "matrix": [1, 6], "w": 1, "x": 6.5, "y": 1 },
- { "label": "U", "matrix": [1, 7], "w": 1, "x": 7.5, "y": 1 },
- { "label": "I", "matrix": [1, 8], "w": 1, "x": 8.5, "y": 1 },
- { "label": "O", "matrix": [1, 9], "w": 1, "x": 9.5, "y": 1 },
- { "label": "P", "matrix": [1, 10], "w": 1, "x": 10.5, "y": 1 },
- { "label": "[", "matrix": [1, 11], "w": 1, "x": 11.5, "y": 1 },
- { "label": "]", "matrix": [1, 12], "w": 1, "x": 12.5, "y": 1 },
- { "label": "|", "matrix": [2, 12], "w": 1.5, "x": 13.5, "y": 1 },
- { "label": "Caps", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
- { "label": "A", "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2 },
- { "label": "S", "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2 },
- { "label": "D", "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2 },
- { "label": "F", "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2 },
- { "label": "G", "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2 },
- { "label": "H", "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2 },
- { "label": "J", "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2 },
- { "label": "K", "matrix": [2, 8], "w": 1, "x": 8.75, "y": 2 },
- { "label": "L", "matrix": [2, 9], "w": 1, "x": 9.75, "y": 2 },
- { "label": ";", "matrix": [2, 10], "w": 1, "x": 10.75, "y": 2 },
- { "label": "'", "matrix": [2, 11], "w": 1, "x": 11.75, "y": 2 },
- { "label": "Enter", "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2 },
- { "label": "LShift", "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3 },
- { "label": "Z", "matrix": [3, 1], "w": 1, "x": 2.25, "y": 3 },
- { "label": "X", "matrix": [3, 2], "w": 1, "x": 3.25, "y": 3 },
- { "label": "C", "matrix": [3, 3], "w": 1, "x": 4.25, "y": 3 },
- { "label": "V", "matrix": [3, 4], "w": 1, "x": 5.25, "y": 3 },
- { "label": "B", "matrix": [3, 5], "w": 1, "x": 6.25, "y": 3 },
- { "label": "N", "matrix": [3, 6], "w": 1, "x": 7.25, "y": 3 },
- { "label": "M", "matrix": [3, 7], "w": 1, "x": 8.25, "y": 3 },
- { "label": ",", "matrix": [3, 8], "w": 1, "x": 9.25, "y": 3 },
- { "label": ".", "matrix": [3, 9], "w": 1, "x": 10.25, "y": 3 },
- { "label": "/", "matrix": [3, 10], "w": 1, "x": 11.25, "y": 3 },
- { "label": "RShift", "matrix": [3, 12], "w": 1.75, "x": 12.25, "y": 3 },
- { "label": "FN", "matrix": [3, 13], "w": 1, "x": 14, "y": 3 },
- { "label": "LCtrl", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 },
- { "label": "LGui", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 },
- { "label": "LAlt", "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 },
- { "label": "Space", "matrix": [5, 5], "w": 6.25, "x": 3.75, "y": 4 },
- { "label": "RAlt", "matrix": [5, 9], "w": 1.25, "x": 10, "y": 4 },
- { "label": "RGui", "matrix": [5, 10], "w": 1.25, "x": 11.25, "y": 4 },
- { "label": "Menu", "matrix": [5, 12], "w": 1.25, "x": 12.5, "y": 4 },
- { "label": "RCtrl", "matrix": [5, 13], "w": 1.25, "x": 13.75, "y": 4 }
+ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+ {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+ {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+ {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+ {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+ {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+ {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+ {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+ {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+ {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+ {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+ {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+ {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+ {"label": "BS", "matrix": [0, 13], "x": 13, "y": 0},
+ {"label": "~", "matrix": [1, 13], "x": 14, "y": 0},
+ {"label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1},
+ {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+ {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+ {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+ {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+ {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+ {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+ {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+ {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+ {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+ {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+ {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+ {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+ {"label": "|", "matrix": [2, 12], "w": 1.5, "x": 13.5, "y": 1},
+ {"label": "Caps", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2},
+ {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+ {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+ {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+ {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+ {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+ {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+ {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+ {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+ {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+ {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+ {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+ {"label": "Enter", "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2},
+ {"label": "LShift", "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3},
+ {"label": "Z", "matrix": [3, 1], "x": 2.25, "y": 3},
+ {"label": "X", "matrix": [3, 2], "x": 3.25, "y": 3},
+ {"label": "C", "matrix": [3, 3], "x": 4.25, "y": 3},
+ {"label": "V", "matrix": [3, 4], "x": 5.25, "y": 3},
+ {"label": "B", "matrix": [3, 5], "x": 6.25, "y": 3},
+ {"label": "N", "matrix": [3, 6], "x": 7.25, "y": 3},
+ {"label": "M", "matrix": [3, 7], "x": 8.25, "y": 3},
+ {"label": ",", "matrix": [3, 8], "x": 9.25, "y": 3},
+ {"label": ".", "matrix": [3, 9], "x": 10.25, "y": 3},
+ {"label": "/", "matrix": [3, 10], "x": 11.25, "y": 3},
+ {"label": "RShift", "matrix": [3, 12], "w": 1.75, "x": 12.25, "y": 3},
+ {"label": "FN", "matrix": [3, 13], "x": 14, "y": 3},
+ {"label": "LCtrl", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4},
+ {"label": "LGui", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4},
+ {"label": "LAlt", "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4},
+ {"label": "Space", "matrix": [5, 5], "w": 6.25, "x": 3.75, "y": 4},
+ {"label": "RAlt", "matrix": [5, 9], "w": 1.25, "x": 10, "y": 4},
+ {"label": "RGui", "matrix": [5, 10], "w": 1.25, "x": 11.25, "y": 4},
+ {"label": "Menu", "matrix": [5, 12], "w": 1.25, "x": 12.5, "y": 4},
+ {"label": "RCtrl", "matrix": [5, 13], "w": 1.25, "x": 13.75, "y": 4}
]
}
}
-} \ No newline at end of file
+}
diff --git a/keyboards/1upkeyboards/pi60_hse/rules.mk b/keyboards/1upkeyboards/pi60_hse/rules.mk
index 997fce7e65..e69de29bb2 100644
--- a/keyboards/1upkeyboards/pi60_hse/rules.mk
+++ b/keyboards/1upkeyboards/pi60_hse/rules.mk
@@ -1 +0,0 @@
-WS2812_DRIVER = vendor
diff --git a/keyboards/1upkeyboards/pi60_rgb/config.h b/keyboards/1upkeyboards/pi60_rgb/config.h
index 7c05197ea2..b0747bd56d 100644
--- a/keyboards/1upkeyboards/pi60_rgb/config.h
+++ b/keyboards/1upkeyboards/pi60_rgb/config.h
@@ -3,8 +3,6 @@
#pragma once
-
-#define RGB_DI_PIN GP19
#define RGB_MATRIX_LED_COUNT 61
#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
#define RGB_MATRIX_KEYPRESSES // reacts to keypresses
diff --git a/keyboards/1upkeyboards/pi60_rgb/info.json b/keyboards/1upkeyboards/pi60_rgb/info.json
index 22afdb58a0..d78705352a 100644
--- a/keyboards/1upkeyboards/pi60_rgb/info.json
+++ b/keyboards/1upkeyboards/pi60_rgb/info.json
@@ -26,6 +26,10 @@
"rgb_matrix": true,
"rgblight": false
},
+ "ws2812": {
+ "pin": "GP19",
+ "driver": "vendor"
+ },
"matrix_pins": {
"cols": ["GP3", "GP4", "GP5", "GP20", "GP18", "GP13", "GP17", "GP16", "GP15", "GP12", "GP11", "GP14", "GP10", "GP9"],
"rows": ["GP1", "GP2", "GP8", "GP6", "GP0", "GP21"]
@@ -36,134 +40,134 @@
"rgb_matrix": {
"driver": "WS2812",
"layout": [
- { "flags": 1, "matrix": [5, 5], "x": 103, "y": 58 },
- { "flags": 1, "matrix": [5, 10], "x": 159, "y": 58 },
- { "flags": 1, "matrix": [5, 11], "x": 178, "y": 58 },
- { "flags": 1, "matrix": [5, 12], "x": 196, "y": 58 },
- { "flags": 1, "matrix": [5, 13], "x": 215, "y": 58 },
- { "flags": 1, "matrix": [3, 13], "x": 204, "y": 45 },
- { "flags": 4, "matrix": [3, 10], "x": 176, "y": 45 },
- { "flags": 4, "matrix": [3, 9], "x": 161, "y": 45 },
- { "flags": 4, "matrix": [3, 8], "x": 146, "y": 45 },
- { "flags": 4, "matrix": [3, 7], "x": 131, "y": 45 },
- { "flags": 4, "matrix": [3, 6], "x": 116, "y": 45 },
- { "flags": 4, "matrix": [3, 5], "x": 101, "y": 45 },
- { "flags": 4, "matrix": [3, 4], "x": 86, "y": 45 },
- { "flags": 4, "matrix": [3, 3], "x": 71, "y": 45 },
- { "flags": 4, "matrix": [3, 2], "x": 56, "y": 45 },
- { "flags": 4, "matrix": [3, 1], "x": 41, "y": 45 },
- { "flags": 1, "matrix": [4, 2], "x": 47, "y": 58 },
- { "flags": 1, "matrix": [4, 1], "x": 28, "y": 58 },
- { "flags": 1, "matrix": [4, 0], "x": 10, "y": 58 },
- { "flags": 1, "matrix": [3, 0], "x": 17, "y": 45 },
- { "flags": 1, "matrix": [2, 0], "x": 13, "y": 32 },
- { "flags": 4, "matrix": [2, 1], "x": 34, "y": 32 },
- { "flags": 4, "matrix": [2, 2], "x": 49, "y": 32 },
- { "flags": 4, "matrix": [2, 3], "x": 64, "y": 32 },
- { "flags": 4, "matrix": [2, 4], "x": 79, "y": 32 },
- { "flags": 4, "matrix": [2, 5], "x": 94, "y": 32 },
- { "flags": 4, "matrix": [2, 6], "x": 109, "y": 32 },
- { "flags": 4, "matrix": [2, 7], "x": 124, "y": 32 },
- { "flags": 4, "matrix": [2, 8], "x": 139, "y": 32 },
- { "flags": 4, "matrix": [2, 9], "x": 153, "y": 32 },
- { "flags": 4, "matrix": [2, 10], "x": 168, "y": 32 },
- { "flags": 4, "matrix": [2, 11], "x": 183, "y": 32 },
- { "flags": 1, "matrix": [2, 13], "x": 208, "y": 32 },
- { "flags": 1, "matrix": [1, 13], "x": 213, "y": 19 },
- { "flags": 4, "matrix": [1, 12], "x": 195, "y": 19 },
- { "flags": 4, "matrix": [1, 11], "x": 180, "y": 19 },
- { "flags": 4, "matrix": [1, 10], "x": 165, "y": 19 },
- { "flags": 4, "matrix": [1, 9], "x": 150, "y": 19 },
- { "flags": 4, "matrix": [1, 8], "x": 135, "y": 19 },
- { "flags": 4, "matrix": [1, 7], "x": 120, "y": 19 },
- { "flags": 4, "matrix": [1, 6], "x": 105, "y": 19 },
- { "flags": 4, "matrix": [1, 5], "x": 90, "y": 19 },
- { "flags": 4, "matrix": [1, 4], "x": 75, "y": 19 },
- { "flags": 4, "matrix": [1, 3], "x": 60, "y": 19 },
- { "flags": 4, "matrix": [1, 2], "x": 45, "y": 19 },
- { "flags": 4, "matrix": [1, 1], "x": 30, "y": 19 },
- { "flags": 1, "matrix": [1, 0], "x": 12, "y": 19 },
- { "flags": 1, "matrix": [0, 0], "x": 8, "y": 7 },
- { "flags": 4, "matrix": [0, 1], "x": 23, "y": 7 },
- { "flags": 4, "matrix": [0, 2], "x": 38, "y": 7 },
- { "flags": 4, "matrix": [0, 3], "x": 53, "y": 7 },
- { "flags": 4, "matrix": [0, 4], "x": 68, "y": 7 },
- { "flags": 4, "matrix": [0, 5], "x": 83, "y": 7 },
- { "flags": 4, "matrix": [0, 6], "x": 98, "y": 7 },
- { "flags": 4, "matrix": [0, 7], "x": 113, "y": 7 },
- { "flags": 4, "matrix": [0, 8], "x": 127, "y": 7 },
- { "flags": 4, "matrix": [0, 9], "x": 142, "y": 7 },
- { "flags": 4, "matrix": [0, 10], "x": 157, "y": 7 },
- { "flags": 4, "matrix": [0, 11], "x": 172, "y": 7 },
- { "flags": 4, "matrix": [0, 12], "x": 187, "y": 7 },
- { "flags": 1, "matrix": [0, 13], "x": 209, "y": 7 }
+ {"flags": 1, "matrix": [5, 5], "x": 103, "y": 58},
+ {"flags": 1, "matrix": [5, 10], "x": 159, "y": 58},
+ {"flags": 1, "matrix": [5, 11], "x": 178, "y": 58},
+ {"flags": 1, "matrix": [5, 12], "x": 196, "y": 58},
+ {"flags": 1, "matrix": [5, 13], "x": 215, "y": 58},
+ {"flags": 1, "matrix": [3, 13], "x": 204, "y": 45},
+ {"flags": 4, "matrix": [3, 10], "x": 176, "y": 45},
+ {"flags": 4, "matrix": [3, 9], "x": 161, "y": 45},
+ {"flags": 4, "matrix": [3, 8], "x": 146, "y": 45},
+ {"flags": 4, "matrix": [3, 7], "x": 131, "y": 45},
+ {"flags": 4, "matrix": [3, 6], "x": 116, "y": 45},
+ {"flags": 4, "matrix": [3, 5], "x": 101, "y": 45},
+ {"flags": 4, "matrix": [3, 4], "x": 86, "y": 45},
+ {"flags": 4, "matrix": [3, 3], "x": 71, "y": 45},
+ {"flags": 4, "matrix": [3, 2], "x": 56, "y": 45},
+ {"flags": 4, "matrix": [3, 1], "x": 41, "y": 45},
+ {"flags": 1, "matrix": [4, 2], "x": 47, "y": 58},
+ {"flags": 1, "matrix": [4, 1], "x": 28, "y": 58},
+ {"flags": 1, "matrix": [4, 0], "x": 10, "y": 58},
+ {"flags": 1, "matrix": [3, 0], "x": 17, "y": 45},
+ {"flags": 1, "matrix": [2, 0], "x": 13, "y": 32},
+ {"flags": 4, "matrix": [2, 1], "x": 34, "y": 32},
+ {"flags": 4, "matrix": [2, 2], "x": 49, "y": 32},
+ {"flags": 4, "matrix": [2, 3], "x": 64, "y": 32},
+ {"flags": 4, "matrix": [2, 4], "x": 79, "y": 32},
+ {"flags": 4, "matrix": [2, 5], "x": 94, "y": 32},
+ {"flags": 4, "matrix": [2, 6], "x": 109, "y": 32},
+ {"flags": 4, "matrix": [2, 7], "x": 124, "y": 32},
+ {"flags": 4, "matrix": [2, 8], "x": 139, "y": 32},
+ {"flags": 4, "matrix": [2, 9], "x": 153, "y": 32},
+ {"flags": 4, "matrix": [2, 10], "x": 168, "y": 32},
+ {"flags": 4, "matrix": [2, 11], "x": 183, "y": 32},
+ {"flags": 1, "matrix": [2, 13], "x": 208, "y": 32},
+ {"flags": 1, "matrix": [1, 13], "x": 213, "y": 19},
+ {"flags": 4, "matrix": [1, 12], "x": 195, "y": 19},
+ {"flags": 4, "matrix": [1, 11], "x": 180, "y": 19},
+ {"flags": 4, "matrix": [1, 10], "x": 165, "y": 19},
+ {"flags": 4, "matrix": [1, 9], "x": 150, "y": 19},
+ {"flags": 4, "matrix": [1, 8], "x": 135, "y": 19},
+ {"flags": 4, "matrix": [1, 7], "x": 120, "y": 19},
+ {"flags": 4, "matrix": [1, 6], "x": 105, "y": 19},
+ {"flags": 4, "matrix": [1, 5], "x": 90, "y": 19},
+ {"flags": 4, "matrix": [1, 4], "x": 75, "y": 19},
+ {"flags": 4, "matrix": [1, 3], "x": 60, "y": 19},
+ {"flags": 4, "matrix": [1, 2], "x": 45, "y": 19},
+ {"flags": 4, "matrix": [1, 1], "x": 30, "y": 19},
+ {"flags": 1, "matrix": [1, 0], "x": 12, "y": 19},
+ {"flags": 1, "matrix": [0, 0], "x": 8, "y": 7},
+ {"flags": 4, "matrix": [0, 1], "x": 23, "y": 7},
+ {"flags": 4, "matrix": [0, 2], "x": 38, "y": 7},
+ {"flags": 4, "matrix": [0, 3], "x": 53, "y": 7},
+ {"flags": 4, "matrix": [0, 4], "x": 68, "y": 7},
+ {"flags": 4, "matrix": [0, 5], "x": 83, "y": 7},
+ {"flags": 4, "matrix": [0, 6], "x": 98, "y": 7},
+ {"flags": 4, "matrix": [0, 7], "x": 113, "y": 7},
+ {"flags": 4, "matrix": [0, 8], "x": 127, "y": 7},
+ {"flags": 4, "matrix": [0, 9], "x": 142, "y": 7},
+ {"flags": 4, "matrix": [0, 10], "x": 157, "y": 7},
+ {"flags": 4, "matrix": [0, 11], "x": 172, "y": 7},
+ {"flags": 4, "matrix": [0, 12], "x": 187, "y": 7},
+ {"flags": 1, "matrix": [0, 13], "x": 209, "y": 7}
]
},
"layouts": {
"LAYOUT_60_ansi": {
"layout": [
- { "label": "Esc", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
- { "label": "1", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 },
- { "label": "2", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 },
- { "label": "3", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 },
- { "label": "4", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 },
- { "label": "5", "matrix": [0, 5], "w": 1, "x": 5, "y": 0 },
- { "label": "6", "matrix": [0, 6], "w": 1, "x": 6, "y": 0 },
- { "label": "7", "matrix": [0, 7], "w": 1, "x": 7, "y": 0 },
- { "label": "8", "matrix": [0, 8], "w": 1, "x": 8, "y": 0 },
- { "label": "9", "matrix": [0, 9], "w": 1, "x": 9, "y": 0 },
- { "label": "0", "matrix": [0, 10], "w": 1, "x": 10, "y": 0 },
- { "label": "-", "matrix": [0, 11], "w": 1, "x": 11, "y": 0 },
- { "label": "=", "matrix": [0, 12], "w": 1, "x": 12, "y": 0 },
- { "label": "BS", "matrix": [0, 13], "w": 2, "x": 13, "y": 0 },
- { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
- { "label": "Q", "matrix": [1, 1], "w": 1, "x": 1.5, "y": 1 },
- { "label": "W", "matrix": [1, 2], "w": 1, "x": 2.5, "y": 1 },
- { "label": "E", "matrix": [1, 3], "w": 1, "x": 3.5, "y": 1 },
- { "label": "R", "matrix": [1, 4], "w": 1, "x": 4.5, "y": 1 },
- { "label": "T", "matrix": [1, 5], "w": 1, "x": 5.5, "y": 1 },
- { "label": "Y", "matrix": [1, 6], "w": 1, "x": 6.5, "y": 1 },
- { "label": "U", "matrix": [1, 7], "w": 1, "x": 7.5, "y": 1 },
- { "label": "I", "matrix": [1, 8], "w": 1, "x": 8.5, "y": 1 },
- { "label": "O", "matrix": [1, 9], "w": 1, "x": 9.5, "y": 1 },
- { "label": "P", "matrix": [1, 10], "w": 1, "x": 10.5, "y": 1 },
- { "label": "[", "matrix": [1, 11], "w": 1, "x": 11.5, "y": 1 },
- { "label": "]", "matrix": [1, 12], "w": 1, "x": 12.5, "y": 1 },
- { "label": "|", "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1 },
- { "label": "Caps", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
- { "label": "A", "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2 },
- { "label": "S", "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2 },
- { "label": "D", "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2 },
- { "label": "F", "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2 },
- { "label": "G", "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2 },
- { "label": "H", "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2 },
- { "label": "J", "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2 },
- { "label": "K", "matrix": [2, 8], "w": 1, "x": 8.75, "y": 2 },
- { "label": "L", "matrix": [2, 9], "w": 1, "x": 9.75, "y": 2 },
- { "label": ";", "matrix": [2, 10], "w": 1, "x": 10.75, "y": 2 },
- { "label": "'", "matrix": [2, 11], "w": 1, "x": 11.75, "y": 2 },
- { "label": "Enter", "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2 },
- { "label": "LShift", "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3 },
- { "label": "Z", "matrix": [3, 1], "w": 1, "x": 2.25, "y": 3 },
- { "label": "X", "matrix": [3, 2], "w": 1, "x": 3.25, "y": 3 },
- { "label": "C", "matrix": [3, 3], "w": 1, "x": 4.25, "y": 3 },
- { "label": "V", "matrix": [3, 4], "w": 1, "x": 5.25, "y": 3 },
- { "label": "B", "matrix": [3, 5], "w": 1, "x": 6.25, "y": 3 },
- { "label": "N", "matrix": [3, 6], "w": 1, "x": 7.25, "y": 3 },
- { "label": "M", "matrix": [3, 7], "w": 1, "x": 8.25, "y": 3 },
- { "label": ",", "matrix": [3, 8], "w": 1, "x": 9.25, "y": 3 },
- { "label": ".", "matrix": [3, 9], "w": 1, "x": 10.25, "y": 3 },
- { "label": "/", "matrix": [3, 10], "w": 1, "x": 11.25, "y": 3 },
- { "label": "RShift", "matrix": [3, 13], "w": 2.75, "x": 12.25, "y": 3 },
- { "label": "LCtrl", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 },
- { "label": "LGui", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 },
- { "label": "LAlt", "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 },
- { "label": "Space", "matrix": [5, 5], "w": 6.25, "x": 3.75, "y": 4 },
- { "label": "RAlt", "matrix": [5, 9], "w": 1.25, "x": 10, "y": 4 },
- { "label": "RGui", "matrix": [5, 10], "w": 1.25, "x": 11.25, "y": 4 },
- { "label": "FN", "matrix": [5, 12], "w": 1.25, "x": 12.5, "y": 4 },
- { "label": "RCtrl", "matrix": [5, 13], "w": 1.25, "x": 13.75, "y": 4 }
+ {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
+ {"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
+ {"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
+ {"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
+ {"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
+ {"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
+ {"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
+ {"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
+ {"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
+ {"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
+ {"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
+ {"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
+ {"label": "=", "matrix": [0, 12], "x": 12, "y": 0},
+ {"label": "BS", "matrix": [0, 13], "w": 2, "x": 13, "y": 0},
+ {"label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1},
+ {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1},
+ {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
+ {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
+ {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
+ {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
+ {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
+ {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
+ {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
+ {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
+ {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
+ {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
+ {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1},
+ {"label": "|", "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1},
+ {"label": "Caps", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2},
+ {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2},
+ {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
+ {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
+ {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
+ {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
+ {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
+ {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
+ {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
+ {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
+ {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
+ {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2},
+ {"label": "Enter", "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2},
+ {"label": "LShift", "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3},
+ {"label": "Z", "matrix": [3, 1], "x": 2.25, "y": 3},
+ {"label": "X", "matrix": [3, 2], "x": 3.25, "y": 3},
+ {"label": "C", "matrix": [3, 3], "x": 4.25, "y": 3},
+ {"label": "V", "matrix": [3, 4], "x": 5.25, "y": 3},
+ {"label": "B", "matrix": [3, 5], "x": 6.25, "y": 3},
+ {"label": "N", "matrix": [3, 6], "x": 7.25, "y": 3},
+ {"label": "M", "matrix": [3, 7], "x": 8.25, "y": 3},
+ {"label": ",", "matrix": [3, 8], "x": 9.25, "y": 3},
+ {"label": ".", "matrix": [3, 9], "x": 10.25, "y": 3},
+ {"label": "/", "matrix": [3, 10], "x": 11.25, "y": 3},
+ {"label": "RShift", "matrix": [3, 13], "w": 2.75, "x": 12.25, "y": 3},
+ {"label": "LCtrl", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4},
+ {"label": "LGui", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4},
+ {"label": "LAlt", "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4},
+ {"label": "Space", "matrix": [5, 5], "w": 6.25, "x": 3.75, "y": 4},
+ {"label": "RAlt", "matrix": [5, 9], "w": 1.25, "x": 10, "y": 4},
+ {"label": "RGui", "matrix": [5, 10], "w": 1.25, "x": 11.25, "y": 4},
+ {"label": "FN", "matrix": [5, 12], "w": 1.25, "x": 12.5, "y": 4},
+ {"label": "RCtrl", "matrix": [5, 13], "w": 1.25, "x": 13.75, "y": 4}
]
}
}
-} \ No newline at end of file
+}
diff --git a/keyboards/1upkeyboards/pi60_rgb/rules.mk b/keyboards/1upkeyboards/pi60_rgb/rules.mk
index 8e853e0af7..e69de29bb2 100644
--- a/keyboards/1upkeyboards/pi60_rgb/rules.mk
+++ b/keyboards/1upkeyboards/pi60_rgb/rules.mk
@@ -1 +0,0 @@
-WS2812_DRIVER = vendor \ No newline at end of file
diff --git a/keyboards/1upkeyboards/super16/config.h b/keyboards/1upkeyboards/super16/config.h
index 7af70c5b75..8102cbda4c 100644
--- a/keyboards/1upkeyboards/super16/config.h
+++ b/keyboards/1upkeyboards/super16/config.h
@@ -17,34 +17,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#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 \
- { D1, D0, F4, F5 }
-#define MATRIX_COL_PINS \
- { D4, C6, F6, F7 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
# define RGBLED_NUM 16 // Add 12 if attaching the RGB LED ring
# define RGB_MATRIX_LED_COUNT RGBLED_NUM
# ifdef RGBLIGHT_ENABLE
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
# define RGBLIGHT_VAL_STEP 8
-# define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
# define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */
# define RGBLIGHT_EFFECT_BREATHING
# define RGBLIGHT_EFFECT_RAINBOW_MOOD
@@ -109,7 +87,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
# define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
# endif
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/1upkeyboards/super16/info.json b/keyboards/1upkeyboards/super16/info.json
index d648c32f3e..923f536ac8 100644
--- a/keyboards/1upkeyboards/super16/info.json
+++ b/keyboards/1upkeyboards/super16/info.json
@@ -8,15 +8,63 @@
"pid": "0x5516",
"device_version": "0.0.1"
},
+ "ws2812": {
+ "pin": "D3"
+ },
+ "rgb_matrix": {
+ "driver": "WS2812"
+ },
+ "matrix_pins": {
+ "cols": ["D4", "C6", "F6", "F7"],
+ "rows": ["D1", "D0", "F4", "F5"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "caterina",
"community_layouts": ["ortho_4x4", "numpad_4x4"],
"layouts": {
"LAYOUT_ortho_4x4": {
- "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}]
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3},
+ {"matrix": [3, 2], "x": 2, "y": 3},
+ {"matrix": [3, 3], "x": 3, "y": 3}
+ ]
},
"LAYOUT_numpad_4x4": {
- "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0, "h":2}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2, "h":2}, {"x":0, "y":3, "w":2}, {"x":2, "y":3}]
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0, "h": 2},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2, "h": 2},
+
+ {"matrix": [3, 1], "x": 0, "y": 3, "w": 2},
+ {"matrix": [3, 2], "x": 2, "y": 3}
+ ]
}
}
}
diff --git a/keyboards/1upkeyboards/super16/rules.mk b/keyboards/1upkeyboards/super16/rules.mk
index 373bf88ecf..b5532d03ff 100644
--- a/keyboards/1upkeyboards/super16/rules.mk
+++ b/keyboards/1upkeyboards/super16/rules.mk
@@ -10,5 +10,4 @@ NKRO_ENABLE = no # Enable N-Key Rollover
BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
AUDIO_ENABLE = no # Audio output
diff --git a/keyboards/1upkeyboards/super16/super16.c b/keyboards/1upkeyboards/super16/super16.c
index eebb72c717..a9946c7525 100644
--- a/keyboards/1upkeyboards/super16/super16.c
+++ b/keyboards/1upkeyboards/super16/super16.c
@@ -13,7 +13,7 @@
* 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 "super16.h"
+#include "quantum.h"
#ifdef RGB_MATRIX_ENABLE
led_config_t g_led_config = { {
diff --git a/keyboards/1upkeyboards/super16/super16.h b/keyboards/1upkeyboards/super16/super16.h
deleted file mode 100644
index 0595af8dcd..0000000000
--- a/keyboards/1upkeyboards/super16/super16.h
+++ /dev/null
@@ -1,51 +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"
-
-/* This 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_ortho_4x4( \
- K00, K01, K02, K03, \
- K10, K11, K12, K13, \
- K20, K21, K22, K23, \
- K30, K31, K32, K33 \
-) { \
- { K00, K01, K02, K03 }, \
- { K10, K11, K12, K13 }, \
- { K20, K21, K22, K23 }, \
- { K30, K31, K32, K33 } \
-}
-
-#define LAYOUT_numpad_4x4( \
- K00, K01, K02, K03, \
- K10, K11, K12, \
- K20, K21, K22, K23, \
- K31, K32 \
-) { \
- { K00, K01, K02, K03 }, \
- { K10, K11, K12, KC_NO }, \
- { K20, K21, K22, K23 }, \
- { KC_NO, K31, K32, KC_NO } \
-}
diff --git a/keyboards/1upkeyboards/super16v2/config.h b/keyboards/1upkeyboards/super16v2/config.h
index 04f5fdd979..73d8badc5e 100644
--- a/keyboards/1upkeyboards/super16v2/config.h
+++ b/keyboards/1upkeyboards/super16v2/config.h
@@ -19,30 +19,8 @@
#define MOUSEKEY_MOVE_DELTA 25
-/*
- * 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)
- *
- */
-
-// 0 1 2 3
-#define MATRIX_ROW_PINS { D1, D2, D3, D4 }
-#define MATRIX_COL_PINS { D5, D6, C2, D0 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN B5
#define RGB_MATRIX_LED_COUNT 20
-#ifdef RGB_DI_PIN
# define RGB_MATRIX_KEYPRESSES // reacts to keypresses
-# define RGBLIGHT_LIMIT_VAL 255
-#endif
#ifdef RGB_MATRIX_ENABLE
# define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 255
diff --git a/keyboards/1upkeyboards/super16v2/info.json b/keyboards/1upkeyboards/super16v2/info.json
index 13e2c55fa5..39a8eefcc4 100644
--- a/keyboards/1upkeyboards/super16v2/info.json
+++ b/keyboards/1upkeyboards/super16v2/info.json
@@ -8,6 +8,17 @@
"pid": "0x5517",
"device_version": "0.0.1"
},
+ "ws2812": {
+ "pin": "B5"
+ },
+ "rgb_matrix": {
+ "driver": "WS2812"
+ },
+ "matrix_pins": {
+ "cols": ["D5", "D6", "C2", "D0"],
+ "rows": ["D1", "D2", "D3", "D4"]
+ },
+ "diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "B1", "pin_b": "B2"},
@@ -18,7 +29,27 @@
"bootloader": "atmel-dfu",
"layouts": {
"LAYOUT_ortho_4x4": {
- "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}]
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3},
+ {"matrix": [3, 2], "x": 2, "y": 3},
+ {"matrix": [3, 3], "x": 3, "y": 3}
+ ]
}
}
}
diff --git a/keyboards/1upkeyboards/super16v2/rules.mk b/keyboards/1upkeyboards/super16v2/rules.mk
index 2653d876b5..a7f5baf807 100644
--- a/keyboards/1upkeyboards/super16v2/rules.mk
+++ b/keyboards/1upkeyboards/super16v2/rules.mk
@@ -11,5 +11,4 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output
RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
ENCODER_ENABLE = yes \ No newline at end of file
diff --git a/keyboards/1upkeyboards/super16v2/super16v2.c b/keyboards/1upkeyboards/super16v2/super16v2.c
index ff7ce33c84..56e5fe7e7f 100644
--- a/keyboards/1upkeyboards/super16v2/super16v2.c
+++ b/keyboards/1upkeyboards/super16v2/super16v2.c
@@ -14,7 +14,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "super16v2.h"
+#include "quantum.h"
#ifdef RGB_MATRIX_ENABLE
led_config_t g_led_config = { {
diff --git a/keyboards/1upkeyboards/super16v2/super16v2.h b/keyboards/1upkeyboards/super16v2/super16v2.h
deleted file mode 100644
index 58fd26ed8a..0000000000
--- a/keyboards/1upkeyboards/super16v2/super16v2.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/* Copyright 2022 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"
-
-/* 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_ortho_4x4( \
- k00, k01, k02, k03, \
- k10, k11, k12, k13, \
- k20, k21, k22, k23, \
- k30, k31, k32, k33 \
-) { \
- { k00, k01, k02, k03 }, \
- { k10, k11, k12, k13 }, \
- { k20, k21, k22, k23 }, \
- { k30, k31, k32, k33 } \
-}
diff --git a/keyboards/1upkeyboards/sweet16/info.json b/keyboards/1upkeyboards/sweet16/info.json
index 320c96bac8..ac9d944969 100644
--- a/keyboards/1upkeyboards/sweet16/info.json
+++ b/keyboards/1upkeyboards/sweet16/info.json
@@ -8,11 +8,47 @@
},
"layouts": {
"LAYOUT_ortho_4x4": {
- "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}]
- },
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3},
+ {"matrix": [3, 2], "x": 2, "y": 3},
+ {"matrix": [3, 3], "x": 3, "y": 3}
+ ]
+ },
"LAYOUT_numpad_4x4": {
- "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0, "h":2}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2, "h":2}, {"x":0, "y":3, "w":2}, {"x":2, "y":3}]
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0, "h": 2},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2, "h": 2},
+
+ {"matrix": [3, 1], "x": 0, "y": 3, "w": 2},
+ {"matrix": [3, 2], "x": 2, "y": 3}
+ ]
}
}
}
diff --git a/keyboards/1upkeyboards/sweet16/keymaps/dlaroe/keymap.c b/keyboards/1upkeyboards/sweet16/keymaps/dlaroe/keymap.c
index d3b6ef0378..5305d0ad05 100644
--- a/keyboards/1upkeyboards/sweet16/keymaps/dlaroe/keymap.c
+++ b/keyboards/1upkeyboards/sweet16/keymaps/dlaroe/keymap.c
@@ -1,4 +1,4 @@
-#include "sweet16.h"
+#include QMK_KEYBOARD_H
enum layers {
num,
diff --git a/keyboards/1upkeyboards/sweet16/sweet16.c b/keyboards/1upkeyboards/sweet16/sweet16.c
deleted file mode 100644
index 2f116c2a37..0000000000
--- a/keyboards/1upkeyboards/sweet16/sweet16.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "sweet16.h" \ No newline at end of file
diff --git a/keyboards/1upkeyboards/sweet16/sweet16.h b/keyboards/1upkeyboards/sweet16/sweet16.h
deleted file mode 100644
index 7320ccd9e0..0000000000
--- a/keyboards/1upkeyboards/sweet16/sweet16.h
+++ /dev/null
@@ -1,30 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-// Any changes to the layout names and/or definitions must also be made to info.json
-
-#define LAYOUT_ortho_4x4( \
- K00, K01, K02, K03, \
- K10, K11, K12, K13, \
- K20, K21, K22, K23, \
- K30, K31, K32, K33 \
-) { \
- { K00, K01, K02, K03 }, \
- { K10, K11, K12, K13 }, \
- { K20, K21, K22, K23 }, \
- { K30, K31, K32, K33 } \
-}
-
-#define LAYOUT_numpad_4x4( \
- K00, K01, K02, K03, \
- K10, K11, K12, \
- K20, K21, K22, K23, \
- K31, K32 \
-) { \
- { K00, K01, K02, K03 }, \
- { K10, K11, K12, KC_NO }, \
- { K20, K21, K22, K23 }, \
- { KC_NO, K31, K32, KC_NO } \
-}
-
diff --git a/keyboards/1upkeyboards/sweet16/v1/config.h b/keyboards/1upkeyboards/sweet16/v1/config.h
index 02e8564702..bed2edc0a6 100644
--- a/keyboards/1upkeyboards/sweet16/v1/config.h
+++ b/keyboards/1upkeyboards/sweet16/v1/config.h
@@ -1,13 +1,5 @@
#pragma once
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { F4, F5, F6, F7 }
-#define MATRIX_COL_PINS { D1, D0, D4, C6 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
#ifndef CONVERT_TO_PROTON_C
# define LED_NUM_LOCK_PIN B0 // RXLED
# define LED_CAPS_LOCK_PIN D5 // TXLED
@@ -15,8 +7,6 @@
#endif
/* Underglow options */
-#define RGB_DI_PIN B1
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -31,4 +21,3 @@
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/1upkeyboards/sweet16/v1/info.json b/keyboards/1upkeyboards/sweet16/v1/info.json
index d549338988..cb82e7fcfb 100644
--- a/keyboards/1upkeyboards/sweet16/v1/info.json
+++ b/keyboards/1upkeyboards/sweet16/v1/info.json
@@ -3,6 +3,14 @@
"pid": "0x0161",
"device_version": "0.0.1"
},
+ "ws2812": {
+ "pin": "B1"
+ },
+ "matrix_pins": {
+ "cols": ["D1", "D0", "D4", "C6"],
+ "rows": ["F4", "F5", "F6", "F7"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "caterina"
}
diff --git a/keyboards/1upkeyboards/sweet16/v1/v1.c b/keyboards/1upkeyboards/sweet16/v1/v1.c
deleted file mode 100644
index 0ff1041aac..0000000000
--- a/keyboards/1upkeyboards/sweet16/v1/v1.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "v1.h"
diff --git a/keyboards/1upkeyboards/sweet16/v1/v1.h b/keyboards/1upkeyboards/sweet16/v1/v1.h
deleted file mode 100644
index 7320ccd9e0..0000000000
--- a/keyboards/1upkeyboards/sweet16/v1/v1.h
+++ /dev/null
@@ -1,30 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-// Any changes to the layout names and/or definitions must also be made to info.json
-
-#define LAYOUT_ortho_4x4( \
- K00, K01, K02, K03, \
- K10, K11, K12, K13, \
- K20, K21, K22, K23, \
- K30, K31, K32, K33 \
-) { \
- { K00, K01, K02, K03 }, \
- { K10, K11, K12, K13 }, \
- { K20, K21, K22, K23 }, \
- { K30, K31, K32, K33 } \
-}
-
-#define LAYOUT_numpad_4x4( \
- K00, K01, K02, K03, \
- K10, K11, K12, \
- K20, K21, K22, K23, \
- K31, K32 \
-) { \
- { K00, K01, K02, K03 }, \
- { K10, K11, K12, KC_NO }, \
- { K20, K21, K22, K23 }, \
- { KC_NO, K31, K32, KC_NO } \
-}
-
diff --git a/keyboards/1upkeyboards/sweet16v2/kb2040/config.h b/keyboards/1upkeyboards/sweet16v2/kb2040/config.h
index 9d62be3bb7..88687335de 100644
--- a/keyboards/1upkeyboards/sweet16v2/kb2040/config.h
+++ b/keyboards/1upkeyboards/sweet16v2/kb2040/config.h
@@ -18,7 +18,6 @@
#define DYNAMIC_KEYMAP_LAYER_COUNT 10
-#define RGB_DI_PIN GP6
#define RGB_MATRIX_LED_COUNT 20
#define RGBLED_NUM 20
#define RGB_MATRIX_KEYPRESSES
diff --git a/keyboards/1upkeyboards/sweet16v2/kb2040/info.json b/keyboards/1upkeyboards/sweet16v2/kb2040/info.json
index 91fa580354..b8705866c8 100644
--- a/keyboards/1upkeyboards/sweet16v2/kb2040/info.json
+++ b/keyboards/1upkeyboards/sweet16v2/kb2040/info.json
@@ -24,47 +24,45 @@
"rgb_matrix": true,
"rgblight": false
},
+ "ws2812": {
+ "pin": "GP6",
+ "driver": "vendor"
+ },
"matrix_pins": {
- "cols": ["GP2", "GP9", "GP8", "GP7"],
+ "cols": ["GP2", "GP9", "GP8", "GP7"],
"rows": ["GP26", "GP1", "GP18", "GP5"]
},
"diode_direction": "COL2ROW",
"encoder": {
"enabled": true,
"rotary": [
- {
- "pin_a": "GP27",
- "pin_b": "GP28"
- },
- {
- "pin_a": "GP4",
- "pin_b": "GP3"
- }
+ {"pin_a": "GP27", "pin_b": "GP28"},
+ {"pin_a": "GP4", "pin_b": "GP3"}
]
},
"rgb_matrix": {
"driver": "WS2812",
"layout": [
- { "flags": 4, "matrix": [0, 0], "x": 28, "y": 12 },
- { "flags": 4, "matrix": [0, 1], "x": 84, "y": 12 },
- { "flags": 4, "matrix": [0, 2], "x": 140, "y": 12 },
- { "flags": 4, "matrix": [0, 3], "x": 196, "y": 12 },
- { "flags": 2, "x": 196, "y": 17 },
- { "flags": 4, "matrix": [1, 3], "x": 196, "y": 28 },
- { "flags": 4, "matrix": [1, 2], "x": 140, "y": 28 },
- { "flags": 4, "matrix": [1, 1], "x": 84, "y": 28 },
- { "flags": 2, "x": 28, "y": 17 },
- { "flags": 4, "matrix": [1, 0], "x": 28, "y": 28 },
- { "flags": 4, "matrix": [2, 0], "x": 28, "y": 44 },
- { "flags": 4, "matrix": [2, 1], "x": 84, "y": 44 },
- { "flags": 4, "matrix": [2, 2], "x": 140, "y": 44 },
- { "flags": 4, "matrix": [2, 3], "x": 196, "y": 44 },
- { "flags": 2, "x": 196, "y": 47 },
- { "flags": 4, "matrix": [3, 3], "x": 196, "y": 60 },
- { "flags": 4, "matrix": [3, 2], "x": 140, "y": 60 },
- { "flags": 4, "matrix": [3, 1], "x": 84, "y": 60 },
- { "flags": 2, "x": 28, "y": 47 },
- { "flags": 4, "matrix": [3, 0], "x": 28, "y": 60 }
+ {"flags": 4, "matrix": [0, 0], "x": 28, "y": 12},
+ {"flags": 4, "matrix": [0, 1], "x": 84, "y": 12},
+ {"flags": 4, "matrix": [0, 2], "x": 140, "y": 12},
+ {"flags": 4, "matrix": [0, 3], "x": 196, "y": 12},
+ {"flags": 2, "x": 196, "y": 17},
+ {"flags": 4, "matrix": [1, 3], "x": 196, "y": 28},
+ {"flags": 4, "matrix": [1, 2], "x": 140, "y": 28},
+ {"flags": 4, "matrix": [1, 1], "x": 84, "y": 28},
+ {"flags": 2, "x": 28, "y": 17},
+ {"flags": 4, "matrix": [1, 0], "x": 28, "y": 28},
+ {"flags": 4, "matrix": [2, 0], "x": 28, "y": 44},
+ {"flags": 4, "matrix": [2, 1], "x": 84, "y": 44},
+ {"flags": 4, "matrix": [2, 2], "x": 140, "y": 44},
+ {"flags": 4, "matrix": [2, 3], "x": 196, "y": 44},
+ {"flags": 2, "x": 196, "y": 47},
+ {"flags": 4, "matrix": [3, 3], "x": 196, "y": 60},
+ {"flags": 4, "matrix": [3, 2], "x": 140, "y": 60},
+ {"flags": 4, "matrix": [3, 1], "x": 84, "y": 60},
+ {"flags": 2, "x": 28, "y": 47},
+ {"flags": 4, "matrix": [3, 0], "x": 28, "y": 60}
]
},
"community_layouts": [
@@ -73,23 +71,23 @@
"layouts": {
"LAYOUT_ortho_4x4": {
"layout": [
- { "matrix": [0, 0], "x": 0, "y": 0 },
- { "matrix": [0, 1], "x": 1, "y": 0 },
- { "matrix": [0, 2], "x": 2, "y": 0 },
- { "matrix": [0, 3], "x": 3, "y": 0 },
- { "matrix": [1, 0], "x": 0, "y": 1 },
- { "matrix": [1, 1], "x": 1, "y": 1 },
- { "matrix": [1, 2], "x": 2, "y": 1 },
- { "matrix": [1, 3], "x": 3, "y": 1 },
- { "matrix": [2, 0], "x": 0, "y": 2 },
- { "matrix": [2, 1], "x": 1, "y": 2 },
- { "matrix": [2, 2], "x": 2, "y": 2 },
- { "matrix": [2, 3], "x": 3, "y": 2 },
- { "matrix": [3, 0], "x": 0, "y": 3 },
- { "matrix": [3, 1], "x": 1, "y": 3 },
- { "matrix": [3, 2], "x": 2, "y": 3 },
- { "matrix": [3, 3], "x": 3, "y": 3 }
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3},
+ {"matrix": [3, 2], "x": 2, "y": 3},
+ {"matrix": [3, 3], "x": 3, "y": 3}
]
}
}
-} \ No newline at end of file
+}
diff --git a/keyboards/1upkeyboards/sweet16v2/kb2040/rules.mk b/keyboards/1upkeyboards/sweet16v2/kb2040/rules.mk
index 997fce7e65..e69de29bb2 100644
--- a/keyboards/1upkeyboards/sweet16v2/kb2040/rules.mk
+++ b/keyboards/1upkeyboards/sweet16v2/kb2040/rules.mk
@@ -1 +0,0 @@
-WS2812_DRIVER = vendor
diff --git a/keyboards/1upkeyboards/sweet16v2/keymaps/default/keymap.c b/keyboards/1upkeyboards/sweet16v2/keymaps/default/keymap.c
index 1994a5bde1..14168ee700 100644
--- a/keyboards/1upkeyboards/sweet16v2/keymaps/default/keymap.c
+++ b/keyboards/1upkeyboards/sweet16v2/keymaps/default/keymap.c
@@ -34,7 +34,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] = {
[0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(RGB_VAD, RGB_VAI) },
[1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }
};
diff --git a/keyboards/1upkeyboards/sweet16v2/keymaps/via/keymap.c b/keyboards/1upkeyboards/sweet16v2/keymaps/via/keymap.c
index 8bb0368d09..b77ed6e256 100644
--- a/keyboards/1upkeyboards/sweet16v2/keymaps/via/keymap.c
+++ b/keyboards/1upkeyboards/sweet16v2/keymaps/via/keymap.c
@@ -90,7 +90,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] = {
[0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
[1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
[2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
diff --git a/keyboards/1upkeyboards/sweet16v2/pro_micro/config.h b/keyboards/1upkeyboards/sweet16v2/pro_micro/config.h
index 2f8c72447e..f773468d8f 100644
--- a/keyboards/1upkeyboards/sweet16v2/pro_micro/config.h
+++ b/keyboards/1upkeyboards/sweet16v2/pro_micro/config.h
@@ -19,7 +19,6 @@
#define DYNAMIC_KEYMAP_LAYER_COUNT 10
-#define RGB_DI_PIN D7
#define RGB_MATRIX_LED_COUNT 20
#define RGB_MATRIX_KEYPRESSES
#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
diff --git a/keyboards/1upkeyboards/sweet16v2/pro_micro/info.json b/keyboards/1upkeyboards/sweet16v2/pro_micro/info.json
index efdb94cd74..fa98b70fbc 100644
--- a/keyboards/1upkeyboards/sweet16v2/pro_micro/info.json
+++ b/keyboards/1upkeyboards/sweet16v2/pro_micro/info.json
@@ -23,6 +23,9 @@
"rgb_matrix": true,
"rgblight": false
},
+ "ws2812": {
+ "pin": "D7"
+ },
"matrix_pins": {
"cols": ["F7", "D2", "B1", "C6"],
"rows": ["D1", "B5", "B4", "E6"]
@@ -31,39 +34,33 @@
"encoder": {
"enabled": true,
"rotary": [
- {
- "pin_a": "F6",
- "pin_b": "F5"
- },
- {
- "pin_a": "D4",
- "pin_b": "D0"
- }
+ {"pin_a": "F6", "pin_b": "F5"},
+ {"pin_a": "D4", "pin_b": "D0"}
]
},
"rgb_matrix": {
"driver": "WS2812",
"layout": [
- { "flags": 4, "matrix": [0, 0], "x": 28, "y": 12 },
- { "flags": 4, "matrix": [0, 1], "x": 84, "y": 12 },
- { "flags": 4, "matrix": [0, 2], "x": 140, "y": 12 },
- { "flags": 4, "matrix": [0, 3], "x": 196, "y": 12 },
- { "flags": 2, "x": 196, "y": 17 },
- { "flags": 4, "matrix": [1, 3], "x": 196, "y": 28 },
- { "flags": 4, "matrix": [1, 2], "x": 140, "y": 28 },
- { "flags": 4, "matrix": [1, 1], "x": 84, "y": 28 },
- { "flags": 2, "x": 28, "y": 17 },
- { "flags": 4, "matrix": [1, 0], "x": 28, "y": 28 },
- { "flags": 4, "matrix": [2, 0], "x": 28, "y": 44 },
- { "flags": 4, "matrix": [2, 1], "x": 84, "y": 44 },
- { "flags": 4, "matrix": [2, 2], "x": 140, "y": 44 },
- { "flags": 4, "matrix": [2, 3], "x": 196, "y": 44 },
- { "flags": 2, "x": 196, "y": 47 },
- { "flags": 4, "matrix": [3, 3], "x": 196, "y": 60 },
- { "flags": 4, "matrix": [3, 2], "x": 140, "y": 60 },
- { "flags": 4, "matrix": [3, 1], "x": 84, "y": 60 },
- { "flags": 2, "x": 28, "y": 47 },
- { "flags": 4, "matrix": [3, 0], "x": 28, "y": 60 }
+ {"flags": 4, "matrix": [0, 0], "x": 28, "y": 12},
+ {"flags": 4, "matrix": [0, 1], "x": 84, "y": 12},
+ {"flags": 4, "matrix": [0, 2], "x": 140, "y": 12},
+ {"flags": 4, "matrix": [0, 3], "x": 196, "y": 12},
+ {"flags": 2, "x": 196, "y": 17},
+ {"flags": 4, "matrix": [1, 3], "x": 196, "y": 28},
+ {"flags": 4, "matrix": [1, 2], "x": 140, "y": 28},
+ {"flags": 4, "matrix": [1, 1], "x": 84, "y": 28},
+ {"flags": 2, "x": 28, "y": 17},
+ {"flags": 4, "matrix": [1, 0], "x": 28, "y": 28},
+ {"flags": 4, "matrix": [2, 0], "x": 28, "y": 44},
+ {"flags": 4, "matrix": [2, 1], "x": 84, "y": 44},
+ {"flags": 4, "matrix": [2, 2], "x": 140, "y": 44},
+ {"flags": 4, "matrix": [2, 3], "x": 196, "y": 44},
+ {"flags": 2, "x": 196, "y": 47},
+ {"flags": 4, "matrix": [3, 3], "x": 196, "y": 60},
+ {"flags": 4, "matrix": [3, 2], "x": 140, "y": 60},
+ {"flags": 4, "matrix": [3, 1], "x": 84, "y": 60},
+ {"flags": 2, "x": 28, "y": 47},
+ {"flags": 4, "matrix": [3, 0], "x": 28, "y": 60}
]
},
"community_layouts": [
@@ -72,23 +69,23 @@
"layouts": {
"LAYOUT_ortho_4x4": {
"layout": [
- { "matrix": [0, 0], "x": 0, "y": 0 },
- { "matrix": [0, 1], "x": 1, "y": 0 },
- { "matrix": [0, 2], "x": 2, "y": 0 },
- { "matrix": [0, 3], "x": 3, "y": 0 },
- { "matrix": [1, 0], "x": 0, "y": 1 },
- { "matrix": [1, 1], "x": 1, "y": 1 },
- { "matrix": [1, 2], "x": 2, "y": 1 },
- { "matrix": [1, 3], "x": 3, "y": 1 },
- { "matrix": [2, 0], "x": 0, "y": 2 },
- { "matrix": [2, 1], "x": 1, "y": 2 },
- { "matrix": [2, 2], "x": 2, "y": 2 },
- { "matrix": [2, 3], "x": 3, "y": 2 },
- { "matrix": [3, 0], "x": 0, "y": 3 },
- { "matrix": [3, 1], "x": 1, "y": 3 },
- { "matrix": [3, 2], "x": 2, "y": 3 },
- { "matrix": [3, 3], "x": 3, "y": 3 }
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3},
+ {"matrix": [3, 2], "x": 2, "y": 3},
+ {"matrix": [3, 3], "x": 3, "y": 3}
]
}
}
-} \ No newline at end of file
+}