`qmk cformat`

4 files changed, 115 insertions, 92 deletions

diff --git a/tmk_core/common/avr/bootloader.c b/tmk_core/common/avr/bootloader.c
index c0272903b8..4e3a27022d 100644
--- a/tmk_core/common/avr/bootloader.c
+++ b/tmk_core/common/avr/bootloader.c
@@ -237,13 +237,13 @@ __attribute__((weak)) void bootloader_jump(void) {
                  "bootloader_startup_loop%=:         \n\t"
                  "rjmp bootloader_startup_loop%=     \n\t"
                  :
-                 : [mcucsrio] "I"(_SFR_IO_ADDR(MCUCSR)),
+                 : [ mcucsrio ] "I"(_SFR_IO_ADDR(MCUCSR)),
 #    if (FLASHEND > 131071)
-                   [ramendhi] "M"(((RAMEND - 2) >> 8) & 0xff), [ramendlo] "M"(((RAMEND - 2) >> 0) & 0xff), [bootaddrhi] "M"((((FLASH_SIZE - BOOTLOADER_SIZE) >> 1) >> 16) & 0xff),
+                   [ ramendhi ] "M"(((RAMEND - 2) >> 8) & 0xff), [ ramendlo ] "M"(((RAMEND - 2) >> 0) & 0xff), [ bootaddrhi ] "M"((((FLASH_SIZE - BOOTLOADER_SIZE) >> 1) >> 16) & 0xff),
 #    else
-                   [ramendhi] "M"(((RAMEND - 1) >> 8) & 0xff), [ramendlo] "M"(((RAMEND - 1) >> 0) & 0xff),
+                   [ ramendhi ] "M"(((RAMEND - 1) >> 8) & 0xff), [ ramendlo ] "M"(((RAMEND - 1) >> 0) & 0xff),
 #    endif
-                   [bootaddrme] "M"((((FLASH_SIZE - BOOTLOADER_SIZE) >> 1) >> 8) & 0xff), [bootaddrlo] "M"((((FLASH_SIZE - BOOTLOADER_SIZE) >> 1) >> 0) & 0xff));
+                   [ bootaddrme ] "M"((((FLASH_SIZE - BOOTLOADER_SIZE) >> 1) >> 8) & 0xff), [ bootaddrlo ] "M"((((FLASH_SIZE - BOOTLOADER_SIZE) >> 1) >> 0) & 0xff));
 
 #else  // Assume remaining boards are DFU, even if the flag isn't set
 
diff --git a/tmk_core/common/mousekey.c b/tmk_core/common/mousekey.c
index 697e0692c0..6c9df67236 100644
--- a/tmk_core/common/mousekey.c
+++ b/tmk_core/common/mousekey.c
@@ -37,7 +37,7 @@ static uint8_t        mousekey_accel        = 0;
 static uint8_t        mousekey_repeat       = 0;
 static uint8_t        mousekey_wheel_repeat = 0;
 #ifdef MK_KINETIC_SPEED
-static uint16_t       mouse_timer     = 0;
+static uint16_t mouse_timer = 0;
 #endif
 
 #ifndef MK_3_SPEED
