summaryrefslogtreecommitdiff
path: root/keyboards/bubble75
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/bubble75')
-rw-r--r--keyboards/bubble75/hotswap/config.h7
-rw-r--r--keyboards/bubble75/hotswap/hotswap.c3
-rw-r--r--keyboards/bubble75/hotswap/hotswap.h35
-rw-r--r--keyboards/bubble75/hotswap/info.json184
-rw-r--r--keyboards/bubble75/hotswap/rules.mk1
5 files changed, 105 insertions, 125 deletions
diff --git a/keyboards/bubble75/hotswap/config.h b/keyboards/bubble75/hotswap/config.h
index e59cba6a50..a637e9e335 100644
--- a/keyboards/bubble75/hotswap/config.h
+++ b/keyboards/bubble75/hotswap/config.h
@@ -16,12 +16,6 @@
#pragma once
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { F4, F5, F6, F7, C7, F1 }
-#define MATRIX_COL_PINS { B0, B1, B2, B3, E6, F0, D0, D1, D4, D6, D7, B4, B5, B6, C6 }
-#define DIODE_DIRECTION COL2ROW
-
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
@@ -32,7 +26,6 @@
/* WS2812 RGB */
#ifdef RGB_MATRIX_ENABLE
-#define RGB_DI_PIN B7
#define RGBLED_NUM 81
#define RGB_MATRIX_LED_COUNT 81
#define RGBLIGHT_HUE_STEP 8
diff --git a/keyboards/bubble75/hotswap/hotswap.c b/keyboards/bubble75/hotswap/hotswap.c
index 97ca40446c..30c908a79f 100644
--- a/keyboards/bubble75/hotswap/hotswap.c
+++ b/keyboards/bubble75/hotswap/hotswap.c
@@ -14,7 +14,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "hotswap.h"
+#include "quantum.h"
+
#ifdef RGB_MATRIX_ENABLE
led_config_t g_led_config = {
{
diff --git a/keyboards/bubble75/hotswap/hotswap.h b/keyboards/bubble75/hotswap/hotswap.h
deleted file mode 100644
index 9914ea651b..0000000000
--- a/keyboards/bubble75/hotswap/hotswap.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2022 Velocifire
- *
- * 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( \
- K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K014, \
- K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \
- K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, \
- K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K314, \
- K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K413, K414, \
- K500, K501, K502, K505, K508, K509, K511, K513, K514 \
-) { \
- { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, KC_NO, K014 }, \
- { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114 }, \
- { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214 }, \
- { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, KC_NO, K314 }, \
- { K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, KC_NO, K413, K414 }, \
- { K500, K501, K502, KC_NO, KC_NO, K505, KC_NO, KC_NO, K508, K509, KC_NO, K511, KC_NO, K513, K514 } \
-}
diff --git a/keyboards/bubble75/hotswap/info.json b/keyboards/bubble75/hotswap/info.json
index b9519f15f1..f57e41df46 100644
--- a/keyboards/bubble75/hotswap/info.json
+++ b/keyboards/bubble75/hotswap/info.json
@@ -8,91 +8,113 @@
"pid": "0x5A4C",
"device_version": "0.0.1"
},
+ "ws2812": {
+ "pin": "B7"
+ },
+ "rgb_matrix": {
+ "driver": "WS2812"
+ },
+ "matrix_pins": {
+ "cols": ["B0", "B1", "B2", "B3", "E6", "F0", "D0", "D1", "D4", "D6", "D7", "B4", "B5", "B6", "C6"],
+ "rows": ["F4", "F5", "F6", "F7", "C7", "F1"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layouts": {
"LAYOUT": {
- "layout": [{"x":0, "y":0},
- {"x":1.5, "y":0},
- {"x":2.5, "y":0},
- {"x":3.5, "y":0},
- {"x":4.5, "y":0},
- {"x":6, "y":0},
- {"x":7, "y":0},
- {"x":8, "y":0},
- {"x":9, "y":0},
- {"x":10.5, "y":0},
- {"x":11.5, "y":0},
- {"x":12.5, "y":0},
- {"x":13.5, "y":0},
- {"x":15, "y":0},
- {"x":0, "y":1.5},
- {"x":1, "y":1.5},
- {"x":2, "y":1.5},
- {"x":3, "y":1.5},
- {"x":4, "y":1.5},
- {"x":5, "y":1.5},
- {"x":6, "y":1.5},
- {"x":7, "y":1.5},
- {"x":8, "y":1.5},
- {"x":9, "y":1.5},
- {"x":10, "y":1.5},
- {"x":11, "y":1.5},
- {"x":12, "y":1.5},
- {"x":13, "y":1.5, "w":2},
- {"x":15, "y":1.5},
- {"x":0, "y":2.5, "w":1.5},
- {"x":1.5, "y":2.5},
- {"x":2.5, "y":2.5},
- {"x":3.5, "y":2.5},
- {"x":4.5, "y":2.5},
- {"x":5.5, "y":2.5},
- {"x":6.5, "y":2.5},
- {"x":7.5, "y":2.5},
- {"x":8.5, "y":2.5},
- {"x":9.5, "y":2.5},
- {"x":10.5, "y":2.5},
- {"x":11.5, "y":2.5},
- {"x":12.5, "y":2.5},
- {"x":13.5, "y":2.5, "w":1.5},
- {"x":15, "y":2.5},
- {"x":0, "y":3.5, "w":1.75},
- {"x":1.75, "y":3.5},
- {"x":2.75, "y":3.5},
- {"x":3.75, "y":3.5},
- {"x":4.75, "y":3.5},
- {"x":5.75, "y":3.5},
- {"x":6.75, "y":3.5},
- {"x":7.75, "y":3.5},
- {"x":8.75, "y":3.5},
- {"x":9.75, "y":3.5},
- {"x":10.75, "y":3.5},
- {"x":11.75, "y":3.5},
- {"x":12.75, "y":3.5, "w":2.25},
- {"x":15, "y":3.5},
- {"x":0, "y":4.5, "w":2.25},
- {"x":2.25, "y":4.5},
- {"x":3.25, "y":4.5},
- {"x":4.25, "y":4.5},
- {"x":5.25, "y":4.5},
- {"x":6.25, "y":4.5},
- {"x":7.25, "y":4.5},
- {"x":8.25, "y":4.5},
- {"x":9.25, "y":4.5},
- {"x":10.25, "y":4.5},
- {"x":11.25, "y":4.5},
- {"x":12.25, "y":4.5, "w":1.75},
- {"x":14, "y":4.5},
- {"x":15, "y":4.5},
- {"x":0, "y":5.5, "w":1.25},
- {"x":1.25, "y":5.5, "w":1.25},
- {"x":2.5, "y":5.5, "w":1.25},
- {"x":3.75, "y":5.5, "w":6.25},
- {"x":10, "y":5.5, "w":1.25},
- {"x":11.25, "y":5.5, "w":1.25},
- {"x":13, "y":5.5},
- {"x":14, "y":5.5},
- {"x":15, "y":5.5}]
+ "layout": [
+ {"label": "K000", "matrix": [0, 0], "x": 0, "y": 0},
+
+ {"label": "K001", "matrix": [0, 1], "x": 1.5, "y": 0},
+ {"label": "K002", "matrix": [0, 2], "x": 2.5, "y": 0},
+ {"label": "K003", "matrix": [0, 3], "x": 3.5, "y": 0},
+ {"label": "K004", "matrix": [0, 4], "x": 4.5, "y": 0},
+
+ {"label": "K005", "matrix": [0, 5], "x": 6, "y": 0},
+ {"label": "K006", "matrix": [0, 6], "x": 7, "y": 0},
+ {"label": "K007", "matrix": [0, 7], "x": 8, "y": 0},
+ {"label": "K008", "matrix": [0, 8], "x": 9, "y": 0},
+
+ {"label": "K009", "matrix": [0, 9], "x": 10.5, "y": 0},
+ {"label": "K010", "matrix": [0, 10], "x": 11.5, "y": 0},
+ {"label": "K011", "matrix": [0, 11], "x": 12.5, "y": 0},
+ {"label": "K012", "matrix": [0, 12], "x": 13.5, "y": 0},
+
+ {"label": "K014", "matrix": [0, 14], "x": 15, "y": 0},
+
+ {"label": "K100", "matrix": [1, 0], "x": 0, "y": 1.5},
+ {"label": "K101", "matrix": [1, 1], "x": 1, "y": 1.5},
+ {"label": "K102", "matrix": [1, 2], "x": 2, "y": 1.5},
+ {"label": "K103", "matrix": [1, 3], "x": 3, "y": 1.5},
+ {"label": "K104", "matrix": [1, 4], "x": 4, "y": 1.5},
+ {"label": "K105", "matrix": [1, 5], "x": 5, "y": 1.5},
+ {"label": "K106", "matrix": [1, 6], "x": 6, "y": 1.5},
+ {"label": "K107", "matrix": [1, 7], "x": 7, "y": 1.5},
+ {"label": "K108", "matrix": [1, 8], "x": 8, "y": 1.5},
+ {"label": "K109", "matrix": [1, 9], "x": 9, "y": 1.5},
+ {"label": "K110", "matrix": [1, 10], "x": 10, "y": 1.5},
+ {"label": "K111", "matrix": [1, 11], "x": 11, "y": 1.5},
+ {"label": "K112", "matrix": [1, 12], "x": 12, "y": 1.5},
+ {"label": "K113", "matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
+ {"label": "K114", "matrix": [1, 14], "x": 15, "y": 1.5},
+
+ {"label": "K200", "matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+ {"label": "K201", "matrix": [2, 1], "x": 1.5, "y": 2.5},
+ {"label": "K202", "matrix": [2, 2], "x": 2.5, "y": 2.5},
+ {"label": "K203", "matrix": [2, 3], "x": 3.5, "y": 2.5},
+ {"label": "K204", "matrix": [2, 4], "x": 4.5, "y": 2.5},
+ {"label": "K205", "matrix": [2, 5], "x": 5.5, "y": 2.5},
+ {"label": "K206", "matrix": [2, 6], "x": 6.5, "y": 2.5},
+ {"label": "K207", "matrix": [2, 7], "x": 7.5, "y": 2.5},
+ {"label": "K208", "matrix": [2, 8], "x": 8.5, "y": 2.5},
+ {"label": "K209", "matrix": [2, 9], "x": 9.5, "y": 2.5},
+ {"label": "K210", "matrix": [2, 10], "x": 10.5, "y": 2.5},
+ {"label": "K211", "matrix": [2, 11], "x": 11.5, "y": 2.5},
+ {"label": "K212", "matrix": [2, 12], "x": 12.5, "y": 2.5},
+ {"label": "K213", "matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
+ {"label": "K214", "matrix": [2, 14], "x": 15, "y": 2.5},
+
+ {"label": "K300", "matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+ {"label": "K301", "matrix": [3, 1], "x": 1.75, "y": 3.5},
+ {"label": "K302", "matrix": [3, 2], "x": 2.75, "y": 3.5},
+ {"label": "K303", "matrix": [3, 3], "x": 3.75, "y": 3.5},
+ {"label": "K304", "matrix": [3, 4], "x": 4.75, "y": 3.5},
+ {"label": "K305", "matrix": [3, 5], "x": 5.75, "y": 3.5},
+ {"label": "K306", "matrix": [3, 6], "x": 6.75, "y": 3.5},
+ {"label": "K307", "matrix": [3, 7], "x": 7.75, "y": 3.5},
+ {"label": "K308", "matrix": [3, 8], "x": 8.75, "y": 3.5},
+ {"label": "K309", "matrix": [3, 9], "x": 9.75, "y": 3.5},
+ {"label": "K310", "matrix": [3, 10], "x": 10.75, "y": 3.5},
+ {"label": "K311", "matrix": [3, 11], "x": 11.75, "y": 3.5},
+ {"label": "K312", "matrix": [3, 12], "x": 12.75, "y": 3.5, "w": 2.25},
+ {"label": "K314", "matrix": [3, 14], "x": 15, "y": 3.5},
+
+ {"label": "K400", "matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+ {"label": "K401", "matrix": [4, 1], "x": 2.25, "y": 4.5},
+ {"label": "K402", "matrix": [4, 2], "x": 3.25, "y": 4.5},
+ {"label": "K403", "matrix": [4, 3], "x": 4.25, "y": 4.5},
+ {"label": "K404", "matrix": [4, 4], "x": 5.25, "y": 4.5},
+ {"label": "K405", "matrix": [4, 5], "x": 6.25, "y": 4.5},
+ {"label": "K406", "matrix": [4, 6], "x": 7.25, "y": 4.5},
+ {"label": "K407", "matrix": [4, 7], "x": 8.25, "y": 4.5},
+ {"label": "K408", "matrix": [4, 8], "x": 9.25, "y": 4.5},
+ {"label": "K409", "matrix": [4, 9], "x": 10.25, "y": 4.5},
+ {"label": "K410", "matrix": [4, 10], "x": 11.25, "y": 4.5},
+ {"label": "K411", "matrix": [4, 11], "x": 12.25, "y": 4.5, "w": 1.75},
+ {"label": "K413", "matrix": [4, 13], "x": 14, "y": 4.5},
+ {"label": "K414", "matrix": [4, 14], "x": 15, "y": 4.5},
+
+ {"label": "K500", "matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+ {"label": "K501", "matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+ {"label": "K502", "matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+ {"label": "K505", "matrix": [5, 5], "x": 3.75, "y": 5.5, "w": 6.25},
+ {"label": "K508", "matrix": [5, 8], "x": 10, "y": 5.5, "w": 1.25},
+ {"label": "K509", "matrix": [5, 9], "x": 11.25, "y": 5.5, "w": 1.25},
+ {"label": "K511", "matrix": [5, 11], "x": 13, "y": 5.5},
+ {"label": "K513", "matrix": [5, 13], "x": 14, "y": 5.5},
+ {"label": "K514", "matrix": [5, 14], "x": 15, "y": 5.5}
+ ]
}
}
}
diff --git a/keyboards/bubble75/hotswap/rules.mk b/keyboards/bubble75/hotswap/rules.mk
index d8dc7dca6f..c11ab0df94 100644
--- a/keyboards/bubble75/hotswap/rules.mk
+++ b/keyboards/bubble75/hotswap/rules.mk
@@ -9,5 +9,4 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
AUDIO_ENABLE = no # Audio output
RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
NO_USB_STARTUP_CHECK = yes \ No newline at end of file