From a51d11f6e66b85e4a3f6561ac30c863e7907eb62 Mon Sep 17 00:00:00 2001 From: Josh Klar Date: Sat, 20 Jul 2019 15:15:01 -0700 Subject: [PATCH] A wild W504 linter error appeared! Fix those. --- kmk/handlers/layers.py | 6 ++---- kmk/hid.py | 5 +---- kmk/internal_state.py | 8 ++++---- kmk/led.py | 7 +++++-- kmk/rgb.py | 7 +++++-- 5 files changed, 17 insertions(+), 16 deletions(-) diff --git a/kmk/handlers/layers.py b/kmk/handlers/layers.py index 06a193f..599f4d1 100644 --- a/kmk/handlers/layers.py +++ b/kmk/handlers/layers.py @@ -101,10 +101,8 @@ def tt_pressed(key, state, *args, **kwargs): def tt_released(key, state, *args, **kwargs): - if ( - state.start_time['tt'] is None or - ticks_diff(ticks_ms(), state.start_time['tt']) >= state.config.tap_time - ): + tap_timed_out = ticks_diff(ticks_ms(), state.start_time['tt']) >= state.config.tap_time + if state.start_time['tt'] is None or tap_timed_out: # On first press, works like MO. On second press, does nothing unless let up within # time window, then acts like TG. state.start_time['tt'] = None diff --git a/kmk/hid.py b/kmk/hid.py index a8ca71d..c095628 100644 --- a/kmk/hid.py +++ b/kmk/hid.py @@ -183,10 +183,7 @@ else: self.devices[HIDReportTypes.MOUSE] = device continue - if ( - up == HIDUsagePage.SYSCONTROL and - us == HIDUsage.SYSCONTROL - ): + if up == HIDUsagePage.SYSCONTROL and us == HIDUsage.SYSCONTROL: self.devices[HIDReportTypes.SYSCONTROL] = device continue diff --git a/kmk/internal_state.py b/kmk/internal_state.py index 82c7107..6a6db5f 100644 --- a/kmk/internal_state.py +++ b/kmk/internal_state.py @@ -200,10 +200,10 @@ class InternalState: if changed_key not in self.tap_side_effects: self.tap_side_effects[changed_key] = None else: - if ( - self.tap_side_effects[changed_key] is not None or - self.tap_dance_counts[changed_key] == len(changed_key.codes) - ): + has_side_effects = self.tap_side_effects[changed_key] is not None + hit_max_defined_taps = self.tap_dance_counts[changed_key] == len(changed_key.codes) + + if has_side_effects or hit_max_defined_taps: self._end_tap_dance(changed_key) return self diff --git a/kmk/led.py b/kmk/led.py index 7aa6f31..d72456f 100644 --- a/kmk/led.py +++ b/kmk/led.py @@ -110,8 +110,11 @@ class led: def effect_breathing(self): # http://sean.voisen.org/blog/2011/10/breathing-led-with-arduino/ # https://github.com/qmk/qmk_firmware/blob/9f1d781fcb7129a07e671a46461e501e3f1ae59d/quantum/rgblight.c#L806 - self.brightness = int((exp(sin((self.pos / 255.0) * pi)) - self.breathe_center / e) * - (self.brightness_limit / (e - 1 / e))) + sined = sin((self.pos / 255.0) * pi) + multip_1 = exp(sined) - self.breathe_center / e + multip_2 = self.brightness_limit / (e - 1 / e) + + self.brightness = int(multip_1 * multip_2) self.pos = (self.pos + self.animation_speed) % 256 self.set_brightness(self.brightness) diff --git a/kmk/rgb.py b/kmk/rgb.py index d227a6f..1aef3a1 100644 --- a/kmk/rgb.py +++ b/kmk/rgb.py @@ -424,8 +424,11 @@ class RGB: def effect_breathing(self): # http://sean.voisen.org/blog/2011/10/breathing-led-with-arduino/ # https://github.com/qmk/qmk_firmware/blob/9f1d781fcb7129a07e671a46461e501e3f1ae59d/quantum/rgblight.c#L806 - self.val = int((exp(sin((self.pos / 255.0) * pi)) - self.breathe_center / e) * - (self.val_limit / (e - 1 / e))) + sined = sin((self.pos / 255.0) * pi) + multip_1 = exp(sined) - self.breathe_center / e + multip_2 = self.val_limit / (e - 1 / e) + + self.val = int(multip_1 * multip_2) self.pos = (self.pos + self.animation_speed) % 256 self.set_hsv_fill(self.hue, self.sat, self.val)