Nulo/qmk_firmware
1
0
Fork 0
Code Releases Activity

Run clang-format manually to fix recently changed files (#8552)

Browse source
This commit is contained in:
Joel Challis 2020-03-25 03:39:53 +00:00 committed by GitHub
parent 5075a1d9e4
commit 6ceaae30f5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 39 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
quantum/rgb_matrix.c
View file

@ -111,7 +111,6 @@ const point_t k_rgb_matrix_center = RGB_MATRIX_CENTER;
# define RGB_MATRIX_STARTUP_SPD UINT8_MAX / 2 # define RGB_MATRIX_STARTUP_SPD UINT8_MAX / 2
#endif #endif
bool g_suspend_state = false; bool g_suspend_state = false;
rgb_config_t rgb_matrix_config; rgb_config_t rgb_matrix_config;

2
quantum/split_common/transport.c
View file

@ -85,7 +85,7 @@ bool transport_master(matrix_row_t matrix[]) {
# ifdef WPM_ENABLE # ifdef WPM_ENABLE
uint8_t current_wpm = get_current_wpm(); uint8_t current_wpm = get_current_wpm();
if(current_wpm != i2c_buffer->current_wpm) { if (current_wpm != i2c_buffer->current_wpm) {
if (i2c_writeReg(SLAVE_I2C_ADDRESS, I2C_WPM_START, (void *)&current_wpm, sizeof(current_wpm), TIMEOUT) >= 0) { if (i2c_writeReg(SLAVE_I2C_ADDRESS, I2C_WPM_START, (void *)&current_wpm, sizeof(current_wpm), TIMEOUT) >= 0) {
i2c_buffer->current_wpm = current_wpm; i2c_buffer->current_wpm = current_wpm;
} }

15
quantum/wpm.c
View file

@ -17,12 +17,12 @@
#include "wpm.h" #include "wpm.h"
//WPM Stuff // WPM Stuff
static uint8_t current_wpm = 0; static uint8_t current_wpm = 0;
static uint8_t latest_wpm = 0; static uint8_t latest_wpm = 0;
static uint16_t wpm_timer = 0; static uint16_t wpm_timer = 0;
//This smoothing is 40 keystrokes // This smoothing is 40 keystrokes
static const float wpm_smoothing = 0.0487; static const float wpm_smoothing = 0.0487;
void set_current_wpm(uint8_t new_wpm) { current_wpm = new_wpm; } void set_current_wpm(uint8_t new_wpm) { current_wpm = new_wpm; }
@ -34,23 +34,21 @@ bool wpm_keycode(uint16_t keycode) { return wpm_keycode_kb(keycode); }
__attribute__((weak)) bool wpm_keycode_kb(uint16_t keycode) { return wpm_keycode_user(keycode); } __attribute__((weak)) bool wpm_keycode_kb(uint16_t keycode) { return wpm_keycode_user(keycode); }
__attribute__((weak)) bool wpm_keycode_user(uint16_t keycode) { __attribute__((weak)) bool wpm_keycode_user(uint16_t keycode) {
if ((keycode >= QK_MOD_TAP && keycode <= QK_MOD_TAP_MAX) || (keycode >= QK_LAYER_TAP && keycode <= QK_LAYER_TAP_MAX) || (keycode >= QK_MODS && keycode <= QK_MODS_MAX)) { if ((keycode >= QK_MOD_TAP && keycode <= QK_MOD_TAP_MAX) || (keycode >= QK_LAYER_TAP && keycode <= QK_LAYER_TAP_MAX) || (keycode >= QK_MODS && keycode <= QK_MODS_MAX)) {
keycode = keycode & 0xFF; keycode = keycode & 0xFF;
} else if (keycode > 0xFF) { } else if (keycode > 0xFF) {
keycode = 0; keycode = 0;
} }
if((keycode >= KC_A && keycode <= KC_0) || (keycode >= KC_TAB && keycode <= KC_SLASH)) { if ((keycode >= KC_A && keycode <= KC_0) || (keycode >= KC_TAB && keycode <= KC_SLASH)) {
return true; return true;
} }
return false; return false;
} }
void update_wpm(uint16_t keycode) { void update_wpm(uint16_t keycode) {
if(wpm_keycode(keycode)) { if (wpm_keycode(keycode)) {
if(wpm_timer > 0) { if (wpm_timer > 0) {
latest_wpm = 60000 / timer_elapsed(wpm_timer) / 5; latest_wpm = 60000 / timer_elapsed(wpm_timer) / 5;
current_wpm = (latest_wpm - current_wpm) * wpm_smoothing + current_wpm; current_wpm = (latest_wpm - current_wpm) * wpm_smoothing + current_wpm;
} }
@ -60,8 +58,7 @@ void update_wpm(uint16_t keycode) {
void decay_wpm(void) { void decay_wpm(void) {
if (timer_elapsed(wpm_timer) > 1000) { if (timer_elapsed(wpm_timer) > 1000) {
current_wpm = (0 - current_wpm) * wpm_smoothing + current_wpm = (0 - current_wpm) * wpm_smoothing + current_wpm;
current_wpm;
wpm_timer = timer_read(); wpm_timer = timer_read();
} }
} }

10
tmk_core/protocol/vusb/vusb.c
View file

@ -354,19 +354,19 @@ const PROGMEM char usbDescriptorConfiguration[] = {
/* USB configuration descriptor */ /* USB configuration descriptor */
9, /* sizeof(usbDescriptorConfiguration): length of descriptor in bytes */ 9, /* sizeof(usbDescriptorConfiguration): length of descriptor in bytes */
USBDESCR_CONFIG, /* descriptor type */ USBDESCR_CONFIG, /* descriptor type */
# if defined (MOUSE_ENABLE) || defined(EXTRAKEY_ENABLE) # if defined(MOUSE_ENABLE) || defined(EXTRAKEY_ENABLE)
59, // 9 + (9 + 9 + 7) + (9 + 9 + 7) 59, // 9 + (9 + 9 + 7) + (9 + 9 + 7)
#else # else
34, // 9 + (9 + 9 + 7) 34, // 9 + (9 + 9 + 7)
# endif # endif
0, 0,
// 18 + 7 * USB_CFG_HAVE_INTRIN_ENDPOINT + 7 * USB_CFG_HAVE_INTRIN_ENDPOINT3 + 9, 0, // 18 + 7 * USB_CFG_HAVE_INTRIN_ENDPOINT + 7 * USB_CFG_HAVE_INTRIN_ENDPOINT3 + 9, 0,
/* total length of data returned (including inlined descriptors) */ /* total length of data returned (including inlined descriptors) */
# if defined(MOUSE_ENABLE) || defined(EXTRAKEY_ENABLE) # if defined(MOUSE_ENABLE) || defined(EXTRAKEY_ENABLE)
2, /* number of interfaces in this configuration */ 2, /* number of interfaces in this configuration */
# else # else
1, 1,
#endif # endif
1, /* index of this configuration */ 1, /* index of this configuration */
0, /* configuration name string index */ 0, /* configuration name string index */
# if USB_CFG_IS_SELF_POWERED # if USB_CFG_IS_SELF_POWERED