diff options
Diffstat (limited to 'quantum/process_keycode')
| -rw-r--r-- | quantum/process_keycode/process_tap_dance.c | 137 | ||||
| -rw-r--r-- | quantum/process_keycode/process_tap_dance.h | 33 | ||||
| -rw-r--r-- | quantum/process_keycode/process_terminal.c | 330 | ||||
| -rw-r--r-- | quantum/process_keycode/process_terminal.h | 24 | ||||
| -rw-r--r-- | quantum/process_keycode/process_terminal_nop.h | 22 | 
5 files changed, 70 insertions, 476 deletions
| diff --git a/quantum/process_keycode/process_tap_dance.c b/quantum/process_keycode/process_tap_dance.c index db8df5f870..3270a1b000 100644 --- a/quantum/process_keycode/process_tap_dance.c +++ b/quantum/process_keycode/process_tap_dance.c @@ -15,12 +15,8 @@   */  #include "quantum.h" -#ifndef NO_ACTION_ONESHOT -uint8_t get_oneshot_mods(void); -#endif - -static uint16_t last_td; -static int16_t  highest_td = -1; +static uint16_t active_td; +static uint16_t last_tap_time;  void qk_tap_dance_pair_on_each_tap(qk_tap_dance_state_t *state, void *user_data) {      qk_tap_dance_pair_t *pair = (qk_tap_dance_pair_t *)user_data; @@ -34,18 +30,14 @@ void qk_tap_dance_pair_on_each_tap(qk_tap_dance_state_t *state, void *user_data)  void qk_tap_dance_pair_finished(qk_tap_dance_state_t *state, void *user_data) {      qk_tap_dance_pair_t *pair = (qk_tap_dance_pair_t *)user_data; -    if (state->count == 1) { -        register_code16(pair->kc1); -    } else if (state->count == 2) { -        register_code16(pair->kc2); -    } +    register_code16(pair->kc1);  }  void qk_tap_dance_pair_reset(qk_tap_dance_state_t *state, void *user_data) {      qk_tap_dance_pair_t *pair = (qk_tap_dance_pair_t *)user_data; -    wait_ms(TAP_CODE_DELAY);      if (state->count == 1) { +        wait_ms(TAP_CODE_DELAY);          unregister_code16(pair->kc1);      } else if (state->count == 2) {          unregister_code16(pair->kc2); @@ -87,23 +79,40 @@ static inline void _process_tap_dance_action_fn(qk_tap_dance_state_t *state, voi  }  static inline void process_tap_dance_action_on_each_tap(qk_tap_dance_action_t *action) { +    action->state.count++; +    action->state.weak_mods = get_mods(); +    action->state.weak_mods |= get_weak_mods(); +#ifndef NO_ACTION_ONESHOT +    action->state.oneshot_mods = get_oneshot_mods(); +#endif      _process_tap_dance_action_fn(&action->state, action->user_data, action->fn.on_each_tap);  } -static inline void process_tap_dance_action_on_dance_finished(qk_tap_dance_action_t *action) { -    if (action->state.finished) return; -    action->state.finished = true; -    add_mods(action->state.oneshot_mods); -    add_weak_mods(action->state.weak_mods); -    send_keyboard_report(); -    _process_tap_dance_action_fn(&action->state, action->user_data, action->fn.on_dance_finished); -} -  static inline void process_tap_dance_action_on_reset(qk_tap_dance_action_t *action) {      _process_tap_dance_action_fn(&action->state, action->user_data, action->fn.on_reset); -    del_mods(action->state.oneshot_mods);      del_weak_mods(action->state.weak_mods); +#ifndef NO_ACTION_ONESHOT +    del_mods(action->state.oneshot_mods); +#endif      send_keyboard_report(); +    action->state = (const qk_tap_dance_state_t){0}; +} + +static inline void process_tap_dance_action_on_dance_finished(qk_tap_dance_action_t *action) { +    if (!action->state.finished) { +        action->state.finished = true; +        add_weak_mods(action->state.weak_mods); +#ifndef NO_ACTION_ONESHOT +        add_mods(action->state.oneshot_mods); +#endif +        send_keyboard_report(); +        _process_tap_dance_action_fn(&action->state, action->user_data, action->fn.on_dance_finished); +    } +    active_td = 0; +    if (!action->state.pressed) { +        // There will not be a key release event, so reset now. +        process_tap_dance_action_on_reset(action); +    }  }  void preprocess_tap_dance(uint16_t keycode, keyrecord_t *record) { @@ -111,51 +120,33 @@ void preprocess_tap_dance(uint16_t keycode, keyrecord_t *record) {      if (!record->event.pressed) return; -    if (highest_td == -1) return; - -    for (int i = 0; i <= highest_td; i++) { -        action = &tap_dance_actions[i]; -        if (action->state.count) { -            if (keycode == action->state.keycode && keycode == last_td) continue; -            action->state.interrupted          = true; -            action->state.interrupting_keycode = keycode; -            process_tap_dance_action_on_dance_finished(action); -            reset_tap_dance(&action->state); - -            // Tap dance actions can leave some weak mods active (e.g., if the tap dance is mapped to a keycode with -            // modifiers), but these weak mods should not affect the keypress which interrupted the tap dance. -            clear_weak_mods(); -        } -    } +    if (!active_td || keycode == active_td) return; + +    action                             = &tap_dance_actions[TD_INDEX(active_td)]; +    action->state.interrupted          = true; +    action->state.interrupting_keycode = keycode; +    process_tap_dance_action_on_dance_finished(action); + +    // Tap dance actions can leave some weak mods active (e.g., if the tap dance is mapped to a keycode with +    // modifiers), but these weak mods should not affect the keypress which interrupted the tap dance. +    clear_weak_mods();  }  bool process_tap_dance(uint16_t keycode, keyrecord_t *record) { -    uint16_t               idx = keycode - QK_TAP_DANCE;      qk_tap_dance_action_t *action;      switch (keycode) {          case QK_TAP_DANCE ... QK_TAP_DANCE_MAX: -            if ((int16_t)idx > highest_td) highest_td = idx; -            action = &tap_dance_actions[idx]; +            action = &tap_dance_actions[TD_INDEX(keycode)];              action->state.pressed = record->event.pressed;              if (record->event.pressed) { -                action->state.keycode = keycode; -                action->state.count++; -                action->state.timer = timer_read(); -#ifndef NO_ACTION_ONESHOT -                action->state.oneshot_mods = get_oneshot_mods(); -#else -                action->state.oneshot_mods = 0; -#endif -                action->state.weak_mods = get_mods(); -                action->state.weak_mods |= get_weak_mods(); +                last_tap_time = timer_read();                  process_tap_dance_action_on_each_tap(action); - -                last_td = keycode; +                active_td = action->state.finished ? 0 : keycode;              } else { -                if (action->state.count && action->state.finished) { -                    reset_tap_dance(&action->state); +                if (action->state.finished) { +                    process_tap_dance_action_on_reset(action);                  }              } @@ -166,35 +157,17 @@ bool process_tap_dance(uint16_t keycode, keyrecord_t *record) {  }  void tap_dance_task() { -    if (highest_td == -1) return; -    uint16_t tap_user_defined; - -    for (uint8_t i = 0; i <= highest_td; i++) { -        qk_tap_dance_action_t *action = &tap_dance_actions[i]; -        if (action->custom_tapping_term > 0) { -            tap_user_defined = action->custom_tapping_term; -        } else { -            tap_user_defined = GET_TAPPING_TERM(action->state.keycode, &(keyrecord_t){}); -        } -        if (action->state.count && timer_elapsed(action->state.timer) > tap_user_defined) { -            process_tap_dance_action_on_dance_finished(action); -            reset_tap_dance(&action->state); -        } -    } -} - -void reset_tap_dance(qk_tap_dance_state_t *state) {      qk_tap_dance_action_t *action; -    if (state->pressed) return; +    if (!active_td || timer_elapsed(last_tap_time) <= GET_TAPPING_TERM(active_td, &(keyrecord_t){})) return; -    action = &tap_dance_actions[state->keycode - QK_TAP_DANCE]; - -    process_tap_dance_action_on_reset(action); +    action = &tap_dance_actions[TD_INDEX(active_td)]; +    if (!action->state.interrupted) { +        process_tap_dance_action_on_dance_finished(action); +    } +} -    state->count                = 0; -    state->interrupted          = false; -    state->finished             = false; -    state->interrupting_keycode = 0; -    last_td                     = 0; +void reset_tap_dance(qk_tap_dance_state_t *state) { +    active_td = 0; +    process_tap_dance_action_on_reset((qk_tap_dance_action_t *)state);  } diff --git a/quantum/process_keycode/process_tap_dance.h b/quantum/process_keycode/process_tap_dance.h index d9ffb1e73d..d97900d96b 100644 --- a/quantum/process_keycode/process_tap_dance.h +++ b/quantum/process_keycode/process_tap_dance.h @@ -22,30 +22,27 @@  #    include <inttypes.h>  typedef struct { +    uint16_t interrupting_keycode;      uint8_t  count; -    uint8_t  oneshot_mods;      uint8_t  weak_mods; -    uint16_t keycode; -    uint16_t interrupting_keycode; -    uint16_t timer; -    bool     interrupted; -    bool     pressed; -    bool     finished; +#    ifndef NO_ACTION_ONESHOT +    uint8_t oneshot_mods; +#    endif +    bool pressed : 1; +    bool finished : 1; +    bool interrupted : 1;  } qk_tap_dance_state_t; -#    define TD(n) (QK_TAP_DANCE | ((n)&0xFF)) -  typedef void (*qk_tap_dance_user_fn_t)(qk_tap_dance_state_t *state, void *user_data);  typedef struct { +    qk_tap_dance_state_t state;      struct {          qk_tap_dance_user_fn_t on_each_tap;          qk_tap_dance_user_fn_t on_dance_finished;          qk_tap_dance_user_fn_t on_reset;      } fn; -    qk_tap_dance_state_t state; -    uint16_t             custom_tapping_term; -    void *               user_data; +    void *user_data;  } qk_tap_dance_action_t;  typedef struct { @@ -62,31 +59,31 @@ typedef struct {  #    define ACTION_TAP_DANCE_DOUBLE(kc1, kc2) \          { .fn = {qk_tap_dance_pair_on_each_tap, qk_tap_dance_pair_finished, qk_tap_dance_pair_reset}, .user_data = (void *)&((qk_tap_dance_pair_t){kc1, kc2}), } -#    define ACTION_TAP_DANCE_DUAL_ROLE(kc, layer) \ +#    define ACTION_TAP_DANCE_LAYER_MOVE(kc, layer) \          { .fn = {qk_tap_dance_dual_role_on_each_tap, qk_tap_dance_dual_role_finished, qk_tap_dance_dual_role_reset}, .user_data = (void *)&((qk_tap_dance_dual_role_t){kc, layer, layer_move}), }  #    define ACTION_TAP_DANCE_LAYER_TOGGLE(kc, layer) \          { .fn = {NULL, qk_tap_dance_dual_role_finished, qk_tap_dance_dual_role_reset}, .user_data = (void *)&((qk_tap_dance_dual_role_t){kc, layer, layer_invert}), } -#    define ACTION_TAP_DANCE_LAYER_MOVE(kc, layer) ACTION_TAP_DANCE_DUAL_ROLE(kc, layer) -  #    define ACTION_TAP_DANCE_FN(user_fn) \          { .fn = {NULL, user_fn, NULL}, .user_data = NULL, }  #    define ACTION_TAP_DANCE_FN_ADVANCED(user_fn_on_each_tap, user_fn_on_dance_finished, user_fn_on_dance_reset) \          { .fn = {user_fn_on_each_tap, user_fn_on_dance_finished, user_fn_on_dance_reset}, .user_data = NULL, } -#    define ACTION_TAP_DANCE_FN_ADVANCED_TIME(user_fn_on_each_tap, user_fn_on_dance_finished, user_fn_on_dance_reset, tap_specific_tapping_term) \ -        { .fn = {user_fn_on_each_tap, user_fn_on_dance_finished, user_fn_on_dance_reset}, .user_data = NULL, .custom_tapping_term = tap_specific_tapping_term, } +#    define TD(n) (QK_TAP_DANCE | TD_INDEX(n)) +#    define TD_INDEX(code) ((code)&0xFF) +#    define TAP_DANCE_KEYCODE(state) TD(((qk_tap_dance_action_t *)state) - tap_dance_actions)  extern qk_tap_dance_action_t tap_dance_actions[]; +void reset_tap_dance(qk_tap_dance_state_t *state); +  /* To be used internally */  void preprocess_tap_dance(uint16_t keycode, keyrecord_t *record);  bool process_tap_dance(uint16_t keycode, keyrecord_t *record);  void tap_dance_task(void); -void reset_tap_dance(qk_tap_dance_state_t *state);  void qk_tap_dance_pair_on_each_tap(qk_tap_dance_state_t *state, void *user_data);  void qk_tap_dance_pair_finished(qk_tap_dance_state_t *state, void *user_data); diff --git a/quantum/process_keycode/process_terminal.c b/quantum/process_keycode/process_terminal.c deleted file mode 100644 index da1c4d506f..0000000000 --- a/quantum/process_keycode/process_terminal.c +++ /dev/null @@ -1,330 +0,0 @@ -/* Copyright 2017 Jack Humbert - * - * 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/>. - */ - -#include "process_terminal.h" -#include <string.h> -#include "version.h" -#include <stdio.h> -#include <math.h> - -#ifndef CMD_BUFF_SIZE -#    define CMD_BUFF_SIZE 5 -#endif - -bool terminal_enabled = false; -char buffer[80]       = ""; -char cmd_buffer[CMD_BUFF_SIZE][80]; -bool cmd_buffer_enabled = true; // replace with ifdef? -char newline[2]         = "\n"; -char arguments[6][20]; -bool firstTime = true; - -short int current_cmd_buffer_pos = 0; // used for up/down arrows - keeps track of where you are in the command buffer - -__attribute__((weak)) const char terminal_prompt[8] = "> "; - -#ifdef AUDIO_ENABLE -#    ifndef TERMINAL_SONG -#        define TERMINAL_SONG SONG(TERMINAL_SOUND) -#    endif -float terminal_song[][2] = TERMINAL_SONG; -#    define TERMINAL_BELL() PLAY_SONG(terminal_song) -#else -#    define TERMINAL_BELL() -#endif - -__attribute__((weak)) const char keycode_to_ascii_lut[58] = {0, 0, 0, 0, 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', '1', '2', '3', '4', '5', '6', '7', '8', '9', '0', 0, 0, 0, '\t', ' ', '-', '=', '[', ']', '\\', 0, ';', '\'', '`', ',', '.', '/'}; - -__attribute__((weak)) const char shifted_keycode_to_ascii_lut[58] = {0, 0, 0, 0, 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', '!', '@', '#', '$', '%', '^', '&', '*', '(', ')', 0, 0, 0, '\t', ' ', '_', '+', '{', '}', '|', 0, ':', '\'', '~', '<', '>', '?'}; - -struct stringcase { -    char *string; -    void (*func)(void); -} typedef stringcase; - -void enable_terminal(void) { -    terminal_enabled = true; -    strcpy(buffer, ""); -    memset(cmd_buffer, 0, CMD_BUFF_SIZE * 80); -    for (int i = 0; i < 6; i++) -        strcpy(arguments[i], ""); -    // select all text to start over -    // SEND_STRING(SS_LCTL("a")); -    send_string(terminal_prompt); -} - -void disable_terminal(void) { -    terminal_enabled = false; -    SEND_STRING("\n"); -} - -void push_to_cmd_buffer(void) { -    if (cmd_buffer_enabled) { -        if (cmd_buffer == NULL) { -            return; -        } else { -            if (firstTime) { -                firstTime = false; -                strcpy(cmd_buffer[0], buffer); -                return; -            } - -            for (int i = CMD_BUFF_SIZE - 1; i > 0; --i) { -                strncpy(cmd_buffer[i], cmd_buffer[i - 1], 80); -            } - -            strcpy(cmd_buffer[0], buffer); - -            return; -        } -    } -} - -void terminal_about(void) { -    SEND_STRING("QMK Firmware\n"); -    SEND_STRING("  v"); -    SEND_STRING(QMK_VERSION); -    SEND_STRING("\n" SS_TAP(X_HOME) "  Built: "); -    SEND_STRING(QMK_BUILDDATE); -    send_string(newline); -#ifdef TERMINAL_HELP -    if (strlen(arguments[1]) != 0) { -        SEND_STRING("You entered: "); -        send_string(arguments[1]); -        send_string(newline); -    } -#endif -} - -void terminal_help(void); - -extern const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS]; - -void terminal_keycode(void) { -    if (strlen(arguments[1]) != 0 && strlen(arguments[2]) != 0 && strlen(arguments[3]) != 0) { -        char     keycode_dec[5]; -        char     keycode_hex[5]; -        uint16_t layer   = strtol(arguments[1], (char **)NULL, 10); -        uint16_t row     = strtol(arguments[2], (char **)NULL, 10); -        uint16_t col     = strtol(arguments[3], (char **)NULL, 10); -        uint16_t keycode = pgm_read_word(&keymaps[layer][row][col]); -        itoa(keycode, keycode_dec, 10); -        itoa(keycode, keycode_hex, 16); -        SEND_STRING("0x"); -        send_string(keycode_hex); -        SEND_STRING(" ("); -        send_string(keycode_dec); -        SEND_STRING(")\n"); -    } else { -#ifdef TERMINAL_HELP -        SEND_STRING("usage: keycode <layer> <row> <col>\n"); -#endif -    } -} - -void terminal_keymap(void) { -    if (strlen(arguments[1]) != 0) { -        uint16_t layer = strtol(arguments[1], (char **)NULL, 10); -        for (int r = 0; r < MATRIX_ROWS; r++) { -            for (int c = 0; c < MATRIX_COLS; c++) { -                uint16_t keycode = pgm_read_word(&keymaps[layer][r][c]); -                char     keycode_s[8]; -                sprintf(keycode_s, "0x%04x,", keycode); -                send_string(keycode_s); -            } -            send_string(newline); -        } -    } else { -#ifdef TERMINAL_HELP -        SEND_STRING("usage: keymap <layer>\n"); -#endif -    } -} - -void print_cmd_buff(void) { -    /* without the below wait, a race condition can occur wherein the -     buffer can be printed before it has been fully moved */ -    wait_ms(250); -    for (int i = 0; i < CMD_BUFF_SIZE; i++) { -        char tmpChar = ' '; -        itoa(i, &tmpChar, 10); -        const char *tmpCnstCharStr = &tmpChar; // because sned_string wont take a normal char * -        send_string(tmpCnstCharStr); -        SEND_STRING(". "); -        send_string(cmd_buffer[i]); -        SEND_STRING("\n"); -    } -} - -void flush_cmd_buffer(void) { -    memset(cmd_buffer, 0, CMD_BUFF_SIZE * 80); -    SEND_STRING("Buffer Cleared!\n"); -} - -stringcase terminal_cases[] = {{"about", terminal_about}, {"help", terminal_help}, {"keycode", terminal_keycode}, {"keymap", terminal_keymap}, {"flush-buffer", flush_cmd_buffer}, {"print-buffer", print_cmd_buff}, {"exit", disable_terminal}}; - -void terminal_help(void) { -    SEND_STRING("commands available:\n  "); -    for (stringcase *case_p = terminal_cases; case_p != terminal_cases + sizeof(terminal_cases) / sizeof(terminal_cases[0]); case_p++) { -        send_string(case_p->string); -        SEND_STRING(" "); -    } -    send_string(newline); -} - -void command_not_found(void) { -    wait_ms(50); // sometimes buffer isnt grabbed quick enough -    SEND_STRING("command \""); -    send_string(buffer); -    SEND_STRING("\" not found\n"); -} - -void process_terminal_command(void) { -    // we capture return bc of the order of events, so we need to manually send a newline -    send_string(newline); - -    char *  pch; -    uint8_t i = 0; -    pch       = strtok(buffer, " "); -    while (pch != NULL) { -        strcpy(arguments[i], pch); -        pch = strtok(NULL, " "); -        i++; -    } - -    bool command_found = false; -    for (stringcase *case_p = terminal_cases; case_p != terminal_cases + sizeof(terminal_cases) / sizeof(terminal_cases[0]); case_p++) { -        if (0 == strcmp(case_p->string, buffer)) { -            command_found = true; -            (*case_p->func)(); -            break; -        } -    } - -    if (!command_found) command_not_found(); - -    if (terminal_enabled) { -        strcpy(buffer, ""); -        for (int i = 0; i < 6; i++) -            strcpy(arguments[i], ""); -        SEND_STRING(SS_TAP(X_HOME)); -        send_string(terminal_prompt); -    } -} -void check_pos(void) { -    if (current_cmd_buffer_pos >= CMD_BUFF_SIZE) { // if over the top, move it back down to the top of the buffer so you can climb back down... -        current_cmd_buffer_pos = CMD_BUFF_SIZE - 1; -    } else if (current_cmd_buffer_pos < 0) { //...and if you fall under the bottom of the buffer, reset back to 0 so you can climb back up -        current_cmd_buffer_pos = 0; -    } -} - -bool process_terminal(uint16_t keycode, keyrecord_t *record) { -    if (keycode == TERM_ON && record->event.pressed) { -        enable_terminal(); -        return false; -    } - -    if (terminal_enabled && record->event.pressed) { -        if (keycode == TERM_OFF && record->event.pressed) { -            disable_terminal(); -            return false; -        } - -        if ((keycode >= QK_MOD_TAP && keycode <= QK_MOD_TAP_MAX) || (keycode >= QK_LAYER_TAP && keycode <= QK_LAYER_TAP_MAX)) { -            keycode = keycode & 0xFF; -        } - -        if (keycode < 256) { -            uint8_t str_len; -            char    char_to_add; -            switch (keycode) { -                case KC_ENTER: -                case KC_KP_ENTER: -                    push_to_cmd_buffer(); -                    current_cmd_buffer_pos = 0; -                    process_terminal_command(); -                    return false; -                    break; -                case KC_ESCAPE: -                    SEND_STRING("\n"); -                    enable_terminal(); -                    return false; -                    break; -                case KC_BACKSPACE: -                    str_len = strlen(buffer); -                    if (str_len > 0) { -                        buffer[str_len - 1] = 0; -                        return true; -                    } else { -                        TERMINAL_BELL(); -                        return false; -                    } -                    break; -                case KC_LEFT: -                    return false; -                    break; -                case KC_RIGHT: -                    return false; -                    break; -                case KC_UP:                                            // 0 = recent -                    check_pos();                                       // check our current buffer position is valid -                    if (current_cmd_buffer_pos <= CMD_BUFF_SIZE - 1) { // once we get to the top, dont do anything -                        str_len = strlen(buffer); -                        for (int i = 0; i < str_len; ++i) { -                            send_string(SS_TAP(X_BSPACE)); // clear w/e is on the line already -                            // process_terminal(KC_BACKSPACE,record); -                        } -                        strncpy(buffer, cmd_buffer[current_cmd_buffer_pos], 80); - -                        send_string(buffer); -                        ++current_cmd_buffer_pos; // get ready to access the above cmd if up/down is pressed again -                    } -                    return false; -                    break; -                case KC_DOWN: -                    check_pos(); -                    if (current_cmd_buffer_pos >= 0) { // once we get to the bottom, dont do anything -                        str_len = strlen(buffer); -                        for (int i = 0; i < str_len; ++i) { -                            send_string(SS_TAP(X_BSPACE)); // clear w/e is on the line already -                            // process_terminal(KC_BACKSPACE,record); -                        } -                        strncpy(buffer, cmd_buffer[current_cmd_buffer_pos], 79); - -                        send_string(buffer); -                        --current_cmd_buffer_pos; // get ready to access the above cmd if down/up is pressed again -                    } -                    return false; -                    break; -                default: -                    if (keycode <= 58) { -                        char_to_add = 0; -                        if (get_mods() & (MOD_BIT(KC_LEFT_SHIFT) | MOD_BIT(KC_RIGHT_SHIFT))) { -                            char_to_add = shifted_keycode_to_ascii_lut[keycode]; -                        } else if (get_mods() == 0) { -                            char_to_add = keycode_to_ascii_lut[keycode]; -                        } -                        if (char_to_add != 0) { -                            strncat(buffer, &char_to_add, 1); -                        } -                    } -                    break; -            } -        } -    } -    return true; -} diff --git a/quantum/process_keycode/process_terminal.h b/quantum/process_keycode/process_terminal.h deleted file mode 100644 index 0159131e5b..0000000000 --- a/quantum/process_keycode/process_terminal.h +++ /dev/null @@ -1,24 +0,0 @@ -/* Copyright 2017 Jack Humbert - * - * 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" - -extern const char keycode_to_ascii_lut[58]; -extern const char shifted_keycode_to_ascii_lut[58]; -extern const char terminal_prompt[8]; -bool              process_terminal(uint16_t keycode, keyrecord_t *record); diff --git a/quantum/process_keycode/process_terminal_nop.h b/quantum/process_keycode/process_terminal_nop.h deleted file mode 100644 index 36e25320c5..0000000000 --- a/quantum/process_keycode/process_terminal_nop.h +++ /dev/null @@ -1,22 +0,0 @@ -/* Copyright 2017 Jack Humbert - * - * 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" - -#define TERM_ON KC_NO -#define TERM_OFF KC_NO | 
