summaryrefslogtreecommitdiffstats
path: root/keyboards/takashicompany/minizone
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/takashicompany/minizone')
-rw-r--r--keyboards/takashicompany/minizone/config.h20
-rw-r--r--keyboards/takashicompany/minizone/info.json88
-rw-r--r--keyboards/takashicompany/minizone/minizone.c2
-rw-r--r--keyboards/takashicompany/minizone/minizone.h30
4 files changed, 51 insertions, 89 deletions
diff --git a/keyboards/takashicompany/minizone/config.h b/keyboards/takashicompany/minizone/config.h
index 4cd3ae6b65..6f631456ea 100644
--- a/keyboards/takashicompany/minizone/config.h
+++ b/keyboards/takashicompany/minizone/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 { D4, C6, D7, E6, B4, B5 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2}
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
# define RGBLED_NUM 11
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
@@ -37,7 +18,6 @@
# define RGBLIGHT_EFFECT_STATIC_GRADIENT
//# define RGBLIGHT_EFFECT_RGB_TEST
//# define RGBLIGHT_EFFECT_ALTERNATING
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/takashicompany/minizone/info.json b/keyboards/takashicompany/minizone/info.json
index 882a8ebdd5..806a255bcb 100644
--- a/keyboards/takashicompany/minizone/info.json
+++ b/keyboards/takashicompany/minizone/info.json
@@ -8,52 +8,64 @@
"pid": "0x0021",
"device_version": "0.0.1"
},
+ "ws2812": {
+ "pin": "D3"
+ },
+ "matrix_pins": {
+ "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"],
+ "rows": ["D4", "C6", "D7", "E6", "B4", "B5"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "caterina",
"layouts": {
"LAYOUT": {
"layout": [
- { "x": 0, "y": 0.42, "w": 0.84, "h": 0.84 },
- { "x": 0.84, "y": 0.21, "w": 0.84, "h": 0.84 },
- { "x": 1.68, "y": 0, "w": 0.84, "h": 0.84 },
- { "x": 2.52, "y": 0.21, "w": 0.84, "h": 0.84 },
- { "x": 3.36, "y": 0.42, "w": 0.84, "h": 0.84 },
- { "x": 5.88, "y": 0.42, "w": 0.84, "h": 0.84 },
- { "x": 6.72, "y": 0.21, "w": 0.84, "h": 0.84 },
- { "x": 7.56, "y": 0, "w": 0.84, "h": 0.84 },
- { "x": 8.4, "y": 0.21, "w": 0.84, "h": 0.84 },
- { "x": 9.24, "y": 0.42, "w": 0.84, "h": 0.84 },
+ {"matrix": [0, 0], "x": 0, "y": 0.42, "w": 0.84, "h": 0.84},
+ {"matrix": [0, 1], "x": 0.84, "y": 0.21, "w": 0.84, "h": 0.84},
+ {"matrix": [0, 2], "x": 1.68, "y": 0, "w": 0.84, "h": 0.84},
+ {"matrix": [0, 3], "x": 2.52, "y": 0.21, "w": 0.84, "h": 0.84},
+ {"matrix": [0, 4], "x": 3.36, "y": 0.42, "w": 0.84, "h": 0.84},
+
+ {"matrix": [0, 5], "x": 5.88, "y": 0.42, "w": 0.84, "h": 0.84},
+ {"matrix": [0, 6], "x": 6.72, "y": 0.21, "w": 0.84, "h": 0.84},
+ {"matrix": [1, 0], "x": 7.56, "y": 0, "w": 0.84, "h": 0.84},
+ {"matrix": [1, 1], "x": 8.4, "y": 0.21, "w": 0.84, "h": 0.84},
+ {"matrix": [1, 2], "x": 9.24, "y": 0.42, "w": 0.84, "h": 0.84},
+
+ {"matrix": [1, 3], "x": 0, "y": 1.26, "w": 0.84, "h": 0.84},
+ {"matrix": [1, 4], "x": 0.84, "y": 1.05, "w": 0.84, "h": 0.84},
+ {"matrix": [1, 5], "x": 1.68, "y": 0.84, "w": 0.84, "h": 0.84},
+ {"matrix": [1, 6], "x": 2.52, "y": 1.05, "w": 0.84, "h": 0.84},
+ {"matrix": [2, 0], "x": 3.36, "y": 1.26, "w": 0.84, "h": 0.84},
+
+ {"matrix": [2, 1], "x": 5.88, "y": 1.26, "w": 0.84, "h": 0.84},
+ {"matrix": [2, 2], "x": 6.72, "y": 1.05, "w": 0.84, "h": 0.84},
+ {"matrix": [2, 3], "x": 7.56, "y": 0.84, "w": 0.84, "h": 0.84},
+ {"matrix": [2, 4], "x": 8.4, "y": 1.05, "w": 0.84, "h": 0.84},
+ {"matrix": [2, 5], "x": 9.24, "y": 1.26, "w": 0.84, "h": 0.84},
+
+ {"matrix": [2, 6], "x": 0, "y": 2.1, "w": 0.84, "h": 0.84},
+ {"matrix": [3, 0], "x": 0.84, "y": 1.89, "w": 0.84, "h": 0.84},
+ {"matrix": [3, 1], "x": 1.68, "y": 1.68, "w": 0.84, "h": 0.84},
+ {"matrix": [3, 2], "x": 2.52, "y": 1.89, "w": 0.84, "h": 0.84},
+ {"matrix": [3, 3], "x": 3.36, "y": 2.1, "w": 0.84, "h": 0.84},
- { "x": 0, "y": 1.26, "w": 0.84, "h": 0.84 },
- { "x": 0.84, "y": 1.05, "w": 0.84, "h": 0.84 },
- { "x": 1.68, "y": 0.84, "w": 0.84, "h": 0.84 },
- { "x": 2.52, "y": 1.05, "w": 0.84, "h": 0.84 },
- { "x": 3.36, "y": 1.26, "w": 0.84, "h": 0.84 },
- { "x": 5.88, "y": 1.26, "w": 0.84, "h": 0.84 },
- { "x": 6.72, "y": 1.05, "w": 0.84, "h": 0.84 },
- { "x": 7.56, "y": 0.84, "w": 0.84, "h": 0.84 },
- { "x": 8.4, "y": 1.05, "w": 0.84, "h": 0.84 },
- { "x": 9.24, "y": 1.26, "w": 0.84, "h": 0.84 },
+ {"matrix": [3, 4], "x": 5.88, "y": 2.1, "w": 0.84, "h": 0.84},
+ {"matrix": [3, 5], "x": 6.72, "y": 1.89, "w": 0.84, "h": 0.84},
+ {"matrix": [3, 6], "x": 7.56, "y": 1.68, "w": 0.84, "h": 0.84},
+ {"matrix": [4, 0], "x": 8.4, "y": 1.89, "w": 0.84, "h": 0.84},
+ {"matrix": [4, 1], "x": 9.24, "y": 2.1, "w": 0.84, "h": 0.84},
- { "x": 0, "y": 2.1, "w": 0.84, "h": 0.84 },
- { "x": 0.84, "y": 1.89, "w": 0.84, "h": 0.84 },
- { "x": 1.68, "y": 1.68, "w": 0.84, "h": 0.84 },
- { "x": 2.52, "y": 1.89, "w": 0.84, "h": 0.84 },
- { "x": 3.36, "y": 2.1, "w": 0.84, "h": 0.84 },
- { "x": 5.88, "y": 2.1, "w": 0.84, "h": 0.84 },
- { "x": 6.72, "y": 1.89, "w": 0.84, "h": 0.84 },
- { "x": 7.56, "y": 1.68, "w": 0.84, "h": 0.84 },
- { "x": 8.4, "y": 1.89, "w": 0.84, "h": 0.84 },
- { "x": 9.24, "y": 2.1, "w": 0.84, "h": 0.84 },
+ {"matrix": [4, 2], "x": 1.68, "y": 2.52, "w": 0.84, "h": 0.84},
+ {"matrix": [4, 3], "x": 2.52, "y": 2.73, "w": 0.84, "h": 0.84},
+ {"matrix": [4, 4], "x": 3.36, "y": 2.94, "w": 0.84, "h": 0.84},
+ {"matrix": [4, 5], "x": 4.2, "y": 2.94, "w": 0.84, "h": 0.84},
- { "x": 1.68, "y": 2.52, "w": 0.84, "h": 0.84 },
- { "x": 2.52, "y": 2.73, "w": 0.84, "h": 0.84 },
- { "x": 3.36, "y": 2.94, "w": 0.84, "h": 0.84 },
- { "x": 4.2, "y": 2.94, "w": 0.84, "h": 0.84 },
- { "x": 5.04, "y": 2.94, "w": 0.84, "h": 0.84 },
- { "x": 5.88, "y": 2.94, "w": 0.84, "h": 0.84 },
- { "x": 6.72, "y": 2.73, "w": 0.84, "h": 0.84 },
- { "x": 7.56, "y": 2.52, "w": 0.84, "h": 0.84 }
+ {"matrix": [4, 6], "x": 5.04, "y": 2.94, "w": 0.84, "h": 0.84},
+ {"matrix": [5, 0], "x": 5.88, "y": 2.94, "w": 0.84, "h": 0.84},
+ {"matrix": [5, 1], "x": 6.72, "y": 2.73, "w": 0.84, "h": 0.84},
+ {"matrix": [5, 2], "x": 7.56, "y": 2.52, "w": 0.84, "h": 0.84}
]
}
}
diff --git a/keyboards/takashicompany/minizone/minizone.c b/keyboards/takashicompany/minizone/minizone.c
index 5231c8c497..1574b0aef7 100644
--- a/keyboards/takashicompany/minizone/minizone.c
+++ b/keyboards/takashicompany/minizone/minizone.c
@@ -1,7 +1,7 @@
// Copyright 2022 takashicompany (@takashicompany)
// SPDX-License-Identifier: GPL-2.0-or-later
-#include "minizone.h"
+#include "quantum.h"
#ifdef OLED_ENABLE
diff --git a/keyboards/takashicompany/minizone/minizone.h b/keyboards/takashicompany/minizone/minizone.h
deleted file mode 100644
index 0e8d62c30d..0000000000
--- a/keyboards/takashicompany/minizone/minizone.h
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright 2022 takashicompany (@takashicompany)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-/* 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( \
- k00, k01, k02, k03, k04, k05, k06, k10, k11, k12, \
- k13, k14, k15, k16, k20, k21, k22, k23, k24, k25, \
- k26, k30, k31, k32, k33, k34, k35, k36, k40, k41, \
- k42, k43, k44, k45, k46, k50, k51, k52 \
-) { \
- { k00, k01, k02, k03, k04, k05, k06 }, \
- { k10, k11, k12, k13, k14, k15, k16 }, \
- { k20, k21, k22, k23, k24, k25, k26 }, \
- { k30, k31, k32, k33, k34, k35, k36 }, \
- { k40, k41, k42, k43, k44, k45, k46 }, \
- { k50, k51, k52, XXX, XXX, XXX, XXX } \
-}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 19:19:32 +0000