summaryrefslogtreecommitdiff
path: root/keyboards/cherrybstudio
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/cherrybstudio')
-rw-r--r--keyboards/cherrybstudio/cb1800/config.h14
-rw-r--r--keyboards/cherrybstudio/cb1800/info.json8
-rw-r--r--keyboards/cherrybstudio/cb1800/rules.mk6
-rw-r--r--keyboards/cherrybstudio/cb65/config.h12
-rw-r--r--keyboards/cherrybstudio/cb65/info.json7
-rw-r--r--keyboards/cherrybstudio/cb65/rules.mk6
-rw-r--r--keyboards/cherrybstudio/cb87/config.h12
-rw-r--r--keyboards/cherrybstudio/cb87/info.json8
-rw-r--r--keyboards/cherrybstudio/cb87/rules.mk8
-rw-r--r--keyboards/cherrybstudio/cb87rgb/config.h9
-rw-r--r--keyboards/cherrybstudio/cb87rgb/info.json2
-rw-r--r--keyboards/cherrybstudio/cb87rgb/rules.mk6
-rw-r--r--keyboards/cherrybstudio/cb87v2/config.h13
-rw-r--r--keyboards/cherrybstudio/cb87v2/info.json7
-rw-r--r--keyboards/cherrybstudio/cb87v2/rules.mk6
15 files changed, 33 insertions, 91 deletions
diff --git a/keyboards/cherrybstudio/cb1800/config.h b/keyboards/cherrybstudio/cb1800/config.h
index c815b3bcfe..cc6d24ebc1 100644
--- a/keyboards/cherrybstudio/cb1800/config.h
+++ b/keyboards/cherrybstudio/cb1800/config.h
@@ -13,11 +13,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-#include "config_common.h"
-
-/* key matrix size */
-#define MATRIX_ROWS 10
-#define MATRIX_COLS 11
/*
* Keyboard Matrix Assignments
@@ -36,15 +31,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* COL2ROW, ROW2COL*/
#define DIODE_DIRECTION COL2ROW
-/* LED Indicators */
-#define LED_CAPS_LOCK_PIN F5
-#define LED_NUM_LOCK_PIN F6
-#define LED_SCROLL_LOCK_PIN F7
-#define LED_PIN_ON_STATE 0
-
-/* Set 0 if debouncing isn't needed */
-#define DEBOUNCE 5
-
#define RGB_DI_PIN E6
#ifdef RGB_DI_PIN
# define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/cherrybstudio/cb1800/info.json b/keyboards/cherrybstudio/cb1800/info.json
index 1caf876a61..8d96a17bcc 100644
--- a/keyboards/cherrybstudio/cb1800/info.json
+++ b/keyboards/cherrybstudio/cb1800/info.json
@@ -8,6 +8,14 @@
"pid": "0x1818",
"device_version": "0.0.1"
},
+ "indicators": {
+ "caps_lock": "F5",
+ "num_lock": "F6",
+ "scroll_lock": "F7",
+ "on_state": 0
+ },
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
"layouts": {
"LAYOUT_all": {
"layout": [
diff --git a/keyboards/cherrybstudio/cb1800/rules.mk b/keyboards/cherrybstudio/cb1800/rules.mk
index 65540808e4..95093e241a 100644
--- a/keyboards/cherrybstudio/cb1800/rules.mk
+++ b/keyboards/cherrybstudio/cb1800/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = atmel-dfu
-
# Build Options
# change yes to no to disable
#
diff --git a/keyboards/cherrybstudio/cb65/config.h b/keyboards/cherrybstudio/cb65/config.h
index d5a644ef8c..6bf9dba1e5 100644
--- a/keyboards/cherrybstudio/cb65/config.h
+++ b/keyboards/cherrybstudio/cb65/config.h
@@ -13,11 +13,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-#include "config_common.h"
-
-/* key matrix size */
-#define MATRIX_ROWS 9
-#define MATRIX_COLS 8
/*
* Keyboard Matrix Assignments
@@ -41,13 +36,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* COL2ROW, ROW2COL*/
#define DIODE_DIRECTION COL2ROW
-#define LED_CAPS_LOCK_PIN F1
-#define LED_SCROLL_LOCK_PIN F4
-#define LED_PIN_ON_STATE 0
-
-/* Set 0 if debouncing isn't needed */
-#define DEBOUNCE 5
-
/* RGB Lighting */
#define RGB_DI_PIN F0
#ifdef RGB_DI_PIN
diff --git a/keyboards/cherrybstudio/cb65/info.json b/keyboards/cherrybstudio/cb65/info.json
index 976b0b2e33..223d5560d4 100644
--- a/keyboards/cherrybstudio/cb65/info.json
+++ b/keyboards/cherrybstudio/cb65/info.json
@@ -8,6 +8,13 @@
"pid": "0x6565",
"device_version": "0.0.1"
},
+ "indicators": {
+ "caps_lock": "F1",
+ "scroll_lock": "F4",
+ "on_state": 0
+ },
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
"layouts": {
"LAYOUT_all": {
"layout": [
diff --git a/keyboards/cherrybstudio/cb65/rules.mk b/keyboards/cherrybstudio/cb65/rules.mk
index e5386c142d..b5dd02b992 100644
--- a/keyboards/cherrybstudio/cb65/rules.mk
+++ b/keyboards/cherrybstudio/cb65/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = atmel-dfu
-
# Build Options
# change yes to no to disable
#
diff --git a/keyboards/cherrybstudio/cb87/config.h b/keyboards/cherrybstudio/cb87/config.h
index 2384b81b40..cf9b6cbf58 100644
--- a/keyboards/cherrybstudio/cb87/config.h
+++ b/keyboards/cherrybstudio/cb87/config.h
@@ -13,11 +13,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-#include "config_common.h"
-
-/* key matrix size */
-#define MATRIX_ROWS 9
-#define MATRIX_COLS 10
/*
* Keyboard Matrix Assignments
@@ -40,13 +35,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define BACKLIGHT_LEVELS 3
#endif
-#define LED_CAPS_LOCK_PIN F0
-#define LED_SCROLL_LOCK_PIN F4
-#define LED_PIN_ON_STATE 0
-
-/* Set 0 if debouncing isn't needed */
-#define DEBOUNCE 5
-
#define RGB_DI_PIN E6
#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/cherrybstudio/cb87/info.json b/keyboards/cherrybstudio/cb87/info.json
index 1e7051c281..3af7eff96d 100644
--- a/keyboards/cherrybstudio/cb87/info.json
+++ b/keyboards/cherrybstudio/cb87/info.json
@@ -8,6 +8,14 @@
"pid": "0x8787",
"device_version": "0.0.1"
},
+ "indicators": {
+ "caps_lock": "F0",
+ "scroll_lock": "F4",
+ "on_state": 0
+ },
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
+ "community_layouts": ["tkl_ansi", "tkl_iso"],
"layouts": {
"LAYOUT_all": {
"layout": [
diff --git a/keyboards/cherrybstudio/cb87/rules.mk b/keyboards/cherrybstudio/cb87/rules.mk
index 2a782e8d52..3d5cb57ad5 100644
--- a/keyboards/cherrybstudio/cb87/rules.mk
+++ b/keyboards/cherrybstudio/cb87/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = atmel-dfu
-
# Build Options
# change yes to no to disable
#
@@ -16,5 +10,3 @@ NKRO_ENABLE = yes # Enable N-Key Rollover
BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output
-
-LAYOUTS = tkl_ansi tkl_iso
diff --git a/keyboards/cherrybstudio/cb87rgb/config.h b/keyboards/cherrybstudio/cb87rgb/config.h
index 9a9c70167e..eedd4de339 100644
--- a/keyboards/cherrybstudio/cb87rgb/config.h
+++ b/keyboards/cherrybstudio/cb87rgb/config.h
@@ -13,11 +13,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-#include "config_common.h"
-
-/* key matrix size */
-#define MATRIX_ROWS 10
-#define MATRIX_COLS 10
/*
* Keyboard Matrix Assignments
@@ -36,10 +31,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* COL2ROW, ROW2COL*/
#define DIODE_DIRECTION COL2ROW
-
-/* Set 0 if debouncing isn't needed */
-#define DEBOUNCE 5
-
#define RGB_DI_PIN E6
#define RGB_MATRIX_LED_COUNT 92
#define RGB_DISABLE_WHEN_USB_SUSPENDED
diff --git a/keyboards/cherrybstudio/cb87rgb/info.json b/keyboards/cherrybstudio/cb87rgb/info.json
index 36b43f5742..059b6d61d4 100644
--- a/keyboards/cherrybstudio/cb87rgb/info.json
+++ b/keyboards/cherrybstudio/cb87rgb/info.json
@@ -8,6 +8,8 @@
"pid": "0x8785",
"device_version": "0.0.1"
},
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
"layouts": {
"LAYOUT_all": {
"layout": [
diff --git a/keyboards/cherrybstudio/cb87rgb/rules.mk b/keyboards/cherrybstudio/cb87rgb/rules.mk
index 9f610c8a90..02c7c58f15 100644
--- a/keyboards/cherrybstudio/cb87rgb/rules.mk
+++ b/keyboards/cherrybstudio/cb87rgb/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = atmel-dfu
-
# Build Options
# change yes to no to disable
#
diff --git a/keyboards/cherrybstudio/cb87v2/config.h b/keyboards/cherrybstudio/cb87v2/config.h
index d3d5818b1c..e7d8a2088f 100644
--- a/keyboards/cherrybstudio/cb87v2/config.h
+++ b/keyboards/cherrybstudio/cb87v2/config.h
@@ -13,11 +13,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-#include "config_common.h"
-
-/* key matrix size */
-#define MATRIX_ROWS 10
-#define MATRIX_COLS 10
/*
* Keyboard Matrix Assignments
@@ -35,18 +30,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* COL2ROW, ROW2COL*/
#define DIODE_DIRECTION COL2ROW
-#define LED_CAPS_LOCK_PIN F0
-#define LED_SCROLL_LOCK_PIN F4
-#define LED_PIN_ON_STATE 0
+
#define BACKLIGHT_PIN B6
#ifdef BACKLIGHT_PIN
#define BACKLIGHT_LEVELS 3
#endif
-
-/* Set 0 if debouncing isn't needed */
-#define DEBOUNCE 5
-
#define RGB_DI_PIN E6
#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/cherrybstudio/cb87v2/info.json b/keyboards/cherrybstudio/cb87v2/info.json
index 6cb3f5fbe3..3cb29e13d0 100644
--- a/keyboards/cherrybstudio/cb87v2/info.json
+++ b/keyboards/cherrybstudio/cb87v2/info.json
@@ -8,6 +8,13 @@
"pid": "0x8788",
"device_version": "0.0.1"
},
+ "indicators": {
+ "caps_lock": "F0",
+ "scroll_lock": "F4",
+ "on_state": 0
+ },
+ "processor": "atmega32u4",
+ "bootloader": "atmel-dfu",
"layouts": {
"LAYOUT_all": {
"layout": [
diff --git a/keyboards/cherrybstudio/cb87v2/rules.mk b/keyboards/cherrybstudio/cb87v2/rules.mk
index 3bd45154f4..cdde6d344b 100644
--- a/keyboards/cherrybstudio/cb87v2/rules.mk
+++ b/keyboards/cherrybstudio/cb87v2/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = atmel-dfu
-
# Build Options
# change yes to no to disable
#
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-02 13:15:11 +0000