summaryrefslogtreecommitdiff
path: root/keyboards/ada/infinity81
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/ada/infinity81')
-rw-r--r--keyboards/ada/infinity81/config.h20
-rw-r--r--keyboards/ada/infinity81/infinity81.c4
-rw-r--r--keyboards/ada/infinity81/infinity81.h30
-rw-r--r--keyboards/ada/infinity81/info.json176
4 files changed, 96 insertions, 134 deletions
diff --git a/keyboards/ada/infinity81/config.h b/keyboards/ada/infinity81/config.h
index d8fc5bf226..dad8639fd6 100644
--- a/keyboards/ada/infinity81/config.h
+++ b/keyboards/ada/infinity81/config.h
@@ -3,25 +3,6 @@
#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, F6, B7 }
-#define MATRIX_COL_PINS { D1, D2, D3, D5, D4, D6, D7, B4, B5, B6, C6, C7, F5, F1, F4 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN D0
-#ifdef RGB_DI_PIN
# define RGBLED_NUM 107
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
@@ -38,7 +19,6 @@
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/ada/infinity81/infinity81.c b/keyboards/ada/infinity81/infinity81.c
deleted file mode 100644
index 7e20a1d705..0000000000
--- a/keyboards/ada/infinity81/infinity81.c
+++ /dev/null
@@ -1,4 +0,0 @@
-// Copyright 2022 peepeetee (@peepeetee)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "infinity81.h"
diff --git a/keyboards/ada/infinity81/infinity81.h b/keyboards/ada/infinity81/infinity81.h
deleted file mode 100644
index 199c6f3642..0000000000
--- a/keyboards/ada/infinity81/infinity81.h
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright 2022 peepeetee (@peepeetee)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#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( \
- K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, \
- 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, K313, K314, \
- K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K413, K414, \
- K500, K501, K502, K505, K510, K511, K512, K513, K514 \
-) { \
- { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, KC_NO, KC_NO }, \
- { 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, KC_NO, K313, 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, KC_NO, KC_NO, K510, K511, K512, K513, K514 } \
-}
diff --git a/keyboards/ada/infinity81/info.json b/keyboards/ada/infinity81/info.json
index 5c32cd0639..f957a01094 100644
--- a/keyboards/ada/infinity81/info.json
+++ b/keyboards/ada/infinity81/info.json
@@ -8,91 +8,107 @@
"pid": "0x0081",
"device_version": "0.0.1"
},
+ "ws2812": {
+ "pin": "D0"
+ },
+ "matrix_pins": {
+ "cols": ["D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F5", "F1", "F4"],
+ "rows": ["B3", "B2", "B1", "B0", "F6", "B7"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layouts": {
"LAYOUT": {
"layout": [
- { "label": "K00 (B3,D1)", "x": 0, "y": 0 },
- { "label": "K01 (B3,D2)", "x": 1.25, "y": 0 },
- { "label": "K02 (B3,D3)", "x": 2.25, "y": 0 },
- { "label": "K03 (B3,D5)", "x": 3.25, "y": 0 },
- { "label": "K04 (B3,D4)", "x": 4.25, "y": 0 },
- { "label": "K05 (B3,D6)", "x": 5.5, "y": 0 },
- { "label": "K06 (B3,D7)", "x": 6.5, "y": 0 },
- { "label": "K07 (B3,B4)", "x": 7.5, "y": 0 },
- { "label": "K08 (B3,B5)", "x": 8.5, "y": 0 },
- { "label": "K09 (B3,B6)", "x": 9.75, "y": 0 },
- { "label": "K0A (B3,C6)", "x": 10.75, "y": 0 },
- { "label": "K0B (B3,C7)", "x": 11.75, "y": 0 },
- { "label": "K0C (B3,F5)", "x": 12.75, "y": 0 },
- { "label": "K10 (B2,D1)", "x": 0, "y": 1.25 },
- { "label": "K11 (B2,D2)", "x": 1, "y": 1.25 },
- { "label": "K12 (B2,D3)", "x": 2, "y": 1.25 },
- { "label": "K13 (B2,D5)", "x": 3, "y": 1.25 },
- { "label": "K14 (B2,D4)", "x": 4, "y": 1.25 },
- { "label": "K15 (B2,D6)", "x": 5, "y": 1.25 },
- { "label": "K16 (B2,D7)", "x": 6, "y": 1.25 },
- { "label": "K17 (B2,B4)", "x": 7, "y": 1.25 },
- { "label": "K18 (B2,B5)", "x": 8, "y": 1.25 },
- { "label": "K19 (B2,B6)", "x": 9, "y": 1.25 },
- { "label": "K1A (B2,C6)", "x": 10, "y": 1.25 },
- { "label": "K1B (B2,C7)", "x": 11, "y": 1.25 },
- { "label": "K1C (B2,F5)", "x": 12, "y": 1.25 },
- { "label": "K1D (B2,F1)", "x": 13, "y": 1.25, "w": 2 },
- { "label": "K1E (B2,F4)", "x": 15, "y": 1.25 },
- { "label": "K20 (B1,D1)", "x": 0, "y": 2.25, "w": 1.5 },
- { "label": "K21 (B1,D2)", "x": 1.5, "y": 2.25 },
- { "label": "K22 (B1,D3)", "x": 2.5, "y": 2.25 },
- { "label": "K23 (B1,D5)", "x": 3.5, "y": 2.25 },
- { "label": "K24 (B1,D4)", "x": 4.5, "y": 2.25 },
- { "label": "K25 (B1,D6)", "x": 5.5, "y": 2.25 },
- { "label": "K26 (B1,D7)", "x": 6.5, "y": 2.25 },
- { "label": "K27 (B1,B4)", "x": 7.5, "y": 2.25 },
- { "label": "K28 (B1,B5)", "x": 8.5, "y": 2.25 },
- { "label": "K29 (B1,B6)", "x": 9.5, "y": 2.25 },
- { "label": "K2A (B1,C6)", "x": 10.5, "y": 2.25 },
- { "label": "K2B (B1,C7)", "x": 11.5, "y": 2.25 },
- { "label": "K2C (B1,F5)", "x": 12.5, "y": 2.25 },
- { "label": "K2D (B1,F1)", "x": 13.5, "y": 2.25, "w": 1.5 },
- { "label": "K2E (B1,F4)", "x": 15, "y": 2.25 },
- { "label": "K30 (B0,D1)", "x": 0, "y": 3.25, "w": 1.75 },
- { "label": "K31 (B0,D2)", "x": 1.75, "y": 3.25 },
- { "label": "K32 (B0,D3)", "x": 2.75, "y": 3.25 },
- { "label": "K33 (B0,D5)", "x": 3.75, "y": 3.25 },
- { "label": "K34 (B0,D4)", "x": 4.75, "y": 3.25 },
- { "label": "K35 (B0,D6)", "x": 5.75, "y": 3.25 },
- { "label": "K36 (B0,D7)", "x": 6.75, "y": 3.25 },
- { "label": "K37 (B0,B4)", "x": 7.75, "y": 3.25 },
- { "label": "K38 (B0,B5)", "x": 8.75, "y": 3.25 },
- { "label": "K39 (B0,B6)", "x": 9.75, "y": 3.25 },
- { "label": "K3A (B0,C6)", "x": 10.75, "y": 3.25 },
- { "label": "K3B (B0,C7)", "x": 11.75, "y": 3.25 },
- { "label": "K3D (B0,F1)", "x": 12.75, "y": 3.25, "w": 2.25 },
- { "label": "K3E (B0,F4)", "x": 15, "y": 3.25 },
- { "label": "K40 (F6,D1)", "x": 0, "y": 4.25, "w": 2.25 },
- { "label": "K41 (F6,D2)", "x": 2.25, "y": 4.25 },
- { "label": "K42 (F6,D3)", "x": 3.25, "y": 4.25 },
- { "label": "K43 (F6,D5)", "x": 4.25, "y": 4.25 },
- { "label": "K44 (F6,D4)", "x": 5.25, "y": 4.25 },
- { "label": "K45 (F6,D6)", "x": 6.25, "y": 4.25 },
- { "label": "K46 (F6,D7)", "x": 7.25, "y": 4.25 },
- { "label": "K47 (F6,B4)", "x": 8.25, "y": 4.25 },
- { "label": "K48 (F6,B5)", "x": 9.25, "y": 4.25 },
- { "label": "K49 (F6,B6)", "x": 10.25, "y": 4.25 },
- { "label": "K4A (F6,C6)", "x": 11.25, "y": 4.25 },
- { "label": "K4B (F6,C7)", "x": 12.25, "y": 4.25, "w": 1.75 },
- { "label": "K4D (F6,F1)", "x": 14, "y": 4.25 },
- { "label": "K4E (F6,F4)", "x": 15, "y": 4.25 },
- { "label": "K50 (B7,D1)", "x": 0, "y": 5.25, "w": 1.25 },
- { "label": "K51 (B7,D2)", "x": 1.25, "y": 5.25, "w": 1.25 },
- { "label": "K52 (B7,D3)", "x": 2.5, "y": 5.25, "w": 1.25 },
- { "label": "K55 (B7,D6)", "x": 3.75, "y": 5.25, "w": 6.25 },
- { "label": "K5A (B7,C6)", "x": 10, "y": 5.25, "w": 1.25 },
- { "label": "K5B (B7,C7)", "x": 11.25, "y": 5.25, "w": 1.25 },
- { "label": "K5C (B7,F5)", "x": 13, "y": 5.25 },
- { "label": "K5D (B7,F1)", "x": 14, "y": 5.25 },
- { "label": "K5E (B7,F4)", "x": 15, "y": 5.25 }
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [0, 1], "x": 1.25, "y": 0},
+ {"matrix": [0, 2], "x": 2.25, "y": 0},
+ {"matrix": [0, 3], "x": 3.25, "y": 0},
+ {"matrix": [0, 4], "x": 4.25, "y": 0},
+
+ {"matrix": [0, 5], "x": 5.5, "y": 0},
+ {"matrix": [0, 6], "x": 6.5, "y": 0},
+ {"matrix": [0, 7], "x": 7.5, "y": 0},
+ {"matrix": [0, 8], "x": 8.5, "y": 0},
+
+ {"matrix": [0, 9], "x": 9.75, "y": 0},
+ {"matrix": [0, 10], "x": 10.75, "y": 0},
+ {"matrix": [0, 11], "x": 11.75, "y": 0},
+ {"matrix": [0, 12], "x": 12.75, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1.25},
+ {"matrix": [1, 1], "x": 1, "y": 1.25},
+ {"matrix": [1, 2], "x": 2, "y": 1.25},
+ {"matrix": [1, 3], "x": 3, "y": 1.25},
+ {"matrix": [1, 4], "x": 4, "y": 1.25},
+ {"matrix": [1, 5], "x": 5, "y": 1.25},
+ {"matrix": [1, 6], "x": 6, "y": 1.25},
+ {"matrix": [1, 7], "x": 7, "y": 1.25},
+ {"matrix": [1, 8], "x": 8, "y": 1.25},
+ {"matrix": [1, 9], "x": 9, "y": 1.25},
+ {"matrix": [1, 10], "x": 10, "y": 1.25},
+ {"matrix": [1, 11], "x": 11, "y": 1.25},
+ {"matrix": [1, 12], "x": 12, "y": 1.25},
+ {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+ {"matrix": [1, 14], "x": 15, "y": 1.25},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+ {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+ {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+ {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+ {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+ {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+ {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+ {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+ {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+ {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+ {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+ {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+ {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+ {"matrix": [2, 14], "x": 15, "y": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+ {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+ {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+ {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+ {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+ {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+ {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+ {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+ {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+ {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+ {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+ {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+ {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+ {"matrix": [3, 14], "x": 15, "y": 3.25},
+
+ {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+ {"matrix": [4, 1], "x": 2.25, "y": 4.25},
+ {"matrix": [4, 2], "x": 3.25, "y": 4.25},
+ {"matrix": [4, 3], "x": 4.25, "y": 4.25},
+ {"matrix": [4, 4], "x": 5.25, "y": 4.25},
+ {"matrix": [4, 5], "x": 6.25, "y": 4.25},
+ {"matrix": [4, 6], "x": 7.25, "y": 4.25},
+ {"matrix": [4, 7], "x": 8.25, "y": 4.25},
+ {"matrix": [4, 8], "x": 9.25, "y": 4.25},
+ {"matrix": [4, 9], "x": 10.25, "y": 4.25},
+ {"matrix": [4, 10], "x": 11.25, "y": 4.25},
+ {"matrix": [4, 11], "x": 12.25, "y": 4.25, "w": 1.75},
+ {"matrix": [4, 13], "x": 14, "y": 4.25},
+ {"matrix": [4, 14], "x": 15, "y": 4.25},
+
+ {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 5], "x": 3.75, "y": 5.25, "w": 6.25},
+ {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 12], "x": 13, "y": 5.25},
+ {"matrix": [5, 13], "x": 14, "y": 5.25},
+ {"matrix": [5, 14], "x": 15, "y": 5.25}
]
}
}