diff options
author | jack <[email protected]> | 2024-07-16 20:08:14 -0600 |
---|---|---|
committer | jack <[email protected]> | 2024-07-16 20:08:14 -0600 |
commit | eaaa7f33b910246872e054c5af473d88153821ee (patch) | |
tree | e07c1cf2878416677a82976232ae3cd2d62ef17b | |
parent | 748b6749148678add41128cf19320c41db716a31 (diff) | |
download | qmk_me-eaaa7f33b910246872e054c5af473d88153821ee.tar.gz qmk_me-eaaa7f33b910246872e054c5af473d88153821ee.zip |
fixup tapdance introspection, q keymap, userspace rgb matrix, more
-rw-r--r-- | keyboards/leftover30/config.h | 2 | ||||
-rw-r--r-- | keymaps/crkbd/config.h | 12 | ||||
-rw-r--r-- | keymaps/crkbd/keymap.c | 8 | ||||
-rw-r--r-- | keymaps/crkbd/rules.mk | 4 | ||||
-rw-r--r-- | keymaps/f60/keymap.c | 1 | ||||
-rw-r--r-- | keymaps/ferris/config.h | 5 | ||||
-rw-r--r-- | keymaps/kyria/config.h | 3 | ||||
-rw-r--r-- | keymaps/microdox/config.h | 11 | ||||
-rw-r--r-- | keymaps/the_q/config.h | 7 | ||||
-rw-r--r-- | keymaps/the_q/keymap.c | 43 | ||||
-rw-r--r-- | keymaps/the_q/rules.mk | 1 | ||||
-rwxr-xr-x | util/link.sh | 3 | ||||
-rw-r--r-- | waffle/config.h | 22 | ||||
-rw-r--r-- | waffle/tapping.c | 10 | ||||
-rw-r--r-- | waffle/waffle.c | 15 | ||||
-rw-r--r-- | waffle/waffle.h | 5 |
16 files changed, 100 insertions, 52 deletions
diff --git a/keyboards/leftover30/config.h b/keyboards/leftover30/config.h index 6912807..d9c5627 100644 --- a/keyboards/leftover30/config.h +++ b/keyboards/leftover30/config.h @@ -2,7 +2,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later #pragma once -#define WS2812_SPI SPID2 +#define WS2812_SPI_DRIVER SPID2 #define WS2812_SPI_MOSI_PAL_MODE 0 #define WS2812_SPI_SCK_PIN B13 #define WS2812_EXTERNAL_PULLUP diff --git a/keymaps/crkbd/config.h b/keymaps/crkbd/config.h index 8722b02..7ca4fe5 100644 --- a/keymaps/crkbd/config.h +++ b/keymaps/crkbd/config.h @@ -17,18 +17,6 @@ #ifdef RGB_MATRIX_ENABLE #undef WS2812_DI_PIN #define WS2812_DI_PIN B5 -#define ENABLE_RGB_MATRIX_ALPHAS_MODS -#define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT -#define ENABLE_RGB_MATRIX_CYCLE_SPIRAL -#define ENABLE_RGB_MATRIX_RAINDROPS -#define ENABLE_RGB_MATRIX_FRAMEBUFFER_EFFECTS -#define ENABLE_RGB_MATRIX_TYPING_HEATMAP -#define ENABLE_RGB_MATRIX_KEYPRESSES -#define ENABLE_RGB_MATRIX_SOLID_REACTIVE -#define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH -#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS -#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_COLOR -#define RGB_DISABLE_WHEN_USB_SUSPENDED #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150 #define WS2812_PWM_DRIVER PWMD3 #define WS2812_PWM_CHANNEL 3 diff --git a/keymaps/crkbd/keymap.c b/keymaps/crkbd/keymap.c index 098ade4..dcbe585 100644 --- a/keymaps/crkbd/keymap.c +++ b/keymaps/crkbd/keymap.c @@ -140,4 +140,12 @@ 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/rules.mk b/keymaps/crkbd/rules.mk index d8f79a0..b1fff61 100644 --- a/keymaps/crkbd/rules.mk +++ b/keymaps/crkbd/rules.mk @@ -2,11 +2,11 @@ CONVERT_TO = proton_c SERIAL_DRIVER = usart WS2812_DRIVER = pwm OLED_ENABLE = yes -AUDIO_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 = yes +POINTING_DEVICE_ENABLE = no POINTING_DEVICE_DRIVER = pimoroni_trackball diff --git a/keymaps/f60/keymap.c b/keymaps/f60/keymap.c index 2ced32d..6bca255 100644 --- a/keymaps/f60/keymap.c +++ b/keymaps/f60/keymap.c @@ -4,7 +4,6 @@ #define ___NONE___ \ _______, _______, _______, _______, _______, _______, _______, _______, \ _______, _______, _______, _______, _______ -#define SPC_OFFSET 20 // clang-format off const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { diff --git a/keymaps/ferris/config.h b/keymaps/ferris/config.h index 9899401..1f624e5 100644 --- a/keymaps/ferris/config.h +++ b/keymaps/ferris/config.h @@ -5,11 +5,6 @@ #define WS2812_DI_PIN B0 #define RGB_MATRIX_LED_COUNT 34 #define RGB_MATRIX_SPLIT {17, 17} -#define RGB_DISABLE_WHEN_USB_SUSPENDED -#define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS -#define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT -#define RGB_MATRIX_KEYPRESSES -#define ENABLE_RGB_MATRIX_SOLID_REACTIVE #define __ NO_PIN #undef DIRECT_PINS #undef DIRECT_PINS_RIGHT diff --git a/keymaps/kyria/config.h b/keymaps/kyria/config.h index fcad92e..25e13a2 100644 --- a/keymaps/kyria/config.h +++ b/keymaps/kyria/config.h @@ -13,9 +13,6 @@ #define CRC8_USE_TABLE #define CRC8_OPTIMIZE_SPEED #undef RGB_MATRIX_MAXIMUM_BRIGHTNESS -#define RGB_MATRIX_TIMEOUT 600000 -#define ENABLE_RGB_MATRIX_BAND_SAT -#define ENABLE_RGB_MATRIX_RAINDROPS #define I2C1_CLOCK_SPEED 1000000 #define BOOTMAGIC_LITE_ROW 0 #define BOOTMAGIC_LITE_COLUMN 6 diff --git a/keymaps/microdox/config.h b/keymaps/microdox/config.h index 6f9749e..f088833 100644 --- a/keymaps/microdox/config.h +++ b/keymaps/microdox/config.h @@ -2,17 +2,6 @@ // SPDX-License-Identifier: GPL-2.0-or-later #pragma once -#define ENABLE_RGB_MATRIX_ALPHAS_MODS -#define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT -#define ENABLE_RGB_MATRIX_CYCLE_SPIRAL -#define ENABLE_RGB_MATRIX_RAINDROPS -#define ENABLE_RGB_MATRIX_FRAMEBUFFER_EFFECTS -#define ENABLE_RGB_MATRIX_TYPING_HEATMAP -#define ENABLE_RGB_MATRIX_KEYPRESSES -#define ENABLE_RGB_MATRIX_SOLID_REACTIVE -#define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH -#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS -#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_ALPHAS_MODS #ifdef OLED_ENABLE #define BONGO_CAT #define LAYER_ANIM diff --git a/keymaps/the_q/config.h b/keymaps/the_q/config.h new file mode 100644 index 0000000..178a1ba --- /dev/null +++ b/keymaps/the_q/config.h @@ -0,0 +1,7 @@ +// Copyright 2024 [email protected] +// SPDX-License-Identifier: GPL-2.0-or-later +#pragma once + +#undef RGB_MATRIX_MAXIMUM_BRIGHTNESS +#define BOOTMAGIC_LITE_ROW 0 +#define BOOTMAGIC_LITE_COLUMN 1 diff --git a/keymaps/the_q/keymap.c b/keymaps/the_q/keymap.c new file mode 100644 index 0000000..91eaf38 --- /dev/null +++ b/keymaps/the_q/keymap.c @@ -0,0 +1,43 @@ +// Copyright 2024 [email protected] +// SPDX-License-Identifier: GPL-2.0-or-later +#include "lib/oled.h" +#include "waffle.h" + +// clang-format off +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [_BASE] = LAYOUT_waffle_3x6( + KC_NO, ___BASE1___, KC_NO, + KC_NO, ___BASE2___, KC_NO, + KC_NO, ___BASE3___, KC_NO, + ___BASE4___ + ), + [_LOWER] = LAYOUT_waffle_3x6( + KC_NO, ___LOWER1___, KC_NO, + KC_NO, ___LOWER2___, KC_NO, + KC_NO, ___LOWER3___, KC_NO, + ___LOWER4___ + ), + [_RAISE] = LAYOUT_waffle_3x6( + KC_NO, ___RAISE1___, KC_NO, + KC_NO, ___RAISE2___, KC_NO, + KC_NO, ___RAISE3___, KC_NO, + ___RAISE4___ + ) +}; +// clang-format on + +#ifdef RGB_MATRIX_ENABLE +bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) { + 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_OFF); + return false; +} +#endif // RGB_MATRIX_ENABLE + +#ifdef OLED_ENABLE +bool oled_task_keymap(void) { + render_layer_state(); + return false; +} +#endif // OLED_ENABLE diff --git a/keymaps/the_q/rules.mk b/keymaps/the_q/rules.mk new file mode 100644 index 0000000..6724291 --- /dev/null +++ b/keymaps/the_q/rules.mk @@ -0,0 +1 @@ +CONVERT_TO = blok diff --git a/util/link.sh b/util/link.sh index 308feda..27aebeb 100755 --- a/util/link.sh +++ b/util/link.sh @@ -18,7 +18,7 @@ done link() { src="$QMKME/keymaps/$1" dst="$QMKFIRMWARE/keyboards/$2/keymaps/waffle" - ln -sv $QMKME/$1 $QMKFIRMWARE/keyboards/$2/keymaps/waffle + ln -sv $src $dst echo "keyboards/$2/keymaps/waffle" >> $QMKFIRMWARE/.git/info/exclude } @@ -27,3 +27,4 @@ link f60 bioi/f60 link ferris ferris link kyria splitkb/kyria link microdox boardsource/microdox +link the_q boardsource/the_q diff --git a/waffle/config.h b/waffle/config.h index 9a733aa..31d803e 100644 --- a/waffle/config.h +++ b/waffle/config.h @@ -10,9 +10,6 @@ #define NO_ACTION_ONESHOT #define UNICODE_SELECTED_MODES UNICODE_MODE_LINUX #define ENABLE_COMPILE_KEYCODE -#ifndef SPC_OFFSET -#define SPC_OFFSET 40 -#endif #ifdef RAW_ENABLE #undef VENDOR_ID #define VENDOR_ID 0x6A73 @@ -37,3 +34,22 @@ #define SPLIT_LED_STATE_ENABLE #define SPLIT_TRANSACTION_IDS_USER RPC_ID_USER_KEYLOG_STR #endif + +#ifdef RGB_MATRIX_ENABLE +#define RGB_MATRIX_SLEEP +#define RGB_MATRIX_TIMEOUT 300000 +#define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_SOLID_COLOR +#define ENABLE_RGB_MATRIX_ALPHAS_MODS +#define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT +#define ENABLE_RGB_MATRIX_CYCLE_SPIRAL +#define ENABLE_RGB_MATRIX_RAINDROPS +#define ENABLE_RGB_MATRIX_FRAMEBUFFER_EFFECTS +#define ENABLE_RGB_MATRIX_TYPING_HEATMAP +#define ENABLE_RGB_MATRIX_KEYPRESSES +#define ENABLE_RGB_MATRIX_SOLID_REACTIVE +#define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH +#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS +#define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS +#define RGB_MATRIX_KEYPRESSES +#define ENABLE_RGB_MATRIX_SOLID_REACTIVE +#endif diff --git a/waffle/tapping.c b/waffle/tapping.c index 205326d..5e9aeb0 100644 --- a/waffle/tapping.c +++ b/waffle/tapping.c @@ -77,7 +77,7 @@ uint16_t get_tapping_term(uint16_t keycode, keyrecord_t *record) { case LWRSPC: case ESCLWR: case RSEBSP: - return TAPPING_TERM - SPC_OFFSET; + return TAPPING_TERM - 40; case TD(EM_DASH_MINS): case TD(PLY_NXT_PRV): case TD(CBRACKET): @@ -126,14 +126,6 @@ void raise_paste(tap_dance_state_t *state, void *user_data) { tap_code16(C(S(KC_V))); } -tap_dance_action_t tap_dance_actions[] = { - [EM_DASH_MINS] = ACTION_TAP_DANCE_FN(em_dash_mins), - [PLY_NXT_PRV] = ACTION_TAP_DANCE_FN(ply_nxt_prv), - [PASTE_RAISE] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, raise_paste, td_reset), - [CBRACKET] = ACTION_TAP_DANCE_DOUBLE(KC_LCBR, KC_RCBR), - [SBRACKET] = ACTION_TAP_DANCE_DOUBLE(KC_LBRC, KC_RBRC), -}; - bool process_record_user(uint16_t keycode, keyrecord_t *record) { #ifdef UNICODE_COMMON_ENABLE if (!process_record_unicode(keycode, record)) diff --git a/waffle/waffle.c b/waffle/waffle.c index 05d9916..fb6f5a4 100644 --- a/waffle/waffle.c +++ b/waffle/waffle.c @@ -11,6 +11,14 @@ void raw_hid_receive(uint8_t *data, uint8_t length) { } #endif +tap_dance_action_t tap_dance_actions[] = { + [EM_DASH_MINS] = ACTION_TAP_DANCE_FN(em_dash_mins), + [PLY_NXT_PRV] = ACTION_TAP_DANCE_FN(ply_nxt_prv), + [PASTE_RAISE] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, raise_paste, td_reset), + [CBRACKET] = ACTION_TAP_DANCE_DOUBLE(KC_LCBR, KC_RCBR), + [SBRACKET] = ACTION_TAP_DANCE_DOUBLE(KC_LBRC, KC_RBRC), +}; + #if defined(SPLIT_KEYBOARD) && defined(OLED_ENABLE) #include "transactions.h" extern char keylog_str[5]; @@ -47,12 +55,11 @@ void keyboard_post_init_user(void) { #endif #ifdef RGBLIGHT_ENABLE rgblight_enable_noeeprom(); - rgblight_sethsv_noeeprom(HSV_CYAN); + rgblight_sethsv_noeeprom(RGB_CYAN); rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT); -#endif -#ifdef RGB_MATRIX_ENABLE +#elif RGB_MATRIX_ENABLE rgb_matrix_enable_noeeprom(); - rgb_matrix_sethsv_noeeprom(HSV_CYAN); + rgb_matrix_sethsv_noeeprom(RGB_CYAN); rgb_matrix_mode_noeeprom(RGB_MATRIX_SOLID_COLOR); #endif #ifdef CONSOLE_ENABLE diff --git a/waffle/waffle.h b/waffle/waffle.h index 77ec797..e7bd8de 100644 --- a/waffle/waffle.h +++ b/waffle/waffle.h @@ -54,6 +54,11 @@ enum unicode_mode { }; #endif +void td_reset(tap_dance_state_t *state, void *user_data); +void em_dash_mins(tap_dance_state_t *state, void *user_data); +void ply_nxt_prv(tap_dance_state_t *state, void *user_data); +void raise_paste(tap_dance_state_t *state, void *user_data); + #define PNP TD(PLY_NXT_PRV) #define PSTRSE TD(PASTE_RAISE) #define ESCLWR LT(_LOWER, KC_ESC) |