diff options
Diffstat (limited to 'quantum')
| -rw-r--r-- | quantum/action.c | 2 | ||||
| -rw-r--r-- | quantum/action_layer.h | 2 | ||||
| -rw-r--r-- | quantum/keymap.h | 2 | ||||
| -rw-r--r-- | quantum/keymap_introspection.c | 25 | ||||
| -rw-r--r-- | quantum/keymap_introspection.h | 15 | ||||
| -rw-r--r-- | quantum/mousekey.c | 27 | ||||
| -rw-r--r-- | quantum/mousekey.h | 4 | ||||
| -rw-r--r-- | quantum/pointing_device.c | 31 | ||||
| -rw-r--r-- | quantum/pointing_device.h | 10 | ||||
| -rw-r--r-- | quantum/pointing_device_drivers.c | 62 | ||||
| -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 | ||||
| -rw-r--r-- | quantum/quantum.c | 3 | ||||
| -rw-r--r-- | quantum/quantum.h | 6 | ||||
| -rw-r--r-- | quantum/quantum_keycodes.h | 6 | ||||
| -rw-r--r-- | quantum/quantum_keycodes_legacy.h | 3 | ||||
| -rw-r--r-- | quantum/rgb_matrix/animations/typing_heatmap_anim.h | 84 | ||||
| -rw-r--r-- | quantum/rgb_matrix/rgb_matrix.c | 11 | ||||
| -rw-r--r-- | quantum/split_common/split_util.c | 12 | ||||
| -rw-r--r-- | quantum/via.c | 21 | 
23 files changed, 285 insertions, 587 deletions
| diff --git a/quantum/action.c b/quantum/action.c index 4e81a5466f..83f6e2a970 100644 --- a/quantum/action.c +++ b/quantum/action.c @@ -844,7 +844,7 @@ __attribute__((weak)) void register_code(uint8_t code) {  #    endif          add_key(KC_CAPS_LOCK);          send_keyboard_report(); -        wait_ms(100); +        wait_ms(TAP_HOLD_CAPS_DELAY);          del_key(KC_CAPS_LOCK);          send_keyboard_report();      } diff --git a/quantum/action_layer.h b/quantum/action_layer.h index b87d096eed..bd1085a70f 100644 --- a/quantum/action_layer.h +++ b/quantum/action_layer.h @@ -41,7 +41,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  #endif  #if !defined(LAYER_STATE_8BIT) && !defined(LAYER_STATE_16BIT) && !defined(LAYER_STATE_32BIT) -#    define LAYER_STATE_32BIT +#    define LAYER_STATE_16BIT  #endif  #if defined(LAYER_STATE_8BIT) diff --git a/quantum/keymap.h b/quantum/keymap.h index d64b271efb..081bc54ebe 100644 --- a/quantum/keymap.h +++ b/quantum/keymap.h @@ -55,3 +55,5 @@ extern const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS];  // Ensure we have a forward declaration for the encoder map  #    include "encoder.h"  #endif + +#include "keymap_introspection.h" diff --git a/quantum/keymap_introspection.c b/quantum/keymap_introspection.c new file mode 100644 index 0000000000..9628b41eef --- /dev/null +++ b/quantum/keymap_introspection.c @@ -0,0 +1,25 @@ +// Copyright 2022 Nick Brassel (@tzarc) +// SPDX-License-Identifier: GPL-2.0-or-later + +// Pull the actual keymap code so that we can inspect stuff from it +#include KEYMAP_C + +#include "keymap_introspection.h" + +#define NUM_KEYMAP_LAYERS ((uint8_t)(sizeof(keymaps) / ((MATRIX_ROWS) * (MATRIX_COLS) * sizeof(uint16_t)))) + +uint8_t keymap_layer_count(void) { +    return NUM_KEYMAP_LAYERS; +} + +#if defined(ENCODER_ENABLE) && defined(ENCODER_MAP_ENABLE) + +#    define NUM_ENCODERMAP_LAYERS ((uint8_t)(sizeof(encoder_map) / ((NUM_ENCODERS) * (2) * sizeof(uint16_t)))) + +uint8_t encodermap_layer_count(void) { +    return NUM_ENCODERMAP_LAYERS; +} + +_Static_assert(NUM_KEYMAP_LAYERS == NUM_ENCODERMAP_LAYERS, "Number of encoder_map layers doesn't match the number of keymap layers"); + +#endif // defined(ENCODER_ENABLE) && defined(ENCODER_MAP_ENABLE) diff --git a/quantum/keymap_introspection.h b/quantum/keymap_introspection.h new file mode 100644 index 0000000000..23f6f2016f --- /dev/null +++ b/quantum/keymap_introspection.h @@ -0,0 +1,15 @@ +// Copyright 2022 Nick Brassel (@tzarc) +// SPDX-License-Identifier: GPL-2.0-or-later +#pragma once + +#include <stdint.h> + +// Get the number of layers defined in the keymap +uint8_t keymap_layer_count(void); + +#if defined(ENCODER_ENABLE) && defined(ENCODER_MAP_ENABLE) + +// Get the number of layers defined in the encoder map +uint8_t encodermap_layer_count(void); + +#endif // defined(ENCODER_ENABLE) && defined(ENCODER_MAP_ENABLE) diff --git a/quantum/mousekey.c b/quantum/mousekey.c index 64d0e66682..81e887d529 100644 --- a/quantum/mousekey.c +++ b/quantum/mousekey.c @@ -66,11 +66,18 @@ uint8_t mk_time_to_max = MOUSEKEY_TIME_TO_MAX;  /* milliseconds between the initial key press and first repeated motion event (0-2550) */  uint8_t mk_wheel_delay = MOUSEKEY_WHEEL_DELAY / 10;  /* milliseconds between repeated motion events (0-255) */ -uint8_t mk_wheel_interval    = MOUSEKEY_WHEEL_INTERVAL; +#    ifdef MK_KINETIC_SPEED +float mk_wheel_interval = 1000.0f / MOUSEKEY_WHEEL_INITIAL_MOVEMENTS; +#    else +uint8_t mk_wheel_interval = MOUSEKEY_WHEEL_INTERVAL; +#    endif  uint8_t mk_wheel_max_speed   = MOUSEKEY_WHEEL_MAX_SPEED;  uint8_t mk_wheel_time_to_max = MOUSEKEY_WHEEL_TIME_TO_MAX;  #    ifndef MK_COMBINED +#        ifndef MK_KINETIC_SPEED + +/* Default accelerated mode */  static uint8_t move_unit(void) {      uint16_t unit; @@ -108,8 +115,7 @@ static uint8_t wheel_unit(void) {      return (unit > MOUSEKEY_WHEEL_MAX ? MOUSEKEY_WHEEL_MAX : (unit == 0 ? 1 : unit));  } -#    else /* #ifndef MK_COMBINED */ -#        ifdef MK_KINETIC_SPEED +#        else /* #ifndef MK_KINETIC_SPEED */  /*   * Kinetic movement  acceleration algorithm @@ -147,27 +153,27 @@ static uint8_t move_unit(void) {      return speed > MOUSEKEY_MOVE_MAX ? MOUSEKEY_MOVE_MAX : speed;  } -float mk_wheel_interval = 1000.0f / MOUSEKEY_WHEEL_INITIAL_MOVEMENTS; -  static uint8_t wheel_unit(void) {      float speed = MOUSEKEY_WHEEL_INITIAL_MOVEMENTS;      if (mousekey_accel & ((1 << 0) | (1 << 2))) {          speed = mousekey_accel & (1 << 2) ? MOUSEKEY_WHEEL_ACCELERATED_MOVEMENTS : MOUSEKEY_WHEEL_DECELERATED_MOVEMENTS; -    } else if (mousekey_repeat && mouse_timer) { +    } else if (mousekey_wheel_repeat && mouse_timer) {          if (mk_wheel_interval != MOUSEKEY_WHEEL_BASE_MOVEMENTS) {              const float time_elapsed = timer_elapsed(mouse_timer) / 50;              speed                    = MOUSEKEY_WHEEL_INITIAL_MOVEMENTS + 1 * time_elapsed + 1 * 0.5 * time_elapsed * time_elapsed;          }          speed = speed > MOUSEKEY_WHEEL_BASE_MOVEMENTS ? MOUSEKEY_WHEEL_BASE_MOVEMENTS : speed;      } -      mk_wheel_interval = 1000.0f / speed; -    return 1; +    return (uint8_t)speed > MOUSEKEY_WHEEL_INITIAL_MOVEMENTS ? 2 : 1;  } -#        else /* #ifndef MK_KINETIC_SPEED */ +#        endif /* #ifndef MK_KINETIC_SPEED */ +#    else      /* #ifndef MK_COMBINED */ + +/* Combined mode */  static uint8_t move_unit(void) {      uint16_t unit; @@ -205,8 +211,7 @@ static uint8_t wheel_unit(void) {      return (unit > MOUSEKEY_WHEEL_MAX ? MOUSEKEY_WHEEL_MAX : (unit == 0 ? 1 : unit));  } -#        endif /* #ifndef MK_KINETIC_SPEED */ -#    endif     /* #ifndef MK_COMBINED */ +#    endif /* #ifndef MK_COMBINED */  void mousekey_task(void) {      // report cursor and scroll movement independently diff --git a/quantum/mousekey.h b/quantum/mousekey.h index 03da5f282a..d44f47fc1f 100644 --- a/quantum/mousekey.h +++ b/quantum/mousekey.h @@ -39,7 +39,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  #        ifndef MK_KINETIC_SPEED  #            define MOUSEKEY_MOVE_DELTA 8  #        else -#            define MOUSEKEY_MOVE_DELTA 5 +#            define MOUSEKEY_MOVE_DELTA 16  #        endif  #    endif  #    ifndef MOUSEKEY_WHEEL_DELTA @@ -82,7 +82,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  #        define MOUSEKEY_INITIAL_SPEED 100  #    endif  #    ifndef MOUSEKEY_BASE_SPEED -#        define MOUSEKEY_BASE_SPEED 1000 +#        define MOUSEKEY_BASE_SPEED 5000  #    endif  #    ifndef MOUSEKEY_DECELERATED_SPEED  #        define MOUSEKEY_DECELERATED_SPEED 400 diff --git a/quantum/pointing_device.c b/quantum/pointing_device.c index a160647890..3c2e2bc09d 100644 --- a/quantum/pointing_device.c +++ b/quantum/pointing_device.c @@ -177,7 +177,8 @@ __attribute__((weak)) void pointing_device_send(void) {  report_mouse_t pointing_device_adjust_by_defines(report_mouse_t mouse_report) {      // Support rotation of the sensor data  #if defined(POINTING_DEVICE_ROTATION_90) || defined(POINTING_DEVICE_ROTATION_180) || defined(POINTING_DEVICE_ROTATION_270) -    int8_t x = mouse_report.x, y = mouse_report.y; +    mouse_xy_report_t x = mouse_report.x; +    mouse_xy_report_t y = mouse_report.y;  #    if defined(POINTING_DEVICE_ROTATION_90)      mouse_report.x = y;      mouse_report.y = -x; @@ -347,7 +348,7 @@ void pointing_device_set_cpi_on_side(bool left, uint16_t cpi) {   * @param[in] int16_t value   * @return int8_t clamped value   */ -static inline int8_t pointing_device_movement_clamp(int16_t value) { +static inline int8_t pointing_device_hv_clamp(int16_t value) {      if (value < INT8_MIN) {          return INT8_MIN;      } else if (value > INT8_MAX) { @@ -358,6 +359,21 @@ static inline int8_t pointing_device_movement_clamp(int16_t value) {  }  /** + * @brief clamps int16_t to int8_t + * + * @param[in] clamp_range_t value + * @return mouse_xy_report_t clamped value + */ +static inline mouse_xy_report_t pointing_device_xy_clamp(clamp_range_t value) { +    if (value < XY_REPORT_MIN) { +        return XY_REPORT_MIN; +    } else if (value > XY_REPORT_MAX) { +        return XY_REPORT_MAX; +    } else { +        return value; +    } +} +/**   * @brief combines 2 mouse reports and returns 2   *   * Combines 2 report_mouse_t structs, clamping movement values to int8_t and ignores report_id then returns the resulting report_mouse_t struct. @@ -369,10 +385,10 @@ static inline int8_t pointing_device_movement_clamp(int16_t value) {   * @return combined report_mouse_t of left_report and right_report   */  report_mouse_t pointing_device_combine_reports(report_mouse_t left_report, report_mouse_t right_report) { -    left_report.x = pointing_device_movement_clamp((int16_t)left_report.x + right_report.x); -    left_report.y = pointing_device_movement_clamp((int16_t)left_report.y + right_report.y); -    left_report.h = pointing_device_movement_clamp((int16_t)left_report.h + right_report.h); -    left_report.v = pointing_device_movement_clamp((int16_t)left_report.v + right_report.v); +    left_report.x = pointing_device_xy_clamp((clamp_range_t)left_report.x + right_report.x); +    left_report.y = pointing_device_xy_clamp((clamp_range_t)left_report.y + right_report.y); +    left_report.h = pointing_device_hv_clamp((int16_t)left_report.h + right_report.h); +    left_report.v = pointing_device_hv_clamp((int16_t)left_report.v + right_report.v);      left_report.buttons |= right_report.buttons;      return left_report;  } @@ -390,7 +406,8 @@ report_mouse_t pointing_device_combine_reports(report_mouse_t left_report, repor  report_mouse_t pointing_device_adjust_by_defines_right(report_mouse_t mouse_report) {      // Support rotation of the sensor data  #    if defined(POINTING_DEVICE_ROTATION_90_RIGHT) || defined(POINTING_DEVICE_ROTATION_RIGHT) || defined(POINTING_DEVICE_ROTATION_RIGHT) -    int8_t x = mouse_report.x, y = mouse_report.y; +    mouse_xy_report_t x = mouse_report.x; +    mouse_xy_report_t y = mouse_report.y;  #        if defined(POINTING_DEVICE_ROTATION_90_RIGHT)      mouse_report.x = y;      mouse_report.y = -x; diff --git a/quantum/pointing_device.h b/quantum/pointing_device.h index 5c0eaeaf34..1e5ef9590c 100644 --- a/quantum/pointing_device.h +++ b/quantum/pointing_device.h @@ -75,6 +75,16 @@ typedef enum {      POINTING_DEVICE_BUTTON8,  } pointing_device_buttons_t; +#ifdef MOUSE_EXTENDED_REPORT +#    define XY_REPORT_MIN INT16_MIN +#    define XY_REPORT_MAX INT16_MAX +typedef int32_t clamp_range_t; +#else +#    define XY_REPORT_MIN INT8_MIN +#    define XY_REPORT_MAX INT8_MAX +typedef int16_t clamp_range_t; +#endif +  void           pointing_device_init(void);  void           pointing_device_task(void);  void           pointing_device_send(void); diff --git a/quantum/pointing_device_drivers.c b/quantum/pointing_device_drivers.c index 56363c7ac6..41d7018c86 100644 --- a/quantum/pointing_device_drivers.c +++ b/quantum/pointing_device_drivers.c @@ -22,8 +22,8 @@  #include "timer.h"  #include <stddef.h> -// hid mouse reports cannot exceed -127 to 127, so constrain to that value -#define constrain_hid(amt) ((amt) < -127 ? -127 : ((amt) > 127 ? 127 : (amt))) +#define CONSTRAIN_HID(amt) ((amt) < INT8_MIN ? INT8_MIN : ((amt) > INT8_MAX ? INT8_MAX : (amt))) +#define CONSTRAIN_HID_XY(amt) ((amt) < XY_REPORT_MIN ? XY_REPORT_MIN : ((amt) > XY_REPORT_MAX ? XY_REPORT_MAX : (amt)))  // get_report functions should probably be moved to their respective drivers.  #if defined(POINTING_DEVICE_DRIVER_adns5050) @@ -35,8 +35,8 @@ report_mouse_t adns5050_get_report(report_mouse_t mouse_report) {          if (debug_mouse) dprintf("Raw ] X: %d, Y: %d\n", data.dx, data.dy);  #    endif -        mouse_report.x = data.dx; -        mouse_report.y = data.dy; +        mouse_report.x = (mouse_xy_report_t)data.dx; +        mouse_report.y = (mouse_xy_report_t)data.dy;      }      return mouse_report; @@ -55,11 +55,8 @@ const pointing_device_driver_t pointing_device_driver = {  report_mouse_t adns9800_get_report_driver(report_mouse_t mouse_report) {      report_adns9800_t sensor_report = adns9800_get_report(); -    int8_t clamped_x = constrain_hid(sensor_report.x); -    int8_t clamped_y = constrain_hid(sensor_report.y); - -    mouse_report.x = clamped_x; -    mouse_report.y = clamped_y; +    mouse_report.x = CONSTRAIN_HID_XY(sensor_report.x); +    mouse_report.y = CONSTRAIN_HID_XY(sensor_report.y);      return mouse_report;  } @@ -107,16 +104,16 @@ const pointing_device_driver_t pointing_device_driver = {  #    endif  report_mouse_t cirque_pinnacle_get_report(report_mouse_t mouse_report) { -    pinnacle_data_t touchData = cirque_pinnacle_read_data(); -    static uint16_t x = 0, y = 0, mouse_timer = 0; -    int8_t          report_x = 0, report_y = 0; -    static bool     is_z_down = false; +    pinnacle_data_t   touchData = cirque_pinnacle_read_data(); +    static uint16_t   x = 0, y = 0, mouse_timer = 0; +    mouse_xy_report_t report_x = 0, report_y = 0; +    static bool       is_z_down = false;      cirque_pinnacle_scale_data(&touchData, cirque_pinnacle_get_scale(), cirque_pinnacle_get_scale()); // Scale coordinates to arbitrary X, Y resolution      if (x && y && touchData.xValue && touchData.yValue) { -        report_x = (int8_t)(touchData.xValue - x); -        report_y = (int8_t)(touchData.yValue - y); +        report_x = (mouse_xy_report_t)(touchData.xValue - x); +        report_y = (mouse_xy_report_t)(touchData.yValue - y);      }      x = touchData.xValue;      y = touchData.yValue; @@ -157,11 +154,26 @@ const pointing_device_driver_t pointing_device_driver = {  // clang-format on  #elif defined(POINTING_DEVICE_DRIVER_pimoroni_trackball) + +mouse_xy_report_t pimoroni_trackball_adapt_values(clamp_range_t* offset) { +    if (*offset > XY_REPORT_MAX) { +        *offset -= XY_REPORT_MAX; +        return (mouse_xy_report_t)XY_REPORT_MAX; +    } else if (*offset < XY_REPORT_MIN) { +        *offset += XY_REPORT_MAX; +        return (mouse_xy_report_t)XY_REPORT_MIN; +    } else { +        mouse_xy_report_t temp_return = *offset; +        *offset                       = 0; +        return temp_return; +    } +} +  report_mouse_t pimoroni_trackball_get_report(report_mouse_t mouse_report) { -    static uint16_t debounce      = 0; -    static uint8_t  error_count   = 0; -    pimoroni_data_t pimoroni_data = {0}; -    static int16_t  x_offset = 0, y_offset = 0; +    static uint16_t      debounce      = 0; +    static uint8_t       error_count   = 0; +    pimoroni_data_t      pimoroni_data = {0}; +    static clamp_range_t x_offset = 0, y_offset = 0;      if (error_count < PIMORONI_TRACKBALL_ERROR_COUNT) {          i2c_status_t status = read_pimoroni_trackball(&pimoroni_data); @@ -174,8 +186,8 @@ report_mouse_t pimoroni_trackball_get_report(report_mouse_t mouse_report) {                  if (!debounce) {                      x_offset += pimoroni_trackball_get_offsets(pimoroni_data.right, pimoroni_data.left, PIMORONI_TRACKBALL_SCALE);                      y_offset += pimoroni_trackball_get_offsets(pimoroni_data.down, pimoroni_data.up, PIMORONI_TRACKBALL_SCALE); -                    pimoroni_trackball_adapt_values(&mouse_report.x, &x_offset); -                    pimoroni_trackball_adapt_values(&mouse_report.y, &y_offset); +                    mouse_report.x = pimoroni_trackball_adapt_values(&x_offset); +                    mouse_report.y = pimoroni_trackball_adapt_values(&y_offset);                  } else {                      debounce--;                  } @@ -221,8 +233,8 @@ report_mouse_t pmw3360_get_report(report_mouse_t mouse_report) {  #    endif              MotionStart = timer_read();          } -        mouse_report.x = constrain_hid(data.dx); -        mouse_report.y = constrain_hid(data.dy); +        mouse_report.x = CONSTRAIN_HID_XY(data.dx); +        mouse_report.y = CONSTRAIN_HID_XY(data.dy);      }      return mouse_report; @@ -259,8 +271,8 @@ report_mouse_t pmw3389_get_report(report_mouse_t mouse_report) {  #    endif              MotionStart = timer_read();          } -        mouse_report.x = constrain_hid(data.dx); -        mouse_report.y = constrain_hid(data.dy); +        mouse_report.x = CONSTRAIN_HID_XY(data.dx); +        mouse_report.y = CONSTRAIN_HID_XY(data.dy);      }      return mouse_report; 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 diff --git a/quantum/quantum.c b/quantum/quantum.c index 33121f6b95..d1cfb5fbe0 100644 --- a/quantum/quantum.c +++ b/quantum/quantum.c @@ -307,9 +307,6 @@ bool process_record_quantum(keyrecord_t *record) {  #ifdef DYNAMIC_TAPPING_TERM_ENABLE              process_dynamic_tapping_term(keycode, record) &&  #endif -#ifdef TERMINAL_ENABLE -            process_terminal(keycode, record) && -#endif  #ifdef SPACE_CADET_ENABLE              process_space_cadet(keycode, record) &&  #endif diff --git a/quantum/quantum.h b/quantum/quantum.h index 92e1af1c40..8a7a20c706 100644 --- a/quantum/quantum.h +++ b/quantum/quantum.h @@ -141,12 +141,6 @@ extern layer_state_t layer_state;  #    include "process_key_lock.h"  #endif -#ifdef TERMINAL_ENABLE -#    include "process_terminal.h" -#else -#    include "process_terminal_nop.h" -#endif -  #ifdef SPACE_CADET_ENABLE  #    include "process_space_cadet.h"  #endif diff --git a/quantum/quantum_keycodes.h b/quantum/quantum_keycodes.h index 40355d799a..869826ce19 100644 --- a/quantum/quantum_keycodes.h +++ b/quantum/quantum_keycodes.h @@ -473,9 +473,9 @@ enum quantum_keycodes {      // Lock Key      KC_LOCK, // 5D2B -    // Terminal -    TERM_ON,  // 5D2C -    TERM_OFF, // 5D2D +    // Unused slots +    UNUSED_000, // 5D2C +    UNUSED_001, // 5D2D      // Sequencer      SQ_ON,  // 5D2E diff --git a/quantum/quantum_keycodes_legacy.h b/quantum/quantum_keycodes_legacy.h index ed9455ee74..51380d9c50 100644 --- a/quantum/quantum_keycodes_legacy.h +++ b/quantum/quantum_keycodes_legacy.h @@ -11,3 +11,6 @@  #define KC_GESC QK_GRAVE_ESCAPE  #define EEP_RST QK_CLEAR_EEPROM + +#define TERM_ON _Static_assert(false, "The Terminal feature has been removed from QMK. Please remove use of TERM_ON/TERM_OFF from your keymap.") +#define TERM_OFF _Static_assert(false, "The Terminal feature has been removed from QMK.. Please remove use of TERM_ON/TERM_OFF from your keymap.")
\ No newline at end of file diff --git a/quantum/rgb_matrix/animations/typing_heatmap_anim.h b/quantum/rgb_matrix/animations/typing_heatmap_anim.h index 4b17c4c3ed..cfc3fc015b 100644 --- a/quantum/rgb_matrix/animations/typing_heatmap_anim.h +++ b/quantum/rgb_matrix/animations/typing_heatmap_anim.h @@ -6,30 +6,35 @@ RGB_MATRIX_EFFECT(TYPING_HEATMAP)  #            define RGB_MATRIX_TYPING_HEATMAP_DECREASE_DELAY_MS 25  #        endif +#        ifndef RGB_MATRIX_TYPING_HEATMAP_SPREAD +#            define RGB_MATRIX_TYPING_HEATMAP_SPREAD 40 +#        endif + +#        ifndef RGB_MATRIX_TYPING_HEATMAP_AREA_LIMIT +#            define RGB_MATRIX_TYPING_HEATMAP_AREA_LIMIT 16 +#        endif  void process_rgb_matrix_typing_heatmap(uint8_t row, uint8_t col) {  #        ifdef RGB_MATRIX_TYPING_HEATMAP_SLIM      // Limit effect to pressed keys      g_rgb_frame_buffer[row][col] = qadd8(g_rgb_frame_buffer[row][col], 32);  #        else -    uint8_t m_row = row - 1; -    uint8_t p_row = row + 1; -    uint8_t m_col = col - 1; -    uint8_t p_col = col + 1; - -    if (m_col < col) g_rgb_frame_buffer[row][m_col] = qadd8(g_rgb_frame_buffer[row][m_col], 16); -    g_rgb_frame_buffer[row][col] = qadd8(g_rgb_frame_buffer[row][col], 32); -    if (p_col < MATRIX_COLS) g_rgb_frame_buffer[row][p_col] = qadd8(g_rgb_frame_buffer[row][p_col], 16); - -    if (p_row < MATRIX_ROWS) { -        if (m_col < col) g_rgb_frame_buffer[p_row][m_col] = qadd8(g_rgb_frame_buffer[p_row][m_col], 13); -        g_rgb_frame_buffer[p_row][col] = qadd8(g_rgb_frame_buffer[p_row][col], 16); -        if (p_col < MATRIX_COLS) g_rgb_frame_buffer[p_row][p_col] = qadd8(g_rgb_frame_buffer[p_row][p_col], 13); -    } - -    if (m_row < row) { -        if (m_col < col) g_rgb_frame_buffer[m_row][m_col] = qadd8(g_rgb_frame_buffer[m_row][m_col], 13); -        g_rgb_frame_buffer[m_row][col] = qadd8(g_rgb_frame_buffer[m_row][col], 16); -        if (p_col < MATRIX_COLS) g_rgb_frame_buffer[m_row][p_col] = qadd8(g_rgb_frame_buffer[m_row][p_col], 13); +    for (uint8_t i_row = 0; i_row < MATRIX_ROWS; i_row++) { +        for (uint8_t i_col = 0; i_col < MATRIX_COLS; i_col++) { +            if (i_row == row && i_col == col) { +                g_rgb_frame_buffer[row][col] = qadd8(g_rgb_frame_buffer[row][col], 32); +            } else { +#            define LED_DISTANCE(led_a, led_b) sqrt16(((int8_t)(led_a.x - led_b.x) * (int8_t)(led_a.x - led_b.x)) + ((int8_t)(led_a.y - led_b.y) * (int8_t)(led_a.y - led_b.y))) +                uint8_t distance = LED_DISTANCE(g_led_config.point[g_led_config.matrix_co[row][col]], g_led_config.point[g_led_config.matrix_co[i_row][i_col]]); +#            undef LED_DISTANCE +                if (distance <= RGB_MATRIX_TYPING_HEATMAP_SPREAD) { +                    uint8_t amount = qsub8(RGB_MATRIX_TYPING_HEATMAP_SPREAD, distance); +                    if (amount > RGB_MATRIX_TYPING_HEATMAP_AREA_LIMIT) { +                        amount = RGB_MATRIX_TYPING_HEATMAP_AREA_LIMIT; +                    } +                    g_rgb_frame_buffer[i_row][i_col] = qadd8(g_rgb_frame_buffer[i_row][i_col], amount); +                } +            } +        }      }  #        endif  } @@ -40,10 +45,7 @@ static uint16_t heatmap_decrease_timer;  static bool decrease_heatmap_values;  bool TYPING_HEATMAP(effect_params_t* params) { -    // Modified version of RGB_MATRIX_USE_LIMITS to work off of matrix row / col size -    uint8_t led_min = RGB_MATRIX_LED_PROCESS_LIMIT * params->iter; -    uint8_t led_max = led_min + RGB_MATRIX_LED_PROCESS_LIMIT; -    if (led_max > sizeof(g_rgb_frame_buffer)) led_max = sizeof(g_rgb_frame_buffer); +    RGB_MATRIX_USE_LIMITS(led_min, led_max);      if (params->init) {          rgb_matrix_set_color_all(0, 0, 0); @@ -63,28 +65,26 @@ bool TYPING_HEATMAP(effect_params_t* params) {      }      // Render heatmap & decrease -    for (int i = led_min; i < led_max; i++) { -        uint8_t row = i % MATRIX_ROWS; -        uint8_t col = i / MATRIX_ROWS; -        uint8_t val = g_rgb_frame_buffer[row][col]; - -        // set the pixel colour -        uint8_t led[LED_HITS_TO_REMEMBER]; -        uint8_t led_count = rgb_matrix_map_row_column_to_led(row, col, led); -        for (uint8_t j = 0; j < led_count; ++j) { -            if (!HAS_ANY_FLAGS(g_led_config.flags[led[j]], params->flags)) continue; - -            HSV hsv = {170 - qsub8(val, 85), rgb_matrix_config.hsv.s, scale8((qadd8(170, val) - 170) * 3, rgb_matrix_config.hsv.v)}; -            RGB rgb = rgb_matrix_hsv_to_rgb(hsv); -            rgb_matrix_set_color(led[j], rgb.r, rgb.g, rgb.b); -        } - -        if (decrease_heatmap_values) { -            g_rgb_frame_buffer[row][col] = qsub8(val, 1); +    uint8_t count = 0; +    for (uint8_t row = 0; row < MATRIX_ROWS && count < RGB_MATRIX_LED_PROCESS_LIMIT; row++) { +        for (uint8_t col = 0; col < MATRIX_COLS && RGB_MATRIX_LED_PROCESS_LIMIT; col++) { +            if (g_led_config.matrix_co[row][col] >= led_min && g_led_config.matrix_co[row][col] < led_max) { +                count++; +                uint8_t val = g_rgb_frame_buffer[row][col]; +                if (!HAS_ANY_FLAGS(g_led_config.flags[g_led_config.matrix_co[row][col]], params->flags)) continue; + +                HSV hsv = {170 - qsub8(val, 85), rgb_matrix_config.hsv.s, scale8((qadd8(170, val) - 170) * 3, rgb_matrix_config.hsv.v)}; +                RGB rgb = rgb_matrix_hsv_to_rgb(hsv); +                rgb_matrix_set_color(g_led_config.matrix_co[row][col], rgb.r, rgb.g, rgb.b); + +                if (decrease_heatmap_values) { +                    g_rgb_frame_buffer[row][col] = qsub8(val, 1); +                } +            }          }      } -    return led_max < sizeof(g_rgb_frame_buffer); +    return rgb_matrix_check_finished_leds(led_max);  }  #    endif // RGB_MATRIX_CUSTOM_EFFECT_IMPLS diff --git a/quantum/rgb_matrix/rgb_matrix.c b/quantum/rgb_matrix/rgb_matrix.c index f721dfc7f2..a51e379025 100644 --- a/quantum/rgb_matrix/rgb_matrix.c +++ b/quantum/rgb_matrix/rgb_matrix.c @@ -249,8 +249,15 @@ void process_rgb_matrix(uint8_t row, uint8_t col, bool pressed) {  #endif // RGB_MATRIX_KEYREACTIVE_ENABLED  #if defined(RGB_MATRIX_FRAMEBUFFER_EFFECTS) && defined(ENABLE_RGB_MATRIX_TYPING_HEATMAP) -    if (rgb_matrix_config.mode == RGB_MATRIX_TYPING_HEATMAP) { -        process_rgb_matrix_typing_heatmap(row, col); +#    if defined(RGB_MATRIX_KEYRELEASES) +    if (!pressed) +#    else +    if (pressed) +#    endif // defined(RGB_MATRIX_KEYRELEASES) +    { +        if (rgb_matrix_config.mode == RGB_MATRIX_TYPING_HEATMAP) { +            process_rgb_matrix_typing_heatmap(row, col); +        }      }  #endif // defined(RGB_MATRIX_FRAMEBUFFER_EFFECTS) && defined(ENABLE_RGB_MATRIX_TYPING_HEATMAP)  } diff --git a/quantum/split_common/split_util.c b/quantum/split_common/split_util.c index 7d50adf758..4892b7f8d8 100644 --- a/quantum/split_common/split_util.c +++ b/quantum/split_common/split_util.c @@ -57,8 +57,9 @@ static uint8_t connection_errors = 0;  volatile bool isLeftHand = true;  #if defined(SPLIT_USB_DETECT) +_Static_assert((SPLIT_USB_TIMEOUT / SPLIT_USB_TIMEOUT_POLL) <= UINT16_MAX, "Please lower SPLIT_USB_TIMEOUT and/or increase SPLIT_USB_TIMEOUT_POLL.");  static bool usbIsActive(void) { -    for (uint8_t i = 0; i < (SPLIT_USB_TIMEOUT / SPLIT_USB_TIMEOUT_POLL); i++) { +    for (uint16_t i = 0; i < (SPLIT_USB_TIMEOUT / SPLIT_USB_TIMEOUT_POLL); i++) {          // This will return true if a USB connection has been established          if (usb_connected_state()) {              return true; @@ -93,7 +94,6 @@ static uint8_t peek_matrix_intersection(pin_t out_pin, pin_t in_pin) {  __attribute__((weak)) bool is_keyboard_left(void) {  #if defined(SPLIT_HAND_PIN)      // Test pin SPLIT_HAND_PIN for High/Low, if low it's right hand -    setPinInput(SPLIT_HAND_PIN);  #    ifdef SPLIT_HAND_PIN_LOW_IS_LEFT      return !readPin(SPLIT_HAND_PIN);  #    else @@ -132,6 +132,14 @@ __attribute__((weak)) bool is_keyboard_master(void) {  // this code runs before the keyboard is fully initialized  void split_pre_init(void) { +#if defined(SPLIT_HAND_PIN) +    setPinInput(SPLIT_HAND_PIN); +    wait_us(100); +#elif defined(EE_HANDS) +    if (!eeconfig_is_enabled()) { +        eeconfig_init(); +    } +#endif      isLeftHand = is_keyboard_left();  #if defined(RGBLIGHT_ENABLE) && defined(RGBLED_SPLIT) diff --git a/quantum/via.c b/quantum/via.c index 320bd5546d..d2ef0862cc 100644 --- a/quantum/via.c +++ b/quantum/via.c @@ -64,6 +64,7 @@ void via_qmk_rgblight_get_value(uint8_t *data);  #endif  #if defined(VIA_QMK_RGB_MATRIX_ENABLE) +#    include <lib/lib8tion/lib8tion.h>  void via_qmk_rgb_matrix_set_value(uint8_t *data);  void via_qmk_rgb_matrix_get_value(uint8_t *data);  void eeconfig_update_rgb_matrix(void); @@ -421,7 +422,7 @@ void via_qmk_backlight_get_value(uint8_t *data) {      switch (*value_id) {          case id_qmk_backlight_brightness: {              // level / BACKLIGHT_LEVELS * 255 -            value_data[0] = ((uint16_t)get_backlight_level()) * 255 / BACKLIGHT_LEVELS; +            value_data[0] = ((uint16_t)get_backlight_level() * UINT8_MAX) / BACKLIGHT_LEVELS;              break;          }          case id_qmk_backlight_effect: { @@ -441,7 +442,7 @@ void via_qmk_backlight_set_value(uint8_t *data) {      switch (*value_id) {          case id_qmk_backlight_brightness: {              // level / 255 * BACKLIGHT_LEVELS -            backlight_level_noeeprom(((uint16_t)value_data[0]) * BACKLIGHT_LEVELS / 255); +            backlight_level_noeeprom(((uint16_t)value_data[0] * BACKLIGHT_LEVELS) / UINT8_MAX);              break;          }          case id_qmk_backlight_effect: { @@ -460,13 +461,16 @@ void via_qmk_backlight_set_value(uint8_t *data) {  #endif // #if defined(VIA_QMK_BACKLIGHT_ENABLE)  #if defined(VIA_QMK_RGBLIGHT_ENABLE) +#    ifndef RGBLIGHT_LIMIT_VAL +#        define RGBLIGHT_LIMIT_VAL 255 +#    endif  void via_qmk_rgblight_get_value(uint8_t *data) {      uint8_t *value_id   = &(data[0]);      uint8_t *value_data = &(data[1]);      switch (*value_id) {          case id_qmk_rgblight_brightness: { -            value_data[0] = rgblight_get_val(); +            value_data[0] = ((uint16_t)rgblight_get_val() * UINT8_MAX) / RGBLIGHT_LIMIT_VAL;              break;          }          case id_qmk_rgblight_effect: { @@ -490,7 +494,7 @@ void via_qmk_rgblight_set_value(uint8_t *data) {      uint8_t *value_data = &(data[1]);      switch (*value_id) {          case id_qmk_rgblight_brightness: { -            rgblight_sethsv_noeeprom(rgblight_get_hue(), rgblight_get_sat(), value_data[0]); +            rgblight_sethsv_noeeprom(rgblight_get_hue(), rgblight_get_sat(), ((uint16_t)value_data[0] * RGBLIGHT_LIMIT_VAL) / UINT8_MAX);              break;          }          case id_qmk_rgblight_effect: { @@ -517,6 +521,11 @@ void via_qmk_rgblight_set_value(uint8_t *data) {  #if defined(VIA_QMK_RGB_MATRIX_ENABLE) +#    if !defined(RGB_MATRIX_MAXIMUM_BRIGHTNESS) || RGB_MATRIX_MAXIMUM_BRIGHTNESS > UINT8_MAX +#        undef RGB_MATRIX_MAXIMUM_BRIGHTNESS +#        define RGB_MATRIX_MAXIMUM_BRIGHTNESS UINT8_MAX +#    endif +  // VIA supports only 4 discrete values for effect speed; map these to some  // useful speed values for RGB Matrix.  enum speed_values { @@ -557,7 +566,7 @@ void via_qmk_rgb_matrix_get_value(uint8_t *data) {      uint8_t *value_data = &(data[1]);      switch (*value_id) {          case id_qmk_rgblight_brightness: -            value_data[0] = rgb_matrix_get_val(); +            value_data[0] = ((uint16_t)rgb_matrix_get_val() * UINT8_MAX) / RGB_MATRIX_MAXIMUM_BRIGHTNESS;              break;          case id_qmk_rgblight_effect:              value_data[0] = rgb_matrix_get_mode(); @@ -577,7 +586,7 @@ void via_qmk_rgb_matrix_set_value(uint8_t *data) {      uint8_t *value_data = &(data[1]);      switch (*value_id) {          case id_qmk_rgblight_brightness: -            rgb_matrix_sethsv_noeeprom(rgb_matrix_get_hue(), rgb_matrix_get_sat(), value_data[0]); +            rgb_matrix_sethsv_noeeprom(rgb_matrix_get_hue(), rgb_matrix_get_sat(), scale8(value_data[0], RGB_MATRIX_MAXIMUM_BRIGHTNESS));              break;          case id_qmk_rgblight_effect:              rgb_matrix_mode_noeeprom(value_data[0]); | 