@@ -123,20 +123,18 @@ static uint8_t wheel_unit(void) {
  * B: base mouse travel speed
  */
 const uint16_t mk_accelerated_speed = MOUSEKEY_ACCELERATED_SPEED;
-const uint16_t mk_base_speed = MOUSEKEY_BASE_SPEED;
+const uint16_t mk_base_speed        = MOUSEKEY_BASE_SPEED;
 const uint16_t mk_decelerated_speed = MOUSEKEY_DECELERATED_SPEED;
-const uint16_t mk_initial_speed = MOUSEKEY_INITIAL_SPEED;
+const uint16_t mk_initial_speed     = MOUSEKEY_INITIAL_SPEED;
 
 static uint8_t move_unit(void) {
     float speed = mk_initial_speed;
 
-    if (mousekey_accel & ((1<<0) | (1<<2))) {
-        speed = mousekey_accel & (1<<2) ? mk_accelerated_speed : mk_decelerated_speed;
+    if (mousekey_accel & ((1 << 0) | (1 << 2))) {
+        speed = mousekey_accel & (1 << 2) ? mk_accelerated_speed : mk_decelerated_speed;
     } else if (mousekey_repeat && mouse_timer) {
         const float time_elapsed = timer_elapsed(mouse_timer) / 50;
-        speed = mk_initial_speed +
-            MOUSEKEY_MOVE_DELTA * time_elapsed +
-            MOUSEKEY_MOVE_DELTA * 0.5 * time_elapsed * time_elapsed;
+        speed                    = mk_initial_speed + MOUSEKEY_MOVE_DELTA * time_elapsed + MOUSEKEY_MOVE_DELTA * 0.5 * time_elapsed * time_elapsed;
 
         speed = speed > mk_base_speed ? mk_base_speed : speed;
     }
@@ -153,14 +151,12 @@ 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;
+    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) {
         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                    = 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;
     }
@@ -209,7 +205,7 @@ static uint8_t wheel_unit(void) {
 }
 
 #        endif /* #ifndef MK_KINETIC_SPEED */
-#    endif /* #ifndef MK_COMBINED */
+#    endif     /* #ifndef MK_COMBINED */
 
 void mousekey_task(void) {
     // report cursor and scroll movement independently
@@ -260,11 +256,11 @@ void mousekey_task(void) {
 }
 
 void mousekey_on(uint8_t code) {
-#ifdef MK_KINETIC_SPEED
+#    ifdef MK_KINETIC_SPEED
     if (mouse_timer == 0) {
         mouse_timer = timer_read();
     }
-#endif /* #ifdef MK_KINETIC_SPEED */
+#    endif /* #ifdef MK_KINETIC_SPEED */
 
     if (code == KC_MS_UP)
         mouse_report.y = move_unit() * -1;
@@ -335,9 +331,9 @@ void mousekey_off(uint8_t code) {
         mousekey_accel &= ~(1 << 2);
     if (mouse_report.x == 0 && mouse_report.y == 0) {
         mousekey_repeat = 0;
-#ifdef MK_KINETIC_SPEED
+#    ifdef MK_KINETIC_SPEED
         mouse_timer = 0;
-#endif /* #ifdef MK_KINETIC_SPEED */
+#    endif /* #ifdef MK_KINETIC_SPEED */
     }
     if (mouse_report.v == 0 && mouse_report.h == 0) mousekey_wheel_repeat = 0;
 }
diff --git a/tmk_core/common/mousekey.h b/tmk_core/common/mousekey.h
index 911d11eeb9..52b8fe10e1 100644
--- a/tmk_core/common/mousekey.h
+++ b/tmk_core/common/mousekey.h
@@ -36,28 +36,28 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    endif
 
 #    ifndef MOUSEKEY_MOVE_DELTA
-#ifndef MK_KINETIC_SPEED
-#        define MOUSEKEY_MOVE_DELTA 5
-#else
-#        define MOUSEKEY_MOVE_DELTA 25
-#endif
+#        ifndef MK_KINETIC_SPEED
+#            define MOUSEKEY_MOVE_DELTA 5
+#        else
+#            define MOUSEKEY_MOVE_DELTA 25
+#        endif
 #    endif
 #    ifndef MOUSEKEY_WHEEL_DELTA
 #        define MOUSEKEY_WHEEL_DELTA 1
 #    endif
 #    ifndef MOUSEKEY_DELAY
-#ifndef MK_KINETIC_SPEED
-#        define MOUSEKEY_DELAY 300
-#else
-#        define MOUSEKEY_DELAY 8
-#endif
+#        ifndef MK_KINETIC_SPEED
+#            define MOUSEKEY_DELAY 300
+#        else
+#            define MOUSEKEY_DELAY 8
+#        endif
 #    endif
 #    ifndef MOUSEKEY_INTERVAL
-#ifndef MK_KINETIC_SPEED
-#        define MOUSEKEY_INTERVAL 50
-#else
-#        define MOUSEKEY_INTERVAL 8
-#endif
+#        ifndef MK_KINETIC_SPEED
+#            define MOUSEKEY_INTERVAL 50
+#        else
+#            define MOUSEKEY_INTERVAL 8
+#        endif
 #    endif
 #    ifndef MOUSEKEY_MAX_SPEED
 #        define MOUSEKEY_MAX_SPEED 10
@@ -78,30 +78,30 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #        define MOUSEKEY_WHEEL_TIME_TO_MAX 40
 #    endif
 
-#ifndef MOUSEKEY_INITIAL_SPEED
-#define MOUSEKEY_INITIAL_SPEED  100
-#endif
-#ifndef MOUSEKEY_BASE_SPEED
-#define MOUSEKEY_BASE_SPEED 1000
-#endif
-#ifndef MOUSEKEY_DECELERATED_SPEED
-#define MOUSEKEY_DECELERATED_SPEED 400
-#endif
-#ifndef MOUSEKEY_ACCELERATED_SPEED
-#define MOUSEKEY_ACCELERATED_SPEED 3000
-#endif
-#ifndef MOUSEKEY_WHEEL_INITIAL_MOVEMENTS
-#define MOUSEKEY_WHEEL_INITIAL_MOVEMENTS  16
-#endif
-#ifndef MOUSEKEY_WHEEL_BASE_MOVEMENTS
-#define MOUSEKEY_WHEEL_BASE_MOVEMENTS  32
-#endif
-#ifndef MOUSEKEY_WHEEL_ACCELERATED_MOVEMENTS
-#define MOUSEKEY_WHEEL_ACCELERATED_MOVEMENTS  48
-#endif
-#ifndef MOUSEKEY_WHEEL_DECELERATED_MOVEMENTS
-#define MOUSEKEY_WHEEL_DECELERATED_MOVEMENTS  8
-#endif
+#    ifndef MOUSEKEY_INITIAL_SPEED
+#        define MOUSEKEY_INITIAL_SPEED 100
+#    endif
+#    ifndef MOUSEKEY_BASE_SPEED
+#        define MOUSEKEY_BASE_SPEED 1000
+#    endif
+#    ifndef MOUSEKEY_DECELERATED_SPEED
+#        define MOUSEKEY_DECELERATED_SPEED 400
+#    endif
+#    ifndef MOUSEKEY_ACCELERATED_SPEED
+#        define MOUSEKEY_ACCELERATED_SPEED 3000
+#    endif
+#    ifndef MOUSEKEY_WHEEL_INITIAL_MOVEMENTS
+#        define MOUSEKEY_WHEEL_INITIAL_MOVEMENTS 16
+#    endif
+#    ifndef MOUSEKEY_WHEEL_BASE_MOVEMENTS
+#        define MOUSEKEY_WHEEL_BASE_MOVEMENTS 32
+#    endif
+#    ifndef MOUSEKEY_WHEEL_ACCELERATED_MOVEMENTS
+#        define MOUSEKEY_WHEEL_ACCELERATED_MOVEMENTS 48
+#    endif
+#    ifndef MOUSEKEY_WHEEL_DECELERATED_MOVEMENTS
+#        define MOUSEKEY_WHEEL_DECELERATED_MOVEMENTS 8
+#    endif
 
 #else /* #ifndef MK_3_SPEED */
 
diff --git a/tmk_core/common/wait.h b/tmk_core/common/wait.h
index 0b3fd755a9..28224fe3aa 100644
--- a/tmk_core/common/wait.h
+++ b/tmk_core/common/wait.h
@@ -15,44 +15,71 @@ extern "C" {
 
 #    define CLOCK_DELAY_NOP8 "nop\n\t nop\n\t nop\n\t nop\n\t   nop\n\t nop\n\t nop\n\t nop\n\t"
 
-__attribute__((always_inline))
-static inline void wait_cpuclock_allnop(unsigned int n) { /* n: 1..135 */
+__attribute__((always_inline)) static inline void wait_cpuclock_allnop(unsigned int n) { /* n: 1..135 */
     /* The argument n must be a constant expression.
      * That way, compiler optimization will remove unnecessary code. */
-    if (n < 1) { return; }
+    if (n < 1) {
+        return;
+    }
     if (n > 8) {
-        unsigned int n8 = n/8;
-        n = n - n8*8;
+        unsigned int n8 = n / 8;
+        n               = n - n8 * 8;
         switch (n8) {
-        case 16: asm volatile (CLOCK_DELAY_NOP8::: "memory");
-        case 15: asm volatile (CLOCK_DELAY_NOP8::: "memory");
-        case 14: asm volatile (CLOCK_DELAY_NOP8::: "memory");
-        case 13: asm volatile (CLOCK_DELAY_NOP8::: "memory");
-        case 12: asm volatile (CLOCK_DELAY_NOP8::: "memory");
-        case 11: asm volatile (CLOCK_DELAY_NOP8::: "memory");
-        case 10: asm volatile (CLOCK_DELAY_NOP8::: "memory");
-        case  9: asm volatile (CLOCK_DELAY_NOP8::: "memory");
-        case  8: asm volatile (CLOCK_DELAY_NOP8::: "memory");
-        case  7: asm volatile (CLOCK_DELAY_NOP8::: "memory");
-        case  6: asm volatile (CLOCK_DELAY_NOP8::: "memory");
-        case  5: asm volatile (CLOCK_DELAY_NOP8::: "memory");
-        case  4: asm volatile (CLOCK_DELAY_NOP8::: "memory");
-        case  3: asm volatile (CLOCK_DELAY_NOP8::: "memory");
-        case  2: asm volatile (CLOCK_DELAY_NOP8::: "memory");
-        case  1: asm volatile (CLOCK_DELAY_NOP8::: "memory");
-        case  0: break;
+            case 16:
+                asm volatile(CLOCK_DELAY_NOP8::: "memory");
+            case 15:
+                asm volatile(CLOCK_DELAY_NOP8::: "memory");
+            case 14:
+                asm volatile(CLOCK_DELAY_NOP8::: "memory");
+            case 13:
+                asm volatile(CLOCK_DELAY_NOP8::: "memory");
+            case 12:
+                asm volatile(CLOCK_DELAY_NOP8::: "memory");
+            case 11:
+                asm volatile(CLOCK_DELAY_NOP8::: "memory");
+            case 10:
+                asm volatile(CLOCK_DELAY_NOP8::: "memory");
+            case 9:
+                asm volatile(CLOCK_DELAY_NOP8::: "memory");
+            case 8:
+                asm volatile(CLOCK_DELAY_NOP8::: "memory");
+            case 7:
+                asm volatile(CLOCK_DELAY_NOP8::: "memory");
+            case 6:
+                asm volatile(CLOCK_DELAY_NOP8::: "memory");
+            case 5:
+                asm volatile(CLOCK_DELAY_NOP8::: "memory");
+            case 4:
+                asm volatile(CLOCK_DELAY_NOP8::: "memory");
+            case 3:
+                asm volatile(CLOCK_DELAY_NOP8::: "memory");
+            case 2:
+                asm volatile(CLOCK_DELAY_NOP8::: "memory");
+            case 1:
+                asm volatile(CLOCK_DELAY_NOP8::: "memory");
+            case 0:
+                break;
         }
     }
     switch (n) {
-    case 8: asm volatile ("nop"::: "memory");
-    case 7: asm volatile ("nop"::: "memory");
-    case 6: asm volatile ("nop"::: "memory");
-    case 5: asm volatile ("nop"::: "memory");
-    case 4: asm volatile ("nop"::: "memory");
-    case 3: asm volatile ("nop"::: "memory");
-    case 2: asm volatile ("nop"::: "memory");
-    case 1: asm volatile ("nop"::: "memory");
-    case 0: break;
+        case 8:
+            asm volatile("nop" ::: "memory");
+        case 7:
+            asm volatile("nop" ::: "memory");
+        case 6:
+            asm volatile("nop" ::: "memory");
+        case 5:
+            asm volatile("nop" ::: "memory");
+        case 4:
+            asm volatile("nop" ::: "memory");
+        case 3:
+            asm volatile("nop" ::: "memory");
+        case 2:
+            asm volatile("nop" ::: "memory");
+        case 1:
+            asm volatile("nop" ::: "memory");
+        case 0:
+            break;
     }
 }
 #endif