diff options
author | Nick Brassel <[email protected]> | 2023-11-28 16:39:48 +1100 |
---|---|---|
committer | Nick Brassel <[email protected]> | 2023-11-28 16:40:47 +1100 |
commit | 0115951de12bd4c798a43a380651c34552552e85 (patch) | |
tree | 62999011ae782d93aa6dc9c889615db2a840cafc /users/xulkal | |
parent | 0379d1f59e58cefa18cdb72ba1b77507d1108ae6 (diff) | |
parent | 4d99e0a23cff02f4c6e55e093b5de08a9be0df7c (diff) | |
download | qmk_firmware-0.23.0.tar.gz qmk_firmware-0.23.0.zip |
`develop` -> `master`, 2023q4 edition0.23.0
Diffstat (limited to 'users/xulkal')
-rw-r--r-- | users/xulkal/config.h | 36 | ||||
-rw-r--r-- | users/xulkal/custom_encoder.c | 73 | ||||
-rw-r--r-- | users/xulkal/custom_encoder.h | 2 | ||||
-rw-r--r-- | users/xulkal/custom_keycodes.h | 40 | ||||
-rw-r--r-- | users/xulkal/custom_oled.c | 189 | ||||
-rw-r--r-- | users/xulkal/custom_oled.h | 2 | ||||
-rw-r--r-- | users/xulkal/custom_rgb.c | 64 | ||||
-rw-r--r-- | users/xulkal/custom_rgb.h | 17 | ||||
-rw-r--r-- | users/xulkal/custom_tap_dance.c | 59 | ||||
-rw-r--r-- | users/xulkal/custom_tap_dance.h | 23 | ||||
-rw-r--r-- | users/xulkal/layouts.h | 119 | ||||
-rw-r--r-- | users/xulkal/process_records.c | 62 | ||||
-rw-r--r-- | users/xulkal/process_records.h | 18 | ||||
-rw-r--r-- | users/xulkal/rules.mk | 32 | ||||
-rw-r--r-- | users/xulkal/xulkal.c | 1 | ||||
-rw-r--r-- | users/xulkal/xulkal.h | 6 |
16 files changed, 0 insertions, 743 deletions
diff --git a/users/xulkal/config.h b/users/xulkal/config.h deleted file mode 100644 index bc175dda98..0000000000 --- a/users/xulkal/config.h +++ /dev/null @@ -1,36 +0,0 @@ -#pragma once - -#undef TAPPING_TERM -#define TAPPING_TERM 175 - -#undef QUICK_TAP_TERM -#define QUICK_TAP_TERM TAPPING_TERM - -#define SPACE_CADET_MODIFIER_CARRYOVER -#define LSPO_KEYS KC_LSFT, KC_TRNS, KC_LBRC -#define RSPC_KEYS KC_RSFT, KC_TRNS, KC_RBRC -#define LCPO_KEYS KC_LCTL, KC_TRNS, KC_MINS -#define RCPC_KEYS KC_RCTL, KC_TRNS, KC_EQL - -// Running out of firmware space -#if defined(__AVR__) -#undef RGB_MATRIX_KEYPRESSES -#undef RGB_MATRIX_KEYRELEASES -#undef RGB_MATRIX_FRAMEBUFFER_EFFECTS -#else -# define RGB_MATRIX_KEYPRESSES -# undef RGB_MATRIX_KEYRELEASES -# define RGB_MATRIX_FRAMEBUFFER_EFFECTS -# define ENABLE_TYPING_HEATMAP_DISTANCE_CHECK -#endif - -// No need for the single versions when multi performance isn't a problem =D -#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE -#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS -#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS -#undef ENABLE_RGB_MATRIX_SPLASH -#undef ENABLE_RGB_MATRIX_SOLID_SPLASH - -// 20m timeout (20m * 60s * 1000mil) -#define RGB_MATRIX_TIMEOUT 1200000 -#define OLED_SCROLL_TIMEOUT 20000 diff --git a/users/xulkal/custom_encoder.c b/users/xulkal/custom_encoder.c deleted file mode 100644 index acd0275a8b..0000000000 --- a/users/xulkal/custom_encoder.c +++ /dev/null @@ -1,73 +0,0 @@ -#include "custom_encoder.h" -#include "custom_keycodes.h" - -#ifdef RGB_OLED_MENU -#include "custom_rgb.h" - -// I'm lazy and like constants over calculations, also using it as a compile time check -#if defined(RGB_MATRIX_ENABLE) - #define RGB_FUNCTION_COUNT 6 -#elif defined(RGBLIGHT_ENABLE) - #define RGB_FUNCTION_COUNT 5 -#endif - -typedef void (*rgb_f)(void); - -const rgb_f rgb_functions[RGB_FUNCTION_COUNT][2] = { -#if defined(RGB_MATRIX_ENABLE) - { rgb_matrix_increase_hue, rgb_matrix_decrease_hue }, - { rgb_matrix_increase_sat, rgb_matrix_decrease_sat }, - { rgb_matrix_increase_val, rgb_matrix_decrease_val }, - { rgb_matrix_increase_speed, rgb_matrix_decrease_speed }, - { rgb_matrix_step, rgb_matrix_step_reverse }, - { rgb_matrix_increase_flags, rgb_matrix_decrease_flags } -#elif defined(RGBLIGHT_ENABLE) - { rgblight_increase_hue, rgblight_decrease_hue }, - { rgblight_increase_sat, rgblight_decrease_sat }, - { rgblight_increase_val, rgblight_decrease_val }, - { rgblight_increase_speed, rgblight_decrease_speed }, - { rgblight_step, rgblight_step_reverse } -#endif -}; - -// Start at the end for mode -uint8_t rgb_encoder_state = 4; - -bool process_record_encoder(uint16_t keycode, keyrecord_t *record) -{ - switch (keycode) - { - case RGB_ENC: - if (record->event.pressed) { - if (get_mods() & MOD_MASK_SHIFT) { - rgb_encoder_state = (rgb_encoder_state - 1); - if (rgb_encoder_state >= RGB_FUNCTION_COUNT) - rgb_encoder_state = RGB_FUNCTION_COUNT - 1; - } else { - rgb_encoder_state = (rgb_encoder_state + 1) % RGB_FUNCTION_COUNT; - } - } - return false; - } - return true; -} -#endif // RGB_OLED_MENU - -const uint16_t PROGMEM encoders[][2] = { - { KC_PGUP, KC_PGDN }, - { KC_VOLU, KC_VOLD } -}; - -bool encoder_update_user(uint8_t index, bool clockwise) -{ - if (!is_keyboard_master()) - return; - -#ifdef RGB_OLED_MENU - if (index == RGB_OLED_MENU) - (*rgb_functions[rgb_encoder_state][clockwise])(); - else -#endif // RGB_OLED_MENU - tap_code16(pgm_read_word(&encoders[index][clockwise])); - return true; -} diff --git a/users/xulkal/custom_encoder.h b/users/xulkal/custom_encoder.h deleted file mode 100644 index 010d4b1383..0000000000 --- a/users/xulkal/custom_encoder.h +++ /dev/null @@ -1,2 +0,0 @@ -#pragma once -#include "quantum.h" diff --git a/users/xulkal/custom_keycodes.h b/users/xulkal/custom_keycodes.h deleted file mode 100644 index 7ced92bf4c..0000000000 --- a/users/xulkal/custom_keycodes.h +++ /dev/null @@ -1,40 +0,0 @@ -#pragma once - -enum custom_keycodes { - RGBRST = SAFE_RANGE, -#ifndef TAP_DANCE_ENABLE - TD_MIN, - TD_COMM = TD_MIN, - TD_BSPC, - TD_DEL, - TD_DOT, - TD_MAX, -#endif -#ifdef ENCODER_ENABLE - RGB_ENC, -#endif - KEYMAP_SAFE_RANGE -}; - -#define RIS_ESC LT(_RAISE, KC_ESC) -#define RIS_CAPS LT(_RAISE, KC_CAPS) - -#define QWERTY DF(_QWERTY) - -#ifndef GAMELAYER_DISABLE -#define GAME DF(_GAME) -#else -#define GAME KC_TRANSPARENT -#endif - -#define LOWER MO(_LOWER) -#define RAISE MO(_RAISE) - - -#ifdef ENCODER_ENABLE -#define KC_ENC1 RGB_ENC -#define KC_ENC2 KC_MPLY -#else -#define KC_ENC1 RGB_RMOD -#define KC_ENC2 RGB_MOD -#endif diff --git a/users/xulkal/custom_oled.c b/users/xulkal/custom_oled.c deleted file mode 100644 index c6341fa3d7..0000000000 --- a/users/xulkal/custom_oled.c +++ /dev/null @@ -1,189 +0,0 @@ -#include "custom_oled.h" -#include "process_records.h" - -#include <stdio.h> - -#ifdef RGBLIGHT_ENABLE -rgblight_config_t rgblight_config; -#endif - -static void render_logo(void) -{ - static const char PROGMEM font_logo[] = { - 0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8a,0x8b,0x8c,0x8d,0x8e,0x8f,0x90,0x91,0x92,0x93,0x94, - 0xa0,0xa1,0xa2,0xa3,0xa4,0xa5,0xa6,0xa7,0xa8,0xa9,0xaa,0xab,0xac,0xad,0xae,0xaf,0xb0,0xb1,0xb2,0xb3,0xb4, - 0xc0,0xc1,0xc2,0xc3,0xc4,0xc5,0xc6,0xc7,0xc8,0xc9,0xca,0xcb,0xcc,0xcd,0xce,0xcf,0xd0,0xd1,0xd2,0xd3,0xd4,0}; - oled_write_P(font_logo, false); -} - -static void render_icon(void) -{ -#ifdef OLED_90ROTATION - static const char PROGMEM font_icon[] = { - 0x9b,0x9c,0x9d,0x9e,0x9f, - 0xbb,0xbc,0xbd,0xbe,0xbf, - 0xdb,0xdc,0xdd,0xde,0xdf,0 - }; -#else - static const char PROGMEM font_icon[] = { - // Use \r (0x0d) to jump to the next line without clearing the rest of the current line - 0x9b,0x9c,0x9d,0x9e,0x9f,0x0d, - 0xbb,0xbc,0xbd,0xbe,0xbf,0x0d, - 0xdb,0xdc,0xdd,0xde,0xdf,0 - }; -#endif - oled_write_P(font_icon, false); -} - -static void render_layer(void) -{ - uint8_t layer = layer_state ? get_highest_layer(layer_state) : get_highest_layer(default_layer_state); -#ifdef OLED_90ROTATION - oled_write_P(PSTR("Layer"), false); -#else - oled_write_P(PSTR("Layer: "), false); -#endif - - switch (layer) - { - case _QWERTY: - oled_write_P(PSTR("BASE "), false); - break; -#ifndef GAMELAYER_DISABLE - case _GAME: - oled_write_P(PSTR("GAME "), false); - break; -#endif - case _LOWER: - oled_write_P(PSTR("LOWER"), false); - break; - case _RAISE: - oled_write_P(PSTR("RAISE"), false); - break; -#ifdef TRILAYER_ENABLED - case _ADJUST: - oled_write_P(PSTR("ADJST"), false); - break; -#endif - } -} - -static void render_keyboard_leds(void) -{ - // Host Keyboard LED Status - led_t led_state = host_keyboard_led_state(); -#ifdef OLED_90ROTATION - oled_write_P(led_state.num_lock ? PSTR("NUMLK") : PSTR(" "), false); - oled_write_P(led_state.caps_lock ? PSTR("CAPLK") : PSTR(" "), false); - oled_write_P(led_state.scroll_lock ? PSTR("SCRLK") : PSTR(" "), false); -#else - oled_write_P(led_state.num_lock ? PSTR("NUM ") : PSTR(" "), false); - oled_write_P(led_state.caps_lock ? PSTR("CAPS ") : PSTR(" "), false); - oled_write_P(led_state.scroll_lock ? PSTR("SCRL") : PSTR(" "), false); -#endif -} - -#ifdef RGB_OLED_MENU -extern uint8_t rgb_encoder_state; -#endif - -#if defined(OLED_90ROTATION) - -#ifdef RGB_ENABLE -static void render_rgb_state(void) -{ - // TODO: need to do a bit more handling here for horizontal rendering -#if defined(RGB_MATRIX_ENABLE) - static char buffer[31] = {0}; - snprintf(buffer, sizeof(buffer), "h%3d s%3d v%3d s%3d m%3d e%3d ", rgb_matrix_config.hsv.h, rgb_matrix_config.hsv.s, rgb_matrix_config.hsv.v, rgb_matrix_config.speed, rgb_matrix_config.mode, rgb_matrix_get_flags()); -#elif defined(RGBLIGHT_ENABLE) - static char buffer[26] = {0}; - snprintf(buffer, sizeof(buffer), "h%3d s%3d v%3d s%3d m%3d ", rgblight_config.hue, rgblight_config.sat, rgblight_config.val, rgblight_config.speed, rgblight_config.mode); -#endif - -#ifdef RGB_OLED_MENU - buffer[4 + rgb_encoder_state * 5] = '<'; -#endif - oled_write(buffer, false); -} -#endif - -static void render_status(void) -{ - render_icon(); - render_layer(); - - // Host Keyboard LED Status - oled_write_P(PSTR("-----"), false); - render_keyboard_leds(); - - oled_write_P(PSTR("-----"), false); -#ifdef RGB_ENABLE - render_rgb_state(); -#endif -} - -oled_rotation_t oled_init_user(oled_rotation_t rotation) { -#if KEYBOARD_helix_rev2 - if (is_keyboard_master()) - return OLED_ROTATION_270; - return rotation; -#else - if (is_keyboard_master()) - return OLED_ROTATION_90; - return rotation; -#endif -} - -#else // OLED_90ROTATION - -#ifdef RGB_ENABLE -static void render_rgb_state(void) -{ - // TODO: need to do a bit more handling here for horizontal rendering -#if defined(RGB_MATRIX_ENABLE) - static char buffer[37] = {0}; - snprintf(buffer, sizeof(buffer), "h%3d s%3d v%3d s%3d m%3d e%3d ", rgb_matrix_config.hsv.h, rgb_matrix_config.hsv.s, rgb_matrix_config.hsv.v, rgb_matrix_config.speed, rgb_matrix_config.mode, rgb_matrix_get_flags()); -#elif defined(RGBLIGHT_ENABLE) - static char buffer[32] = {0}; - snprintf(buffer, sizeof(buffer), "h%3d s%3d v%3d s%3d m%3d ", rgblight_config.hue, rgblight_config.sat, rgblight_config.val, rgblight_config.speed, rgblight_config.mode); -#endif - -#ifdef RGB_OLED_MENU - buffer[4 + rgb_encoder_state * 5] = '<'; -#endif - oled_write(buffer, false); -} -#endif - -static void render_status(void) -{ - render_icon(); - - // Host Layer Status - oled_set_cursor(6, 0); - render_layer(); - - // Host Keyboard LED Status - oled_set_cursor(6, 1); - render_keyboard_leds(); - -#ifdef RGB_ENABLE - oled_set_cursor(6, 2); - render_rgb_state(); -#endif -} - -#endif // OLED_90ROTATION - -bool oled_task_user(void) -{ - if (is_keyboard_master()) - render_status(); - else - { - render_logo(); - oled_scroll_left(); - } - return false; -} diff --git a/users/xulkal/custom_oled.h b/users/xulkal/custom_oled.h deleted file mode 100644 index 010d4b1383..0000000000 --- a/users/xulkal/custom_oled.h +++ /dev/null @@ -1,2 +0,0 @@ -#pragma once -#include "quantum.h" diff --git a/users/xulkal/custom_rgb.c b/users/xulkal/custom_rgb.c deleted file mode 100644 index f68a7c56c0..0000000000 --- a/users/xulkal/custom_rgb.c +++ /dev/null @@ -1,64 +0,0 @@ -#include "custom_rgb.h" - -#ifdef RGB_MATRIX_ENABLE -void rgb_matrix_increase_flags(void) -{ - switch (rgb_matrix_get_flags()) { - case LED_FLAG_ALL: { - rgb_matrix_set_flags(LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER); - rgb_matrix_set_color_all(0, 0, 0); - } - break; - case LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER: { - rgb_matrix_set_flags(LED_FLAG_NONE); - rgb_matrix_disable_noeeprom(); - } - break; - case LED_FLAG_UNDERGLOW: { - rgb_matrix_set_flags(LED_FLAG_ALL); - rgb_matrix_set_color_all(0, 0, 0); - } - break; - default: { - rgb_matrix_set_flags(LED_FLAG_UNDERGLOW); - rgb_matrix_enable_noeeprom(); - } - break; - } -} - -void rgb_matrix_decrease_flags(void) -{ - switch (rgb_matrix_get_flags()) { - case LED_FLAG_ALL: { - rgb_matrix_set_flags(LED_FLAG_UNDERGLOW); - rgb_matrix_set_color_all(0, 0, 0); - } - break; - case LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER: { - rgb_matrix_set_flags(LED_FLAG_ALL); - rgb_matrix_set_color_all(0, 0, 0); - } - break; - case LED_FLAG_UNDERGLOW: { - rgb_matrix_set_flags(LED_FLAG_NONE); - rgb_matrix_disable_noeeprom(); - } - break; - default: { - rgb_matrix_set_flags(LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER); - rgb_matrix_enable_noeeprom(); - } - break; - } -} -#endif - -void rgb_reset(void) { -#if defined(RGB_MATRIX_ENABLE) - eeconfig_update_rgb_matrix_default(); -#elif defined(RGBLIGHT_ENABLE) - eeconfig_update_rgblight_default(); - rgblight_enable(); -#endif -} diff --git a/users/xulkal/custom_rgb.h b/users/xulkal/custom_rgb.h deleted file mode 100644 index 10010b5242..0000000000 --- a/users/xulkal/custom_rgb.h +++ /dev/null @@ -1,17 +0,0 @@ -#pragma once - -#if defined(RGB_MATRIX_ENABLE) -# include "rgb_matrix.h" -#elif defined(RGBLIGHT_ENABLE) -# if !defined(__AVR__) -# define PROGMEM -# endif -# include "rgblight.h" -#endif - -#ifdef RGB_MATRIX_ENABLE -void rgb_matrix_increase_flags(void); -void rgb_matrix_decrease_flags(void); -#endif - -void rgb_reset(void); diff --git a/users/xulkal/custom_tap_dance.c b/users/xulkal/custom_tap_dance.c deleted file mode 100644 index c2f9efe44b..0000000000 --- a/users/xulkal/custom_tap_dance.c +++ /dev/null @@ -1,59 +0,0 @@ -#include "custom_tap_dance.h" -#include "custom_keycodes.h" - -#ifdef TAP_DANCE_ENABLE - -//Tap Dance Definitions -tap_dance_action_t tap_dance_actions[] = { - [COMM_QUOT] = ACTION_TAP_DANCE_DOUBLE(KC_COMM, KC_QUOT), - [BACKSPACE] = ACTION_TAP_DANCE_DOUBLE (KC_BACKSPACE, LCTL(KC_BACKSPACE)), - [DELETE] = ACTION_TAP_DANCE_DOUBLE (KC_DELETE, LCTL(KC_DELETE)) -}; - -#else - -static uint16_t td_keycode; -static uint16_t td_timer; - -const uint16_t PROGMEM td_keymaps[TD_MAX - TD_MIN][2] = { - [TD_COMM - TD_MIN] = { KC_COMM, KC_QUOT }, - [TD_BSPC - TD_MIN] = { KC_BACKSPACE, LCTL(KC_BACKSPACE) }, - [TD_DEL - TD_MIN] = { KC_DELETE, LCTL(KC_DELETE) } -}; - -static void run_custom_tap_dance(uint8_t i) -{ - tap_code16(pgm_read_word(&td_keymaps[td_keycode - TD_MIN][i])); - td_keycode = KC_TRANSPARENT; - td_timer = timer_read() + TAPPING_TERM; -} - -bool process_custom_tap_dance(uint16_t keycode, keyrecord_t *record) -{ - if (TD_MIN <= keycode && keycode < TD_MAX) - { - if (record->event.pressed) - { - if (td_keycode != keycode || timer_expired(td_timer)) - { - td_keycode = keycode; - td_timer = timer_read() + TAPPING_TERM; - } - else - run_custom_tap_dance(1); - } - return false; - } - - if (td_keycode != KC_TRANSPARENT) - run_custom_tap_dance(0); - return true; -} - -void matrix_scan_user(void) -{ - if (td_keycode != KC_TRANSPARENT && timer_expired(td_timer)) - run_custom_tap_dance(0); -} - -#endif diff --git a/users/xulkal/custom_tap_dance.h b/users/xulkal/custom_tap_dance.h deleted file mode 100644 index c4da9318c2..0000000000 --- a/users/xulkal/custom_tap_dance.h +++ /dev/null @@ -1,23 +0,0 @@ -#pragma once -#include "quantum.h" - -#ifdef TAP_DANCE_ENABLE - -#include "process_tap_dance.h" - -//Tap Dance Declarations -enum { - COMM_QUOT = 0, - BACKSPACE, - DELETE -}; - -#define TD_COMM TD(COMM_QUOT) -#define TD_BSPC TD(BACKSPACE) -#define TD_DEL TD(DELETE) - -#else - -bool process_custom_tap_dance(uint16_t keycode, keyrecord_t *record); - -#endif diff --git a/users/xulkal/layouts.h b/users/xulkal/layouts.h deleted file mode 100644 index 2b939b23bf..0000000000 --- a/users/xulkal/layouts.h +++ /dev/null @@ -1,119 +0,0 @@ -#pragma once - - /* Qwerty Layout - * ,-----------------------------------------. ,-----------------------------------------. - * | GESC | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | BkSp | - * |------+------+------+------+------+------| |------+------+------+------+------+------| - * | Tab | Q | W | E | R | T | | Y | U | I | O | P | \ | - * |------+------+------+------+------+------| |------+------+------+------+------+------| - * |FN(CAPS)| A | S | D | F | G | | H | J | K | L | ; | Enter| - * |------+------+------+------+------+------| |------+------+------+------+------+------| - * | Sft[ | Z | X | C | V | B | | N | M | , | . | / | Sft] | - * |------+------+------+------+------+------| |------+------+------+------+------+------| - * | Ctrl | Win | ADJ | FN | Alt | Space| | Space| Left | Up | Down | Right| Ctrl | - * `-----------------------------------------' `-----------------------------------------' - */ - -#define _________________QWERTY_L1_________________ QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5 -#define _________________QWERTY_L2_________________ KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T -#define _________________QWERTY_L3_________________ RIS_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G -#define _________________QWERTY_L4_________________ SC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B -#define _________________QWERTY_L5_________________ SC_LCPO, KC_LGUI, KC_LALT, LOWER, RAISE, KC_SPC - -#define _________________QWERTY_R1_________________ KC_6, KC_7, KC_8, KC_9, KC_0, TD_BSPC -#define _________________QWERTY_R2_________________ KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS -#define _________________QWERTY_R3_________________ KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENT -#define _________________QWERTY_R4_________________ KC_N, KC_M, TD_COMM, KC_DOT, KC_SLASH, SC_RSPC -#define _________________QWERTY_R5_________________ KC_SPC, KC_LEFT, KC_UP, KC_DOWN, KC_RIGHT, SC_RCPC - - -#define ___________________GAME_L1_________________ KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5 -#define ___________________GAME_L2_________________ KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T -#define ___________________GAME_L3_________________ KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G -#define ___________________GAME_L4_________________ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B -#define ___________________GAME_L5_________________ KC_LCTL, KC_LGUI, LOWER, RAISE, KC_LALT, KC_SPC - -#define ___________________GAME_R1_________________ KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC -#define ___________________GAME_R2_________________ KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS -#define ___________________GAME_R3_________________ KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENT -#define ___________________GAME_R4_________________ KC_N, KC_M, KC_COMM, KC_DOT, KC_SLASH, KC_RSFT -#define ___________________GAME_R5_________________ KC_SPC, KC_LEFT, KC_UP, KC_DOWN, KC_RIGHT, KC_RCTL - - - /* RAISE Layout - * ,-----------------------------------------. ,-----------------------------------------. - * | F12 | F1 | F2 | F3 | F4 | F5 | | F6 | F7 | F8 | F9 | F10 | F11 | - * |------+------+------+------+------+------| |------+------+------+------+------+------| - * | | PGDN | UP | PGUP | |QWERTY| | | INS | HOME | PGUP | PRINT| | - * |------+------+------+------+------+------| |------+------+------+------+------+------| - * | | LEFT | DOWN | RIGHT| | GAME | | | DEL | END | PGDN |SCRLCK| | - * |------+------+------+------+------+------| |------+------+------+------+------+------| - * | | | | | | | | | | | | | | - * |------+------+------+------+------+------| |------+------+------+------+------+------| - * | | | | | | | | | PREV | VOL+ | VOL- | NEXT | PLAY | - * `-----------------------------------------' `-----------------------------------------' - */ - -#define __________________RAISE_L1_________________ KC_F12, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5 -#define __________________RAISE_L2_________________ _______, KC_PGDN, KC_UP, KC_PGUP, _______, QWERTY -#define __________________RAISE_L3_________________ _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, GAME -#define __________________RAISE_L4_________________ _______, _______, _______, _______, _______, _______ -#define __________________RAISE_L5_________________ _______, _______, _______, _______, _______, _______ - -#define __________________RAISE_R1_________________ KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11 -#define __________________RAISE_R2_________________ _______, KC_INS, KC_HOME, KC_PGUP, KC_PSCR, _______ -#define __________________RAISE_R3_________________ _______, KC_DEL, KC_END, KC_PGDN, KC_SCRL, _______ -#define __________________RAISE_R4_________________ _______, _______, _______, _______, _______, _______ -#define __________________RAISE_R5_________________ _______, KC_MPRV, KC_VOLU, KC_VOLD, KC_MNXT, KC_MPLY - - /* LOWER Layout - * ,-----------------------------------------. ,-----------------------------------------. - * | |RGBMD |RGBRMD|RGBTOG| | | | | | | SLCK | NLCK | DEL | - * |------+------+------+------+------+------| |------+------+------+------+------+------| - * | SPDI | SAI | VAI | HUI | RESET| | | | | 7 | 8 | 9 | | - * |------+------+------+------+------+------| |------+------+------+------+------+------| - * | SPDD | SAD | VAD | HUD |RGBRST| | | | | 4 | 5 | 6 | | - * |------+------+------+------+------+------| |------+------+------+------+------+------| - * | | | | | | | | | | 1 | 2 | 3 | | - * |------+------+------+------+------+------| |------+------+------+------+------+------| - * | | | | | | | | | | | 0 | . | | - * `-----------------------------------------' `-----------------------------------------' - */ - -#define __________________LOWER_L1_________________ _______, RGB_RMOD, RGB_MOD, RGB_TOG, _______, _______ -#define __________________LOWER_L2_________________ RGB_SPI, RGB_SAI, RGB_VAI, RGB_HUI, QK_BOOT, _______ -#define __________________LOWER_L3_________________ RGB_SPD, RGB_SAD, RGB_VAD, RGB_HUD, RGBRST, _______ -#define __________________LOWER_L4_________________ _______, _______, _______, _______, _______, _______ -#define __________________LOWER_L5_________________ _______, _______, _______, _______, _______, _______ - -#define __________________LOWER_R1_________________ _______, _______, _______, KC_SCRL, KC_NUM, KC_DEL -#define __________________LOWER_R2_________________ _______, _______, KC_KP_7, KC_KP_8, KC_KP_9, _______ -#define __________________LOWER_R3_________________ _______, _______, KC_KP_4, KC_KP_5, KC_KP_6, _______ -#define __________________LOWER_R4_________________ _______, _______, KC_KP_1, KC_KP_2, KC_KP_3, _______ -#define __________________LOWER_R5_________________ _______, _______, _______, KC_KP_0, KC_PDOT, _______ - - /* ADJUST Layout - * ,-----------------------------------------. ,-----------------------------------------. - * | | | | | | | | | | | | | | - * |------+------+------+------+------+------| |------+------+------+------+------+------| - * | | RESET| Debug| | | | | | | | | | | - * |------+------+------+------+------+------| |------+------+------+------+------+------| - * | | |MusMod|Aud on|AudOff|AGnorm| |AGswap|ClkUp |ClkDwn| | | | - * |------+------+------+------+------+------| |------+------+------+------+------+------| - * | |Voice-|Voice+|Mus on|MusOff|MidiOn| |MidOff|ClkOn |ClkOff| | | | - * |------+------+------+------+------+------| |------+------+------+------+------+------| - * | | | | | | | | | | | | | | - * `-----------------------------------------' `-----------------------------------------' - */ - -#define _________________ADJUST_L1_________________ _______, _______, _______, _______, _______, _______ -#define _________________ADJUST_L2_________________ _______, QK_BOOT, DB_TOGG, _______, _______, _______ -#define _________________ADJUST_L3_________________ _______, _______, MU_NEXT, AU_ON, AU_OFF, AG_NORM -#define _________________ADJUST_L4_________________ _______, AU_PREV, AU_NEXT, MU_ON, MU_OFF, MI_ON -#define _________________ADJUST_L5_________________ _______, _______, _______, _______, _______, _______ - -#define _________________ADJUST_R1_________________ _______, _______, _______, _______, _______, _______ -#define _________________ADJUST_R2_________________ _______, _______, _______, _______, _______, _______ -#define _________________ADJUST_R3_________________ AG_SWAP, CK_UP, CK_DOWN, _______, _______, _______ -#define _________________ADJUST_R4_________________ MI_OFF, CK_ON, CK_OFF, _______, _______, _______ -#define _________________ADJUST_R5_________________ _______, _______, _______, _______, _______, _______ diff --git a/users/xulkal/process_records.c b/users/xulkal/process_records.c deleted file mode 100644 index 804dd4677a..0000000000 --- a/users/xulkal/process_records.c +++ /dev/null @@ -1,62 +0,0 @@ -#include "process_records.h" -#include "custom_keycodes.h" - -#ifdef RGB_ENABLE -#include "custom_rgb.h" -#endif - -#ifdef TRILAYER_ENABLED -layer_state_t layer_state_set_user(layer_state_t state) -{ - return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); -} -#endif - -bool process_record_user(uint16_t keycode, keyrecord_t *record) -{ - static uint16_t reset_timer; - -#ifndef TAP_DANCE_ENABLE - if (!process_custom_tap_dance(keycode, record)) - return false; -#endif - - switch (keycode) - { - case RGBRST: -#ifdef RGB_ENABLE - if (record->event.pressed) - rgb_reset(); -#endif - return false; - case QK_BOOT: - { - if (record->event.pressed) - reset_timer = timer_read() + 500; - else if (timer_expired(timer_read(), reset_timer)) - reset_keyboard(); - } - return false; -#if defined(RGB_MATRIX_TOG_LAYERS) && defined(RGB_ENABLE) - case RGB_TOG: - if (record->event.pressed) { - rgb_matrix_increase_flags(); - } - return false; -#endif - } - - return process_record_encoder(keycode, record) && process_record_keymap(keycode, record); -} - -__attribute__ ((weak)) -bool process_record_keymap(uint16_t keycode, keyrecord_t *record) -{ - return true; -} - -__attribute__ ((weak)) -bool process_record_encoder(uint16_t keycode, keyrecord_t *record) -{ - return true; -} diff --git a/users/xulkal/process_records.h b/users/xulkal/process_records.h deleted file mode 100644 index c219394f8e..0000000000 --- a/users/xulkal/process_records.h +++ /dev/null @@ -1,18 +0,0 @@ -#pragma once -#include "quantum.h" -#include "custom_tap_dance.h" - -enum layer_number { - _QWERTY = 0, -#ifndef GAMELAYER_DISABLE - _GAME, -#endif - _LOWER, - _RAISE, -#ifdef TRILAYER_ENABLED - _ADJUST -#endif -}; - -bool process_record_keymap(uint16_t keycode, keyrecord_t *record); -bool process_record_encoder(uint16_t keycode, keyrecord_t *record); diff --git a/users/xulkal/rules.mk b/users/xulkal/rules.mk deleted file mode 100644 index 7094191f2f..0000000000 --- a/users/xulkal/rules.mk +++ /dev/null @@ -1,32 +0,0 @@ -SRC += xulkal.c \ - process_records.c \ - custom_tap_dance.c - -# Some usual defaults -MOUSEKEY_ENABLE = no # Mouse keys (+4700) -EXTRAKEY_ENABLE = yes # Audio control and System control (+450) -TAP_DANCE_ENABLE = yes - -ifneq ($(strip $(DISABLE_LTO)), yes) - EXTRAFLAGS += -flto - OPT_DEFS += -DNO_ACTION_MACRO - OPT_DEFS += -DNO_ACTION_FUNCTION -endif - -ifeq ($(strip $(ENCODER_ENABLE)), yes) - SRC += custom_encoder.c -endif - -ifneq ($(strip $(RGB_MATRIX_ENABLE)), no) - OPT_DEFS += -DRGB_ENABLE - SRC += custom_rgb.c -endif - -ifeq ($(strip $(RGBLIGHT_ENABLE)), yes) - OPT_DEFS += -DRGB_ENABLE - SRC += custom_rgb.c -endif - -ifeq ($(strip $(OLED_ENABLE)), yes) - SRC += custom_oled.c -endif diff --git a/users/xulkal/xulkal.c b/users/xulkal/xulkal.c deleted file mode 100644 index ea9b6bdbbe..0000000000 --- a/users/xulkal/xulkal.c +++ /dev/null @@ -1 +0,0 @@ -#include "xulkal.h" diff --git a/users/xulkal/xulkal.h b/users/xulkal/xulkal.h deleted file mode 100644 index 32df8df0c6..0000000000 --- a/users/xulkal/xulkal.h +++ /dev/null @@ -1,6 +0,0 @@ -#pragma once - -#include "process_records.h" -#include "layouts.h" -#include "custom_keycodes.h" -#include "custom_tap_dance.h" |