summaryrefslogtreecommitdiff
path: root/keyboards/tkc
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/tkc')
-rw-r--r--keyboards/tkc/candybar/lefty/rules.mk2
-rw-r--r--keyboards/tkc/candybar/righty/rules.mk2
-rw-r--r--keyboards/tkc/godspeed75/config.h1
-rw-r--r--keyboards/tkc/godspeed75/info.json3
-rw-r--r--keyboards/tkc/godspeed75/rules.mk2
-rw-r--r--keyboards/tkc/m0lly/config.h5
-rw-r--r--keyboards/tkc/m0lly/info.json6
-rw-r--r--keyboards/tkc/osav2/config.h5
-rw-r--r--keyboards/tkc/osav2/info.json5
-rw-r--r--keyboards/tkc/portico75/info.json91
-rw-r--r--keyboards/tkc/portico75/keymaps/via/keymap.c30
-rw-r--r--keyboards/tkc/tkc1800/config.h4
-rw-r--r--keyboards/tkc/tkc1800/info.json6
-rw-r--r--keyboards/tkc/tkl_ab87/config.h5
-rw-r--r--keyboards/tkc/tkl_ab87/info.json6
15 files changed, 40 insertions, 133 deletions
diff --git a/keyboards/tkc/candybar/lefty/rules.mk b/keyboards/tkc/candybar/lefty/rules.mk
index 36101d2f8e..51c822797a 100644
--- a/keyboards/tkc/candybar/lefty/rules.mk
+++ b/keyboards/tkc/candybar/lefty/rules.mk
@@ -13,5 +13,3 @@ AUDIO_ENABLE = no
RGBLIGHT_ENABLE = no
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/tkc/candybar/righty/rules.mk b/keyboards/tkc/candybar/righty/rules.mk
index 36101d2f8e..51c822797a 100644
--- a/keyboards/tkc/candybar/righty/rules.mk
+++ b/keyboards/tkc/candybar/righty/rules.mk
@@ -13,5 +13,3 @@ AUDIO_ENABLE = no
RGBLIGHT_ENABLE = no
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/tkc/godspeed75/config.h b/keyboards/tkc/godspeed75/config.h
index e995bb1c7c..3f67f77910 100644
--- a/keyboards/tkc/godspeed75/config.h
+++ b/keyboards/tkc/godspeed75/config.h
@@ -32,7 +32,6 @@
//#define NO_ACTION_TAPPING
//#define NO_ACTION_ONESHOT
-#define RGBLED_NUM 14
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/tkc/godspeed75/info.json b/keyboards/tkc/godspeed75/info.json
index 4e45459bb9..6565239b52 100644
--- a/keyboards/tkc/godspeed75/info.json
+++ b/keyboards/tkc/godspeed75/info.json
@@ -8,6 +8,9 @@
"pid": "0x0006",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 14
+ },
"ws2812": {
"pin": "A13"
},
diff --git a/keyboards/tkc/godspeed75/rules.mk b/keyboards/tkc/godspeed75/rules.mk
index 0f15f10b20..0098dc473a 100644
--- a/keyboards/tkc/godspeed75/rules.mk
+++ b/keyboards/tkc/godspeed75/rules.mk
@@ -11,5 +11,3 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
AUDIO_ENABLE = no # Audio output
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/tkc/m0lly/config.h b/keyboards/tkc/m0lly/config.h
index bad0f51bde..06338d2a2d 100644
--- a/keyboards/tkc/m0lly/config.h
+++ b/keyboards/tkc/m0lly/config.h
@@ -17,11 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-# define RGBLED_NUM 30
-# define RGBLIGHT_HUE_STEP 5
-# define RGBLIGHT_SAT_STEP 10
-# define RGBLIGHT_VAL_STEP 10
-//# define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */
# define RGBLIGHT_EFFECT_BREATHING
# define RGBLIGHT_EFFECT_RAINBOW_MOOD
# define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/tkc/m0lly/info.json b/keyboards/tkc/m0lly/info.json
index 37a8c19bf8..302cbb54c1 100644
--- a/keyboards/tkc/m0lly/info.json
+++ b/keyboards/tkc/m0lly/info.json
@@ -27,6 +27,12 @@
"num_lock": "D2",
"scroll_lock": "D4"
},
+ "rgblight": {
+ "hue_steps": 5,
+ "saturation_steps": 10,
+ "brightness_steps": 10,
+ "led_count": 30
+ },
"ws2812": {
"pin": "D7"
},
diff --git a/keyboards/tkc/osav2/config.h b/keyboards/tkc/osav2/config.h
index f2a7de800b..77a7393d75 100644
--- a/keyboards/tkc/osav2/config.h
+++ b/keyboards/tkc/osav2/config.h
@@ -17,11 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
- #define RGBLED_NUM 9
-// #define RGBLIGHT_HUE_STEP 10
-// #define RGBLIGHT_SAT_STEP 17
-// #define RGBLIGHT_VAL_STEP 17
- #define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/tkc/osav2/info.json b/keyboards/tkc/osav2/info.json
index 78cad2daf2..c882c073ac 100644
--- a/keyboards/tkc/osav2/info.json
+++ b/keyboards/tkc/osav2/info.json
@@ -8,6 +8,10 @@
"pid": "0x0005",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "led_count": 9,
+ "sleep": true
+ },
"ws2812": {
"pin": "D4"
},
@@ -17,6 +21,7 @@
},
"diode_direction": "COL2ROW",
"backlight": {
+ "driver": "timer",
"pin": "D6",
"breathing": true
},
diff --git a/keyboards/tkc/portico75/info.json b/keyboards/tkc/portico75/info.json
index 4380caba4f..171228cb28 100644
--- a/keyboards/tkc/portico75/info.json
+++ b/keyboards/tkc/portico75/info.json
@@ -113,97 +113,6 @@
{"matrix": [5, 12], "x": 14.25, "y": 5.5},
{"matrix": [5, 13], "x": 15.25, "y": 5.5}
]
- },
- "LAYOUT_75_via": {
- "layout": [
- {"matrix": [0, 0], "x": 0, "y": 0},
- {"matrix": [0, 1], "x": 1, "y": 0},
- {"matrix": [0, 2], "x": 2, "y": 0},
- {"matrix": [0, 3], "x": 3, "y": 0},
- {"matrix": [0, 4], "x": 4, "y": 0},
- {"matrix": [0, 5], "x": 5, "y": 0},
- {"matrix": [0, 6], "x": 6, "y": 0},
- {"matrix": [0, 7], "x": 7, "y": 0},
- {"matrix": [0, 8], "x": 8, "y": 0},
- {"matrix": [0, 9], "x": 9, "y": 0},
- {"matrix": [0, 10], "x": 10, "y": 0},
- {"matrix": [0, 11], "x": 11, "y": 0},
- {"matrix": [0, 12], "x": 12, "y": 0},
- {"matrix": [0, 13], "x": 13, "y": 0},
- {"matrix": [0, 14], "x": 14, "y": 0},
-
- {"matrix": [1, 0], "x": 15, "y": 0},
- {"matrix": [1, 1], "x": 16, "y": 0},
- {"matrix": [1, 2], "x": 17, "y": 0},
- {"matrix": [1, 3], "x": 18, "y": 0},
- {"matrix": [1, 4], "x": 19, "y": 0},
- {"matrix": [1, 5], "x": 20, "y": 0},
- {"matrix": [1, 6], "x": 21, "y": 0},
- {"matrix": [1, 7], "x": 22, "y": 0},
- {"matrix": [1, 8], "x": 23, "y": 0},
- {"matrix": [1, 9], "x": 24, "y": 0},
- {"matrix": [1, 10], "x": 25, "y": 0},
- {"matrix": [1, 11], "x": 26, "y": 0},
- {"matrix": [1, 12], "x": 27, "y": 0},
- {"matrix": [1, 13], "x": 28, "y": 0},
- {"matrix": [1, 14], "x": 29, "y": 0},
-
- {"matrix": [2, 0], "x": 30, "y": 0},
- {"matrix": [2, 1], "x": 31, "y": 0},
- {"matrix": [2, 2], "x": 32, "y": 0},
- {"matrix": [2, 3], "x": 33, "y": 0},
- {"matrix": [2, 4], "x": 34, "y": 0},
- {"matrix": [2, 5], "x": 35, "y": 0},
- {"matrix": [2, 6], "x": 36, "y": 0},
- {"matrix": [2, 7], "x": 37, "y": 0},
- {"matrix": [2, 8], "x": 38, "y": 0},
- {"matrix": [2, 9], "x": 39, "y": 0},
- {"matrix": [2, 10], "x": 40, "y": 0},
- {"matrix": [2, 11], "x": 41, "y": 0},
- {"matrix": [2, 12], "x": 42, "y": 0},
- {"matrix": [2, 13], "x": 43, "y": 0},
- {"matrix": [2, 14], "x": 44, "y": 0},
-
- {"matrix": [3, 0], "x": 45, "y": 0},
- {"matrix": [3, 1], "x": 46, "y": 0},
- {"matrix": [3, 2], "x": 47, "y": 0},
- {"matrix": [3, 3], "x": 48, "y": 0},
- {"matrix": [3, 4], "x": 49, "y": 0},
- {"matrix": [3, 5], "x": 50, "y": 0},
- {"matrix": [3, 6], "x": 51, "y": 0},
- {"matrix": [3, 7], "x": 52, "y": 0},
- {"matrix": [3, 8], "x": 53, "y": 0},
- {"matrix": [3, 9], "x": 54, "y": 0},
- {"matrix": [3, 10], "x": 55, "y": 0},
- {"matrix": [3, 11], "x": 56, "y": 0},
- {"matrix": [3, 12], "x": 57, "y": 0},
- {"matrix": [3, 14], "x": 58, "y": 0},
-
- {"matrix": [4, 0], "x": 59, "y": 0},
- {"matrix": [4, 1], "x": 60, "y": 0},
- {"matrix": [4, 2], "x": 61, "y": 0},
- {"matrix": [4, 3], "x": 62, "y": 0},
- {"matrix": [4, 4], "x": 63, "y": 0},
- {"matrix": [4, 5], "x": 64, "y": 0},
- {"matrix": [4, 6], "x": 65, "y": 0},
- {"matrix": [4, 7], "x": 66, "y": 0},
- {"matrix": [4, 8], "x": 67, "y": 0},
- {"matrix": [4, 9], "x": 68, "y": 0},
- {"matrix": [4, 10], "x": 69, "y": 0},
- {"matrix": [4, 11], "x": 70, "y": 0},
- {"matrix": [4, 12], "x": 71, "y": 0},
- {"matrix": [4, 14], "x": 72, "y": 0},
-
- {"matrix": [5, 0], "x": 73, "y": 0},
- {"matrix": [5, 1], "x": 74, "y": 0},
- {"matrix": [5, 2], "x": 75, "y": 0},
- {"matrix": [5, 5], "x": 76, "y": 0},
- {"matrix": [5, 9], "x": 77, "y": 0},
- {"matrix": [5, 10], "x": 78, "y": 0},
- {"matrix": [5, 11], "x": 79, "y": 0},
- {"matrix": [5, 12], "x": 80, "y": 0},
- {"matrix": [5, 13], "x": 81, "y": 0}
- ]
}
}
}
diff --git a/keyboards/tkc/portico75/keymaps/via/keymap.c b/keyboards/tkc/portico75/keymaps/via/keymap.c
index befb3b8829..03e96a2706 100644
--- a/keyboards/tkc/portico75/keymaps/via/keymap.c
+++ b/keyboards/tkc/portico75/keymaps/via/keymap.c
@@ -27,47 +27,47 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
// BR_INC, BR_DEC, // backlight brightness increase/decrease
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- [0] = LAYOUT_75_via(
+ [0] = LAYOUT_75_ansi(
KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_MUTE,
KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_HOME,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,
- KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_VOLD,
- KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_VOLU,
+ KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
+ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP,
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT
),
#ifdef RGB_BACKLIGHT_PORTICO75
- [1] = LAYOUT_75_via(
+ [1] = LAYOUT_75_ansi(
_______, EF_INC, EF_DEC, H1_INC, H1_DEC, S1_INC, S1_DEC, H2_INC, H2_DEC, S2_INC, S2_DEC, BR_INC, BR_DEC, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______
),
#else
- [1] = LAYOUT_75_via(
+ [1] = LAYOUT_75_ansi(
_______, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______
),
#endif
- [2] = LAYOUT_75_via(
+ [2] = LAYOUT_75_ansi(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______
),
- [3] = LAYOUT_75_via(
+ [3] = LAYOUT_75_ansi(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______
)
};
diff --git a/keyboards/tkc/tkc1800/config.h b/keyboards/tkc/tkc1800/config.h
index dd6631f545..03c8bceba0 100644
--- a/keyboards/tkc/tkc1800/config.h
+++ b/keyboards/tkc/tkc1800/config.h
@@ -29,10 +29,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 30 // Number of LEDs
-#define RGBLIGHT_HUE_STEP 5
-#define RGBLIGHT_SAT_STEP 10
-#define RGBLIGHT_VAL_STEP 10
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/tkc/tkc1800/info.json b/keyboards/tkc/tkc1800/info.json
index 5cf8f83c80..50f471c08f 100644
--- a/keyboards/tkc/tkc1800/info.json
+++ b/keyboards/tkc/tkc1800/info.json
@@ -27,6 +27,12 @@
"num_lock": "D2",
"scroll_lock": "D4"
},
+ "rgblight": {
+ "hue_steps": 5,
+ "saturation_steps": 10,
+ "brightness_steps": 10,
+ "led_count": 30
+ },
"ws2812": {
"pin": "D7"
},
diff --git a/keyboards/tkc/tkl_ab87/config.h b/keyboards/tkc/tkl_ab87/config.h
index 95ce321679..0cfc6216fc 100644
--- a/keyboards/tkc/tkl_ab87/config.h
+++ b/keyboards/tkc/tkl_ab87/config.h
@@ -20,11 +20,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define DYNAMIC_KEYMAP_LAYER_COUNT 2 //Reduced layer count due to memory space considerations
- #define RGBLED_NUM 22
- #define RGBLIGHT_HUE_STEP 8
- #define RGBLIGHT_SAT_STEP 8
- #define RGBLIGHT_VAL_STEP 8
- #define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/tkc/tkl_ab87/info.json b/keyboards/tkc/tkl_ab87/info.json
index c0a178595b..bd1ec85f19 100644
--- a/keyboards/tkc/tkl_ab87/info.json
+++ b/keyboards/tkc/tkl_ab87/info.json
@@ -25,7 +25,11 @@
"pin": "E2"
},
"rgblight": {
- "max_brightness": 200
+ "saturation_steps": 8,
+ "brightness_steps": 8,
+ "led_count": 22,
+ "max_brightness": 200,
+ "sleep": true
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-28 02:35:20 +0000