summaryrefslogtreecommitdiff
path: root/keyboards/crkbd
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/crkbd')
-rw-r--r--keyboards/crkbd/info.json1
-rw-r--r--keyboards/crkbd/keymaps/colemak_luna/config.h2
-rw-r--r--keyboards/crkbd/post_config.h16
-rw-r--r--keyboards/crkbd/r2g/config.h51
-rw-r--r--keyboards/crkbd/r2g/info.json27
-rw-r--r--keyboards/crkbd/r2g/r2g.c69
-rw-r--r--keyboards/crkbd/readme.md2
-rw-r--r--keyboards/crkbd/rev1/config.h26
-rw-r--r--keyboards/crkbd/rev1/info.json8
9 files changed, 43 insertions, 159 deletions
diff --git a/keyboards/crkbd/info.json b/keyboards/crkbd/info.json
index fa9abc574e..880cbccc29 100644
--- a/keyboards/crkbd/info.json
+++ b/keyboards/crkbd/info.json
@@ -14,7 +14,6 @@
"features": {
"bootmagic": true,
"extrakey": true,
- "lto": true,
"mousekey": true,
"nkro": true,
"oled": true
diff --git a/keyboards/crkbd/keymaps/colemak_luna/config.h b/keyboards/crkbd/keymaps/colemak_luna/config.h
index 1975c91366..546e01bdba 100644
--- a/keyboards/crkbd/keymaps/colemak_luna/config.h
+++ b/keyboards/crkbd/keymaps/colemak_luna/config.h
@@ -45,7 +45,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
//# define RGB_MATRIX_KEYPRESSES // reacts to keypresses
// # define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
// # define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
-# define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
+# define RGB_MATRIX_SLEEP // turn off effects when suspended
//# define RGB_MATRIX_FRAMEBUFFER_EFFECTS
// # define RGB_MATRIX_LED_PROCESS_LIMIT (DRIVER_LED_TOTAL + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
// # define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
diff --git a/keyboards/crkbd/post_config.h b/keyboards/crkbd/post_config.h
index 133014b02a..aaf405a5bf 100644
--- a/keyboards/crkbd/post_config.h
+++ b/keyboards/crkbd/post_config.h
@@ -16,18 +16,18 @@
#pragma once
-#ifndef BOOTMAGIC_LITE_ROW
-# define BOOTMAGIC_LITE_ROW 0
+#ifndef BOOTMAGIC_ROW
+# define BOOTMAGIC_ROW 0
#endif
-#ifndef BOOTMAGIC_LITE_COLUMN
-# define BOOTMAGIC_LITE_COLUMN 1
+#ifndef BOOTMAGIC_COLUMN
+# define BOOTMAGIC_COLUMN 1
#endif
-#ifndef BOOTMAGIC_LITE_ROW_RIGHT
-# define BOOTMAGIC_LITE_ROW_RIGHT 4
+#ifndef BOOTMAGIC_ROW_RIGHT
+# define BOOTMAGIC_ROW_RIGHT 4
#endif
-#ifndef BOOTMAGIC_LITE_COLUMN_RIGHT
-# define BOOTMAGIC_LITE_COLUMN_RIGHT 1
+#ifndef BOOTMAGIC_COLUMN_RIGHT
+# define BOOTMAGIC_COLUMN_RIGHT 1
#endif
#ifdef RGBLIGHT_ENABLE
diff --git a/keyboards/crkbd/r2g/config.h b/keyboards/crkbd/r2g/config.h
deleted file mode 100644
index 4c2e374415..0000000000
--- a/keyboards/crkbd/r2g/config.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
-Copyright 2019 @foostan
-Copyright 2020 Drashna Jaelre <@drashna>
-Copyright 2021 Elliot Powell @e11i0t23
-
-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
-
-#ifdef RGB_MATRIX_ENABLE
-# define RGB_MATRIX_LED_COUNT 54
-# define RGB_MATRIX_SPLIT \
- { 27, 27 }
-# define SPLIT_TRANSPORT_MIRROR
-
-# define ENABLE_RGB_MATRIX_ALPHAS_MODS
-# define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
-# define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
-# define ENABLE_RGB_MATRIX_BREATHING
-# define ENABLE_RGB_MATRIX_BAND_SAT
-# define ENABLE_RGB_MATRIX_BAND_VAL
-# define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
-# define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
-# define ENABLE_RGB_MATRIX_CYCLE_ALL
-# define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
-# define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
-# define ENABLE_RGB_MATRIX_RAINDROPS
-# define ENABLE_RGB_MATRIX_HUE_BREATHING
-# define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
-// # define ENABLE_RGB_MATRIX_TYPING_HEATMAP
-// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
-// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE
-// # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
-// # define ENABLE_RGB_MATRIX_SPLASH
-// # define ENABLE_RGB_MATRIX_SOLID_SPLASH
-#endif
-
-#define SPLIT_USB_DETECT
-
diff --git a/keyboards/crkbd/r2g/info.json b/keyboards/crkbd/r2g/info.json
index 8cdf07854e..991a5301f4 100644
--- a/keyboards/crkbd/r2g/info.json
+++ b/keyboards/crkbd/r2g/info.json
@@ -3,7 +3,15 @@
"rgb_matrix": true
},
"split": {
- "soft_serial_pin": "D2"
+ "soft_serial_pin": "D2",
+ "transport": {
+ "sync": {
+ "matrix_state": true
+ }
+ },
+ "usb_detect": {
+ "enabled": true
+ }
},
"rgblight": {
"led_count": 54,
@@ -131,6 +139,23 @@
}
},
"rgb_matrix": {
+ "animations": {
+ "alphas_mods": true,
+ "gradient_up_down": true,
+ "gradient_left_right": true,
+ "breathing": true,
+ "band_sat": true,
+ "band_val": true,
+ "band_spiral_sat": true,
+ "band_spiral_val": true,
+ "cycle_all": true,
+ "rainbow_moving_chevron": true,
+ "cycle_spiral": true,
+ "raindrops": true,
+ "hue_breathing": true,
+ "pixel_fractal": true
+ },
+ "split_count": [27, 27],
"layout": [
{"x": 85, "y": 16, "flags": 2},
{"x": 50, "y": 13, "flags": 2},
diff --git a/keyboards/crkbd/r2g/r2g.c b/keyboards/crkbd/r2g/r2g.c
index ef7b84b4a9..9a589a9e72 100644
--- a/keyboards/crkbd/r2g/r2g.c
+++ b/keyboards/crkbd/r2g/r2g.c
@@ -18,75 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "quantum.h"
-#ifdef RGB_MATRIX_ENABLE
-
- // Logical Layout
- // Columns
- // Left
- // 0 1 2 3 4 5
- // ROWS
- // 25 24 19 18 11 10 0
- // 03 02 01
- // 26 23 20 17 12 09 1
- // 04 05 06
- // 27 22 21 16 13 08 2
- //
- // 15 14 07 3
- //
- // Right
- // 0 1 2 3 4 5
- // ROWS
- // 25 24 19 18 11 10 4
- // 03 02 01
- // 26 23 20 17 12 09 5
- // 04 05 06
- // 27 22 21 16 13 08 6
- //
- // 15 14 07 7
- //
- // Physical Layout
- // Columns
- // 0 1 2 3 4 5 6 7 8 9 10 11 12 13
- // ROWS
- // 25 24 19 18 11 10 10 11 18 19 24 25 0
- // 03 02 01 01 02 03
- // 26 23 20 17 12 09 09 12 17 20 23 26 1
- // 04 04
- // 27 22 21 16 13 08 08 13 16 21 22 27 2
- // 05 06 06 05
- // 15 14 07 07 14 15 3
-
-led_config_t g_led_config = { {
- { 24, 23, 18, 17, 10, 9 },
- { 25, 22, 19, 16, 11, 8 },
- { 26, 21, 20, 15, 12, 7 },
- { NO_LED, NO_LED, NO_LED, 14, 13, 6 },
- { 51, 50, 45, 44, 37, 36 },
- { 52, 49, 46, 43, 38, 35 },
- { 53, 48, 47, 42, 39, 34 },
- { NO_LED, NO_LED, NO_LED, 41, 40, 33 }
-}, {
- { 85, 16 }, { 50, 13 }, { 16, 20 }, { 16, 38 }, { 50, 48 }, { 85, 52 }, { 95, 63 },
- { 85, 39 }, { 85, 21 }, { 85, 4 }, { 68, 2 }, { 68, 19 }, { 68, 37 }, { 80, 58 },
- { 60, 55 }, { 50, 35 }, { 50, 13 }, { 50, 0 }, { 33, 3 }, { 33, 20 }, { 33, 37 },
- { 16, 42 }, { 16, 24 }, { 16, 7 }, { 0, 7 }, { 0, 24 }, { 0, 41 }, { 139, 16 },
- { 174, 13 }, { 208, 20 }, { 208, 38 }, { 174, 48 }, { 139, 52 }, { 129, 63 }, { 139, 39 },
- { 139, 21 }, { 139, 4 }, { 156, 2 }, { 156, 19 }, { 156, 37 }, { 144, 58 }, { 164, 55 },
- { 174, 35 }, { 174, 13 }, { 174, 0 }, { 191, 3 }, { 191, 20 }, { 191, 37 }, { 208, 42 },
- { 208, 24 }, { 208, 7 }, { 224, 7 }, { 224, 24 }, { 224, 41 }
-}, {
- 2, 2, 2, 2, 2, 2, 1,
- 4, 4, 4, 4, 4, 4, 1,
- 1, 4, 4, 4, 4, 4, 4,
- 4, 4, 4, 1, 1, 1, 2,
- 2, 2, 2, 2, 2, 1, 4,
- 4, 4, 4, 4, 4, 1, 1,
- 4, 4, 4, 4, 4, 4, 4,
- 4, 4, 1, 1, 1
-} };
-
-#endif
-
#ifdef OLED_ENABLE
void oled_render_logo(void) {
static const char PROGMEM mb_logo[] = {
diff --git a/keyboards/crkbd/readme.md b/keyboards/crkbd/readme.md
index 75267463b2..4297ee56d9 100644
--- a/keyboards/crkbd/readme.md
+++ b/keyboards/crkbd/readme.md
@@ -43,7 +43,7 @@ And in your `config.h` file, add the following:
#ifdef RGB_MATRIX_ENABLE
# define RGB_MATRIX_KEYPRESSES // reacts to keypresses
// # define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
-# define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
+# define RGB_MATRIX_SLEEP // turn off effects when suspended
# define RGB_MATRIX_FRAMEBUFFER_EFFECTS
// # define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
// # define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
diff --git a/keyboards/crkbd/rev1/config.h b/keyboards/crkbd/rev1/config.h
deleted file mode 100644
index 60a49100e3..0000000000
--- a/keyboards/crkbd/rev1/config.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
-Copyright 2019 @foostan
-Copyright 2020 Drashna Jaelre <@drashna>
-
-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
-
-#ifdef RGB_MATRIX_ENABLE
-# define RGB_MATRIX_LED_COUNT 54
-# define RGB_MATRIX_SPLIT \
- { 27, 27 }
-# define SPLIT_TRANSPORT_MIRROR
-#endif
diff --git a/keyboards/crkbd/rev1/info.json b/keyboards/crkbd/rev1/info.json
index 48a27d11f3..108bfb7370 100644
--- a/keyboards/crkbd/rev1/info.json
+++ b/keyboards/crkbd/rev1/info.json
@@ -3,7 +3,12 @@
"rgblight": true
},
"split": {
- "soft_serial_pin": "D2"
+ "soft_serial_pin": "D2",
+ "transport": {
+ "sync": {
+ "matrix_state": true
+ }
+ }
},
"rgblight": {
"led_count": 54,
@@ -13,6 +18,7 @@
"pin": "D3"
},
"rgb_matrix": {
+ "split_count": [27, 27],
"layout": [
{"x": 85, "y": 16, "flags": 2},
{"x": 50, "y": 13, "flags": 2},
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-26 06:27:48 +0000