summaryrefslogtreecommitdiff
path: root/keyboards/rura66
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/rura66')
-rw-r--r--keyboards/rura66/rev1/config.h18
-rw-r--r--keyboards/rura66/rev1/info.json91
-rw-r--r--keyboards/rura66/rev1/oled_display.c2
-rw-r--r--keyboards/rura66/rev1/rev1.c2
-rw-r--r--keyboards/rura66/rev1/rev1.h28
-rw-r--r--keyboards/rura66/rev1/rules.mk1
-rw-r--r--keyboards/rura66/rules.mk1
-rw-r--r--keyboards/rura66/rura66.c16
-rw-r--r--keyboards/rura66/rura66.h22
9 files changed, 88 insertions, 93 deletions
diff --git a/keyboards/rura66/rev1/config.h b/keyboards/rura66/rev1/config.h
index 1a6ca8ac73..3ca7920978 100644
--- a/keyboards/rura66/rev1/config.h
+++ b/keyboards/rura66/rev1/config.h
@@ -17,28 +17,10 @@ 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 { D4, C6, D7, E6, B4 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
/* Split hand configration */
#define MASTER_LEFT
#ifdef RGBLIGHT_ENABLE
- #define RGB_DI_PIN D3
#define RGBLED_NUM 66 // Number of LEDs
#define RGBLIGHT_SPLIT
#define RGBLED_SPLIT { 33, 33 }
diff --git a/keyboards/rura66/rev1/info.json b/keyboards/rura66/rev1/info.json
index fc4f1793bc..de1578cc83 100644
--- a/keyboards/rura66/rev1/info.json
+++ b/keyboards/rura66/rev1/info.json
@@ -8,19 +8,100 @@
"pid": "0x0200",
"device_version": "0.0.1"
},
+ "rgb_matrix": {
+ "driver": "WS2812"
+ },
+ "matrix_pins": {
+ "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"],
+ "rows": ["D4", "C6", "D7", "E6", "B4"]
+ },
+ "diode_direction": "COL2ROW",
"split": {
"soft_serial_pin": "D2"
},
+ "ws2812": {
+ "pin": "D3"
+ },
"processor": "atmega32u4",
"bootloader": "caterina",
"layouts": {
"LAYOUT": {
"layout": [
- {"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15, "y":0},
- {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "y":1}, {"x":13, "y":1}, {"x":14, "y":1}, {"x":15, "y":1},
- {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":13, "y":2}, {"x":14, "y":2}, {"x":15, "y":2},
- {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":6, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}, {"x":13, "y":3}, {"x":14, "y":3}, {"x":15, "y":3},
- {"x":0, "y":4}, {"x":1, "y":4}, {"x":2, "y":4}, {"x":5, "y":4}, {"x":6, "y":4}, {"x":7, "y":4}, {"x":8, "y":4}, {"x":9, "y":4}, {"x":10, "y":4}, {"x":13, "y":4}, {"x":14, "y":4}, {"x":15, "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": [5, 5], "x": 10, "y": 0},
+ {"matrix": [5, 4], "x": 11, "y": 0},
+ {"matrix": [5, 3], "x": 12, "y": 0},
+ {"matrix": [5, 2], "x": 13, "y": 0},
+ {"matrix": [5, 1], "x": 14, "y": 0},
+ {"matrix": [5, 0], "x": 15, "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": [1, 4], "x": 4, "y": 1},
+ {"matrix": [1, 5], "x": 5, "y": 1},
+
+ {"matrix": [6, 5], "x": 10, "y": 1},
+ {"matrix": [6, 4], "x": 11, "y": 1},
+ {"matrix": [6, 3], "x": 12, "y": 1},
+ {"matrix": [6, 2], "x": 13, "y": 1},
+ {"matrix": [6, 1], "x": 14, "y": 1},
+ {"matrix": [6, 0], "x": 15, "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": [2, 4], "x": 4, "y": 2},
+ {"matrix": [2, 5], "x": 5, "y": 2},
+ {"matrix": [2, 6], "x": 6, "y": 2},
+
+ {"matrix": [7, 6], "x": 9, "y": 2},
+ {"matrix": [7, 5], "x": 10, "y": 2},
+ {"matrix": [7, 4], "x": 11, "y": 2},
+ {"matrix": [7, 3], "x": 12, "y": 2},
+ {"matrix": [7, 2], "x": 13, "y": 2},
+ {"matrix": [7, 1], "x": 14, "y": 2},
+ {"matrix": [7, 0], "x": 15, "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": [3, 4], "x": 4, "y": 3},
+ {"matrix": [3, 5], "x": 5, "y": 3},
+ {"matrix": [3, 6], "x": 6, "y": 3},
+ {"matrix": [0, 6], "x": 7, "y": 3},
+ {"matrix": [5, 6], "x": 8, "y": 3},
+ {"matrix": [8, 6], "x": 9, "y": 3},
+ {"matrix": [8, 5], "x": 10, "y": 3},
+ {"matrix": [8, 4], "x": 11, "y": 3},
+ {"matrix": [8, 3], "x": 12, "y": 3},
+ {"matrix": [8, 2], "x": 13, "y": 3},
+ {"matrix": [8, 1], "x": 14, "y": 3},
+ {"matrix": [8, 0], "x": 15, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+ {"matrix": [4, 1], "x": 1, "y": 4},
+ {"matrix": [4, 2], "x": 2, "y": 4},
+
+ {"matrix": [4, 5], "x": 5, "y": 4},
+ {"matrix": [4, 6], "x": 6, "y": 4},
+ {"matrix": [1, 6], "x": 7, "y": 4},
+ {"matrix": [6, 6], "x": 8, "y": 4},
+ {"matrix": [9, 6], "x": 9, "y": 4},
+ {"matrix": [9, 5], "x": 10, "y": 4},
+
+ {"matrix": [9, 2], "x": 13, "y": 4},
+ {"matrix": [9, 1], "x": 14, "y": 4},
+ {"matrix": [9, 0], "x": 15, "y": 4}
]
}
}
diff --git a/keyboards/rura66/rev1/oled_display.c b/keyboards/rura66/rev1/oled_display.c
index 137fd188c7..d2e3422bf9 100644
--- a/keyboards/rura66/rev1/oled_display.c
+++ b/keyboards/rura66/rev1/oled_display.c
@@ -14,7 +14,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include QMK_KEYBOARD_H
+#include "rev1.h"
// Defines names for use in layer keycodes and the keymap
enum layer_names {
diff --git a/keyboards/rura66/rev1/rev1.c b/keyboards/rura66/rev1/rev1.c
index f42bdad44b..d1b6a4ff6a 100644
--- a/keyboards/rura66/rev1/rev1.c
+++ b/keyboards/rura66/rev1/rev1.c
@@ -14,7 +14,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "rura66.h"
+#include "rev1.h"
bool is_mac_mode(void) {
return keymap_config.swap_lalt_lgui == false;
diff --git a/keyboards/rura66/rev1/rev1.h b/keyboards/rura66/rev1/rev1.h
index 70f793ca3d..c843f6b716 100644
--- a/keyboards/rura66/rev1/rev1.h
+++ b/keyboards/rura66/rev1/rev1.h
@@ -20,31 +20,3 @@
bool is_mac_mode(void);
void set_mac_mode(bool macmode);
-
-/* 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( \
- L00, L01, L02, L03, L04, L05, R05, R04, R03, R02, R01, R00, \
- L10, L11, L12, L13, L14, L15, R15, R14, R13, R12, R11, R10, \
- L20, L21, L22, L23, L24, L25, L26, R26, R25, R24, R23, R22, R21, R20, \
- L30, L31, L32, L33, L34, L35, L36, L06, R06, R36, R35, R34, R33, R32, R31, R30, \
- L40, L41, L42, L45, L46, L16, R16, R46, R45, R42, R41, R40 \
-) \
-{ \
- { L00, L01, L02, L03, L04, L05, L06 }, \
- { L10, L11, L12, L13, L14, L15, L16 }, \
- { L20, L21, L22, L23, L24, L25, L26 }, \
- { L30, L31, L32, L33, L34, L35, L36 }, \
- { L40, L41, L42, KC_NO, KC_NO, L45, L46 }, \
- { R00, R01, R02, R03, R04, R05, R06 }, \
- { R10, R11, R12, R13, R14, R15, R16 }, \
- { R20, R21, R22, R23, R24, R25, R26 }, \
- { R30, R31, R32, R33, R34, R35, R36 }, \
- { R40, R41, R42, KC_NO, KC_NO, R45, R46 } \
-}
diff --git a/keyboards/rura66/rev1/rules.mk b/keyboards/rura66/rev1/rules.mk
index 5130195b44..0f2fb66a80 100644
--- a/keyboards/rura66/rev1/rules.mk
+++ b/keyboards/rura66/rev1/rules.mk
@@ -2,7 +2,6 @@ EXTRAKEY_ENABLE = yes # Audio control and System control
RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
SPLIT_KEYBOARD = yes
RGB_MATRIX_ENABLE = no
-RGB_MATRIX_DRIVER = WS2812
OLED_DRIVER = SSD1306
ENCODER_ENABLE = no
LTO_ENABLE = yes
diff --git a/keyboards/rura66/rules.mk b/keyboards/rura66/rules.mk
index 41795ddcb4..c7eacfa19a 100644
--- a/keyboards/rura66/rules.mk
+++ b/keyboards/rura66/rules.mk
@@ -13,6 +13,5 @@ AUDIO_ENABLE = no # Audio output
OLED_ENABLE = yes
SPLIT_KEYBOARD = yes
LTO_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
DEFAULT_FOLDER = rura66/rev1
diff --git a/keyboards/rura66/rura66.c b/keyboards/rura66/rura66.c
deleted file mode 100644
index 641643ef25..0000000000
--- a/keyboards/rura66/rura66.c
+++ /dev/null
@@ -1,16 +0,0 @@
- /* Copyright 2021 T.Shinohara
- *
- * 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 "rura66.h"
diff --git a/keyboards/rura66/rura66.h b/keyboards/rura66/rura66.h
deleted file mode 100644
index 9df9980b82..0000000000
--- a/keyboards/rura66/rura66.h
+++ /dev/null
@@ -1,22 +0,0 @@
- /* Copyright 2021 T.Shinohara
- *
- * 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"
-#if defined(KEYBOARD_rura66_rev1)
-# include "rev1.h"
-#endif
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-11 00:08:59 +0000