diff options
author | QMK Bot <hello@qmk.fm> | 2022-03-30 20:55:16 +0000 |
---|---|---|
committer | QMK Bot <hello@qmk.fm> | 2022-03-30 20:55:16 +0000 |
commit | d75ae52fe6b61e66387d7073404ca52c62e9c33e (patch) | |
tree | d6df4537471b2d53135aa15aa6c9e660619a16ff /lib | |
parent | 38209c5c861900e94ad2a0acdc11ea50214f0400 (diff) | |
parent | 64974a7f8fbda680ea307a9a4c2cb1cfbe92c01e (diff) | |
download | qmk_firmware-d75ae52fe6b61e66387d7073404ca52c62e9c33e.tar.gz qmk_firmware-d75ae52fe6b61e66387d7073404ca52c62e9c33e.zip |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'lib')
-rw-r--r-- | lib/python/qmk/cli/generate/rgb_breathe_table.py | 4 | ||||
-rw-r--r-- | lib/python/qmk/keyboard.py | 14 |
2 files changed, 9 insertions, 9 deletions
diff --git a/lib/python/qmk/cli/generate/rgb_breathe_table.py b/lib/python/qmk/cli/generate/rgb_breathe_table.py index 7382abd68b..8cf83238e1 100644 --- a/lib/python/qmk/cli/generate/rgb_breathe_table.py +++ b/lib/python/qmk/cli/generate/rgb_breathe_table.py @@ -34,7 +34,7 @@ def generate_rgb_breathe_table(cli): """ breathe_values = [0] * 256 for pos in range(0, 256): - breathe_values[pos] = (int)((math.exp(math.sin((pos/255) * math.pi)) - cli.args.center / math.e) * (cli.args.max / (math.e - 1 / math.e))) # noqa: yapf insists there be no whitespace around / + breathe_values[pos] = (int)((math.exp(math.sin((pos / 255) * math.pi)) - cli.args.center / math.e) * (cli.args.max / (math.e - 1 / math.e))) values_template = '' for s in range(0, 3): @@ -46,7 +46,7 @@ def generate_rgb_breathe_table(cli): values_template += ' ' if pos % 8 == 0 else '' values_template += '0x{:02X}'.format(breathe_values[pos]) values_template += ',' if (pos + step) < 256 else '' - values_template += '\n' if (pos+step) % 8 == 0 else ' ' # noqa: yapf insists there be no whitespace around + + values_template += '\n' if (pos + step) % 8 == 0 else ' ' values_template += '#endif' values_template += '\n\n' if s < 2 else '' diff --git a/lib/python/qmk/keyboard.py b/lib/python/qmk/keyboard.py index 7cd0a1d5a7..e69f63aebe 100644 --- a/lib/python/qmk/keyboard.py +++ b/lib/python/qmk/keyboard.py @@ -218,7 +218,7 @@ def render_key_rect(textpad, x, y, w, h, label, style): label_blank = ' ' * label_len label_border = box_chars['h'] * label_len - label_middle = label + ' '*label_leftover # noqa: yapf insists there be no whitespace around * + label_middle = label + ' ' * label_leftover top_line = array('u', box_chars['tl'] + label_border + box_chars['tr']) lab_line = array('u', box_chars['v'] + label_middle + box_chars['v']) @@ -245,10 +245,10 @@ def render_key_isoenter(textpad, x, y, w, h, label, style): if len(label) > label_len: label = label[:label_len] - label_blank = ' ' * (label_len-1) # noqa: yapf insists there be no whitespace around - and * + label_blank = ' ' * (label_len - 1) label_border_top = box_chars['h'] * label_len - label_border_bottom = box_chars['h'] * (label_len-1) # noqa - label_middle = label + ' '*label_leftover # noqa + label_border_bottom = box_chars['h'] * (label_len - 1) + label_middle = label + ' ' * label_leftover top_line = array('u', box_chars['tl'] + label_border_top + box_chars['tr']) lab_line = array('u', box_chars['v'] + label_middle + box_chars['v']) @@ -277,10 +277,10 @@ def render_key_baenter(textpad, x, y, w, h, label, style): if len(label) > label_len: label = label[:label_len] - label_blank = ' ' * (label_len-3) # noqa: yapf insists there be no whitespace around - and * - label_border_top = box_chars['h'] * (label_len-3) # noqa + label_blank = ' ' * (label_len - 3) + label_border_top = box_chars['h'] * (label_len - 3) label_border_bottom = box_chars['h'] * label_len - label_middle = label + ' '*label_leftover # noqa + label_middle = label + ' ' * label_leftover top_line = array('u', box_chars['tl'] + label_border_top + box_chars['tr']) mid_line = array('u', box_chars['v'] + label_blank + box_chars['v']) |