From ddd8b41b78f546a83eeb7a1aca30f489a948bcf4 Mon Sep 17 00:00:00 2001 From: Jk Jensen Date: Sun, 26 Feb 2023 15:51:03 -0800 Subject: [PATCH] Linting --- boards/kyria/main.py | 29 +++++++++++++---------------- kmk/extensions/oled.py | 17 +++++++++-------- pyproject.toml | 3 +++ 3 files changed, 25 insertions(+), 24 deletions(-) diff --git a/boards/kyria/main.py b/boards/kyria/main.py index 23235d9..b4dce83 100644 --- a/boards/kyria/main.py +++ b/boards/kyria/main.py @@ -1,19 +1,16 @@ from kyria_v1_rp2040 import KMKKeyboard +from kmk.extensions.international import International +from kmk.extensions.media_keys import MediaKeys +from kmk.extensions.oled import Oled, OledData +from kmk.extensions.rgb import RGB, AnimationModes from kmk.hid import HIDModes from kmk.keys import KC +from kmk.modules.encoder import EncoderHandler from kmk.modules.layers import Layers from kmk.modules.modtap import ModTap from kmk.modules.split import Split, SplitType from kmk.modules.tapdance import TapDance -from kmk.modules.encoder import EncoderHandler -from kmk.extensions.rgb import RGB, AnimationModes -from kmk.extensions.media_keys import MediaKeys -from kmk.extensions.oled import ( - Oled, - OledData, -) -from kmk.extensions.international import International keyboard = KMKKeyboard() keyboard.debug_enabled = True @@ -39,13 +36,13 @@ keyboard.extensions.append(rgb_ext) oled_ext = Oled( OledData( entries=[ - OledData.oled_text_entry(text="Kyria v1.4", x=0, y=0), - OledData.oled_text_entry(text="KB2040", x=0, y=10), - OledData.oled_text_entry(text="Layer: ", x=0, y=20), - OledData.oled_text_entry(text="BASE", x=40, y=20, layer=0), - OledData.oled_text_entry(text="LOWER", x=40, y=20, layer=3), - OledData.oled_text_entry(text="RAISE", x=40, y=20, layer=4), - OledData.oled_text_entry(text="ADJUST", x=40, y=20, layer=6), + OledData.oled_text_entry(text='Kyria v1.4', x=0, y=0), + OledData.oled_text_entry(text='KB2040', x=0, y=10), + OledData.oled_text_entry(text='Layer: ', x=0, y=20), + OledData.oled_text_entry(text='BASE', x=40, y=20, layer=0), + OledData.oled_text_entry(text='LOWER', x=40, y=20, layer=3), + OledData.oled_text_entry(text='RAISE', x=40, y=20, layer=4), + OledData.oled_text_entry(text='ADJUST', x=40, y=20, layer=6), ] ), oHeight=64, @@ -121,5 +118,5 @@ encoder_handler.map = ( keyboard.extensions.append(encoder_handler) -if __name__ == "__main__": +if __name__ == '__main__': keyboard.go(hid_type=HIDModes.USB) diff --git a/kmk/extensions/oled.py b/kmk/extensions/oled.py index 8bc9945..705d2ef 100644 --- a/kmk/extensions/oled.py +++ b/kmk/extensions/oled.py @@ -1,13 +1,14 @@ import busio import gc -from kmk.handlers.stock import passthrough as handler_passthrough -from kmk.keys import make_key import adafruit_displayio_ssd1306 import displayio import terminalio from adafruit_display_text import label + from kmk.extensions import Extension +from kmk.handlers.stock import passthrough as handler_passthrough +from kmk.keys import make_key DISPLAY_OFFSET = 4 # Used to calculate a new zero level since SSD1306 is clipped. @@ -22,11 +23,11 @@ class OledData: self, entries=None, ): - if entries != None: + if entries is not None: self.data = entries @staticmethod - def oled_text_entry(x=0, y=0, text="", layer=None): + def oled_text_entry(x=0, y=0, text='', layer=None): return { 0: text, 1: x, @@ -36,7 +37,7 @@ class OledData: } @staticmethod - def oled_image_entry(x=0, y=0, image="", layer=None): + def oled_image_entry(x=0, y=0, image='', layer=None): odb = displayio.OnDiskBitmap(image) return { 0: odb, @@ -70,17 +71,17 @@ class Oled(Extension): gc.collect() make_key( - names=("OLED_BRI",), on_press=self._oled_bri, on_release=handler_passthrough + names=('OLED_BRI',), on_press=self._oled_bri, on_release=handler_passthrough ) make_key( - names=("OLED_BRD",), on_press=self._oled_brd, on_release=handler_passthrough + names=('OLED_BRD',), on_press=self._oled_brd, on_release=handler_passthrough ) def render_oled(self, layer): splash = displayio.Group() for view in self._views: - if view[3] == layer or view[3] == None: + if view[3] == layer or view[3] is None: if view[4] == OledEntryType.TXT: splash.append( label.Label( diff --git a/pyproject.toml b/pyproject.toml index e4957af..384d1ca 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -22,3 +22,6 @@ exclude = ''' | mnt )/ ''' + +[tool.ruff.flake8-quotes] +inline-quotes="single"