diff options
Diffstat (limited to 'keymaps/crkbd')
-rw-r--r-- | keymaps/crkbd/config.h | 8 | ||||
-rw-r--r-- | keymaps/crkbd/halconf.h | 2 | ||||
-rw-r--r-- | keymaps/crkbd/keymap.c | 54 | ||||
-rw-r--r-- | keymaps/crkbd/mcuconf.h | 2 | ||||
-rw-r--r-- | keymaps/crkbd/rules.mk | 3 |
5 files changed, 18 insertions, 51 deletions
diff --git a/keymaps/crkbd/config.h b/keymaps/crkbd/config.h index 1516e0b..f93a586 100644 --- a/keymaps/crkbd/config.h +++ b/keymaps/crkbd/config.h @@ -1,4 +1,4 @@ -// Copyright 2024 [email protected] +// Copyright 2025 [email protected] // SPDX-License-Identifier: GPL-2.0-or-later #pragma once @@ -13,9 +13,9 @@ #define WS2812_DI_PIN B5 #define WS2812_PWM_DRIVER PWMD3 #define WS2812_PWM_CHANNEL 3 -#define WS2812_DMA_STREAM STM32_DMA1_STREAM3 -#define WS2812_DMA_CHANNEL 3 -#define WS2812_DMAMUX_ID STM32_DMAMUX1_TIM3_UP +#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM3 +#define WS2812_PWM_DMA_CHANNEL 3 +#define WS2812_PWM_DMAMUX_ID STM32_DMAMUX1_TIM3_UP #endif #ifdef ENCODER_ENABLE diff --git a/keymaps/crkbd/halconf.h b/keymaps/crkbd/halconf.h index 547b9db..81505ac 100644 --- a/keymaps/crkbd/halconf.h +++ b/keymaps/crkbd/halconf.h @@ -1,4 +1,4 @@ -// Copyright 2024 [email protected] +// Copyright 2025 [email protected] // SPDX-License-Identifier: GPL-2.0-or-later #pragma once diff --git a/keymaps/crkbd/keymap.c b/keymaps/crkbd/keymap.c index 54fd197..1e634ab 100644 --- a/keymaps/crkbd/keymap.c +++ b/keymaps/crkbd/keymap.c @@ -1,4 +1,4 @@ -// Copyright 2024 [email protected] +// Copyright 2025 [email protected] // SPDX-License-Identifier: GPL-2.0-or-later #include "jack.h" @@ -6,21 +6,21 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_BASE] = LAYOUT_jack_3x6( XXXXXXX, ___BASE1___, XXXXXXX, - XXXXXXX, ___BASE2___, RWORD, + XXXXXXX, ___BASE2___, XXXXXXX, XXXXXXX, ___BASE3___, XXXXXXX, - ___BASE4___ + ___BASE4___ ), [_LOWER] = LAYOUT_jack_3x6( - XXXXXXX, ___LOWER1___, XXXXXXX, - XXXXXXX, ___LOWER2___, XXXXXXX, - XXXXXXX, ___LOWER3___, XXXXXXX, - ___LOWER4___ + _______, ___LOWER1___, _______, + _______, ___LOWER2___, _______, + _______, ___LOWER3___, _______, + ___LOWER4___ ), [_RAISE] = LAYOUT_jack_3x6( - XXXXXXX, ___RAISE1___, XXXXXXX, - XXXXXXX, ___RAISE2___, XXXXXXX, - XXXXXXX, ___RAISE3___, XXXXXXX, - ___RAISE4___ + _______, ___RAISE1___, _______, + _______, ___RAISE2___, _______, + _______, ___RAISE3___, _______, + ___RAISE4___ ) }; // clang-format on @@ -62,31 +62,9 @@ void keyboard_post_init_keymap(void) { } #endif // audio -#ifdef POINTING_DEVICE_ENABLE -uint8_t red = 255, green = 0, blue = 0; - -void trackball_hue(void) { - if (red != 255 && green != 255 && blue != 255) - red = 255; - if (red == 255 && green < 255 && !blue) - green += 15; - else if (green == 255 && !blue && red) - red -= 15; - else if (!red && blue < 255 && green == 255) - blue += 15; - else if (blue == 255 && green && !red) - green -= 15; - else if (!green && blue == 255 && red < 255) - red += 15; - else if (!green && blue && red == 255) - blue -= 15; - pimoroni_trackball_set_rgbw(red, green, blue, 0); -} -#endif // pointing device - #ifdef OLED_ENABLE oled_rotation_t oled_init_user(oled_rotation_t rotation) { - return is_keyboard_master() ? 2 : 3; + return is_keyboard_master() ? OLED_ROTATION_180 : OLED_ROTATION_270; } bool oled_task_keymap(void) { @@ -131,12 +109,4 @@ void matrix_init_user(void) { 4, 4, 4, 2, 2, 2, 2, 2, 2, 1, 1, 1, 4, 4, 4, 4, 4, 1, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 2, 2, 2, 2, 2, 2}}; } - -bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) { - rgb_matrix_sethsv_noeeprom(43, 255, 120); - for (uint8_t i = led_min; i <= led_max; i++) - if (g_led_config.flags[i] & LED_FLAG_UNDERGLOW) - rgb_matrix_set_color(i, RGB_RED); - return false; -} #endif // rgb matrix diff --git a/keymaps/crkbd/mcuconf.h b/keymaps/crkbd/mcuconf.h index 871c3e7..db028e0 100644 --- a/keymaps/crkbd/mcuconf.h +++ b/keymaps/crkbd/mcuconf.h @@ -1,4 +1,4 @@ -// Copyright 2024 [email protected] +// Copyright 2025 [email protected] // SPDX-License-Identifier: GPL-2.0-or-later #pragma once diff --git a/keymaps/crkbd/rules.mk b/keymaps/crkbd/rules.mk index b1fff61..42387df 100644 --- a/keymaps/crkbd/rules.mk +++ b/keymaps/crkbd/rules.mk @@ -4,9 +4,6 @@ WS2812_DRIVER = pwm OLED_ENABLE = yes AUDIO_ENABLE = no AUDIO_DRIVER = dac_basic -RGBLIGHT_ENABLE = no -RGB_MATRIX_ENABLE = yes ENCODER_ENABLE = yes -ENCODER_MAP_ENABLE = yes POINTING_DEVICE_ENABLE = no POINTING_DEVICE_DRIVER = pimoroni_trackball |