summaryrefslogtreecommitdiff
path: root/keyboards/jacky_studio/bear_65
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/jacky_studio/bear_65')
-rw-r--r--keyboards/jacky_studio/bear_65/bear_65.c17
-rw-r--r--keyboards/jacky_studio/bear_65/bear_65.h25
-rw-r--r--keyboards/jacky_studio/bear_65/config.h21
-rw-r--r--keyboards/jacky_studio/bear_65/rev1/info.json11
-rw-r--r--keyboards/jacky_studio/bear_65/rev1/rev1.h2
-rw-r--r--keyboards/jacky_studio/bear_65/rev1/rules.mk1
-rw-r--r--keyboards/jacky_studio/bear_65/rev2/info.json11
-rw-r--r--keyboards/jacky_studio/bear_65/rev2/rev2.h2
-rw-r--r--keyboards/jacky_studio/bear_65/rev2/rules.mk1
9 files changed, 24 insertions, 67 deletions
diff --git a/keyboards/jacky_studio/bear_65/bear_65.c b/keyboards/jacky_studio/bear_65/bear_65.c
deleted file mode 100644
index a2ae572b82..0000000000
--- a/keyboards/jacky_studio/bear_65/bear_65.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 MudkipMao
- *
- * 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 "bear_65.h"
diff --git a/keyboards/jacky_studio/bear_65/bear_65.h b/keyboards/jacky_studio/bear_65/bear_65.h
deleted file mode 100644
index be8a14a86f..0000000000
--- a/keyboards/jacky_studio/bear_65/bear_65.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright 2020 MudkipMao
- *
- * 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_jacky_studio_bear_65_rev1)
- #include "rev1.h"
-#elif defined(KEYBOARD_jacky_studio_bear_65_rev2)
- #include "rev2.h"
-#endif
diff --git a/keyboards/jacky_studio/bear_65/config.h b/keyboards/jacky_studio/bear_65/config.h
index 0caf635045..2303086f2e 100644
--- a/keyboards/jacky_studio/bear_65/config.h
+++ b/keyboards/jacky_studio/bear_65/config.h
@@ -3,31 +3,12 @@
#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 { B0, B1, B2, B3, B7 }
-#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4, F7, F6, F5, F4, F1, F0 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION ROW2COL
-
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE
-#define RGB_DI_PIN E2
-#ifdef RGB_DI_PIN
#define RGBLIGHT_LIMIT_VAL 200
#define RGBLIGHT_DEFAULT_VAL 50
#define RGBLIGHT_EFFECT_BREATHING
@@ -46,5 +27,3 @@
#define RGBLIGHT_VAL_STEP 8
/* If defined, the RGB lighting will be switched off when the host goes to sleep */
#define RGBLIGHT_SLEEP
-
-#endif
diff --git a/keyboards/jacky_studio/bear_65/rev1/info.json b/keyboards/jacky_studio/bear_65/rev1/info.json
index ed5768bf32..8bc527606f 100644
--- a/keyboards/jacky_studio/bear_65/rev1/info.json
+++ b/keyboards/jacky_studio/bear_65/rev1/info.json
@@ -10,9 +10,20 @@
"pid": "0x000A",
"device_version": "0.0.1"
},
+ "rgb_matrix": {
+ "driver": "WS2812"
+ },
+ "matrix_pins": {
+ "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "F7", "F6", "F5", "F4", "F1", "F0"],
+ "rows": ["B0", "B1", "B2", "B3", "B7"]
+ },
+ "diode_direction": "ROW2COL",
"backlight": {
"pin": "B6"
},
+ "ws2812": {
+ "pin": "E2"
+ },
"indicators": {
"caps_lock": "C7",
"on_state": 0
diff --git a/keyboards/jacky_studio/bear_65/rev1/rev1.h b/keyboards/jacky_studio/bear_65/rev1/rev1.h
index 901efe70b7..872436fcd4 100644
--- a/keyboards/jacky_studio/bear_65/rev1/rev1.h
+++ b/keyboards/jacky_studio/bear_65/rev1/rev1.h
@@ -16,7 +16,7 @@
#pragma once
-#include "bear_65.h"
+#include "quantum.h"
#define LAYOUT_all( \
K31, K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K4E, \
diff --git a/keyboards/jacky_studio/bear_65/rev1/rules.mk b/keyboards/jacky_studio/bear_65/rev1/rules.mk
index 5d90baa2af..7e03810942 100644
--- a/keyboards/jacky_studio/bear_65/rev1/rules.mk
+++ b/keyboards/jacky_studio/bear_65/rev1/rules.mk
@@ -14,4 +14,3 @@ AUDIO_ENABLE = no # Audio output
LTO_ENABLE = yes # Use LTO flags to reduce firmware size
RGB_MATRIX_ENABLE = no # Enable keyboard RGB matrix (do not use together with RGBLIGHT_ENABLE)
-RGB_MATRIX_DRIVER = WS2812 # RGB matrix driver support
diff --git a/keyboards/jacky_studio/bear_65/rev2/info.json b/keyboards/jacky_studio/bear_65/rev2/info.json
index 147dc2ade4..c6565255ed 100644
--- a/keyboards/jacky_studio/bear_65/rev2/info.json
+++ b/keyboards/jacky_studio/bear_65/rev2/info.json
@@ -10,9 +10,20 @@
"pid": "0x0428",
"device_version": "0.0.1"
},
+ "rgb_matrix": {
+ "driver": "WS2812"
+ },
+ "matrix_pins": {
+ "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "F7", "F6", "F5", "F4", "F1", "F0"],
+ "rows": ["B0", "B1", "B2", "B3", "B7"]
+ },
+ "diode_direction": "ROW2COL",
"backlight": {
"pin": "B6"
},
+ "ws2812": {
+ "pin": "E2"
+ },
"indicators": {
"caps_lock": "C7",
"on_state": 0
diff --git a/keyboards/jacky_studio/bear_65/rev2/rev2.h b/keyboards/jacky_studio/bear_65/rev2/rev2.h
index 31cc430504..61f5a9d6fe 100644
--- a/keyboards/jacky_studio/bear_65/rev2/rev2.h
+++ b/keyboards/jacky_studio/bear_65/rev2/rev2.h
@@ -16,7 +16,7 @@
#pragma once
-#include "bear_65.h"
+#include "quantum.h"
#define LAYOUT_wk_full( \
K31, K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K4E, \
diff --git a/keyboards/jacky_studio/bear_65/rev2/rules.mk b/keyboards/jacky_studio/bear_65/rev2/rules.mk
index 5d90baa2af..7e03810942 100644
--- a/keyboards/jacky_studio/bear_65/rev2/rules.mk
+++ b/keyboards/jacky_studio/bear_65/rev2/rules.mk
@@ -14,4 +14,3 @@ AUDIO_ENABLE = no # Audio output
LTO_ENABLE = yes # Use LTO flags to reduce firmware size
RGB_MATRIX_ENABLE = no # Enable keyboard RGB matrix (do not use together with RGBLIGHT_ENABLE)
-RGB_MATRIX_DRIVER = WS2812 # RGB matrix driver support
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-11 00:03:35 +0000