summaryrefslogtreecommitdiff
path: root/keyboards/ryanbaekr/rb18
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/ryanbaekr/rb18')
-rw-r--r--keyboards/ryanbaekr/rb18/config.h20
-rw-r--r--keyboards/ryanbaekr/rb18/info.json42
-rw-r--r--keyboards/ryanbaekr/rb18/rb18.c17
-rw-r--r--keyboards/ryanbaekr/rb18/rb18.h35
4 files changed, 25 insertions, 89 deletions
diff --git a/keyboards/ryanbaekr/rb18/config.h b/keyboards/ryanbaekr/rb18/config.h
index 8fde291d58..835872aed5 100644
--- a/keyboards/ryanbaekr/rb18/config.h
+++ b/keyboards/ryanbaekr/rb18/config.h
@@ -17,26 +17,7 @@ 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 { B1, F7, F6, F5, F4 }
-#define MATRIX_COL_PINS { B2, B6, B5, B4 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
/* Underglow options */
-#define RGB_DI_PIN B0
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -51,7 +32,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RGBLED_HUE_STEP 8
#define RGBLED_SAT_STEP 8
#define RGBLED_VAL_STEP 8
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/ryanbaekr/rb18/info.json b/keyboards/ryanbaekr/rb18/info.json
index 4302522a49..2ee0967486 100644
--- a/keyboards/ryanbaekr/rb18/info.json
+++ b/keyboards/ryanbaekr/rb18/info.json
@@ -8,32 +8,40 @@
"pid": "0x0018",
"device_version": "0.0.3"
},
+ "ws2812": {
+ "pin": "B0"
+ },
+ "matrix_pins": {
+ "cols": ["B2", "B6", "B5", "B4"],
+ "rows": ["B1", "F7", "F6", "F5", "F4"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "caterina",
"layouts": {
"LAYOUT_numpad_5x4": {
"layout": [
- {"x":0, "y":0},
- {"x":1, "y":0},
- {"x":2, "y":0},
- {"x":3, "y":0},
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [1, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
- {"x":0, "y":1},
- {"x":1, "y":1},
- {"x":2, "y":1},
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [2, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
- {"x":0, "y":2},
- {"x":1, "y":2},
- {"x":2, "y":2},
- {"x":3, "y":1, "h":2},
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [3, 1], "x": 1, "y": 2},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [1, 3], "x": 3, "y": 1, "h": 2},
- {"x":0, "y":3},
- {"x":1, "y":3},
- {"x":2, "y":3},
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [4, 1], "x": 1, "y": 3},
+ {"matrix": [3, 2], "x": 2, "y": 3},
- {"x":0, "y":4, "w":2},
- {"x":2, "y":4},
- {"x":3, "y":3, "h":2}
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 2},
+ {"matrix": [4, 2], "x": 2, "y": 4},
+ {"matrix": [3, 3], "x": 3, "y": 3, "h": 2}
]
}
}
diff --git a/keyboards/ryanbaekr/rb18/rb18.c b/keyboards/ryanbaekr/rb18/rb18.c
deleted file mode 100644
index 366364e42f..0000000000
--- a/keyboards/ryanbaekr/rb18/rb18.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2022 ryanbaekr
- *
- * 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 "rb18.h"
diff --git a/keyboards/ryanbaekr/rb18/rb18.h b/keyboards/ryanbaekr/rb18/rb18.h
deleted file mode 100644
index 2dd2d61e86..0000000000
--- a/keyboards/ryanbaekr/rb18/rb18.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2022 ryanbaekr
- *
- * 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 ___ KC_NO
-
-#define LAYOUT_numpad_5x4( \
- k00, k11, k02, k03, \
- k10, k21, k12, \
- k20, k31, k22, k13, \
- k30, k41, k32, \
- k40, k42, k33 \
-){ \
- { k00, ___, k02, k03 }, \
- { k10, k11, k12, k13 }, \
- { k20, k21, k22, ___ }, \
- { k30, k31, k32, k33 }, \
- { k40, k41, k42, ___ } \
-}