summaryrefslogtreecommitdiff
path: root/keyboards/uranuma
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/uranuma')
-rw-r--r--keyboards/uranuma/config.h17
-rw-r--r--keyboards/uranuma/info.json102
-rw-r--r--keyboards/uranuma/uranuma.c1
-rw-r--r--keyboards/uranuma/uranuma.h26
4 files changed, 56 insertions, 90 deletions
diff --git a/keyboards/uranuma/config.h b/keyboards/uranuma/config.h
index fb911ab60c..39bb20f2a8 100644
--- a/keyboards/uranuma/config.h
+++ b/keyboards/uranuma/config.h
@@ -1,22 +1,5 @@
#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 { C6, D7, E6, B4, B5 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B6, D2, D4 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
// fix iPhone and iPad power adapter issue
// iOS device need lessthan 100
#define USB_MAX_POWER_CONSUMPTION 100
diff --git a/keyboards/uranuma/info.json b/keyboards/uranuma/info.json
index d8bc5b107d..2dd2bd9e53 100644
--- a/keyboards/uranuma/info.json
+++ b/keyboards/uranuma/info.json
@@ -8,61 +8,71 @@
"pid": "0x112D",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6", "D2", "D4"],
+ "rows": ["C6", "D7", "E6", "B4", "B5"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layouts": {
"LAYOUT": {
"layout": [
- {"label":"k00", "x":0 , "y":0.62},
- {"label":"k01", "x":1 , "y":0.36},
- {"label":"k02", "x":2 , "y":0},
- {"label":"k03", "x":3 , "y":0.09},
- {"label":"k04", "x":4 , "y":0.70},
- {"label":"k05", "x":8 , "y":0.70},
- {"label":"k06", "x":9 , "y":0.09},
- {"label":"k07", "x":10, "y":0},
- {"label":"k08", "x":11, "y":0.36},
- {"label":"k09", "x":12, "y":0.62},
+ {"matrix": [0, 0], "x": 0, "y": 0.62},
+ {"matrix": [0, 1], "x": 1, "y": 0.36},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0.09},
+ {"matrix": [0, 4], "x": 4, "y": 0.7},
+
+ {"matrix": [0, 5], "x": 8, "y": 0.7},
+ {"matrix": [0, 6], "x": 9, "y": 0.09},
+ {"matrix": [0, 7], "x": 10, "y": 0},
+ {"matrix": [0, 8], "x": 11, "y": 0.36},
+ {"matrix": [0, 9], "x": 12, "y": 0.62},
+
+ {"matrix": [1, 0], "x": 0, "y": 1.62},
+ {"matrix": [1, 1], "x": 1, "y": 1.36},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1.09},
+ {"matrix": [1, 4], "x": 4, "y": 1.7},
+
+ {"matrix": [1, 5], "x": 8, "y": 1.7},
+ {"matrix": [1, 6], "x": 9, "y": 1.09},
+ {"matrix": [1, 7], "x": 10, "y": 1},
+ {"matrix": [1, 8], "x": 11, "y": 1.36},
+ {"matrix": [1, 9], "x": 12, "y": 1.62},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.62},
+ {"matrix": [2, 1], "x": 1, "y": 2.36},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2.09},
+ {"matrix": [2, 4], "x": 4, "y": 2.7},
+
+ {"matrix": [2, 5], "x": 8, "y": 2.7},
+ {"matrix": [2, 6], "x": 9, "y": 2.09},
+ {"matrix": [2, 7], "x": 10, "y": 2},
+ {"matrix": [2, 8], "x": 11, "y": 2.36},
+ {"matrix": [2, 9], "x": 12, "y": 2.62},
- {"label":"k10", "x":0 , "y":1.62},
- {"label":"k11", "x":1 , "y":1.36},
- {"label":"k12", "x":2 , "y":1},
- {"label":"k13", "x":3 , "y":1.09},
- {"label":"k14", "x":4 , "y":1.70},
- {"label":"k15", "x":8 , "y":1.70},
- {"label":"k16", "x":9 , "y":1.09},
- {"label":"k17", "x":10, "y":1},
- {"label":"k18", "x":11, "y":1.36},
- {"label":"k19", "x":12, "y":1.62},
+ {"matrix": [3, 0], "x": 0, "y": 3.62},
+ {"matrix": [3, 1], "x": 1, "y": 3.36},
+ {"matrix": [3, 2], "x": 2, "y": 3},
+ {"matrix": [3, 3], "x": 3, "y": 3.09},
+ {"matrix": [3, 4], "x": 4, "y": 3.7},
+ {"matrix": [4, 4], "x": 5, "y": 2.44, "h": 2},
- {"label":"k20", "x":0 , "y":2.62},
- {"label":"k21", "x":1 , "y":2.36},
- {"label":"k22", "x":2 , "y":2},
- {"label":"k23", "x":3 , "y":2.09},
- {"label":"k24", "x":4 , "y":2.70},
- {"label":"k25", "x":8 , "y":2.70},
- {"label":"k26", "x":9 , "y":2.09},
- {"label":"k27", "x":10, "y":2},
- {"label":"k28", "x":11, "y":2.36},
- {"label":"k29", "x":12, "y":2.62},
+ {"matrix": [4, 5], "x": 7, "y": 2.44, "h": 2},
+ {"matrix": [3, 5], "x": 8, "y": 3.7},
+ {"matrix": [3, 6], "x": 9, "y": 3.09},
+ {"matrix": [3, 7], "x": 10, "y": 3},
+ {"matrix": [3, 8], "x": 11, "y": 3.36},
+ {"matrix": [3, 9], "x": 12, "y": 3.62},
- {"label":"k30", "x":0 , "y":3.62},
- {"label":"k31", "x":1 , "y":3.36},
- {"label":"k32", "x":2 , "y":3},
- {"label":"k33", "x":3 , "y":3.09},
- {"label":"k34", "x":4 , "y":3.70},
- {"label":"k44", "x":5, "y":2.44, "h":2},
- {"label":"k45", "x":7, "y":2.44, "h":2},
- {"label":"k35", "x":8 , "y":3.70},
- {"label":"k36", "x":9 , "y":3.09},
- {"label":"k37", "x":10, "y":3},
- {"label":"k38", "x":11, "y":3.36},
- {"label":"k39", "x":12, "y":3.62},
+ {"matrix": [4, 0], "x": 0, "y": 4.7, "w": 1.5},
+ {"matrix": [4, 1], "x": 1.5, "y": 4.7},
- {"label":"k40", "x":0, "y":4.70, "w":1.5},
- {"label":"k41", "x":1.5, "y":4.70},
- {"label":"k48", "x":10.5, "y":4.70},
- {"label":"k49", "x":11.5, "y":4.70, "w":1.5}
+ {"matrix": [4, 8], "x": 10.5, "y": 4.7},
+ {"matrix": [4, 9], "x": 11.5, "y": 4.7, "w": 1.5}
]
}
}
diff --git a/keyboards/uranuma/uranuma.c b/keyboards/uranuma/uranuma.c
deleted file mode 100644
index e439177af7..0000000000
--- a/keyboards/uranuma/uranuma.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "uranuma.h"
diff --git a/keyboards/uranuma/uranuma.h b/keyboards/uranuma/uranuma.h
deleted file mode 100644
index 8b2e4c6930..0000000000
--- a/keyboards/uranuma/uranuma.h
+++ /dev/null
@@ -1,26 +0,0 @@
-#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( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, \
- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, \
- k30, k31, k32, k33, k34, k44, k45, k35, k36, k37, k38, k39, \
- k40, k41, k48, k49 \
-) { \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09 }, \
- { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19 }, \
- { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29 }, \
- { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39 }, \
- { k40, k41, KC_NO, KC_NO, k44, k45, KC_NO, KC_NO, k48, k49 } \
-}