6 files changed, 39 insertions(+), 43 deletions(-)

M quantum/process_keycode/process_combo.c
M quantum/rgb_matrix.c
M quantum/split_common/transport.c
M quantum/wpm.c
M quantum/wpm.h
M tmk_core/protocol/vusb/vusb.c

@@ 20,8 20,8 @@
 #ifndef COMBO_VARIABLE_LEN
 __attribute__((weak)) combo_t key_combos[COMBO_COUNT] = {};
 #else
-extern combo_t key_combos[];
-extern int     COMBO_LEN;
+extern combo_t  key_combos[];
+extern int      COMBO_LEN;
 #endif
 
 __attribute__((weak)) void process_combo_event(uint8_t combo_index, bool pressed) {}


@@ 146,7 146,7 @@ bool process_combo(uint16_t keycode, keyrecord_t *record) {
     }
 #ifndef COMBO_VARIABLE_LEN
     for (current_combo_index = 0; current_combo_index < COMBO_COUNT; ++current_combo_index) {
-#else 
+#else
     for (current_combo_index = 0; current_combo_index < COMBO_LEN; ++current_combo_index) {
 #endif
         combo_t *combo = &key_combos[current_combo_index];

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

@@ 85,7 85,7 @@ bool transport_master(matrix_row_t matrix[]) {
 
 #    ifdef WPM_ENABLE
     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) {
             i2c_buffer->current_wpm = current_wpm;
         }


@@ 269,7 269,7 @@ void transport_slave(matrix_row_t matrix[]) {
 #    endif
 
 #    ifdef WPM_ENABLE
-     set_current_wpm(serial_m2s_buffer.current_wpm);
+    set_current_wpm(serial_m2s_buffer.current_wpm);
 #    endif
 }
 

@@ 17,12 17,12 @@
 
 #include "wpm.h"
 
-//WPM Stuff
-static uint8_t current_wpm = 0;
-static uint8_t latest_wpm = 0;
-static uint16_t wpm_timer = 0;
+// WPM Stuff
+static uint8_t  current_wpm = 0;
+static uint8_t  latest_wpm  = 0;
+static uint16_t wpm_timer   = 0;
 
-//This smoothing is 40 keystrokes
+// This smoothing is 40 keystrokes
 static const float wpm_smoothing = 0.0487;
 
 void set_current_wpm(uint8_t new_wpm) { current_wpm = new_wpm; }


@@ 34,34 34,31 @@ 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_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)) {
         keycode = keycode & 0xFF;
     } else if (keycode > 0xFF) {
-	keycode = 0;
+        keycode = 0;
     }
-    if((keycode >= KC_A && keycode <= KC_0) || (keycode >= KC_TAB && keycode <= KC_SLASH)) {
-	return true;
+    if ((keycode >= KC_A && keycode <= KC_0) || (keycode >= KC_TAB && keycode <= KC_SLASH)) {
+        return true;
     }
 
     return false;
 }
 
-
 void update_wpm(uint16_t keycode) {
-    if(wpm_keycode(keycode)) {
-	if(wpm_timer > 0) {
-	    latest_wpm = 60000 / timer_elapsed(wpm_timer) / 5;
-	    current_wpm = (latest_wpm - current_wpm) * wpm_smoothing + current_wpm;
-	}
-	wpm_timer = timer_read();
+    if (wpm_keycode(keycode)) {
+        if (wpm_timer > 0) {
+            latest_wpm  = 60000 / timer_elapsed(wpm_timer) / 5;
+            current_wpm = (latest_wpm - current_wpm) * wpm_smoothing + current_wpm;
+        }
+        wpm_timer = timer_read();
     }
 }
 
 void decay_wpm(void) {
-  if (timer_elapsed(wpm_timer) > 1000) {
-	current_wpm = (0 - current_wpm) * wpm_smoothing +
-		current_wpm;
-	wpm_timer = timer_read();
-  }
+    if (timer_elapsed(wpm_timer) > 1000) {
+        current_wpm = (0 - current_wpm) * wpm_smoothing + current_wpm;
+        wpm_timer   = timer_read();
+    }
 }

@@ 23,8 23,8 @@ bool wpm_keycode(uint16_t keycode);
 bool wpm_keycode_kb(uint16_t keycode);
 bool wpm_keycode_user(uint16_t keycode);
 
-void set_current_wpm(uint8_t);
+void    set_current_wpm(uint8_t);
 uint8_t get_current_wpm(void);
-void update_wpm(uint16_t);
+void    update_wpm(uint16_t);
 
 void decay_wpm(void);

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


@@ 419,13 419,13 @@ const PROGMEM char usbDescriptorConfiguration[] = {
     0,                             /* PROTOCOL: none */
     0,                             /* string index for interface */
     /* HID descriptor */
-    9,                                /* sizeof(usbDescrHID): length of descriptor in bytes */
-    USBDESCR_HID,                     /* descriptor type: HID */
-    0x01, 0x01,                       /* BCD representation of HID version */
-    0x00,                             /* target country code */
-    0x01,                             /* number of HID Report (or other HID class) Descriptor infos to follow */
-    0x22,                             /* descriptor type: report */
-    sizeof(mouse_extra_hid_report), 0,      /* total length of report descriptor */
+    9,                                    /* sizeof(usbDescrHID): length of descriptor in bytes */
+    USBDESCR_HID,                         /* descriptor type: HID */
+    0x01, 0x01,                           /* BCD representation of HID version */
+    0x00,                                 /* target country code */
+    0x01,                                 /* number of HID Report (or other HID class) Descriptor infos to follow */
+    0x22,                                 /* descriptor type: report */
+    sizeof(mouse_extra_hid_report), 0,    /* total length of report descriptor */
 #        if USB_CFG_HAVE_INTRIN_ENDPOINT3 /* endpoint descriptor for endpoint 3 */
     /* Endpoint descriptor */
     7,                                 /* sizeof(usbDescrEndpoint) */