summaryrefslogtreecommitdiff
path: root/keyboards/controllerworks
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/controllerworks')
-rw-r--r--keyboards/controllerworks/mini36/config.h28
-rw-r--r--keyboards/controllerworks/mini36/keymaps/default/config.h2
-rw-r--r--keyboards/controllerworks/mini36/keymaps/via/config.h2
-rw-r--r--keyboards/controllerworks/mini42/config.h26
-rw-r--r--keyboards/controllerworks/mini42/info.json1
-rw-r--r--keyboards/controllerworks/mini42/keymaps/default/config.h2
-rw-r--r--keyboards/controllerworks/mini42/keymaps/via/config.h4
-rw-r--r--keyboards/controllerworks/mini42/mini42.c5
-rw-r--r--keyboards/controllerworks/mini42/mini42.h20
9 files changed, 10 insertions, 80 deletions
diff --git a/keyboards/controllerworks/mini36/config.h b/keyboards/controllerworks/mini36/config.h
index ab98e119b7..0903534838 100644
--- a/keyboards/controllerworks/mini36/config.h
+++ b/keyboards/controllerworks/mini36/config.h
@@ -24,7 +24,7 @@
#define WS2812_PIO_USE_PIO1
#define RGBLED_NUM 48
-#define DRIVER_LED_TOTAL RGBLED_NUM
+#define RGB_MATRIX_LED_COUNT RGBLED_NUM
#define RGB_MATRIX_SPLIT \
{ 24, 24 }
@@ -36,29 +36,3 @@
#define I2C_DRIVER I2CD1
#define I2C1_SCL_PIN GP25
#define I2C1_SDA_PIN GP24
-
-/* #define EE_HANDS */
-/* #define MASTER_LEFT */
-/* #define MASTER_RIGHT */
-
-/* Top left key on left half */
-#define BOOTMAGIC_LITE_ROW 0
-#define BOOTMAGIC_LITE_COLUMN 0
-/* Top right key on right half */
-#define BOOTMAGIC_LITE_ROW_RIGHT 0
-#define BOOTMAGIC_LITE_COLUMN_RIGHT 0
-/*
- * Feature disable options
- * These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT \ No newline at end of file
diff --git a/keyboards/controllerworks/mini36/keymaps/default/config.h b/keyboards/controllerworks/mini36/keymaps/default/config.h
index e1d162ef3e..77da61828c 100644
--- a/keyboards/controllerworks/mini36/keymaps/default/config.h
+++ b/keyboards/controllerworks/mini36/keymaps/default/config.h
@@ -23,7 +23,7 @@
// # 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_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_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)
# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150 // limits maximum brightness of LEDs to 150 out of 255. Higher may cause the controller to crash.
# define RGB_MATRIX_HUE_STEP 8
diff --git a/keyboards/controllerworks/mini36/keymaps/via/config.h b/keyboards/controllerworks/mini36/keymaps/via/config.h
index e1d162ef3e..77da61828c 100644
--- a/keyboards/controllerworks/mini36/keymaps/via/config.h
+++ b/keyboards/controllerworks/mini36/keymaps/via/config.h
@@ -23,7 +23,7 @@
// # 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_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_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)
# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150 // limits maximum brightness of LEDs to 150 out of 255. Higher may cause the controller to crash.
# define RGB_MATRIX_HUE_STEP 8
diff --git a/keyboards/controllerworks/mini42/config.h b/keyboards/controllerworks/mini42/config.h
index a56fa70402..420e616ad2 100644
--- a/keyboards/controllerworks/mini42/config.h
+++ b/keyboards/controllerworks/mini42/config.h
@@ -17,16 +17,9 @@
#pragma once
-#include "config_common.h"
-
-/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
-/* #define DEBOUNCE 5 */
-
#define WS2812_PIO_USE_PIO1
#define RGBLED_NUM 54
-#define DRIVER_LED_TOTAL RGBLED_NUM
-#define RGB_MATRIX_SPLIT \
- { 27, 27 }
+#define RGB_MATRIX_LED_COUNT RGBLED_NUM
#define SPLIT_TRANSPORT_MIRROR
#define SPLIT_LAYER_STATE_ENABLE
@@ -50,20 +43,3 @@
/* Top right key on right half */
#define BOOTMAGIC_LITE_ROW_RIGHT 0
#define BOOTMAGIC_LITE_COLUMN_RIGHT 0
-/*
- * Feature disable options
- * These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
-
-
diff --git a/keyboards/controllerworks/mini42/info.json b/keyboards/controllerworks/mini42/info.json
index 1e0527be02..b18747c62c 100644
--- a/keyboards/controllerworks/mini42/info.json
+++ b/keyboards/controllerworks/mini42/info.json
@@ -56,6 +56,7 @@
},
"rgb_matrix": {
"driver": "WS2812",
+ "split_count": [27, 27],
"layout": [
{ "flags": 2, "x": 75, "y": 4 },
{ "flags": 2, "x": 40, "y": 2 },
diff --git a/keyboards/controllerworks/mini42/keymaps/default/config.h b/keyboards/controllerworks/mini42/keymaps/default/config.h
index e1d162ef3e..77da61828c 100644
--- a/keyboards/controllerworks/mini42/keymaps/default/config.h
+++ b/keyboards/controllerworks/mini42/keymaps/default/config.h
@@ -23,7 +23,7 @@
// # 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_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_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)
# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150 // limits maximum brightness of LEDs to 150 out of 255. Higher may cause the controller to crash.
# define RGB_MATRIX_HUE_STEP 8
diff --git a/keyboards/controllerworks/mini42/keymaps/via/config.h b/keyboards/controllerworks/mini42/keymaps/via/config.h
index 94eb482c86..e11d5aa37f 100644
--- a/keyboards/controllerworks/mini42/keymaps/via/config.h
+++ b/keyboards/controllerworks/mini42/keymaps/via/config.h
@@ -16,8 +16,6 @@
*/
#pragma once
#ifdef RGB_MATRIX_ENABLE
-# define RGBLED_NUM 54 // Number of LEDs
-# define DRIVER_LED_TOTAL RGBLED_NUM
# define RGB_MATRIX_SPLIT \
{ 27, 27 }
//# define SPLIT_TRANSPORT_MIRROR
@@ -26,7 +24,7 @@
// # 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_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_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)
# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150 // limits maximum brightness of LEDs to 150 out of 255. Higher may cause the controller to crash.
# define RGB_MATRIX_HUE_STEP 8
diff --git a/keyboards/controllerworks/mini42/mini42.c b/keyboards/controllerworks/mini42/mini42.c
index cc6397fa11..be16d1400a 100644
--- a/keyboards/controllerworks/mini42/mini42.c
+++ b/keyboards/controllerworks/mini42/mini42.c
@@ -14,7 +14,8 @@
* 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 "mini42.h"
+
+#include "quantum.h"
#ifdef OLED_ENABLE
@@ -79,4 +80,4 @@ bool oled_task_kb(void) {
return false;
}
-#endif \ No newline at end of file
+#endif
diff --git a/keyboards/controllerworks/mini42/mini42.h b/keyboards/controllerworks/mini42/mini42.h
deleted file mode 100644
index 8155798246..0000000000
--- a/keyboards/controllerworks/mini42/mini42.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright 2022 Kevin Gee <info@controller.works>
- *
- * 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"